summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-02 18:37:23 (UTC)
committer simon <simon>2002-12-02 18:37:23 (UTC)
commit54665278a9b7d703deb73ede0d74d3948c265b39 (patch) (side-by-side diff)
tree82a047d0c948f8a1f917a8fb430a69dbf2968e25
parentcf6d2e032faac6fbaeb9c5730767fc25021045fe (diff)
downloadopie-54665278a9b7d703deb73ede0d74d3948c265b39.zip
opie-54665278a9b7d703deb73ede0d74d3948c265b39.tar.gz
opie-54665278a9b7d703deb73ede0d74d3948c265b39.tar.bz2
- converted to MediaPlayerState::DisplayType
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp13
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h4
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
@@ -140,5 +140,5 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
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) ) );
@@ -240,9 +240,11 @@ void VideoWidget::setLength( long 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;
@@ -250,5 +252,4 @@ void VideoWidget::setView( char view ) {
hide();
}
-}
void VideoWidget::updateSlider( long i, long max ) {
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
@@ -38,4 +38,6 @@
#include "xinevideowidget.h"
+#include "mediaplayerstate.h"
+
class QPixmap;
class QSlider;
@@ -70,5 +72,5 @@ public slots:
void setPosition( long );
void setLength( long );
- void setView( char );
+ void setDisplayType( MediaPlayerState::DisplayType displayType );
signals: