Commit 68bc8db0 authored by Scott Wheeler's avatar Scott Wheeler

Make Player a QObject since all of the concrete implementations are...

svn path=/trunk/kdemultimedia/juk/; revision=304637
parent 30e5a86c
......@@ -39,7 +39,7 @@ namespace KDE {
class PlayObject;
}
class ArtsPlayer : public QObject, public Player
class ArtsPlayer : public Player
{
Q_OBJECT
......
......@@ -32,7 +32,7 @@ using namespace KDE::GSTPlay;
// public methods
////////////////////////////////////////////////////////////////////////////////
GStreamerPlayer::GStreamerPlayer() : QObject(0), Player(),
GStreamerPlayer::GStreamerPlayer() : Player(),
m_positionNs(0), m_durationNs(0), m_currentVolume(1.0)
{
setupPlayer();
......
......@@ -25,12 +25,11 @@
#include <kde/gstplay/play.h>
#include <qobject.h>
#include <qstring.h>
#include "player.h"
class GStreamerPlayer : public QObject, public Player
class GStreamerPlayer : public Player
{
Q_OBJECT
......
......@@ -18,18 +18,12 @@
#ifndef PLAYER_H
#define PLAYER_H
/**
* Just an interface for concrete player implementations
*/
#include <qobject.h>
#include <qstring.h>
#include "filehandle.h"
class QObject;
class KSelectAction;
class Player
class Player : public QObject
{
public:
virtual ~Player() {}
......@@ -52,7 +46,7 @@ public:
virtual void seekPosition(int position) = 0;
protected:
Player() {}
Player() : QObject() {}
};
......
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