summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-02 18:17:40 (UTC)
committer simon <simon>2002-12-02 18:17:40 (UTC)
commit2aa2e01cd678012d4b28365c9c765a2076f64a3b (patch) (side-by-side diff)
tree53fb067b1670b734cd65ce1d2fddd920e059d200
parentdaf5a1cfa07615a3259dce3f7f980d30241fa3d5 (diff)
downloadopie-2aa2e01cd678012d4b28365c9c765a2076f64a3b.zip
opie-2aa2e01cd678012d4b28365c9c765a2076f64a3b.tar.gz
opie-2aa2e01cd678012d4b28365c9c765a2076f64a3b.tar.bz2
- adapted to the new MediaPlayerState::MediaType
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp15
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h4
2 files changed, 10 insertions, 9 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 46d374d..74bc390 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -161,5 +161,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) );
- connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) );
+ connect( mediaPlayerState, SIGNAL( mediaTypeChanged(MediaPlayerState::MediaType) ), this, SLOT( setMediaType(MediaPlayerState::MediaType) ) );
connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
@@ -265,14 +265,13 @@ void AudioWidget::setLength( long max ) {
-void AudioWidget::setView( char view ) {
-
-if ( view == 'a' ) {
- // startTimer( 150 );
- showMaximized();
- } else {
+void AudioWidget::setMediaType( MediaPlayerState::MediaType mediaType ) {
+ if ( mediaType == MediaPlayerState::Video ) {
killTimers();
hide();
+ return;
}
- // qApp->processEvents();
+
+ // startTimer( 150 );
+ showMaximized();
}
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 54adb36..3f0c059 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -47,4 +47,6 @@
#include <opie/oticker.h>
+#include "mediaplayerstate.h"
+
class QPixmap;
@@ -80,5 +82,5 @@ public slots:
void setLength( long );
void setSeekable( bool );
- void setView( char );
+ void setMediaType( MediaPlayerState::MediaType mediaType );
signals: