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 | |||
@@ -30,34 +30,36 @@ | |||
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
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 | ||
42 | #include "playlistwidget.h" | ||
43 | |||
42 | class DocLnk; | 44 | class DocLnk; |
43 | class VolumeControl; | 45 | class VolumeControl; |
44 | class MediaPlayerState; | 46 | class MediaPlayerState; |
45 | class AudioWidget; | 47 | class AudioWidget; |
46 | class VideoWidget; | 48 | class VideoWidget; |
47 | 49 | ||
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: |
55 | void recreateAudioAndVideoWidgets(); | 57 | void recreateAudioAndVideoWidgets(); |
56 | 58 | ||
57 | private slots: | 59 | private slots: |
58 | void setPlaying( bool ); | 60 | void setPlaying( bool ); |
59 | void pauseCheck( bool ); | 61 | void pauseCheck( bool ); |
60 | void play(); | 62 | void play(); |
61 | void next(); | 63 | void next(); |
62 | void prev(); | 64 | void prev(); |
63 | void startIncreasingVolume(); | 65 | void startIncreasingVolume(); |
@@ -68,19 +70,20 @@ private slots: | |||
68 | 70 | ||
69 | protected: | 71 | protected: |
70 | void timerEvent( QTimerEvent *e ); | 72 | void timerEvent( QTimerEvent *e ); |
71 | void keyReleaseEvent( QKeyEvent *e); | 73 | void keyReleaseEvent( QKeyEvent *e); |
72 | private: | 74 | private: |
73 | 75 | ||
74 | bool isBlanked, l, r; | 76 | bool isBlanked, l, r; |
75 | int fd, fl; | 77 | int fd, fl; |
76 | int volumeDirection; | 78 | int volumeDirection; |
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 | }; |
83 | 86 | ||
84 | 87 | ||
85 | #endif // MEDIA_PLAYER_H | 88 | #endif // MEDIA_PLAYER_H |
86 | 89 | ||