added playlist transition option

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9230 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 63 insertions, 26 deletions

diff --git a/src/qmmpui/qmmpuisettings.cpp b/src/qmmpui/qmmpuisettings.cpp
index 215fdd1e6..8d654352d 100644
--- a/src/qmmpui/qmmpuisettings.cpp
+++ b/src/qmmpui/qmmpuisettings.cpp
@@ -48,6 +48,7 @@ QmmpUiSettings::QmmpUiSettings(QObject *parent) : QObject(parent)
     m_no_pl_advance = s.value("no_advance", false).toBool();
     m_clear_prev_playlist = s.value("clear_previous", false).toBool();
     m_read_metadata_for_playlist = s.value("read_metadata_for_playlist", true).toBool();
+    m_transit_between_playlists = s.value("transit_between_playlists", false).toBool();
     s.endGroup();
     s.beginGroup("General");
     m_resume_on_startup = s.value("resume_on_startup", false).toBool();
@@ -102,6 +103,11 @@ bool QmmpUiSettings::isNoPlayListAdvance() const
     return m_no_pl_advance;
 }
 
+bool QmmpUiSettings::isPlayListTransitionEnabled() const
+{
+    return m_transit_between_playlists;
+}
+
 bool QmmpUiSettings::convertUnderscore() const
 {
     return m_convertUnderscore;
@@ -181,6 +187,7 @@ void QmmpUiSettings::sync()
     s.setValue("PlayList/no_advance", m_no_pl_advance);
     s.setValue("PlayList/clear_previous", m_clear_prev_playlist);
     s.setValue("PlayList/read_metadata_for_playlist", m_read_metadata_for_playlist);
+    s.setValue("PlayList/transit_between_playlists", m_transit_between_playlists);
     s.setValue("General/resume_on_startup", m_resume_on_startup);
     s.setValue("General/restrict_filters", m_restrict_filters);
     s.setValue("General/exclude_filters", m_exclude_filters);
@@ -191,47 +198,62 @@ void QmmpUiSettings::sync()
 
 void QmmpUiSettings::setRepeatableList(bool r)
 {
-    if(m_repeate_list == r)
-        return;
-    m_repeate_list = r;
-    m_timer->start();
-    emit repeatableListChanged(r);
+    if(m_repeate_list != r)
+    {
+        m_repeate_list = r;
+        m_timer->start();
+        emit repeatableListChanged(r);
+    }
 }
 
 void QmmpUiSettings::setShuffle(bool s)
 {
-    if(m_shuffle == s)
-        return;
-    m_shuffle = s;
-    m_timer->start();
-    emit shuffleChanged(s);
+    if(m_shuffle != s)
+    {
+        m_shuffle = s;
+        m_timer->start();
+        emit shuffleChanged(s);
+    }
 }
 
 void QmmpUiSettings::setGroupsEnabled(bool enabled)
 {
-    if(m_groups_enabled == enabled)
-        return;
-    m_groups_enabled = enabled;
-    m_timer->start();
-    emit groupsChanged(enabled);
+    if(m_groups_enabled != enabled)
+    {
+        m_groups_enabled = enabled;
+        m_timer->start();
+        emit groupsChanged(enabled);
+    }
 }
 
 void QmmpUiSettings::setRepeatableTrack(bool enabled)
 {
-    if(m_repeat_track == enabled)
-        return;
-    m_repeat_track = enabled;
-    m_timer->start();
-    emit repeatableTrackChanged(enabled);
+    if(m_repeat_track != enabled)
+    {
+        m_repeat_track = enabled;
+        m_timer->start();
+        emit repeatableTrackChanged(enabled);
+    }
 }
 
 void QmmpUiSettings::setNoPlayListAdvance(bool enabled)
 {
-    if(m_no_pl_advance == enabled)
-        return;
-    m_no_pl_advance = enabled;
-    m_timer->start();
-    emit noPlayListAdvanceChanged(enabled);
+    if(m_no_pl_advance != enabled)
+    {
+        m_no_pl_advance = enabled;
+        m_timer->start();
+        emit noPlayListAdvanceChanged(enabled);
+    }
+}
+
+void QmmpUiSettings::setPlayListTransitionEnabled(bool enabled)
+{
+    if(m_transit_between_playlists != enabled)
+    {
+        m_transit_between_playlists = enabled;
+        m_timer->start();
+        emit playListTransitionChanged(enabled);
+    }
 }
 
 QStringList QmmpUiSettings::restrictFilters() const
diff --git a/src/qmmpui/qmmpuisettings.h b/src/qmmpui/qmmpuisettings.h
index 569a2aa05..38b0ce94f 100644
--- a/src/qmmpui/qmmpuisettings.h
+++ b/src/qmmpui/qmmpuisettings.h
@@ -84,6 +84,10 @@ public:
      */
     bool isNoPlayListAdvance() const;
     /*!
+     * Returns \b true if transition between playlists is enabled, otherwise returns \b false
+     */
+    bool isPlayListTransitionEnabled() const;
+    /*!
      * Sets the "Convert underscores to blanks" option state to \b enabled
      * @param enabled Option state (\b true - enabled, \b false - disabled)
      */
@@ -217,6 +221,11 @@ signals:
      * \b false - normal playlist behaviour)
      */
     void noPlayListAdvanceChanged(bool enabled);
+    /*!
+     * Emitted when state of the "transition between playlists" option changes
+     * @param enabled State of transition (\b true - enabled, \b false - disabled)
+     */
+    void playListTransitionChanged(bool enabled) const;
 
 public slots:
     /*!
@@ -231,7 +240,7 @@ public slots:
     void setShuffle(bool s);
     /*!
      * Enables or disables playlist groups
-     * * @param enabled State of the groups (\b true - enabled, \b false - disabled)
+     * @param enabled State of the groups (\b true - enabled, \b false - disabled)
      */
     void setGroupsEnabled(bool enabled);
     /*!
@@ -245,6 +254,11 @@ public slots:
      * (\b true - enabled, \b false - normal playback)
      */
     void setNoPlayListAdvance(bool enabled);
+    /*!
+     * Enables or disables transition between playlists
+     * @param enabled State of transition (\b true - enabled, \b false - disabled)
+     */
+    void setPlayListTransitionEnabled(bool enabled);
 
 private slots:
     /*!
@@ -267,6 +281,7 @@ private:
     bool m_no_pl_advance;
     bool m_clear_prev_playlist;
     bool m_read_metadata_for_playlist;
+    bool m_transit_between_playlists;
     //general
     bool m_resume_on_startup;
     QStringList m_exclude_filters, m_restrict_filters;