-rw-r--r-- | core/multimedia/opieplayer/audiowidget.cpp | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/videowidget.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp index 44fbe48..fbc5072 100644 --- a/core/multimedia/opieplayer/audiowidget.cpp +++ b/core/multimedia/opieplayer/audiowidget.cpp | |||
@@ -241,97 +241,97 @@ void AudioWidget::resizeEvent( QResizeEvent * ) { | |||
241 | } | 241 | } |
242 | 242 | ||
243 | 243 | ||
244 | static bool audioSliderBeingMoved = FALSE; | 244 | static bool audioSliderBeingMoved = FALSE; |
245 | 245 | ||
246 | void AudioWidget::sliderPressed() { | 246 | void AudioWidget::sliderPressed() { |
247 | audioSliderBeingMoved = TRUE; | 247 | audioSliderBeingMoved = TRUE; |
248 | } | 248 | } |
249 | 249 | ||
250 | 250 | ||
251 | void AudioWidget::sliderReleased() { | 251 | void AudioWidget::sliderReleased() { |
252 | audioSliderBeingMoved = FALSE; | 252 | audioSliderBeingMoved = FALSE; |
253 | if ( slider.width() == 0 ) | 253 | if ( slider.width() == 0 ) |
254 | return; | 254 | return; |
255 | long val = long((double)slider.value() * mediaPlayerState->length() / slider.width()); | 255 | long val = long((double)slider.value() * mediaPlayerState->length() / slider.width()); |
256 | mediaPlayerState->setPosition( val ); | 256 | mediaPlayerState->setPosition( val ); |
257 | } | 257 | } |
258 | 258 | ||
259 | 259 | ||
260 | void AudioWidget::setPosition( long i ) { | 260 | void AudioWidget::setPosition( long i ) { |
261 | // qDebug("set position %d",i); | 261 | // qDebug("set position %d",i); |
262 | long length = mediaPlayerState->length(); | 262 | long length = mediaPlayerState->length(); |
263 | updateSlider( i, length ); | 263 | updateSlider( i, length ); |
264 | } | 264 | } |
265 | 265 | ||
266 | 266 | ||
267 | void AudioWidget::setLength( long max ) { | 267 | void AudioWidget::setLength( long max ) { |
268 | updateSlider( mediaPlayerState->position(), max ); | 268 | updateSlider( mediaPlayerState->position(), max ); |
269 | } | 269 | } |
270 | 270 | ||
271 | 271 | ||
272 | void AudioWidget::setView( char view ) { | 272 | void AudioWidget::setView( char view ) { |
273 | 273 | ||
274 | if (mediaPlayerState->isStreaming) { | 274 | if (mediaPlayerState->isStreaming) { |
275 | if( !slider.isHidden()) slider.hide(); | 275 | if( !slider.isHidden()) slider.hide(); |
276 | disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 276 | disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
277 | disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 277 | disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
278 | } else { | 278 | } else { |
279 | // this stops the slider from being moved, thus | 279 | // this stops the slider from being moved, thus |
280 | // does not stop stream when it reaches the end | 280 | // does not stop stream when it reaches the end |
281 | slider.show(); | 281 | slider.show(); |
282 | connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 282 | connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
283 | connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 283 | connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
284 | } | 284 | } |
285 | 285 | ||
286 | if ( view == 'a' ) { | 286 | if ( view == 'a' ) { |
287 | startTimer( 150 ); | 287 | startTimer( 150 ); |
288 | // show(); | 288 | // show(); |
289 | showMaximized(); | 289 | QPEApplication::showWidget( this ); |
290 | } else { | 290 | } else { |
291 | killTimers(); | 291 | killTimers(); |
292 | hide(); | 292 | hide(); |
293 | } | 293 | } |
294 | 294 | ||
295 | } | 295 | } |
296 | 296 | ||
297 | 297 | ||
298 | static QString timeAsString( long length ) { | 298 | static QString timeAsString( long length ) { |
299 | length /= 44100; | 299 | length /= 44100; |
300 | int minutes = length / 60; | 300 | int minutes = length / 60; |
301 | int seconds = length % 60; | 301 | int seconds = length % 60; |
302 | return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 ); | 302 | return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 ); |
303 | } | 303 | } |
304 | 304 | ||
305 | void AudioWidget::updateSlider( long i, long max ) { | 305 | void AudioWidget::updateSlider( long i, long max ) { |
306 | this->setFocus(); | 306 | this->setFocus(); |
307 | time.setText( timeAsString( i ) + " / " + timeAsString( max ) ); | 307 | time.setText( timeAsString( i ) + " / " + timeAsString( max ) ); |
308 | 308 | ||
309 | if ( max == 0 ) | 309 | if ( max == 0 ) |
310 | return; | 310 | return; |
311 | // Will flicker too much if we don't do this | 311 | // Will flicker too much if we don't do this |
312 | // Scale to something reasonable | 312 | // Scale to something reasonable |
313 | int width = slider.width(); | 313 | int width = slider.width(); |
314 | int val = int((double)i * width / max); | 314 | int val = int((double)i * width / max); |
315 | if ( !audioSliderBeingMoved ) { | 315 | if ( !audioSliderBeingMoved ) { |
316 | if ( slider.value() != val ) | 316 | if ( slider.value() != val ) |
317 | slider.setValue( val ); | 317 | slider.setValue( val ); |
318 | if ( slider.maxValue() != width ) | 318 | if ( slider.maxValue() != width ) |
319 | slider.setMaxValue( width ); | 319 | slider.setMaxValue( width ); |
320 | } | 320 | } |
321 | } | 321 | } |
322 | 322 | ||
323 | 323 | ||
324 | void AudioWidget::setToggleButton( int i, bool down ) { | 324 | void AudioWidget::setToggleButton( int i, bool down ) { |
325 | if ( down != audioButtons[i].isDown ) | 325 | if ( down != audioButtons[i].isDown ) |
326 | toggleButton( i ); | 326 | toggleButton( i ); |
327 | } | 327 | } |
328 | 328 | ||
329 | 329 | ||
330 | void AudioWidget::toggleButton( int i ) { | 330 | void AudioWidget::toggleButton( int i ) { |
331 | audioButtons[i].isDown = !audioButtons[i].isDown; | 331 | audioButtons[i].isDown = !audioButtons[i].isDown; |
332 | QPainter p(this); | 332 | QPainter p(this); |
333 | paintButton ( &p, i ); | 333 | paintButton ( &p, i ); |
334 | } | 334 | } |
335 | 335 | ||
336 | 336 | ||
337 | void AudioWidget::paintButton( QPainter *p, int i ) { | 337 | void AudioWidget::paintButton( QPainter *p, int i ) { |
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 82fd1e1..db99866 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -660,97 +660,97 @@ bool PlayListWidget::next() { | |||
660 | } else { | 660 | } else { |
661 | return mediaPlayerState->looping(); | 661 | return mediaPlayerState->looping(); |
662 | } | 662 | } |
663 | } | 663 | } |
664 | 664 | ||
665 | 665 | ||
666 | bool PlayListWidget::first() { | 666 | bool PlayListWidget::first() { |
667 | if ( mediaPlayerState->playlist() ) | 667 | if ( mediaPlayerState->playlist() ) |
668 | return d->selectedFiles->first(); | 668 | return d->selectedFiles->first(); |
669 | else | 669 | else |
670 | return mediaPlayerState->looping(); | 670 | return mediaPlayerState->looping(); |
671 | } | 671 | } |
672 | 672 | ||
673 | 673 | ||
674 | bool PlayListWidget::last() { | 674 | bool PlayListWidget::last() { |
675 | if ( mediaPlayerState->playlist() ) | 675 | if ( mediaPlayerState->playlist() ) |
676 | return d->selectedFiles->last(); | 676 | return d->selectedFiles->last(); |
677 | else | 677 | else |
678 | return mediaPlayerState->looping(); | 678 | return mediaPlayerState->looping(); |
679 | } | 679 | } |
680 | 680 | ||
681 | 681 | ||
682 | void PlayListWidget::saveList() { | 682 | void PlayListWidget::saveList() { |
683 | writem3u(); | 683 | writem3u(); |
684 | } | 684 | } |
685 | 685 | ||
686 | void PlayListWidget::loadList( const DocLnk & lnk) { | 686 | void PlayListWidget::loadList( const DocLnk & lnk) { |
687 | QString name = lnk.name(); | 687 | QString name = lnk.name(); |
688 | // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name); | 688 | // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name); |
689 | 689 | ||
690 | if( name.length()>0) { | 690 | if( name.length()>0) { |
691 | setCaption("OpiePlayer: "+name); | 691 | setCaption("OpiePlayer: "+name); |
692 | // qDebug("<<<<<<<<<<<<load list "+ lnk.file()); | 692 | // qDebug("<<<<<<<<<<<<load list "+ lnk.file()); |
693 | clearList(); | 693 | clearList(); |
694 | readm3u(lnk.file()); | 694 | readm3u(lnk.file()); |
695 | tabWidget->setCurrentPage(0); | 695 | tabWidget->setCurrentPage(0); |
696 | } | 696 | } |
697 | } | 697 | } |
698 | 698 | ||
699 | void PlayListWidget::setPlaylist( bool shown ) { | 699 | void PlayListWidget::setPlaylist( bool shown ) { |
700 | if ( shown ) | 700 | if ( shown ) |
701 | d->playListFrame->show(); | 701 | d->playListFrame->show(); |
702 | else | 702 | else |
703 | d->playListFrame->hide(); | 703 | d->playListFrame->hide(); |
704 | } | 704 | } |
705 | 705 | ||
706 | void PlayListWidget::setView( char view ) { | 706 | void PlayListWidget::setView( char view ) { |
707 | if ( view == 'l' ) | 707 | if ( view == 'l' ) |
708 | showMaximized(); | 708 | QPEApplication::showWidget( this ); |
709 | else | 709 | else |
710 | hide(); | 710 | hide(); |
711 | } | 711 | } |
712 | 712 | ||
713 | void PlayListWidget::addSelected() { | 713 | void PlayListWidget::addSelected() { |
714 | DocLnk lnk; | 714 | DocLnk lnk; |
715 | QString filename; | 715 | QString filename; |
716 | switch (tabWidget->currentPageIndex()) { | 716 | switch (tabWidget->currentPageIndex()) { |
717 | 717 | ||
718 | case 0: //playlist | 718 | case 0: //playlist |
719 | return; | 719 | return; |
720 | break; | 720 | break; |
721 | case 1: { //audio | 721 | case 1: { //audio |
722 | QListViewItemIterator it( audioView ); | 722 | QListViewItemIterator it( audioView ); |
723 | for ( ; it.current(); ++it ) { | 723 | for ( ; it.current(); ++it ) { |
724 | if ( it.current()->isSelected() ) { | 724 | if ( it.current()->isSelected() ) { |
725 | filename = it.current()->text(3); | 725 | filename = it.current()->text(3); |
726 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 726 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
727 | lnk.setFile( filename ); //sets file name | 727 | lnk.setFile( filename ); //sets file name |
728 | d->selectedFiles->addToSelection( lnk); | 728 | d->selectedFiles->addToSelection( lnk); |
729 | } | 729 | } |
730 | } | 730 | } |
731 | audioView->clearSelection(); | 731 | audioView->clearSelection(); |
732 | // d->selectedFiles->next(); | 732 | // d->selectedFiles->next(); |
733 | } | 733 | } |
734 | break; | 734 | break; |
735 | 735 | ||
736 | case 2: { // video | 736 | case 2: { // video |
737 | QListViewItemIterator it( videoView ); | 737 | QListViewItemIterator it( videoView ); |
738 | for ( ; it.current(); ++it ) { | 738 | for ( ; it.current(); ++it ) { |
739 | if ( it.current()->isSelected() ) { | 739 | if ( it.current()->isSelected() ) { |
740 | 740 | ||
741 | filename = it.current()->text(3); | 741 | filename = it.current()->text(3); |
742 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 742 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
743 | lnk.setFile( filename ); //sets file name | 743 | lnk.setFile( filename ); //sets file name |
744 | d->selectedFiles->addToSelection( lnk); | 744 | d->selectedFiles->addToSelection( lnk); |
745 | } | 745 | } |
746 | } | 746 | } |
747 | videoView->clearSelection(); | 747 | videoView->clearSelection(); |
748 | } | 748 | } |
749 | break; | 749 | break; |
750 | }; | 750 | }; |
751 | // tabWidget->setCurrentPage(0); | 751 | // tabWidget->setCurrentPage(0); |
752 | writeCurrentM3u(); | 752 | writeCurrentM3u(); |
753 | 753 | ||
754 | } | 754 | } |
755 | 755 | ||
756 | void PlayListWidget::removeSelected() { | 756 | void PlayListWidget::removeSelected() { |
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp index d9a9478..5273ad3 100644 --- a/core/multimedia/opieplayer/videowidget.cpp +++ b/core/multimedia/opieplayer/videowidget.cpp | |||
@@ -375,97 +375,97 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
375 | mediaPlayerState->setPaused( TRUE ); | 375 | mediaPlayerState->setPaused( TRUE ); |
376 | return; | 376 | return; |
377 | } else { | 377 | } else { |
378 | return; | 378 | return; |
379 | } | 379 | } |
380 | } | 380 | } |
381 | 381 | ||
382 | case VideoStop: mediaPlayerState->setPlaying( FALSE ); setToggleButton( i+1, true); setToggleButton( i, true ); return; | 382 | case VideoStop: mediaPlayerState->setPlaying( FALSE ); setToggleButton( i+1, true); setToggleButton( i, true ); return; |
383 | case VideoNext: mediaPlayerState->setNext(); return; | 383 | case VideoNext: mediaPlayerState->setNext(); return; |
384 | case VideoPrevious: mediaPlayerState->setPrev(); return; | 384 | case VideoPrevious: mediaPlayerState->setPrev(); return; |
385 | case VideoVolUp: emit moreReleased(); return; | 385 | case VideoVolUp: emit moreReleased(); return; |
386 | case VideoVolDown: emit lessReleased(); return; | 386 | case VideoVolDown: emit lessReleased(); return; |
387 | case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return; | 387 | case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return; |
388 | } | 388 | } |
389 | } | 389 | } |
390 | } | 390 | } |
391 | } | 391 | } |
392 | } | 392 | } |
393 | 393 | ||
394 | 394 | ||
395 | void VideoWidget::mousePressEvent( QMouseEvent *event ) { | 395 | void VideoWidget::mousePressEvent( QMouseEvent *event ) { |
396 | mouseMoveEvent( event ); | 396 | mouseMoveEvent( event ); |
397 | } | 397 | } |
398 | 398 | ||
399 | 399 | ||
400 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { | 400 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { |
401 | if ( mediaPlayerState->fullscreen() ) | 401 | if ( mediaPlayerState->fullscreen() ) |
402 | { | 402 | { |
403 | mediaPlayerState->setFullscreen( FALSE ); | 403 | mediaPlayerState->setFullscreen( FALSE ); |
404 | makeVisible(); | 404 | makeVisible(); |
405 | } | 405 | } |
406 | mouseMoveEvent( event ); | 406 | mouseMoveEvent( event ); |
407 | // } | 407 | // } |
408 | } | 408 | } |
409 | 409 | ||
410 | 410 | ||
411 | void VideoWidget::makeVisible() { | 411 | void VideoWidget::makeVisible() { |
412 | if ( mediaPlayerState->fullscreen() ) | 412 | if ( mediaPlayerState->fullscreen() ) |
413 | { | 413 | { |
414 | setBackgroundMode( QWidget::NoBackground ); | 414 | setBackgroundMode( QWidget::NoBackground ); |
415 | showFullScreen(); | 415 | showFullScreen(); |
416 | resize( qApp->desktop()->size() ); | 416 | resize( qApp->desktop()->size() ); |
417 | slider->hide(); | 417 | slider->hide(); |
418 | } | 418 | } |
419 | else | 419 | else |
420 | { | 420 | { |
421 | setBackgroundPixmap( *pixBg ); | 421 | setBackgroundPixmap( *pixBg ); |
422 | showNormal(); | 422 | showNormal(); |
423 | showMaximized(); | 423 | QPEApplication::showWidget( this ); |
424 | slider->show(); | 424 | slider->show(); |
425 | } | 425 | } |
426 | } | 426 | } |
427 | 427 | ||
428 | 428 | ||
429 | void VideoWidget::paintEvent( QPaintEvent * pe) { | 429 | void VideoWidget::paintEvent( QPaintEvent * pe) { |
430 | QPainter p( this ); | 430 | QPainter p( this ); |
431 | 431 | ||
432 | if ( mediaPlayerState->fullscreen() ) { | 432 | if ( mediaPlayerState->fullscreen() ) { |
433 | // Clear the background | 433 | // Clear the background |
434 | p.setBrush( QBrush( Qt::black ) ); | 434 | p.setBrush( QBrush( Qt::black ) ); |
435 | p.drawRect( rect() ); | 435 | p.drawRect( rect() ); |
436 | } else { | 436 | } else { |
437 | if ( !pe->erased() ) { | 437 | if ( !pe->erased() ) { |
438 | // Combine with background and double buffer | 438 | // Combine with background and double buffer |
439 | QPixmap pix( pe->rect().size() ); | 439 | QPixmap pix( pe->rect().size() ); |
440 | QPainter p( &pix ); | 440 | QPainter p( &pix ); |
441 | p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); | 441 | p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); |
442 | p.drawTiledPixmap( pe->rect(), *pixBg, pe->rect().topLeft() ); | 442 | p.drawTiledPixmap( pe->rect(), *pixBg, pe->rect().topLeft() ); |
443 | for ( int i = 0; i < numVButtons; i++ ) { | 443 | for ( int i = 0; i < numVButtons; i++ ) { |
444 | paintButton( &p, i ); | 444 | paintButton( &p, i ); |
445 | } | 445 | } |
446 | QPainter p2( this ); | 446 | QPainter p2( this ); |
447 | p2.drawPixmap( pe->rect().topLeft(), pix ); | 447 | p2.drawPixmap( pe->rect().topLeft(), pix ); |
448 | } else { | 448 | } else { |
449 | QPainter p( this ); | 449 | QPainter p( this ); |
450 | for ( int i = 0; i < numVButtons; i++ ) | 450 | for ( int i = 0; i < numVButtons; i++ ) |
451 | paintButton( &p, i ); | 451 | paintButton( &p, i ); |
452 | } | 452 | } |
453 | slider->repaint( TRUE ); | 453 | slider->repaint( TRUE ); |
454 | } | 454 | } |
455 | } | 455 | } |
456 | 456 | ||
457 | 457 | ||
458 | void VideoWidget::closeEvent( QCloseEvent* ) { | 458 | void VideoWidget::closeEvent( QCloseEvent* ) { |
459 | mediaPlayerState->setList(); | 459 | mediaPlayerState->setList(); |
460 | } | 460 | } |
461 | 461 | ||
462 | 462 | ||
463 | bool VideoWidget::playVideo() { | 463 | bool VideoWidget::playVideo() { |
464 | bool result = FALSE; | 464 | bool result = FALSE; |
465 | // qDebug("<<<<<<<<<<<<<<<< play video"); | 465 | // qDebug("<<<<<<<<<<<<<<<< play video"); |
466 | int stream = 0; | 466 | int stream = 0; |
467 | 467 | ||
468 | int sw = mediaPlayerState->curDecoder()->videoWidth( stream ); | 468 | int sw = mediaPlayerState->curDecoder()->videoWidth( stream ); |
469 | int sh = mediaPlayerState->curDecoder()->videoHeight( stream ); | 469 | int sh = mediaPlayerState->curDecoder()->videoHeight( stream ); |
470 | int dd = QPixmap::defaultDepth(); | 470 | int dd = QPixmap::defaultDepth(); |
471 | int w = height(); | 471 | int w = height(); |