summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp13
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp9
2 files changed, 21 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 132a911..442864f 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -320,16 +320,17 @@ void AudioWidget::setView( char view ) {
if ( view == 'a' ) {
// startTimer( 150 );
showMaximized();
} else {
killTimers();
hide();
}
+ qApp->processEvents();
}
static QString timeAsString( long length ) {
int minutes = length / 60;
int seconds = length % 60;
return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 );
}
@@ -565,13 +566,23 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e)
mediaPlayerState->setNext();
// toggleButton(3);
break;
case Key_Left:
// toggleButton(4);
mediaPlayerState->setPrev();
// toggleButton(4);
break;
- case Key_Escape:
+ case Key_Escape: {
+#if defined(QT_QWS_IPAQ)
+ if( mediaPlayerState->isPaused ) {
+ setToggleButton( i, FALSE );
+ mediaPlayerState->setPaused( FALSE );
+ } else if( !mediaPlayerState->isPaused ) {
+ setToggleButton( i, TRUE );
+ mediaPlayerState->setPaused( TRUE );
+ }
+#endif
+ }
break;
};
}
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 0521419..5a69bf5 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -473,16 +473,25 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) {
break;
case Key_Right:
mediaPlayerState->setNext();
break;
case Key_Left:
mediaPlayerState->setPrev();
break;
case Key_Escape:
+#if defined(QT_QWS_IPAQ)
+ if( mediaPlayerState->isPaused ) {
+ setToggleButton( i, FALSE );
+ mediaPlayerState->setPaused( FALSE );
+ } else if( !mediaPlayerState->isPaused ) {
+ setToggleButton( i, TRUE );
+ mediaPlayerState->setPaused( TRUE );
+ }
+#endif
break;
};
}
XineVideoWidget* VideoWidget::vidWidget() {
return videoFrame;
}