owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UI] Restored audio encoding setting

Browse Source
This commit is contained in:
emeric
2016-01-16 19:04:46 +01:00
parent 027e9d9bf7
commit 5151d779ae
5 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/audio/AudioPlayer.cpp
+32 -1
View File
@@ -33,9 +33,19 @@
namespace UserInterface {
Av::Encoding
AudioPlayer::getBestEncoding() const
{
// TODO get the supported formats of the player and pick one
return Av::Encoding::MP3;
}
bool
AudioPlayer::loadTrack(Database::Track::id_type trackId)
{
// TODO reduce this scope
Wt::Dbo::Transaction transaction(DboSession());
Database::Track::pointer track = Database::Track::getById(DboSession(), trackId);
@@ -45,6 +55,25 @@ AudioPlayer::loadTrack(Database::Track::id_type trackId)
return false;
}
Database::User::pointer user = CurrentUser();
if (!user)
{
LMS_LOG(UI, ERROR) << "No user found!";
return false;
}
Av::Encoding encoding;
switch (user->getAudioEncoding())
{
case Database::AudioEncoding::MP3: encoding = Av::Encoding::MP3; break;
case Database::AudioEncoding::OGA: encoding = Av::Encoding::OGA; break;
case Database::AudioEncoding::WEBMA: encoding = Av::Encoding::WEBMA; break;
case Database::AudioEncoding::AUTO:
default:
encoding = getBestEncoding();
break;
}
bindString("track", Wt::WString::fromUTF8(track->getName()));
bindString("artist", Wt::WString::fromUTF8(track->getArtist()->getName()));
_cover->setImageLink(SessionCoverResource()->getTrackUrl(trackId, 64));
@@ -75,11 +104,13 @@ AudioPlayer::loadTrack(Database::Track::id_type trackId)
document.lms.audio.curTime = 0;\
");
LMS_LOG(UI, DEBUG) << "Loading, URL = '" << SessionTranscodeResource()->getUrl(trackId, encoding, 0, streams) << "'";
//TODO, try to load everything in JS in order to prevent the WriteError bug?
_audio->pause();
_audio->clearSources();
//TODO, encoding
_audio->addSource(SessionTranscodeResource()->getUrl(trackId, Av::Encoding::MP3, 0, streams));
_audio->addSource(SessionTranscodeResource()->getUrl(trackId, encoding, 0, streams));
_audio->setPreloadMode(Wt::WAudio::PreloadAuto);
_audio->play();