[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:       2004-03-08 0:37:09
Message-ID: 20040308003709.DB9689985 () office ! kde ! org
[Download RAW message or body]

CVS commit by wheeler: 

While porting things over it was useful for this to implement the Player
interface; it's not really useful anymore.


  M +0 -1      playermanager.cpp   1.15
  M +13 -18    playermanager.h   1.10


--- kdemultimedia/juk/playermanager.cpp  #1.14:1.15
@@ -37,5 +37,4 @@ PlayerManager *PlayerManager::m_instance
 PlayerManager::PlayerManager() :
     QObject(0, "PlayerManager"),
-    Player(),
     m_sliderAction(0),
     m_playlistInterface(0),

--- kdemultimedia/juk/playermanager.h  #1.9:1.10
@@ -32,5 +32,5 @@ class PlaylistInterface;
  */
 
-class PlayerManager : public QObject, public Player
+class PlayerManager : public QObject
 {
     Q_OBJECT
@@ -43,10 +43,10 @@ public:
     static PlayerManager *instance();
 
-    virtual bool playing() const;
-    virtual bool paused() const;
-    virtual float volume() const;
-    virtual long totalTime() const;
-    virtual long currentTime() const;
-    virtual int position() const;
+    bool playing() const;
+    bool paused() const;
+    float volume() const;
+    long totalTime() const;
+    long currentTime() const;
+    int position() const;
 
     void setPlaylistInterface(PlaylistInterface *interface);
@@ -55,15 +55,10 @@ public:
 public slots:
 
-    // implementations of the player interface
-
-    virtual void play(const QString &fileName = QString::null);
-    virtual void pause();
-    virtual void stop();
-    virtual void setVolume(float volume = 1.0);
-    virtual void seek(long seekTime);
-    virtual void seekPosition(int position);
-
-    // additional slots
-
+    void play(const QString &fileName = QString::null);
+    void pause();
+    void stop();
+    void setVolume(float volume = 1.0);
+    void seek(long seekTime);
+    void seekPosition(int position);
     void seekForward();
     void seekBack();


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