diff --git a/src/ui/audio/mobile/MobileAudio.cpp b/src/ui/audio/mobile/MobileAudio.cpp index 6d8a385d..04bd79e7 100644 --- a/src/ui/audio/mobile/MobileAudio.cpp +++ b/src/ui/audio/mobile/MobileAudio.cpp @@ -82,7 +82,7 @@ Audio::Audio(Wt::WContainerWidget *parent) } } - AudioMediaPlayer* mediaPlayer = new AudioMediaPlayer(db, encoding); + AudioMediaPlayer* mediaPlayer = new AudioMediaPlayer(encoding); footer->bindWidget("player", mediaPlayer); edit->changed().connect(std::bind([=] () { diff --git a/src/ui/audio/mobile/MobileAudioMediaPlayer.cpp b/src/ui/audio/mobile/MobileAudioMediaPlayer.cpp index 48e2dd67..47c2ff0a 100644 --- a/src/ui/audio/mobile/MobileAudioMediaPlayer.cpp +++ b/src/ui/audio/mobile/MobileAudioMediaPlayer.cpp @@ -23,6 +23,8 @@ #include #include +#include "LmsApplication.hpp" + #include "MobileAudioMediaPlayer.hpp" #include "resource/AvConvTranscodeStreamResource.hpp" @@ -37,15 +39,12 @@ AudioMediaPlayer::getBestEncoding() return Wt::WMediaPlayer::MP3; } -AudioMediaPlayer::AudioMediaPlayer(Database::Handler& db, Wt::WMediaPlayer::Encoding encoding, Wt::WContainerWidget *parent) +AudioMediaPlayer::AudioMediaPlayer(Wt::WMediaPlayer::Encoding encoding, Wt::WContainerWidget *parent) : Wt::WContainerWidget(parent), -_db(db), _player(nullptr), _encoding(encoding) { - _coverResource = new CoverResource(db, 48); - Wt::WTemplate* container = new Wt::WTemplate(this); container->setTemplateText(Wt::WString::tr("mobile-audio-player")); @@ -91,12 +90,12 @@ AudioMediaPlayer::play(Database::Track::id_type trackId, const Transcode::Parame _player->play(); - _cover->setImageLink( Wt::WLink (_coverResource->getTrackUrl(trackId))); + _cover->setImageLink( Wt::WLink (LmsApplication::instance()->getCoverResource()->getTrackUrl(trackId, 48))); { - Wt::Dbo::Transaction transaction(_db.getSession()); + Wt::Dbo::Transaction transaction(DboSession()); - Database::Track::pointer track = Database::Track::getById(_db.getSession(), trackId); + Database::Track::pointer track = Database::Track::getById(DboSession(), trackId); _track->setText( Wt::WString::fromUTF8(track->getName() )); _artistRelease->setText( Wt::WString::fromUTF8(track->getArtistName()) ); diff --git a/src/ui/audio/mobile/MobileAudioMediaPlayer.hpp b/src/ui/audio/mobile/MobileAudioMediaPlayer.hpp index c9b7ce8d..1b9ab86e 100644 --- a/src/ui/audio/mobile/MobileAudioMediaPlayer.hpp +++ b/src/ui/audio/mobile/MobileAudioMediaPlayer.hpp @@ -25,7 +25,6 @@ #include #include "database/DatabaseHandler.hpp" -#include "resource/CoverResource.hpp" #include "transcode/Parameters.hpp" namespace UserInterface { @@ -37,7 +36,7 @@ class AudioMediaPlayer : public Wt::WContainerWidget static Wt::WMediaPlayer::Encoding getBestEncoding(); - AudioMediaPlayer(Database::Handler& db, Wt::WMediaPlayer::Encoding encoding, Wt::WContainerWidget *parent = 0); + AudioMediaPlayer(Wt::WMediaPlayer::Encoding encoding, Wt::WContainerWidget *parent = 0); void play(Database::Track::id_type trackId, const Transcode::Parameters& parameters); @@ -45,9 +44,6 @@ class AudioMediaPlayer : public Wt::WContainerWidget private: - Database::Handler& _db; - CoverResource* _coverResource; - Wt::WMediaPlayer* _player; Wt::WMediaPlayer::Encoding _encoding;