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

Updated code due to session data changes

Browse Source
This commit is contained in:
emeric
2015-06-07 21:10:10 +02:00
parent ad2fc0b402
commit 2023600fcd
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/audio/mobile/MobileAudio.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ Audio::Audio(Wt::WContainerWidget *parent)
} }
} }
AudioMediaPlayer* mediaPlayer = new AudioMediaPlayer(db, encoding); AudioMediaPlayer* mediaPlayer = new AudioMediaPlayer(encoding);
footer->bindWidget("player", mediaPlayer); footer->bindWidget("player", mediaPlayer);
edit->changed().connect(std::bind([=] () { edit->changed().connect(std::bind([=] () {
src/ui/audio/mobile/MobileAudioMediaPlayer.cpp
+6 -7
View File
@@ -23,6 +23,8 @@
#include <Wt/WPushButton> #include <Wt/WPushButton>
#include <Wt/WSlider> #include <Wt/WSlider>
#include "LmsApplication.hpp"
#include "MobileAudioMediaPlayer.hpp" #include "MobileAudioMediaPlayer.hpp"
#include "resource/AvConvTranscodeStreamResource.hpp" #include "resource/AvConvTranscodeStreamResource.hpp"
@@ -37,15 +39,12 @@ AudioMediaPlayer::getBestEncoding()
return Wt::WMediaPlayer::MP3; 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), Wt::WContainerWidget(parent),
_db(db),
_player(nullptr), _player(nullptr),
_encoding(encoding) _encoding(encoding)
{ {
_coverResource = new CoverResource(db, 48);
Wt::WTemplate* container = new Wt::WTemplate(this); Wt::WTemplate* container = new Wt::WTemplate(this);
container->setTemplateText(Wt::WString::tr("mobile-audio-player")); container->setTemplateText(Wt::WString::tr("mobile-audio-player"));
@@ -91,12 +90,12 @@ AudioMediaPlayer::play(Database::Track::id_type trackId, const Transcode::Parame
_player->play(); _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() )); _track->setText( Wt::WString::fromUTF8(track->getName() ));
_artistRelease->setText( Wt::WString::fromUTF8(track->getArtistName()) ); _artistRelease->setText( Wt::WString::fromUTF8(track->getArtistName()) );
src/ui/audio/mobile/MobileAudioMediaPlayer.hpp
+1 -5
View File
@@ -25,7 +25,6 @@
#include <Wt/WImage> #include <Wt/WImage>
#include "database/DatabaseHandler.hpp" #include "database/DatabaseHandler.hpp"
#include "resource/CoverResource.hpp"
#include "transcode/Parameters.hpp" #include "transcode/Parameters.hpp"
namespace UserInterface { namespace UserInterface {
@@ -37,7 +36,7 @@ class AudioMediaPlayer : public Wt::WContainerWidget
static Wt::WMediaPlayer::Encoding getBestEncoding(); 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); void play(Database::Track::id_type trackId, const Transcode::Parameters& parameters);
@@ -45,9 +44,6 @@ class AudioMediaPlayer : public Wt::WContainerWidget
private: private:
Database::Handler& _db;
CoverResource* _coverResource;
Wt::WMediaPlayer* _player; Wt::WMediaPlayer* _player;
Wt::WMediaPlayer::Encoding _encoding; Wt::WMediaPlayer::Encoding _encoding;