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
@@ -130,25 +130,25 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
 
     setBackgroundPixmap( *pixBg );
 
     slider = new QSlider( Qt::Horizontal, this );
     slider->setMinValue( 0 );
     slider->setMaxValue( 1 );
     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() );
 }
 
 
 VideoWidget::~VideoWidget() {
 
     for ( int i = 0; i < 7; i++ ) {
@@ -230,35 +230,36 @@ void VideoWidget::sliderReleased() {
     mediaPlayerState->setPosition( val );
 }
 
 void VideoWidget::setPosition( long i ) {
     updateSlider( i, mediaPlayerState->length() );
 }
 
 
 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;
     }
     int width = slider->width();
     int val = int((double)i * width / max);
     if ( !mediaPlayerState->isFullscreen() && !videoSliderBeingMoved ) {
         if ( slider->value() != val ) {
             slider->setValue( val );
         }
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
@@ -28,24 +28,26 @@
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #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,
 //    VideoPause,
     VideoPrevious,
     VideoNext,
     VideoVolUp,
     VideoVolDown,
     VideoFullscreen
@@ -60,25 +62,25 @@ public:
 
     XineVideoWidget* vidWidget();
 public slots:
     void updateSlider( long, long );
     void sliderPressed( );
     void sliderReleased( );
     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();
     void sliderMoved( long );
     void videoResized ( const QSize &s );
 
 protected:
 
     void resizeEvent( QResizeEvent * );