summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp1
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 6f3842f..ddb4d74 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -368,24 +368,25 @@ void VideoWidget::showEvent( QShowEvent* ) {
368 makeVisible(); 368 makeVisible();
369 } 369 }
370 370
371void VideoWidget::makeVisible() { 371void VideoWidget::makeVisible() {
372 if ( mediaPlayerState->fullscreen() ) { 372 if ( mediaPlayerState->fullscreen() ) {
373 setBackgroundMode( QWidget::NoBackground ); 373 setBackgroundMode( QWidget::NoBackground );
374 showFullScreen(); 374 showFullScreen();
375 resize( qApp->desktop()->size() ); 375 resize( qApp->desktop()->size() );
376 slider->hide(); 376 slider->hide();
377 videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); 377 videoFrame-> setGeometry ( 0, 0, width ( ), height ( ));
378 378
379 } else { 379 } else {
380 showNormal();
380 showMaximized(); 381 showMaximized();
381 setBackgroundPixmap( *pixBg ); 382 setBackgroundPixmap( *pixBg );
382 if ( mediaPlayerState->streaming() ) { 383 if ( mediaPlayerState->streaming() ) {
383 slider->hide(); 384 slider->hide();
384 disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); 385 disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
385 disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); 386 disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
386 } else { 387 } else {
387 slider->show(); 388 slider->show();
388 connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); 389 connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
389 connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); 390 connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
390 } 391 }
391 videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) ); 392 videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) );
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 8fd2743..c03ea16 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -62,24 +62,25 @@ XineControl::~XineControl() {
62 disabledSuspendScreenSaver = FALSE; 62 disabledSuspendScreenSaver = FALSE;
63 // Re-enable the suspend mode 63 // Re-enable the suspend mode
64 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; 64 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
65 } 65 }
66#endif 66#endif
67 delete libXine; 67 delete libXine;
68} 68}
69 69
70void XineControl::play( const QString& fileName ) { 70void XineControl::play( const QString& fileName ) {
71 hasVideoChannel=FALSE; 71 hasVideoChannel=FALSE;
72 hasAudioChannel=FALSE; 72 hasAudioChannel=FALSE;
73 m_fileName = fileName; 73 m_fileName = fileName;
74 qDebug("<<FILENAME: " + fileName + ">>>>");
74 libXine->play( fileName ); 75 libXine->play( fileName );
75 mediaPlayerState->setPlaying( true ); 76 mediaPlayerState->setPlaying( true );
76 // default to audio view until we know how to handle video 77 // default to audio view until we know how to handle video
77 // MediaDetect mdetect; 78 // MediaDetect mdetect;
78 char whichGui = mdetect.videoOrAudio( fileName ); 79 char whichGui = mdetect.videoOrAudio( fileName );
79 if (whichGui == 'f') { 80 if (whichGui == 'f') {
80 qDebug("Nicht erkannter Dateityp"); 81 qDebug("Nicht erkannter Dateityp");
81 return; 82 return;
82 } 83 }
83 84
84 if (whichGui == 'a') { 85 if (whichGui == 'a') {
85 libXine->setShowVideo( false ); 86 libXine->setShowVideo( false );