aboutsummaryrefslogtreecommitdiff
path: root/src/qmmpui
diff options
context:
space:
mode:
Diffstat (limited to 'src/qmmpui')
-rw-r--r--src/qmmpui/mediaplayer.cpp4
-rw-r--r--src/qmmpui/qmmpuisettings.cpp6
-rw-r--r--src/qmmpui/qmmpuisettings.h7
3 files changed, 8 insertions, 9 deletions
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: