summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show 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
@@ -160,7 +160,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
160 resizeEvent( NULL ); 160 resizeEvent( NULL );
161 161
162 connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); 162 connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) );
163 connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) ); 163 connect( mediaPlayerState, SIGNAL( mediaTypeChanged(MediaPlayerState::MediaType) ), this, SLOT( setMediaType(MediaPlayerState::MediaType) ) );
164 connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); 164 connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
165 connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); 165 connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
166 connect( mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) ); 166 connect( mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) );
@@ -264,16 +264,15 @@ void AudioWidget::setLength( long max ) {
264} 264}
265 265
266 266
267void AudioWidget::setView( char view ) { 267void AudioWidget::setMediaType( MediaPlayerState::MediaType mediaType ) {
268 268 if ( mediaType == MediaPlayerState::Video ) {
269if ( view == 'a' ) {
270 // startTimer( 150 );
271 showMaximized();
272 } else {
273 killTimers(); 269 killTimers();
274 hide(); 270 hide();
271 return;
275 } 272 }
276 // qApp->processEvents(); 273
274 // startTimer( 150 );
275 showMaximized();
277} 276}
278 277
279 278
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
@@ -46,6 +46,8 @@
46 46
47#include <opie/oticker.h> 47#include <opie/oticker.h>
48 48
49#include "mediaplayerstate.h"
50
49class QPixmap; 51class QPixmap;
50 52
51namespace { 53namespace {
@@ -79,7 +81,7 @@ public slots:
79 void setPosition( long ); 81 void setPosition( long );
80 void setLength( long ); 82 void setLength( long );
81 void setSeekable( bool ); 83 void setSeekable( bool );
82 void setView( char ); 84 void setMediaType( MediaPlayerState::MediaType mediaType );
83 85
84signals: 86signals:
85 void moreClicked(); 87 void moreClicked();