Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged from "remotecontrol". Fixed two broken connects

Browse Source
This commit is contained in:
Andreas 2013-01-16 19:26:33 +01:00
parent 209b342bb9
commit 76c294e470
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/networkremote/incomingdataparser.cpp
View File

@ -42,6 +42,14 @@ IncomingDataParser::IncomingDataParser(Application* app)
app_->player(), SLOT(SetVolume(int))); app_->player(), SLOT(SetVolume(int)));
connect(this, SIGNAL(PlayAt(int,Engine::TrackChangeFlags,bool)), connect(this, SIGNAL(PlayAt(int,Engine::TrackChangeFlags,bool)),
app_->player(), SLOT(PlayAt(int,Engine::TrackChangeFlags,bool))); app_->player(), SLOT(PlayAt(int,Engine::TrackChangeFlags,bool)));
// For some connects we have to wait for the playlistmanager
// to be initialized
connect(app_->playlist_manager(), SIGNAL(PlaylistManagerInitialized()),
this, SLOT(PlaylistManagerInitialized()));
}
void IncomingDataParser::PlaylistManagerInitialized() {
connect(this, SIGNAL(SetActivePlaylist(int)), connect(this, SIGNAL(SetActivePlaylist(int)),
app_->playlist_manager(), SLOT(SetActivePlaylist(int))); app_->playlist_manager(), SLOT(SetActivePlaylist(int)));
connect(this, SIGNAL(ShuffleCurrent()), connect(this, SIGNAL(ShuffleCurrent()),

3
src/networkremote/incomingdataparser.h
View File

@ -35,6 +35,9 @@ signals:
void SetRepeatMode(PlaylistSequence::RepeatMode mode); void SetRepeatMode(PlaylistSequence::RepeatMode mode);
void SetShuffleMode(PlaylistSequence::ShuffleMode mode); void SetShuffleMode(PlaylistSequence::ShuffleMode mode);
private slots:
void PlaylistManagerInitialized();
private: private:
Application* app_; Application* app_;
bool close_connection_; bool close_connection_;