summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-02 18:11:26 (UTC)
committer simon <simon>2002-12-02 18:11:26 (UTC)
commit66979ef81a8e945f8d34db05399b1d92cdb3b67a (patch) (unidiff)
tree1d99c8cceb3abae3be0947c712b0fa28d0c24d87
parent41fe383fe8b840de6dc0bcd47cd29b0d68bf760a (diff)
downloadopie-66979ef81a8e945f8d34db05399b1d92cdb3b67a.zip
opie-66979ef81a8e945f8d34db05399b1d92cdb3b67a.tar.gz
opie-66979ef81a8e945f8d34db05399b1d92cdb3b67a.tar.bz2
- introducing MediaType { Video, Audio } enum, to get rid of the
char view ('a' and 'v') step by step
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.cpp6
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.h4
2 files changed, 10 insertions, 0 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
index 586870c..22451b7 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
@@ -85,6 +85,11 @@ void MediaPlayerState::writeConfig( Config& cfg ) const {
85 cfg.writeEntry( "VideoGamma", videoGamma ); 85 cfg.writeEntry( "VideoGamma", videoGamma );
86} 86}
87 87
88MediaPlayerState::MediaType MediaPlayerState::mediaType() const
89{
90 return view() == 'a' ? MediaPlayerState::Audio : MediaPlayerState::Video;
91}
92
88// slots 93// slots
89void MediaPlayerState::setIsStreaming( bool b ) { 94void MediaPlayerState::setIsStreaming( bool b ) {
90 streaming = b; 95 streaming = b;
@@ -203,6 +208,7 @@ void MediaPlayerState::setView( char v ) {
203 } 208 }
204 curView = v; 209 curView = v;
205 emit viewChanged(v); 210 emit viewChanged(v);
211 emit mediaTypeChanged( mediaType() );
206} 212}
207 213
208void MediaPlayerState::setPrev(){ 214void MediaPlayerState::setPrev(){
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h
index fc4e6cb..9474882 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.h
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h
@@ -47,6 +47,8 @@ class Config;
47class MediaPlayerState : public QObject { 47class MediaPlayerState : public QObject {
48Q_OBJECT 48Q_OBJECT
49public: 49public:
50 enum MediaType { Audio, Video };
51
50 MediaPlayerState( QObject *parent, const char *name ); 52 MediaPlayerState( QObject *parent, const char *name );
51 ~MediaPlayerState(); 53 ~MediaPlayerState();
52 54
@@ -62,6 +64,7 @@ public:
62 long position() const { return curPosition; } 64 long position() const { return curPosition; }
63 long length() const { return curLength; } 65 long length() const { return curLength; }
64 char view() const { return curView; } 66 char view() const { return curView; }
67 MediaType mediaType() const;
65 68
66public slots: 69public slots:
67 void setIsStreaming( bool b ); 70 void setIsStreaming( bool b );
@@ -108,6 +111,7 @@ signals:
108 void positionUpdated( long ); // When the media file progresses 111 void positionUpdated( long ); // When the media file progresses
109 void lengthChanged( long ); 112 void lengthChanged( long );
110 void viewChanged( char ); 113 void viewChanged( char );
114 void mediaTypeChanged( MediaType type );
111 void isSeekableToggled( bool ); 115 void isSeekableToggled( bool );
112 void blankToggled( bool ); 116 void blankToggled( bool );
113 void videoGammaChanged( int ); 117 void videoGammaChanged( int );