summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/mediaplayer.h
authorsimon <simon>2002-12-02 20:09:10 (UTC)
committer simon <simon>2002-12-02 20:09:10 (UTC)
commite1ef407b16b652755f9c8eefce0f617ec3996998 (patch) (unidiff)
tree6db64108908f1eee41955caa0e9d7f1d7878e5a8 /noncore/multimedia/opieplayer2/mediaplayer.h
parentacfbc79f2acf59fa5e4494dde4ea1c4ea5e429b7 (diff)
downloadopie-e1ef407b16b652755f9c8eefce0f617ec3996998.zip
opie-e1ef407b16b652755f9c8eefce0f617ec3996998.tar.gz
opie-e1ef407b16b652755f9c8eefce0f617ec3996998.tar.bz2
- MediaPlayer no more uses the MediaPlayerState instance as singleton
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.h') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h
index de3886e..6aeac7c 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.h
+++ b/noncore/multimedia/opieplayer2/mediaplayer.h
@@ -32,44 +32,46 @@
32*/ 32*/
33 33
34#ifndef MEDIA_PLAYER_H 34#ifndef MEDIA_PLAYER_H
35#define MEDIA_PLAYER_H 35#define MEDIA_PLAYER_H
36 36
37#include <qmainwindow.h> 37#include <qmainwindow.h>
38#include <qframe.h> 38#include <qframe.h>
39 39
40#include "xinecontrol.h" 40#include "xinecontrol.h"
41 41
42class DocLnk; 42class DocLnk;
43class VolumeControl; 43class VolumeControl;
44class MediaPlayerState;
44 45
45class MediaPlayer : public QObject { 46class MediaPlayer : public QObject {
46 Q_OBJECT 47 Q_OBJECT
47public: 48public:
48 MediaPlayer( QObject *parent, const char *name ); 49 MediaPlayer( MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name );
49 ~MediaPlayer(); 50 ~MediaPlayer();
50private slots: 51private slots:
51 void setPlaying( bool ); 52 void setPlaying( bool );
52 void pauseCheck( bool ); 53 void pauseCheck( bool );
53 void play(); 54 void play();
54 void next(); 55 void next();
55 void prev(); 56 void prev();
56 void startIncreasingVolume(); 57 void startIncreasingVolume();
57 void startDecreasingVolume(); 58 void startDecreasingVolume();
58 void stopChangingVolume(); 59 void stopChangingVolume();
59 void cleanUp(); 60 void cleanUp();
60 void blank( bool ); 61 void blank( bool );
61 62
62protected: 63protected:
63 void timerEvent( QTimerEvent *e ); 64 void timerEvent( QTimerEvent *e );
64 void keyReleaseEvent( QKeyEvent *e); 65 void keyReleaseEvent( QKeyEvent *e);
65private: 66private:
66 bool isBlanked, l, r; 67 bool isBlanked, l, r;
67 int fd, fl; 68 int fd, fl;
68 int volumeDirection; 69 int volumeDirection;
69 XineControl *xineControl; 70 XineControl *xineControl;
70 VolumeControl *volControl; 71 VolumeControl *volControl;
72 MediaPlayerState &mediaPlayerState;
71}; 73};
72 74
73 75
74#endif // MEDIA_PLAYER_H 76#endif // MEDIA_PLAYER_H
75 77