Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 39010a32 authored by Scott Wheeler's avatar Scott Wheeler

Re-add the Collection DCOP interface.

svn path=/trunk/kdemultimedia/juk/; revision=317527
parent b5a3f485
......@@ -4,15 +4,19 @@
#include <dcopobject.h>
#include <qstringlist.h>
class CollectionIface : virtual public DCOPObject
class CollectionIface : public DCOPObject
{
K_DCOP
k_dcop:
virtual void openFile(const QString &s) = 0;
virtual void openFile(const QStringList &file) = 0;
void openFile(const QString &file) { open(file); }
void openFile(const QStringList &files) { open(files); }
protected:
CollectionIface() : DCOPObject("Collection") {}
virtual void open(const QStringList &files) = 0;
};
class PlayerIface : virtual public DCOPObject
class PlayerIface : public DCOPObject
{
K_DCOP
k_dcop:
......@@ -38,11 +42,13 @@ k_dcop:
virtual void mute() = 0;
virtual void setVolume(float volume) = 0;
virtual void seek(int time) = 0;
// virtual void startPlayingPlaylist() = 0;
virtual QString playingString() const = 0;
virtual int currentTime() const = 0;
virtual int totalTime() const = 0;
protected:
PlayerIface() : DCOPObject("Player") {}
};
#endif
......@@ -68,7 +68,6 @@ static Player *createPlayer(int system = ArtsBackend)
////////////////////////////////////////////////////////////////////////////////
PlayerManager::PlayerManager() :
DCOPObject("Player"),
Player(),
m_sliderAction(0),
m_playlistInterface(0),
......
......@@ -17,6 +17,7 @@
#include "playlistinterface.h"
#include "stringhash.h"
#include "jukIface.h"
#include <kshortcut.h>
#include <kdirwatch.h>
......@@ -34,7 +35,7 @@ class PlaylistItem;
typedef QValueList<PlaylistItem *> PlaylistItemList;
class PlaylistCollection : public PlaylistInterface
class PlaylistCollection : public PlaylistInterface, CollectionIface
{
friend class Playlist;
friend class CollectionList;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment