[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdemultimedia/juk
From:       Scott Wheeler <wheeler () kde ! org>
Date:       2005-02-22 0:33:31
Message-ID: 20050222003331.4CC422226 () office ! kde ! org
[Download RAW message or body]

CVS commit by wheeler: 

Add a "playingPlaylist()" DCOP method rather than overloading playlist() and
returning the playing playlist when playing and the visible playlist when not.

BUG:99907


  M +1 -0      jukIface.h   1.18
  M +6 -3      playlistcollection.cpp   1.66
  M +1 -0      playlistcollection.h   1.37


--- kdemultimedia/juk/jukIface.h  #1.17:1.18
@@ -22,4 +22,5 @@ k_dcop:
 
     virtual QString playlist() const = 0;
+    virtual QString playingPlaylist() const = 0;
     virtual void setPlaylist(const QString &playlist) = 0;
 

--- kdemultimedia/juk/playlistcollection.cpp  #1.65:1.66
@@ -234,7 +234,10 @@ void PlaylistCollection::removeTrack(con
 QString PlaylistCollection::playlist() const
 {
-    if(currentPlaylist())
-        return currentPlaylist()->name();
-    return QString::null;
+    return visiblePlaylist() ? visiblePlaylist()->name() : QString::null;
+}
+
+QString PlaylistCollection::playingPlaylist() const
+{
+    return currentPlaylist() && m_playing ? currentPlaylist()->name() : QString::null;
 }
 

--- kdemultimedia/juk/playlistcollection.h  #1.36:1.37
@@ -67,4 +67,5 @@ public:
 
     virtual QString playlist() const;
+    virtual QString playingPlaylist() const;
     virtual void setPlaylist(const QString &playlist);
 


[prev in list] [next in list] [prev in thread] [next in thread]