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 | |
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') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/main.cpp | 5 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 32 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.h | 5 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 10 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 12 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 2 |
9 files changed, 36 insertions, 40 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index f6e6086..b573c45 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -88,7 +88,7 @@ static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton)); | |||
88 | 88 | ||
89 | 89 | ||
90 | AudioWidget::AudioWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : | 90 | AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : |
91 | 91 | ||
92 | MediaWidget( mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) { | 92 | MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) { |
93 | 93 | ||
94 | setCaption( tr("OpiePlayer") ); | 94 | setCaption( tr("OpiePlayer") ); |
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index f092699..52a358c 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -53,5 +53,5 @@ class AudioWidget : public MediaWidget { | |||
53 | Q_OBJECT | 53 | Q_OBJECT |
54 | public: | 54 | public: |
55 | AudioWidget( MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); | 55 | AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); |
56 | ~AudioWidget(); | 56 | ~AudioWidget(); |
57 | void setTickerText( const QString &text ) { songInfo.setText( text ); } | 57 | void setTickerText( const QString &text ) { songInfo.setText( text ); } |
diff --git a/noncore/multimedia/opieplayer2/main.cpp b/noncore/multimedia/opieplayer2/main.cpp index 7fc7b94..ffc7cb6 100644 --- a/noncore/multimedia/opieplayer2/main.cpp +++ b/noncore/multimedia/opieplayer2/main.cpp | |||
@@ -5,6 +5,4 @@ | |||
5 | #include "mediaplayer.h" | 5 | #include "mediaplayer.h" |
6 | 6 | ||
7 | PlayListWidget *playList; | ||
8 | |||
9 | int main(int argc, char **argv) { | 7 | int main(int argc, char **argv) { |
10 | QPEApplication a(argc,argv); | 8 | QPEApplication a(argc,argv); |
@@ -12,7 +10,6 @@ int main(int argc, char **argv) { | |||
12 | MediaPlayerState st( 0, "mediaPlayerState" ); | 10 | MediaPlayerState st( 0, "mediaPlayerState" ); |
13 | PlayListWidget pl( st, 0, "playList" ); | 11 | PlayListWidget pl( st, 0, "playList" ); |
14 | playList = &pl; | ||
15 | pl.showMaximized(); | 12 | pl.showMaximized(); |
16 | MediaPlayer mp( st, 0, "mediaPlayer" ); | 13 | MediaPlayer mp( pl, st, 0, "mediaPlayer" ); |
17 | QObject::connect( &pl, SIGNAL( skinSelected() ), | 14 | QObject::connect( &pl, SIGNAL( skinSelected() ), |
18 | &mp, SLOT( recreateAudioAndVideoWidgets() ) ); | 15 | &mp, SLOT( recreateAudioAndVideoWidgets() ) ); |
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index a9c74c4..8acc488 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -25,12 +25,10 @@ | |||
25 | 25 | ||
26 | 26 | ||
27 | extern VideoWidget *videoUI; | ||
28 | extern PlayListWidget *playList; | ||
29 | 27 | ||
30 | 28 | ||
31 | #define FBIOBLANK 0x4611 | 29 | #define FBIOBLANK 0x4611 |
32 | 30 | ||
33 | MediaPlayer::MediaPlayer( MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ) | 31 | MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ) |
34 | : QObject( parent, name ), volumeDirection( 0 ), mediaPlayerState( _mediaPlayerState ) { | 32 | : QObject( parent, name ), volumeDirection( 0 ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) { |
35 | 33 | ||
36 | audioUI = 0; | 34 | audioUI = 0; |
@@ -40,5 +38,5 @@ MediaPlayer::MediaPlayer( MediaPlayerState &_mediaPlayerState, QObject *parent, | |||
40 | 38 | ||
41 | fd=-1;fl=-1; | 39 | fd=-1;fl=-1; |
42 | playList->setCaption( tr( "OpiePlayer: Initializating" ) ); | 40 | playList.setCaption( tr( "OpiePlayer: Initializating" ) ); |
43 | 41 | ||
44 | qApp->processEvents(); | 42 | qApp->processEvents(); |
@@ -58,5 +56,5 @@ MediaPlayer::MediaPlayer( MediaPlayerState &_mediaPlayerState, QObject *parent, | |||
58 | cfg.setGroup("PlayList"); | 56 | cfg.setGroup("PlayList"); |
59 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default"); | 57 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default"); |
60 | playList->setCaption( tr( "OpiePlayer: " ) + QFileInfo(currentPlaylist).baseName() ); | 58 | playList.setCaption( tr( "OpiePlayer: " ) + QFileInfo(currentPlaylist).baseName() ); |
61 | } | 59 | } |
62 | 60 | ||
@@ -88,5 +86,5 @@ void MediaPlayer::setPlaying( bool play ) { | |||
88 | 86 | ||
89 | QString tickerText, time, fileName; | 87 | QString tickerText, time, fileName; |
90 | if ( playList->currentTab() != PlayListWidget::CurrentPlayList ) { | 88 | if ( playList.currentTab() != PlayListWidget::CurrentPlayList ) { |
91 | //if playing in file list.. play in a different way | 89 | //if playing in file list.. play in a different way |
92 | // random and looping settings enabled causes problems here, | 90 | // random and looping settings enabled causes problems here, |
@@ -101,5 +99,5 @@ void MediaPlayer::setPlaying( bool play ) { | |||
101 | } | 99 | } |
102 | 100 | ||
103 | PlayListWidget::Entry playListEntry = playList->currentEntry(); | 101 | PlayListWidget::Entry playListEntry = playList.currentEntry(); |
104 | fileName = playListEntry.name; | 102 | fileName = playListEntry.name; |
105 | xineControl->play( playListEntry.file ); | 103 | xineControl->play( playListEntry.file ); |
@@ -127,9 +125,9 @@ void MediaPlayer::setPlaying( bool play ) { | |||
127 | 125 | ||
128 | void MediaPlayer::prev() { | 126 | void MediaPlayer::prev() { |
129 | if( playList->currentTab() == PlayListWidget::CurrentPlayList ) { //if using the playlist | 127 | if( playList.currentTab() == PlayListWidget::CurrentPlayList ) { //if using the playlist |
130 | if ( playList->prev() ) { | 128 | if ( playList.prev() ) { |
131 | play(); | 129 | play(); |
132 | } else if ( mediaPlayerState.isLooping() ) { | 130 | } else if ( mediaPlayerState.isLooping() ) { |
133 | if ( playList->last() ) { | 131 | if ( playList.last() ) { |
134 | play(); | 132 | play(); |
135 | } | 133 | } |
@@ -143,9 +141,9 @@ void MediaPlayer::prev() { | |||
143 | void MediaPlayer::next() { | 141 | void MediaPlayer::next() { |
144 | 142 | ||
145 | if(playList->currentTab() == PlayListWidget::CurrentPlayList) { //if using the playlist | 143 | if(playList.currentTab() == PlayListWidget::CurrentPlayList) { //if using the playlist |
146 | if ( playList->next() ) { | 144 | if ( playList.next() ) { |
147 | play(); | 145 | play(); |
148 | } else if ( mediaPlayerState.isLooping() ) { | 146 | } else if ( mediaPlayerState.isLooping() ) { |
149 | if ( playList->first() ) { | 147 | if ( playList.first() ) { |
150 | play(); | 148 | play(); |
151 | } | 149 | } |
@@ -340,5 +338,5 @@ void MediaPlayer::cleanUp() {// this happens on closing | |||
340 | Config cfg( "OpiePlayer" ); | 338 | Config cfg( "OpiePlayer" ); |
341 | mediaPlayerState.writeConfig( cfg ); | 339 | mediaPlayerState.writeConfig( cfg ); |
342 | playList->writeDefaultPlaylist( ); | 340 | playList.writeDefaultPlaylist( ); |
343 | 341 | ||
344 | // QPEApplication::grabKeyboard(); | 342 | // QPEApplication::grabKeyboard(); |
@@ -351,6 +349,6 @@ void MediaPlayer::recreateAudioAndVideoWidgets() | |||
351 | delete audioUI; | 349 | delete audioUI; |
352 | delete videoUI; | 350 | delete videoUI; |
353 | audioUI = new AudioWidget( mediaPlayerState, 0, "audioUI" ); | 351 | audioUI = new AudioWidget( playList, mediaPlayerState, 0, "audioUI" ); |
354 | videoUI = new VideoWidget( mediaPlayerState, 0, "videoUI" ); | 352 | videoUI = new VideoWidget( playList, mediaPlayerState, 0, "videoUI" ); |
355 | 353 | ||
356 | connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); | 354 | connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); |
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 | |||
@@ -40,4 +40,6 @@ | |||
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; |
@@ -49,5 +51,5 @@ 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 | ||
@@ -78,4 +80,5 @@ private: | |||
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; |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 2992fd6..ed5bc5a 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -22,8 +22,6 @@ | |||
22 | #include "playlistwidget.h" | 22 | #include "playlistwidget.h" |
23 | 23 | ||
24 | extern PlayListWidget *playList; | 24 | MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name ) |
25 | 25 | : QWidget( parent, name ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) | |
26 | MediaWidget::MediaWidget( MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name ) | ||
27 | : QWidget( parent, name ), mediaPlayerState( _mediaPlayerState ) | ||
28 | { | 26 | { |
29 | connect( &mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ), | 27 | connect( &mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ), |
@@ -49,6 +47,6 @@ void MediaWidget::handleCommand( Command command, bool buttonDown ) | |||
49 | case Play: mediaPlayerState.togglePaused(); | 47 | case Play: mediaPlayerState.togglePaused(); |
50 | case Stop: mediaPlayerState.setPlaying(FALSE); return; | 48 | case Stop: mediaPlayerState.setPlaying(FALSE); return; |
51 | case Next: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; | 49 | case Next: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; |
52 | case Previous: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return; | 50 | case Previous: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return; |
53 | case Loop: mediaPlayerState.setLooping( buttonDown ); return; | 51 | case Loop: mediaPlayerState.setLooping( buttonDown ); return; |
54 | case VolumeUp: emit moreReleased(); return; | 52 | case VolumeUp: emit moreReleased(); return; |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index e3f09ce..2d92d65 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -24,4 +24,5 @@ | |||
24 | 24 | ||
25 | #include "mediaplayerstate.h" | 25 | #include "mediaplayerstate.h" |
26 | #include "playlistwidget.h" | ||
26 | 27 | ||
27 | class MediaWidget : public QWidget | 28 | class MediaWidget : public QWidget |
@@ -31,5 +32,5 @@ public: | |||
31 | enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back }; | 32 | enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back }; |
32 | 33 | ||
33 | MediaWidget( MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); | 34 | MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); |
34 | virtual ~MediaWidget(); | 35 | virtual ~MediaWidget(); |
35 | 36 | ||
@@ -51,4 +52,5 @@ protected: | |||
51 | 52 | ||
52 | MediaPlayerState &mediaPlayerState; | 53 | MediaPlayerState &mediaPlayerState; |
54 | PlayListWidget &playList; | ||
53 | }; | 55 | }; |
54 | 56 | ||
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index c0039b1..b7305fe 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -54,5 +54,4 @@ | |||
54 | 54 | ||
55 | 55 | ||
56 | extern PlayListWidget *playList; | ||
57 | 56 | ||
58 | 57 | ||
@@ -82,8 +81,7 @@ static const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton)); | |||
82 | 81 | ||
83 | 82 | ||
84 | VideoWidget::VideoWidget(MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : | 83 | VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) |
85 | MediaWidget( mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) { | 84 | : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) |
86 | 85 | { | |
87 | |||
88 | setCaption( tr("OpiePlayer - Video") ); | 86 | setCaption( tr("OpiePlayer - Video") ); |
89 | 87 | ||
@@ -333,6 +331,6 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
333 | 331 | ||
334 | case VideoStop: mediaPlayerState.setPlaying( FALSE ); return; | 332 | case VideoStop: mediaPlayerState.setPlaying( FALSE ); return; |
335 | case VideoNext: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; | 333 | case VideoNext: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; |
336 | case VideoPrevious: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return; | 334 | case VideoPrevious: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return; |
337 | case VideoVolUp: emit moreReleased(); return; | 335 | case VideoVolUp: emit moreReleased(); return; |
338 | case VideoVolDown: emit lessReleased(); return; | 336 | case VideoVolDown: emit lessReleased(); return; |
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h index ae0e687..f996803 100644 --- a/noncore/multimedia/opieplayer2/videowidget.h +++ b/noncore/multimedia/opieplayer2/videowidget.h | |||
@@ -59,5 +59,5 @@ class VideoWidget : public MediaWidget { | |||
59 | Q_OBJECT | 59 | Q_OBJECT |
60 | public: | 60 | public: |
61 | VideoWidget( MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); | 61 | VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); |
62 | ~VideoWidget(); | 62 | ~VideoWidget(); |
63 | 63 | ||