Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 75 |
1 files changed, 37 insertions, 38 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index e0ca243..b4ecb4c 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -55,3 +55,2 @@ | |||
55 | 55 | ||
56 | extern MediaPlayerState *mediaPlayerState; | ||
57 | extern PlayListWidget *playList; | 56 | extern PlayListWidget *playList; |
@@ -84,4 +83,4 @@ static const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton)); | |||
84 | 83 | ||
85 | VideoWidget::VideoWidget(QWidget* parent, const char* name) : | 84 | VideoWidget::VideoWidget(MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : |
86 | MediaWidget( parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) { | 85 | MediaWidget( mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) { |
87 | 86 | ||
@@ -139,6 +138,6 @@ MediaWidget( parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) { | |||
139 | 138 | ||
140 | setLength( mediaPlayerState->length() ); | 139 | setLength( mediaPlayerState.length() ); |
141 | setPosition( mediaPlayerState->position() ); | 140 | setPosition( mediaPlayerState.position() ); |
142 | setFullscreen( mediaPlayerState->isFullscreen() ); | 141 | setFullscreen( mediaPlayerState.isFullscreen() ); |
143 | setPlaying( mediaPlayerState->isPlaying() ); | 142 | setPlaying( mediaPlayerState.isPlaying() ); |
144 | } | 143 | } |
@@ -223,4 +222,4 @@ void VideoWidget::sliderReleased() { | |||
223 | } | 222 | } |
224 | long val = long((double)slider->value() * mediaPlayerState->length() / slider->width()); | 223 | long val = long((double)slider->value() * mediaPlayerState.length() / slider->width()); |
225 | mediaPlayerState->setPosition( val ); | 224 | mediaPlayerState.setPosition( val ); |
226 | } | 225 | } |
@@ -228,3 +227,3 @@ void VideoWidget::sliderReleased() { | |||
228 | void VideoWidget::setPosition( long i ) { | 227 | void VideoWidget::setPosition( long i ) { |
229 | updateSlider( i, mediaPlayerState->length() ); | 228 | updateSlider( i, mediaPlayerState.length() ); |
230 | } | 229 | } |
@@ -233,3 +232,3 @@ void VideoWidget::setPosition( long i ) { | |||
233 | void VideoWidget::setLength( long max ) { | 232 | void VideoWidget::setLength( long max ) { |
234 | updateSlider( mediaPlayerState->position(), max ); | 233 | updateSlider( mediaPlayerState.position(), max ); |
235 | } | 234 | } |
@@ -256,3 +255,3 @@ void VideoWidget::updateSlider( long i, long max ) { | |||
256 | int val = int((double)i * width / max); | 255 | int val = int((double)i * width / max); |
257 | if ( !mediaPlayerState->isFullscreen() && !videoSliderBeingMoved ) { | 256 | if ( !mediaPlayerState.isFullscreen() && !videoSliderBeingMoved ) { |
258 | if ( slider->value() != val ) { | 257 | if ( slider->value() != val ) { |
@@ -325,9 +324,9 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
325 | case VideoPlay: { | 324 | case VideoPlay: { |
326 | if( mediaPlayerState->isPaused() ) { | 325 | if( mediaPlayerState.isPaused() ) { |
327 | setToggleButton( i, FALSE ); | 326 | setToggleButton( i, FALSE ); |
328 | mediaPlayerState->setPaused( FALSE ); | 327 | mediaPlayerState.setPaused( FALSE ); |
329 | return; | 328 | return; |
330 | } else if( !mediaPlayerState->isPaused() ) { | 329 | } else if( !mediaPlayerState.isPaused() ) { |
331 | setToggleButton( i, TRUE ); | 330 | setToggleButton( i, TRUE ); |
332 | mediaPlayerState->setPaused( TRUE ); | 331 | mediaPlayerState.setPaused( TRUE ); |
333 | return; | 332 | return; |
@@ -338,8 +337,8 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
338 | 337 | ||
339 | case VideoStop: mediaPlayerState->setPlaying( FALSE ); return; | 338 | case VideoStop: mediaPlayerState.setPlaying( FALSE ); return; |
340 | case VideoNext: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState->setNext(); return; | 339 | case VideoNext: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; |
341 | case VideoPrevious: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState->setPrev(); return; | 340 | case VideoPrevious: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return; |
342 | case VideoVolUp: emit moreReleased(); return; | 341 | case VideoVolUp: emit moreReleased(); return; |
343 | case VideoVolDown: emit lessReleased(); return; | 342 | case VideoVolDown: emit lessReleased(); return; |
344 | case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return; | 343 | case VideoFullscreen: mediaPlayerState.setFullscreen( TRUE ); makeVisible(); return; |
345 | } | 344 | } |
@@ -355,4 +354,4 @@ void VideoWidget::mousePressEvent( QMouseEvent *event ) { | |||
355 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { | 354 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { |
356 | if ( mediaPlayerState->isFullscreen() ) { | 355 | if ( mediaPlayerState.isFullscreen() ) { |
357 | mediaPlayerState->setFullscreen( FALSE ); | 356 | mediaPlayerState.setFullscreen( FALSE ); |
358 | makeVisible(); | 357 | makeVisible(); |
@@ -369,3 +368,3 @@ void VideoWidget::showEvent( QShowEvent* ) { | |||
369 | void VideoWidget::backToNormal() { | 368 | void VideoWidget::backToNormal() { |
370 | mediaPlayerState->setFullscreen( FALSE ); | 369 | mediaPlayerState.setFullscreen( FALSE ); |
371 | makeVisible(); | 370 | makeVisible(); |
@@ -374,3 +373,3 @@ void VideoWidget::showEvent( QShowEvent* ) { | |||
374 | void VideoWidget::makeVisible() { | 373 | void VideoWidget::makeVisible() { |
375 | if ( mediaPlayerState->isFullscreen() ) { | 374 | if ( mediaPlayerState.isFullscreen() ) { |
376 | setBackgroundMode( QWidget::NoBackground ); | 375 | setBackgroundMode( QWidget::NoBackground ); |
@@ -381,4 +380,4 @@ void VideoWidget::makeVisible() { | |||
381 | slider->hide(); | 380 | slider->hide(); |
382 | disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 381 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
383 | disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 382 | disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
384 | disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 383 | disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
@@ -401,3 +400,3 @@ void VideoWidget::makeVisible() { | |||
401 | 400 | ||
402 | if ( !mediaPlayerState->isSeekable() ) { | 401 | if ( !mediaPlayerState.isSeekable() ) { |
403 | if( !slider->isHidden()) { | 402 | if( !slider->isHidden()) { |
@@ -405,4 +404,4 @@ void VideoWidget::makeVisible() { | |||
405 | } | 404 | } |
406 | disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 405 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
407 | disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 406 | disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
408 | disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 407 | disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
@@ -411,4 +410,4 @@ void VideoWidget::makeVisible() { | |||
411 | slider->show(); | 410 | slider->show(); |
412 | connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 411 | connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
413 | connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 412 | connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
414 | connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 413 | connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
@@ -425,3 +424,3 @@ void VideoWidget::paintEvent( QPaintEvent * pe) { | |||
425 | 424 | ||
426 | if ( mediaPlayerState->isFullscreen() ) { | 425 | if ( mediaPlayerState.isFullscreen() ) { |
427 | // Clear the background | 426 | // Clear the background |
@@ -451,3 +450,3 @@ void VideoWidget::paintEvent( QPaintEvent * pe) { | |||
451 | void VideoWidget::closeEvent( QCloseEvent* ) { | 450 | void VideoWidget::closeEvent( QCloseEvent* ) { |
452 | mediaPlayerState->setList(); | 451 | mediaPlayerState.setList(); |
453 | } | 452 | } |
@@ -472,6 +471,6 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) { | |||
472 | case Key_Space: { | 471 | case Key_Space: { |
473 | if(mediaPlayerState->isPlaying()) { | 472 | if(mediaPlayerState.isPlaying()) { |
474 | mediaPlayerState->setPlaying(FALSE); | 473 | mediaPlayerState.setPlaying(FALSE); |
475 | } else { | 474 | } else { |
476 | mediaPlayerState->setPlaying(TRUE); | 475 | mediaPlayerState.setPlaying(TRUE); |
477 | } | 476 | } |
@@ -492,6 +491,6 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) { | |||
492 | case Key_Right: | 491 | case Key_Right: |
493 | mediaPlayerState->setNext(); | 492 | mediaPlayerState.setNext(); |
494 | break; | 493 | break; |
495 | case Key_Left: | 494 | case Key_Left: |
496 | mediaPlayerState->setPrev(); | 495 | mediaPlayerState.setPrev(); |
497 | break; | 496 | break; |