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

[UI] Removed unused playlist icon

Browse Source
This commit is contained in:
emeric
2016-01-24 15:13:36 +01:00
parent 589aa1f79b
commit 4575da4c79
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/templates.xml
+1 -1
View File
@@ -545,7 +545,7 @@
${curtime}${seekbar}${duration} ${curtime}${seekbar}${duration}
</div> </div>
</div> </div>
${shuffle}${repeat}${playlist} ${shuffle}${repeat}
</message> </message>
</messages> </messages>
src/ui/audio/AudioPlayer.cpp
+2 -7
View File
@@ -114,9 +114,8 @@ AudioPlayer::loadTrack(Database::Track::id_type trackId)
//TODO, try to load everything in JS in order to prevent the WriteError bug? //TODO, try to load everything in JS in order to prevent the WriteError bug?
_audio->pause(); _audio->pause();
_audio->clearSources(); _audio->clearSources();
//TODO, encoding
_audio->addSource(SessionTranscodeResource()->getUrl(trackId, encoding, 0, streams)); _audio->addSource(SessionTranscodeResource()->getUrl(trackId, encoding, 0, streams));
_audio->setPreloadMode(Wt::WAudio::PreloadAuto); _audio->setPreloadMode(Wt::WAudio::PreloadNone);
_audio->play(); _audio->play();
return true; return true;
@@ -131,7 +130,7 @@ AudioPlayer::AudioPlayer(Wt::WContainerWidget *parent)
// TODO potential leak here // TODO potential leak here
_audio = new Wt::WAudio(); _audio = new Wt::WAudio();
_audio->setOptions(Wt::WAudio::Autoplay); _audio->setOptions(Wt::WAudio::Autoplay);
_audio->setPreloadMode(Wt::WAudio::PreloadAuto); _audio->setPreloadMode(Wt::WAudio::PreloadNone);
bindWidget("audio", _audio); bindWidget("audio", _audio);
_audio->ended().connect(std::bind([=] () _audio->ended().connect(std::bind([=] ()
@@ -155,10 +154,6 @@ AudioPlayer::AudioPlayer(Wt::WContainerWidget *parent)
volumeSlider->setAttributeValue("orient", "vertical"); // firefox volumeSlider->setAttributeValue("orient", "vertical"); // firefox
bindWidget("volume", volumeSlider); bindWidget("volume", volumeSlider);
Wt::WText *playlistBtn = new Wt::WText("<i class=\"fa fa-list fa-2x\"></i>", Wt::XHTMLText);
playlistBtn->addStyleClass("mediaplayer-btn");
bindWidget("playlist", playlistBtn);
Wt::WText *repeatBtn = new Wt::WText("<i class=\"fa fa-repeat fa-2x\"></i>", Wt::XHTMLText); Wt::WText *repeatBtn = new Wt::WText("<i class=\"fa fa-repeat fa-2x\"></i>", Wt::XHTMLText);
repeatBtn->addStyleClass("mediaplayer-btn"); repeatBtn->addStyleClass("mediaplayer-btn");
bindWidget("repeat", repeatBtn); bindWidget("repeat", repeatBtn);