From 4575da4c79a1f823d877b99e914623040c743eb1 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 24 Jan 2016 15:13:36 +0100 Subject: [PATCH] [UI] Removed unused playlist icon --- approot/templates.xml | 2 +- src/ui/audio/AudioPlayer.cpp | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/approot/templates.xml b/approot/templates.xml index c6e1c600..411523a4 100644 --- a/approot/templates.xml +++ b/approot/templates.xml @@ -545,7 +545,7 @@ ${curtime}${seekbar}${duration} - ${shuffle}${repeat}${playlist} + ${shuffle}${repeat} diff --git a/src/ui/audio/AudioPlayer.cpp b/src/ui/audio/AudioPlayer.cpp index c97e775b..1d166635 100644 --- a/src/ui/audio/AudioPlayer.cpp +++ b/src/ui/audio/AudioPlayer.cpp @@ -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? _audio->pause(); _audio->clearSources(); - //TODO, encoding _audio->addSource(SessionTranscodeResource()->getUrl(trackId, encoding, 0, streams)); - _audio->setPreloadMode(Wt::WAudio::PreloadAuto); + _audio->setPreloadMode(Wt::WAudio::PreloadNone); _audio->play(); return true; @@ -131,7 +130,7 @@ AudioPlayer::AudioPlayer(Wt::WContainerWidget *parent) // TODO potential leak here _audio = new Wt::WAudio(); _audio->setOptions(Wt::WAudio::Autoplay); - _audio->setPreloadMode(Wt::WAudio::PreloadAuto); + _audio->setPreloadMode(Wt::WAudio::PreloadNone); bindWidget("audio", _audio); _audio->ended().connect(std::bind([=] () @@ -155,10 +154,6 @@ AudioPlayer::AudioPlayer(Wt::WContainerWidget *parent) volumeSlider->setAttributeValue("orient", "vertical"); // firefox bindWidget("volume", volumeSlider); - Wt::WText *playlistBtn = new Wt::WText("", Wt::XHTMLText); - playlistBtn->addStyleClass("mediaplayer-btn"); - bindWidget("playlist", playlistBtn); - Wt::WText *repeatBtn = new Wt::WText("", Wt::XHTMLText); repeatBtn->addStyleClass("mediaplayer-btn"); bindWidget("repeat", repeatBtn);