author | simon <simon> | 2002-12-02 23:31:57 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 23:31:57 (UTC) |
commit | 22e232bdb4bae5e28013a4d14bfda3c068827557 (patch) (unidiff) | |
tree | bcefd6ed54318bb075cd71455b82236606634cd4 /noncore/multimedia/opieplayer2/mediaplayer.h | |
parent | 24a00c944aace8d7627c1eb0d7cc0ebf40731c57 (diff) | |
download | opie-22e232bdb4bae5e28013a4d14bfda3c068827557.zip opie-22e232bdb4bae5e28013a4d14bfda3c068827557.tar.gz opie-22e232bdb4bae5e28013a4d14bfda3c068827557.tar.bz2 |
- yay, last singleton gone. global playList variable is no more :)
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.h') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h index 0d6f722..dc306c4 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.h +++ b/noncore/multimedia/opieplayer2/mediaplayer.h | |||
@@ -39,6 +39,8 @@ | |||
39 | 39 | ||
40 | #include "xinecontrol.h" | 40 | #include "xinecontrol.h" |
41 | 41 | ||
42 | #include "playlistwidget.h" | ||
43 | |||
42 | class DocLnk; | 44 | class DocLnk; |
43 | class VolumeControl; | 45 | class VolumeControl; |
44 | class MediaPlayerState; | 46 | class MediaPlayerState; |
@@ -48,7 +50,7 @@ class VideoWidget; | |||
48 | class MediaPlayer : public QObject { | 50 | class MediaPlayer : public QObject { |
49 | Q_OBJECT | 51 | Q_OBJECT |
50 | public: | 52 | public: |
51 | MediaPlayer( MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ); | 53 | MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ); |
52 | ~MediaPlayer(); | 54 | ~MediaPlayer(); |
53 | 55 | ||
54 | public slots: | 56 | public slots: |
@@ -77,6 +79,7 @@ private: | |||
77 | XineControl *xineControl; | 79 | XineControl *xineControl; |
78 | VolumeControl *volControl; | 80 | VolumeControl *volControl; |
79 | MediaPlayerState &mediaPlayerState; | 81 | MediaPlayerState &mediaPlayerState; |
82 | PlayListWidget &playList; | ||
80 | AudioWidget *audioUI; | 83 | AudioWidget *audioUI; |
81 | VideoWidget *videoUI; | 84 | VideoWidget *videoUI; |
82 | }; | 85 | }; |