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/videowidget.cpp | |
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/videowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
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 | |||
@@ -53,7 +53,6 @@ | |||
53 | #endif | 53 | #endif |
54 | 54 | ||
55 | 55 | ||
56 | extern PlayListWidget *playList; | ||
57 | 56 | ||
58 | 57 | ||
59 | static const int xo = 2; // movable x offset | 58 | static const int xo = 2; // movable x offset |
@@ -81,10 +80,9 @@ const char *skinV_mask_file_names[7] = { | |||
81 | static const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton)); | 80 | 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 | ||
90 | videoFrame = new XineVideoWidget ( this, "Video frame" ); | 88 | videoFrame = new XineVideoWidget ( this, "Video frame" ); |
@@ -332,8 +330,8 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
332 | } | 330 | } |
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; |
339 | case VideoFullscreen: mediaPlayerState.setFullscreen( TRUE ); makeVisible(); return; | 337 | case VideoFullscreen: mediaPlayerState.setFullscreen( TRUE ); makeVisible(); return; |