Merge branch 'master' of https://code.google.com/r/asfa194-clementineremote
This commit is contained in:
commit
591b455684
|
@ -48,6 +48,8 @@ void RegisterMetaTypes() {
|
||||||
qRegisterMetaType<PodcastList>("PodcastList");
|
qRegisterMetaType<PodcastList>("PodcastList");
|
||||||
qRegisterMetaType<QList<CoverSearchResult> >("QList<CoverSearchResult>");
|
qRegisterMetaType<QList<CoverSearchResult> >("QList<CoverSearchResult>");
|
||||||
qRegisterMetaType<QList<PlaylistItemPtr> >("QList<PlaylistItemPtr>");
|
qRegisterMetaType<QList<PlaylistItemPtr> >("QList<PlaylistItemPtr>");
|
||||||
|
qRegisterMetaType<PlaylistSequence::RepeatMode>("PlaylistSequence::RepeatMode");
|
||||||
|
qRegisterMetaType<PlaylistSequence::ShuffleMode>("PlaylistSequence::ShuffleMode");
|
||||||
qRegisterMetaType<QList<PodcastEpisode> >("QList<PodcastEpisode>");
|
qRegisterMetaType<QList<PodcastEpisode> >("QList<PodcastEpisode>");
|
||||||
qRegisterMetaType<QList<Podcast> >("QList<Podcast>");
|
qRegisterMetaType<QList<Podcast> >("QList<Podcast>");
|
||||||
qRegisterMetaType<QList<QNetworkCookie> >("QList<QNetworkCookie>");
|
qRegisterMetaType<QList<QNetworkCookie> >("QList<QNetworkCookie>");
|
||||||
|
|
|
@ -45,13 +45,6 @@ IncomingDataParser::IncomingDataParser(Application* app)
|
||||||
connect(this, SIGNAL(SeekTo(int)),
|
connect(this, SIGNAL(SeekTo(int)),
|
||||||
app_->player(), SLOT(SeekTo(int)));
|
app_->player(), SLOT(SeekTo(int)));
|
||||||
|
|
||||||
// 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()),
|
||||||
|
|
|
@ -36,8 +36,6 @@ signals:
|
||||||
void SetShuffleMode(PlaylistSequence::ShuffleMode mode);
|
void SetShuffleMode(PlaylistSequence::ShuffleMode mode);
|
||||||
void SeekTo(int seconds);
|
void SeekTo(int seconds);
|
||||||
|
|
||||||
private slots:
|
|
||||||
void PlaylistManagerInitialized();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Application* app_;
|
Application* app_;
|
||||||
|
|
|
@ -140,6 +140,13 @@ void OutgoingDataCreator::SendFirstData() {
|
||||||
|
|
||||||
// And the current track position
|
// And the current track position
|
||||||
UpdateTrackPosition();
|
UpdateTrackPosition();
|
||||||
|
|
||||||
|
// And the current playlists
|
||||||
|
SendAllPlaylists();
|
||||||
|
|
||||||
|
// Send the current random and repeat mode
|
||||||
|
SendShuffleMode(app_->playlist_manager()->sequence()->shuffle_mode());
|
||||||
|
SendRepeatMode(app_->playlist_manager()->sequence()->repeat_mode());
|
||||||
}
|
}
|
||||||
|
|
||||||
void OutgoingDataCreator::CurrentSongChanged(const Song& song, const QString& uri, const QImage& img) {
|
void OutgoingDataCreator::CurrentSongChanged(const Song& song, const QString& uri, const QImage& img) {
|
||||||
|
|
Loading…
Reference in New Issue