diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/mainwindow.cpp | 6 | ||||
| -rw-r--r-- | src/qmmpui/mediaplayer.cpp | 4 | ||||
| -rw-r--r-- | src/qmmpui/qmmpuisettings.cpp | 6 | ||||
| -rw-r--r-- | src/qmmpui/qmmpuisettings.h | 7 |
5 files changed, 12 insertions, 13 deletions
diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp index 7930e84e4..e4e76d6ac 100644 --- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp +++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp @@ -134,7 +134,7 @@ QString PlayListOption::executeCommand(const QString& opt_str, const QStringList out += "SHUFFLE: " + boolToText(ui_settings->isShuffle()) + "\n"; out += "REPEAT PLAYLIST: " + boolToText(ui_settings->isRepeatableList()) + "\n"; out += "REPEAT TRACK: " + boolToText(ui_settings->isRepeatableTrack()) + "\n"; - out += "NO PLAYLIST ADVANCE: " + boolToText(ui_settings->isNoPlaylistAdvance()) + "\n"; + out += "NO PLAYLIST ADVANCE: " + boolToText(ui_settings->isNoPlayListAdvance()) + "\n"; } return out; } diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp index 378651079..45eda8dd4 100644 --- a/src/plugins/Ui/skinned/mainwindow.cpp +++ b/src/plugins/Ui/skinned/mainwindow.cpp @@ -248,7 +248,7 @@ void MainWindow::readSettings() ACTION(ActionManager::REPEAT_ALL)->setChecked(m_ui_settings->isRepeatableList()); ACTION(ActionManager::SHUFFLE)->setChecked(m_ui_settings->isShuffle()); ACTION(ActionManager::REPEAT_TRACK)->setChecked(m_ui_settings->isRepeatableTrack()); - ACTION(ActionManager::NO_PL_ADVANCE)->setChecked(m_ui_settings->isNoPlaylistAdvance()); + ACTION(ActionManager::NO_PL_ADVANCE)->setChecked(m_ui_settings->isNoPlayListAdvance()); m_update = true; } else @@ -387,7 +387,7 @@ void MainWindow::createActions() plMenu->addAction(SET_ACTION(ActionManager::REPEAT_TRACK, m_ui_settings, SLOT(setRepeatableTrack(bool)))); plMenu->addAction(SET_ACTION(ActionManager::SHUFFLE, m_ui_settings, SLOT(setShuffle(bool)))); plMenu->addAction(SET_ACTION(ActionManager::NO_PL_ADVANCE, m_ui_settings, - SLOT(setNoPlaylistAdvance(bool)))); + SLOT(setNoPlayListAdvance(bool)))); plMenu->addAction(SET_ACTION(ActionManager::STOP_AFTER_SELECTED, m_pl_manager, SLOT(stopAfterSelected()))); plMenu->addAction(SET_ACTION(ActionManager::CLEAR_QUEUE, m_pl_manager, SLOT(clearQueue()))); @@ -395,7 +395,7 @@ void MainWindow::createActions() ACTION(ActionManager::REPEAT_ALL), SLOT(setChecked(bool))); connect(m_ui_settings, SIGNAL (repeatableTrackChanged(bool)), ACTION(ActionManager::REPEAT_TRACK), SLOT(setChecked(bool))); - connect(m_ui_settings, SIGNAL (noPlaylistAdvanceChanged(bool)), + connect(m_ui_settings, SIGNAL (noPlayListAdvanceChanged(bool)), ACTION(ActionManager::NO_PL_ADVANCE), SLOT(setChecked(bool))); connect(m_ui_settings, SIGNAL(shuffleChanged(bool)), ACTION(ActionManager::SHUFFLE), SLOT(setChecked(bool))); diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp index b00771579..487b974c9 100644 --- a/src/qmmpui/mediaplayer.cpp +++ b/src/qmmpui/mediaplayer.cpp @@ -121,7 +121,7 @@ void MediaPlayer::playNext() play(); return; } - if(m_settings->isNoPlaylistAdvance()) + if(m_settings->isNoPlayListAdvance()) { stop(); return; @@ -140,7 +140,7 @@ void MediaPlayer::updateNextUrl() PlayListTrack *track = 0; if(m_settings->isRepeatableTrack()) track = m_pl_manager->currentPlayList()->currentTrack(); - else if(!m_settings->isNoPlaylistAdvance()) + else if(!m_settings->isNoPlayListAdvance()) track = m_pl_manager->currentPlayList()->nextTrack(); if(track) diff --git a/src/qmmpui/qmmpuisettings.cpp b/src/qmmpui/qmmpuisettings.cpp index a05c811ee..6e718eb0b 100644 --- a/src/qmmpui/qmmpuisettings.cpp +++ b/src/qmmpui/qmmpuisettings.cpp @@ -91,7 +91,7 @@ bool QmmpUiSettings::isRepeatableTrack() const return m_repeat_track; } -bool QmmpUiSettings::isNoPlaylistAdvance() const +bool QmmpUiSettings::isNoPlayListAdvance() const { return m_no_pl_advance; } @@ -224,12 +224,12 @@ void QmmpUiSettings::setRepeatableTrack(bool enabled) emit repeatableTrackChanged(enabled); } -void QmmpUiSettings::setNoPlaylistAdvance(bool enabled) +void QmmpUiSettings::setNoPlayListAdvance(bool enabled) { if(m_no_pl_advance == enabled) return; m_no_pl_advance = enabled; - emit noPlaylistAdvanceChanged(enabled); + emit noPlayListAdvanceChanged(enabled); } QStringList QmmpUiSettings::restrictFilters() const diff --git a/src/qmmpui/qmmpuisettings.h b/src/qmmpui/qmmpuisettings.h index 53a24788f..c5b63f496 100644 --- a/src/qmmpui/qmmpuisettings.h +++ b/src/qmmpui/qmmpuisettings.h @@ -80,7 +80,7 @@ public: /*! * Returns \b true if "No playlist advance" option is enabled, otherwise returns \b false */ - bool isNoPlaylistAdvance() const; + bool isNoPlayListAdvance() const; /*! * Sets the "Convert underscores to blanks" option state to \b enabled * @param enabled Option state (\b true - enabled, \b false - disabled) @@ -172,7 +172,6 @@ public: */ static QmmpUiSettings* instance(); - signals: /*! * Emitted when state of the "Repeat All" option has changed. @@ -199,7 +198,7 @@ signals: * @param enabled New state of this option (\b true - no playlist advance, * \b false - normal playlist behaviour) */ - void noPlaylistAdvanceChanged(bool enabled); + void noPlayListAdvanceChanged(bool enabled); public slots: /*! @@ -231,7 +230,7 @@ public slots: * @param enabled State of the 'No playlist advance' option * (\b true - enabled, \b false - normal playback) */ - void setNoPlaylistAdvance(bool enabled); + void setNoPlayListAdvance(bool enabled); private: |