Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index ffda2e4..8e3a365 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -35,34 +35,36 @@ | |||
35 | #include <qpe/resource.h> | 35 | #include <qpe/resource.h> |
36 | #include <qpe/mediaplayerplugininterface.h> | 36 | #include <qpe/mediaplayerplugininterface.h> |
37 | #include <qpe/config.h> | 37 | #include <qpe/config.h> |
38 | 38 | ||
39 | 39 | ||
40 | #include <qwidget.h> | 40 | #include <qwidget.h> |
41 | #include <qpainter.h> | 41 | #include <qpainter.h> |
42 | #include <qpixmap.h> | 42 | #include <qpixmap.h> |
43 | #include <qslider.h> | 43 | #include <qslider.h> |
44 | #include <qdrawutil.h> | 44 | #include <qdrawutil.h> |
45 | #include "videowidget.h" | 45 | #include "videowidget.h" |
46 | #include "mediaplayerstate.h" | 46 | #include "mediaplayerstate.h" |
47 | #include "playlistwidget.h" | ||
47 | 48 | ||
48 | 49 | ||
49 | #ifdef Q_WS_QWS | 50 | #ifdef Q_WS_QWS |
50 | # define USE_DIRECT_PAINTER | 51 | # define USE_DIRECT_PAINTER |
51 | # include <qdirectpainter_qws.h> | 52 | # include <qdirectpainter_qws.h> |
52 | # include <qgfxraster_qws.h> | 53 | # include <qgfxraster_qws.h> |
53 | #endif | 54 | #endif |
54 | 55 | ||
55 | 56 | ||
56 | extern MediaPlayerState *mediaPlayerState; | 57 | extern MediaPlayerState *mediaPlayerState; |
58 | extern PlayListWidget *playList; | ||
57 | 59 | ||
58 | 60 | ||
59 | static const int xo = 2; // movable x offset | 61 | static const int xo = 2; // movable x offset |
60 | static const int yo = 0; // movable y offset | 62 | static const int yo = 0; // movable y offset |
61 | 63 | ||
62 | 64 | ||
63 | struct MediaButton { | 65 | struct MediaButton { |
64 | bool isToggle, isHeld, isDown; | 66 | bool isToggle, isHeld, isDown; |
65 | }; | 67 | }; |
66 | 68 | ||
67 | MediaButton videoButtons[] = { | 69 | MediaButton videoButtons[] = { |
68 | { FALSE, FALSE, FALSE }, // stop | 70 | { FALSE, FALSE, FALSE }, // stop |
@@ -329,26 +331,26 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
329 | mediaPlayerState->setPaused( FALSE ); | 331 | mediaPlayerState->setPaused( FALSE ); |
330 | return; | 332 | return; |
331 | } else if( !mediaPlayerState->isPaused ) { | 333 | } else if( !mediaPlayerState->isPaused ) { |
332 | setToggleButton( i, TRUE ); | 334 | setToggleButton( i, TRUE ); |
333 | mediaPlayerState->setPaused( TRUE ); | 335 | mediaPlayerState->setPaused( TRUE ); |
334 | return; | 336 | return; |
335 | } else { | 337 | } else { |
336 | return; | 338 | return; |
337 | } | 339 | } |
338 | } | 340 | } |
339 | 341 | ||
340 | case VideoStop: mediaPlayerState->setPlaying( FALSE ); return; | 342 | case VideoStop: mediaPlayerState->setPlaying( FALSE ); return; |
341 | case VideoNext: mediaPlayerState->setNext(); return; | 343 | case VideoNext: if(playList->whichList() ==0) mediaPlayerState->setNext(); return; |
342 | case VideoPrevious: mediaPlayerState->setPrev(); return; | 344 | case VideoPrevious: if(playList->whichList() ==0) mediaPlayerState->setPrev(); return; |
343 | case VideoVolUp: emit moreReleased(); return; | 345 | case VideoVolUp: emit moreReleased(); return; |
344 | case VideoVolDown: emit lessReleased(); return; | 346 | case VideoVolDown: emit lessReleased(); return; |
345 | case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return; | 347 | case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return; |
346 | } | 348 | } |
347 | } | 349 | } |
348 | } | 350 | } |
349 | } | 351 | } |
350 | } | 352 | } |
351 | 353 | ||
352 | void VideoWidget::mousePressEvent( QMouseEvent *event ) { | 354 | void VideoWidget::mousePressEvent( QMouseEvent *event ) { |
353 | mouseMoveEvent( event ); | 355 | mouseMoveEvent( event ); |
354 | } | 356 | } |