diff --git a/ext/libclementine-remote/remotecontrolmessages.proto b/ext/libclementine-remote/remotecontrolmessages.proto index 1e59774f0..f28a78894 100644 --- a/ext/libclementine-remote/remotecontrolmessages.proto +++ b/ext/libclementine-remote/remotecontrolmessages.proto @@ -127,7 +127,6 @@ enum RepeatMode { Repeat_Album = 2; Repeat_Playlist = 3; Repeat_OneByOne = 4; - Repeat_Intro = 5; } // Valid Shuffle modes diff --git a/src/core/player.cpp b/src/core/player.cpp index 23894a028..bd0a107cd 100644 --- a/src/core/player.cpp +++ b/src/core/player.cpp @@ -589,8 +589,6 @@ void Player::TrackAboutToEnd() { next_item->Metadata().end_nanosec()); } -void Player::IntroPointReached() { NextInternal(Engine::Intro); } - void Player::ValidSongRequested(const QUrl& url) { emit SongChangeRequestProcessed(url, true); } diff --git a/src/core/player.h b/src/core/player.h index 347c9dc14..bba893e7c 100644 --- a/src/core/player.h +++ b/src/core/player.h @@ -92,7 +92,7 @@ class PlayerInterface : public QObject { virtual void Play() = 0; virtual void ShowOSD() = 0; -signals: + signals: void Playing(); void Paused(); void Stopped(); @@ -163,7 +163,6 @@ class Player : public PlayerInterface { void Pause(); void Stop(bool stop_after = false); void StopAfterCurrent(); - void IntroPointReached(); void Play(); void ShowOSD(); void TogglePrettyOSD(); diff --git a/src/engines/engine_fwd.h b/src/engines/engine_fwd.h index 2a6eac2c3..31377e618 100644 --- a/src/engines/engine_fwd.h +++ b/src/engines/engine_fwd.h @@ -27,7 +27,6 @@ enum TrackChangeType { First = 0x01, Manual = 0x02, Auto = 0x04, - Intro = 0x08, // Any of: SameAlbum = 0x10, diff --git a/src/engines/gstengine.cpp b/src/engines/gstengine.cpp index d8c6b0ea1..f9e18843d 100755 --- a/src/engines/gstengine.cpp +++ b/src/engines/gstengine.cpp @@ -302,8 +302,8 @@ void GstEngine::UpdateScope(int chunk_length) { gst_buffer_map(latest_buffer_, &map, GST_MAP_READ); // determine where to split the buffer - int chunk_density = - (map.size * kNsecPerMsec) / GST_BUFFER_DURATION(latest_buffer_); + int chunk_density = (map.size * kNsecPerMsec) / + GST_BUFFER_DURATION(latest_buffer_); int chunk_size = chunk_length * chunk_density; @@ -321,9 +321,10 @@ void GstEngine::UpdateScope(int chunk_length) { // make sure we don't go beyond the end of the buffer if (scope_chunk_ == scope_chunks_ - 1) { - bytes = qMin(static_cast( - map.size - (chunk_size * scope_chunk_)), - scope_.size() * sizeof(sample_type)); + bytes = + qMin(static_cast( + map.size - (chunk_size * scope_chunk_)), + scope_.size() * sizeof(sample_type)); } else { bytes = qMin(static_cast(chunk_size), scope_.size() * sizeof(sample_type)); @@ -379,9 +380,7 @@ bool GstEngine::Load(const QUrl& url, Engine::TrackChangeFlags change, bool crossfade = current_pipeline_ && ((crossfade_enabled_ && change & Engine::Manual) || - (autocrossfade_enabled_ && change & Engine::Auto) || - ((crossfade_enabled_ || autocrossfade_enabled_) && - change & Engine::Intro)); + (autocrossfade_enabled_ && change & Engine::Auto)); if (change & Engine::Auto && change & Engine::SameAlbum && !crossfade_same_album_) @@ -768,8 +767,9 @@ GstEngine::PluginDetailsList GstEngine::GetPluginList( if (QString(gst_element_factory_get_klass(factory)).contains(classname)) { PluginDetails details; details.name = QString::fromUtf8(gst_plugin_feature_get_name(p->data)); - details.description = QString::fromUtf8(gst_element_factory_get_metadata( - factory, GST_ELEMENT_METADATA_DESCRIPTION)); + details.description = QString::fromUtf8( + gst_element_factory_get_metadata(factory, + GST_ELEMENT_METADATA_DESCRIPTION)); ret << details; } p = g_list_next(p); diff --git a/src/networkremote/outgoingdatacreator.cpp b/src/networkremote/outgoingdatacreator.cpp index 92c2c0a77..ca8fdbc93 100644 --- a/src/networkremote/outgoingdatacreator.cpp +++ b/src/networkremote/outgoingdatacreator.cpp @@ -79,8 +79,10 @@ void OutgoingDataCreator::SetClients(QList* clients) { SLOT(ResultsAvailable(int, SearchProvider::ResultList)), Qt::QueuedConnection); - connect(app_->global_search(), SIGNAL(SearchFinished(int)), - SLOT(SearchFinished(int)), Qt::QueuedConnection); + connect(app_->global_search(), + SIGNAL(SearchFinished(int)), + SLOT(SearchFinished(int)), + Qt::QueuedConnection); } void OutgoingDataCreator::CheckEnabledProviders() { @@ -377,11 +379,9 @@ void OutgoingDataCreator::CreateSong(const Song& song, const QImage& art, song_metadata->set_file_size(song.filesize()); song_metadata->set_rating(song.rating()); song_metadata->set_url(DataCommaSizeFromQString(song.url().toString())); - song_metadata->set_art_automatic( - DataCommaSizeFromQString(song.art_automatic())); + song_metadata->set_art_automatic(DataCommaSizeFromQString(song.art_automatic())); song_metadata->set_art_manual(DataCommaSizeFromQString(song.art_manual())); - song_metadata->set_type( - static_cast<::pb::remote::SongMetadata_Type>(song.filetype())); + song_metadata->set_type(static_cast< ::pb::remote::SongMetadata_Type>(song.filetype())); // Append coverart if (!art.isNull()) { @@ -506,9 +506,6 @@ void OutgoingDataCreator::SendRepeatMode(PlaylistSequence::RepeatMode mode) { case PlaylistSequence::Repeat_OneByOne: msg.mutable_repeat()->set_repeat_mode(pb::remote::Repeat_OneByOne); break; - case PlaylistSequence::Repeat_Intro: - msg.mutable_repeat()->set_repeat_mode(pb::remote::Repeat_Intro); - break; } SendDataToClients(&msg); @@ -676,8 +673,7 @@ void OutgoingDataCreator::DoGlobalSearch(const QString& query, // Send status message pb::remote::Message msg; - pb::remote::ResponseGlobalSearchStatus* status = - msg.mutable_response_global_search_status(); + pb::remote::ResponseGlobalSearchStatus* status = msg.mutable_response_global_search_status(); msg.set_type(pb::remote::GLOBAL_SEARCH_STATUS); status->set_id(id); @@ -722,8 +718,7 @@ void OutgoingDataCreator::ResultsAvailable( client->SendData(&msg); - qLog(Debug) << "ResultsAvailable" << id << results.first().provider_->name() - << results.size(); + qLog(Debug) << "ResultsAvailable" << id << results.first().provider_->name() << results.size(); } void OutgoingDataCreator::SearchFinished(int id) { @@ -733,8 +728,7 @@ void OutgoingDataCreator::SearchFinished(int id) { // Send status message pb::remote::Message msg; - pb::remote::ResponseGlobalSearchStatus* status = - msg.mutable_response_global_search_status(); + pb::remote::ResponseGlobalSearchStatus* status = msg.mutable_response_global_search_status(); msg.set_type(pb::remote::GLOBAL_SEARCH_STATUS); status->set_id(req.id_); diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp index 1ed5e4c45..dcb0897d3 100644 --- a/src/playlist/playlist.cpp +++ b/src/playlist/playlist.cpp @@ -563,7 +563,6 @@ int Playlist::next_row(bool ignore_repeat_track) const { switch (playlist_sequence_->repeat_mode()) { case PlaylistSequence::Repeat_Off: - case PlaylistSequence::Repeat_Intro: return -1; case PlaylistSequence::Repeat_Track: next_virtual_index = current_virtual_index_; diff --git a/src/playlist/playlistsequence.cpp b/src/playlist/playlistsequence.cpp index abedde1f5..43cfe0162 100644 --- a/src/playlist/playlistsequence.cpp +++ b/src/playlist/playlistsequence.cpp @@ -53,7 +53,6 @@ PlaylistSequence::PlaylistSequence(QWidget* parent, SettingsProvider* settings) repeat_group->addAction(ui_->action_repeat_album); repeat_group->addAction(ui_->action_repeat_playlist); repeat_group->addAction(ui_->action_repeat_onebyone); - repeat_group->addAction(ui_->action_repeat_intro); repeat_menu_->addActions(repeat_group->actions()); ui_->repeat->setMenu(repeat_menu_); @@ -121,7 +120,6 @@ void PlaylistSequence::RepeatActionTriggered(QAction* action) { if (action == ui_->action_repeat_album) mode = Repeat_Album; if (action == ui_->action_repeat_playlist) mode = Repeat_Playlist; if (action == ui_->action_repeat_onebyone) mode = Repeat_OneByOne; - if (action == ui_->action_repeat_intro) mode = Repeat_Intro; SetRepeatMode(mode); } @@ -154,9 +152,6 @@ void PlaylistSequence::SetRepeatMode(RepeatMode mode) { case Repeat_OneByOne: ui_->action_repeat_onebyone->setChecked(true); break; - case Repeat_Intro: - ui_->action_repeat_intro->setChecked(true); - break; } if (mode != repeat_mode_) { @@ -250,9 +245,6 @@ void PlaylistSequence::CycleRepeatMode() { mode = Repeat_OneByOne; break; case Repeat_OneByOne: - mode = Repeat_Intro; - break; - case Repeat_Intro: break; } diff --git a/src/playlist/playlistsequence.h b/src/playlist/playlistsequence.h index 855504d50..65ddd79ee 100644 --- a/src/playlist/playlistsequence.h +++ b/src/playlist/playlistsequence.h @@ -41,7 +41,6 @@ class PlaylistSequence : public QWidget { Repeat_Album = 2, Repeat_Playlist = 3, Repeat_OneByOne = 4, - Repeat_Intro = 5, }; enum ShuffleMode { Shuffle_Off = 0, diff --git a/src/playlist/playlistsequence.ui b/src/playlist/playlistsequence.ui index 2b66de3cf..bac173756 100644 --- a/src/playlist/playlistsequence.ui +++ b/src/playlist/playlistsequence.ui @@ -106,14 +106,6 @@ Stop after each track - - - true - - - Intro tracks - - true diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 85e50ccff..3ff22148a 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -494,8 +494,6 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd, connect(app_->player(), SIGNAL(Seeked(qlonglong)), SLOT(Seeked(qlonglong))); connect(app_->player(), SIGNAL(TrackSkipped(PlaylistItemPtr)), SLOT(TrackSkipped(PlaylistItemPtr))); - connect(this, SIGNAL(IntroPointReached()), app_->player(), - SLOT(IntroPointReached())); connect(app_->player(), SIGNAL(VolumeChanged(int)), SLOT(VolumeChanged(int))); connect(app_->player(), SIGNAL(Paused()), ui_->playlist, @@ -1340,13 +1338,6 @@ void MainWindow::UpdateTrackPosition() { } } - // (just after) the scrobble point is a good point to change tracks in intro mode - if (position >= scrobble_point + 5) { - if (playlist->sequence()->repeat_mode() == PlaylistSequence::Repeat_Intro) { - emit IntroPointReached(); - } - } - // Update the tray icon every 10 seconds if (position % 10 == 0) { qLog(Debug) << "position" << position << "scrobble point" << scrobble_point diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h index b9400c793..b1dd0b660 100644 --- a/src/ui/mainwindow.h +++ b/src/ui/mainwindow.h @@ -137,8 +137,6 @@ signals: // Signals that stop playing after track was toggled. void StopAfterToggled(bool stop); - void IntroPointReached(); - private slots: void FilePathChanged(const QString& path); diff --git a/src/widgets/osd.cpp b/src/widgets/osd.cpp index ba00e9188..8bb636dbe 100644 --- a/src/widgets/osd.cpp +++ b/src/widgets/osd.cpp @@ -317,9 +317,6 @@ void OSD::RepeatModeChanged(PlaylistSequence::RepeatMode mode) { case PlaylistSequence::Repeat_OneByOne: current_mode = tr("Stop after every track"); break; - case PlaylistSequence::Repeat_Intro: - current_mode = tr("Intro tracks"); - break; } ShowMessage(QCoreApplication::applicationName(), current_mode); }