summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp19
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h4
2 files changed, 13 insertions, 10 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index ff3f5f7..9ce2b57 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -141,3 +141,3 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
141 connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); 141 connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) );
142 connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) ); 142 connect( mediaPlayerState, SIGNAL( displayTypeChanged(MediaPlayerState::DisplayType) ), this, SLOT( setDisplayType(MediaPlayerState::DisplayType) ) );
143 connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); 143 connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
@@ -241,12 +241,13 @@ void VideoWidget::setLength( long max ) {
241 241
242void VideoWidget::setView( char view ) { 242void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType )
243 243{
244 if ( view == 'v' ) { 244 if ( displayType == MediaPlayerState::Video ) {
245 makeVisible(); 245 makeVisible();
246 } else { 246 return;
247 // Effectively blank the view next time we show it so it looks nicer
248 scaledWidth = 0;
249 scaledHeight = 0;
250 hide();
251 } 247 }
248
249 // Effectively blank the view next time we show it so it looks nicer
250 scaledWidth = 0;
251 scaledHeight = 0;
252 hide();
252} 253}
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 990fa5f..89af646 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -39,2 +39,4 @@
39 39
40#include "mediaplayerstate.h"
41
40class QPixmap; 42class QPixmap;
@@ -71,3 +73,3 @@ public slots:
71 void setLength( long ); 73 void setLength( long );
72 void setView( char ); 74 void setDisplayType( MediaPlayerState::DisplayType displayType );
73 75