Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 14 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.cpp | 16 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.h | 6 |
4 files changed, 23 insertions, 15 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 74bc390..1600320 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) : | |||
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( mediaTypeChanged(MediaPlayerState::MediaType) ), this, SLOT( setMediaType(MediaPlayerState::MediaType) ) ); | 163 | connect( mediaPlayerState, SIGNAL( displayTypeChanged(MediaPlayerState::DisplayType) ), this, SLOT( setDisplayType(MediaPlayerState::DisplayType) ) ); |
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) ) ); |
@@ -265,13 +265,13 @@ void AudioWidget::setLength( long max ) { | |||
265 | 265 | ||
266 | 266 | ||
267 | void AudioWidget::setMediaType( MediaPlayerState::MediaType mediaType ) { | 267 | void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) { |
268 | if ( mediaType == MediaPlayerState::Video ) { | 268 | if ( mediaType == MediaPlayerState::Audio ) { |
269 | killTimers(); | 269 | // startTimer( 150 ); |
270 | hide(); | 270 | showMaximized(); |
271 | return; | 271 | return; |
272 | } | 272 | } |
273 | 273 | ||
274 | // startTimer( 150 ); | 274 | killTimers(); |
275 | showMaximized(); | 275 | hide(); |
276 | } | 276 | } |
277 | 277 | ||
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index 3f0c059..91fcbc5 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -82,5 +82,5 @@ public slots: | |||
82 | void setLength( long ); | 82 | void setLength( long ); |
83 | void setSeekable( bool ); | 83 | void setSeekable( bool ); |
84 | void setMediaType( MediaPlayerState::MediaType mediaType ); | 84 | void setDisplayType( MediaPlayerState::DisplayType displayType ); |
85 | 85 | ||
86 | signals: | 86 | signals: |
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp index 22451b7..6806adc 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp | |||
@@ -42,5 +42,5 @@ | |||
42 | #include "mediaplayerstate.h" | 42 | #include "mediaplayerstate.h" |
43 | 43 | ||
44 | 44 | #include <assert.h> | |
45 | 45 | ||
46 | //#define MediaPlayerDebug(x) qDebug x | 46 | //#define MediaPlayerDebug(x) qDebug x |
@@ -86,7 +86,15 @@ void MediaPlayerState::writeConfig( Config& cfg ) const { | |||
86 | } | 86 | } |
87 | 87 | ||
88 | MediaPlayerState::MediaType MediaPlayerState::mediaType() const | 88 | MediaPlayerState::DisplayType MediaPlayerState::displayType() const |
89 | { | 89 | { |
90 | return view() == 'a' ? MediaPlayerState::Audio : MediaPlayerState::Video; | 90 | char v = view(); |
91 | switch ( v ) { | ||
92 | case 'a': return MediaPlayerState::Audio; | ||
93 | case 'v': return MediaPlayerState::Video; | ||
94 | case 'l': return MediaPlayerState::MediaSelection; | ||
95 | default: assert( false ); | ||
96 | } | ||
97 | // never reached | ||
98 | return MediaPlayerState::MediaSelection; | ||
91 | } | 99 | } |
92 | 100 | ||
@@ -209,5 +217,5 @@ void MediaPlayerState::setView( char v ) { | |||
209 | curView = v; | 217 | curView = v; |
210 | emit viewChanged(v); | 218 | emit viewChanged(v); |
211 | emit mediaTypeChanged( mediaType() ); | 219 | emit displayTypeChanged( displayType() ); |
212 | } | 220 | } |
213 | 221 | ||
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h index 05264cf..ca531c5 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.h +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h | |||
@@ -48,5 +48,5 @@ class MediaPlayerState : public QObject { | |||
48 | Q_OBJECT | 48 | Q_OBJECT |
49 | public: | 49 | public: |
50 | enum MediaType { Audio, Video }; | 50 | enum DisplayType { Audio, Video, MediaSelection }; |
51 | 51 | ||
52 | MediaPlayerState( QObject *parent, const char *name ); | 52 | MediaPlayerState( QObject *parent, const char *name ); |
@@ -65,5 +65,5 @@ public: | |||
65 | long length() const { return curLength; } | 65 | long length() const { return curLength; } |
66 | char view() const { return curView; } | 66 | char view() const { return curView; } |
67 | MediaType mediaType() const; | 67 | DisplayType displayType() const; |
68 | 68 | ||
69 | public slots: | 69 | public slots: |
@@ -112,5 +112,5 @@ signals: | |||
112 | void lengthChanged( long ); | 112 | void lengthChanged( long ); |
113 | void viewChanged( char ); | 113 | void viewChanged( char ); |
114 | void mediaTypeChanged( MediaPlayerState::MediaType type ); | 114 | void displayTypeChanged( MediaPlayerState::DisplayType type ); |
115 | void isSeekableToggled( bool ); | 115 | void isSeekableToggled( bool ); |
116 | void blankToggled( bool ); | 116 | void blankToggled( bool ); |