eyecreate/Arbitrateor
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add untested play/pause event code and change web interface to know which happened.

Browse Source
This commit is contained in:
Kevin Whitaker
2017-02-08 23:22:34 -05:00
parent 35279008ee
commit 41fa567f82
3 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/GroovePlayer.cpp
View File

@@ -389,11 +389,51 @@ void GroovePlayerMgr::grooveEventLoop()
}
else if(event.eventType == PLAYING_PAUSED)
{
//TODO
//Add action to DB
Wt::Dbo::Transaction pauseTransaction(sqlSession);
UserAction* action = new UserAction();
action->action = UserAction::UAction::PlayPause;
action->user = Wt::Dbo::ptr<User>(&event.userInvolved);
action->trackInvolved = Wt::Dbo::ptr<AudioTrack>(&event.tracksInvolved.front());
action->datetime = Wt::WDateTime::currentDateTime();
sqlSession.add(action);
pauseTransaction.commit();
groove_playlist_pause(currentPlaylist);
//Update vote display on all clients.
Wt::WServer::instance()->postAll([event]() {
Wt::WApplication* app = Wt::WApplication::instance();
if(app != nullptr)
{
static_cast<WebInterface*>(app)->playPauseActionFromServer(event.userInvolved, true);
}
}
);
}
else if(event.eventType == PLAYING_RESUMED)
{
//TODO
//Add action to DB
Wt::Dbo::Transaction playTransaction(sqlSession);
UserAction* action = new UserAction();
action->action = UserAction::UAction::PlayPause;
action->user = Wt::Dbo::ptr<User>(&event.userInvolved);
action->trackInvolved = Wt::Dbo::ptr<AudioTrack>(&event.tracksInvolved.front());
action->datetime = Wt::WDateTime::currentDateTime();
sqlSession.add(action);
playTransaction.commit();
groove_playlist_play(currentPlaylist);
//Update vote display on all clients.
Wt::WServer::instance()->postAll([event]() {
Wt::WApplication* app = Wt::WApplication::instance();
if(app != nullptr)
{
static_cast<WebInterface*>(app)->playPauseActionFromServer(event.userInvolved, false);
}
}
);
}
else if(event.eventType == SKIP_REQUESTED)
{

2
src/WebInterface.cpp
View File

@@ -57,7 +57,7 @@ void WebInterface::loginCompleted()
//TODO: request current player state.
}
void WebInterface::playPauseActionFromServer(User userPausing)
void WebInterface::playPauseActionFromServer(User userPausing, bool pause)
{
priv_int->playerUI->tempText->setText(priv_int->playerUI->tempText->text()+"play");
triggerUpdate();

2
src/WebInterface.h
View File

@@ -31,7 +31,7 @@ public:
WebInterface(const Wt::WEnvironment& env);
~WebInterface();
void loginCompleted();
void playPauseActionFromServer(User userPausing);
void playPauseActionFromServer(User userPausing, bool pause);
void songChangedFromServer(AudioTrack nextTrack);
void voteTracksUpdatedFromServer(std::list<AudioTrack> voteableTracks);
void skipVotedFromServer(User userRequestingToSkipCurrentTrack);