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 | |||
@@ -50,13 +50,12 @@ | |||
50 | # define USE_DIRECT_PAINTER | 50 | # define USE_DIRECT_PAINTER |
51 | # include <qdirectpainter_qws.h> | 51 | # include <qdirectpainter_qws.h> |
52 | # include <qgfxraster_qws.h> | 52 | # include <qgfxraster_qws.h> |
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 |
60 | static const int yo = 0; // movable y offset | 59 | static const int yo = 0; // movable y offset |
61 | 60 | ||
62 | 61 | ||
@@ -78,16 +77,15 @@ const char *skinV_mask_file_names[7] = { | |||
78 | "stop","play","back","fwd","up","down","full" | 77 | "stop","play","back","fwd","up","down","full" |
79 | }; | 78 | }; |
80 | 79 | ||
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" ); |
91 | 89 | ||
92 | connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); | 90 | connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); |
93 | connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) ); | 91 | connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) ); |
@@ -329,14 +327,14 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
329 | } else { | 327 | } else { |
330 | return; | 328 | return; |
331 | } | 329 | } |
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; |
340 | } | 338 | } |
341 | } | 339 | } |
342 | } | 340 | } |