author | simon <simon> | 2002-12-02 20:09:10 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 20:09:10 (UTC) |
commit | e1ef407b16b652755f9c8eefce0f617ec3996998 (patch) (unidiff) | |
tree | 6db64108908f1eee41955caa0e9d7f1d7878e5a8 /noncore/multimedia/opieplayer2/mediaplayer.h | |
parent | acfbc79f2acf59fa5e4494dde4ea1c4ea5e429b7 (diff) | |
download | opie-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.h | 4 |
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 | |||
@@ -38,17 +38,18 @@ | |||
38 | #include <qframe.h> | 38 | #include <qframe.h> |
39 | 39 | ||
40 | #include "xinecontrol.h" | 40 | #include "xinecontrol.h" |
41 | 41 | ||
42 | class DocLnk; | 42 | class DocLnk; |
43 | class VolumeControl; | 43 | class VolumeControl; |
44 | class MediaPlayerState; | ||
44 | 45 | ||
45 | class MediaPlayer : public QObject { | 46 | class MediaPlayer : public QObject { |
46 | Q_OBJECT | 47 | Q_OBJECT |
47 | public: | 48 | public: |
48 | MediaPlayer( QObject *parent, const char *name ); | 49 | MediaPlayer( MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ); |
49 | ~MediaPlayer(); | 50 | ~MediaPlayer(); |
50 | private slots: | 51 | private 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(); |
@@ -65,11 +66,12 @@ protected: | |||
65 | private: | 66 | private: |
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 | ||