- converted to MediaPlayerState::DisplayType

2 files changed, 10 insertions, 7 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
@@ -136,13 +136,13 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
     slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) );
     //slider->setFocusPolicy( QWidget::NoFocus );
 
     resizeEvent( NULL );
 
     connect( mediaPlayerState, SIGNAL( lengthChanged(long) ),  this, SLOT( setLength(long) ) );
-    connect( mediaPlayerState, SIGNAL( viewChanged(char) ),    this, SLOT( setView(char) ) );
+    connect( mediaPlayerState, SIGNAL( displayTypeChanged(MediaPlayerState::DisplayType) ),    this, SLOT( setDisplayType(MediaPlayerState::DisplayType) ) );
     connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
 
     setLength( mediaPlayerState->length() );
     setPosition( mediaPlayerState->position() );
     setFullscreen( mediaPlayerState->isFullscreen() );
     setPlaying( mediaPlayerState->isPlaying() );
@@ -236,23 +236,24 @@ void VideoWidget::setPosition( long i ) {
 
 
 void VideoWidget::setLength( long max ) {
     updateSlider( mediaPlayerState->position(), max );
 }
 
-void VideoWidget::setView( char view ) {
-
-    if ( view == 'v' ) {
+void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType )
+{
+    if ( displayType == MediaPlayerState::Video ) {
         makeVisible();
-    } else {
+        return;
+    }
+
         // Effectively blank the view next time we show it so it looks nicer
         scaledWidth = 0;
         scaledHeight = 0;
         hide();
     }
-}
 
 void VideoWidget::updateSlider( long i, long max ) {
     // Will flicker too much if we don't do this
     if ( max == 0 ) {
         return;
     }
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
@@ -34,12 +34,14 @@
 #ifndef VIDEO_WIDGET_H
 #define VIDEO_WIDGET_H
 
 #include <qwidget.h>
 #include "xinevideowidget.h"
 
+#include "mediaplayerstate.h"
+
 class QPixmap;
 class QSlider;
 
 enum VideoButtons {
     VideoStop = 0,
     VideoPlay,
@@ -66,13 +68,13 @@ public slots:
     void setPlaying( bool b);
     void setFullscreen( bool b );
     void makeVisible();
     void backToNormal();
     void setPosition( long );
     void setLength( long );
-    void setView( char );
+    void setDisplayType( MediaPlayerState::DisplayType displayType );
 
 signals:
     void moreClicked();
     void lessClicked();
     void moreReleased();
     void lessReleased();