summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-08-20 12:32:06 (UTC)
committer llornkcor <llornkcor>2002-08-20 12:32:06 (UTC)
commitec61d92a7ea43e517d38d26af71164d0fd70d16c (patch) (unidiff)
tree53464e7755944a00ff3c4f282abd235a5225dac9
parent41fe19a4e2e808d48429c84f4b7dd6b9af797ead (diff)
downloadopie-ec61d92a7ea43e517d38d26af71164d0fd70d16c.zip
opie-ec61d92a7ea43e517d38d26af71164d0fd70d16c.tar.gz
opie-ec61d92a7ea43e517d38d26af71164d0fd70d16c.tar.bz2
need to still write playerstate to config
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp3
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 5503705..603d426 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -265,37 +265,38 @@ void MediaPlayer::blank( bool b ) {
265 isBlanked = FALSE; 265 isBlanked = FALSE;
266 } 266 }
267 close( fd ); 267 close( fd );
268 } else { 268 } else {
269 qDebug("<< /dev/fb0 could not be opened >>"); 269 qDebug("<< /dev/fb0 could not be opened >>");
270 } 270 }
271} 271}
272 272
273void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { 273void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
274 switch ( e->key() ) { 274 switch ( e->key() ) {
275////////////////////////////// Zaurus keys 275////////////////////////////// Zaurus keys
276 case Key_Home: 276 case Key_Home:
277 break; 277 break;
278 case Key_F9: //activity 278 case Key_F9: //activity
279 break; 279 break;
280 case Key_F10: //contacts 280 case Key_F10: //contacts
281 break; 281 break;
282 case Key_F11: //menu 282 case Key_F11: //menu
283 break; 283 break;
284 case Key_F12: //home 284 case Key_F12: //home
285 qDebug("Blank here"); 285 qDebug("Blank here");
286// mediaPlayerState->toggleBlank(); 286// mediaPlayerState->toggleBlank();
287 break; 287 break;
288 case Key_F13: //mail 288 case Key_F13: //mail
289 qDebug("Blank here"); 289 qDebug("Blank here");
290 // mediaPlayerState->toggleBlank(); 290 // mediaPlayerState->toggleBlank();
291 break; 291 break;
292 } 292 }
293} 293}
294 294
295void MediaPlayer::cleanUp() {// this happens on closing 295void MediaPlayer::cleanUp() {// this happens on closing
296 Config cfg( "OpiePlayer" ); 296 Config cfg( "OpiePlayer" );
297 playList->writeConfig( cfg ); 297 mediaPlayerState->writeConfig( cfg );
298 playList->writeConfig( cfg );
298 299
299// QPEApplication::grabKeyboard(); 300// QPEApplication::grabKeyboard();
300// QPEApplication::ungrabKeyboard(); 301// QPEApplication::ungrabKeyboard();
301} 302}
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h
index b3431d7..215a2a8 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.h
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h
@@ -65,71 +65,71 @@ public:
65 char view(); 65 char view();
66 66
67public slots: 67public slots:
68 void setIsStreaming( bool b ); 68 void setIsStreaming( bool b );
69 void setFullscreen( bool b ); 69 void setFullscreen( bool b );
70 void setScaled( bool b ); 70 void setScaled( bool b );
71 void setLooping( bool b ); 71 void setLooping( bool b );
72 void setShuffled( bool b ); 72 void setShuffled( bool b );
73 void setPlaylist( bool b ); 73 void setPlaylist( bool b );
74 void setPaused( bool b ); 74 void setPaused( bool b );
75 void setPlaying( bool b ); 75 void setPlaying( bool b );
76 void setStop( bool b ); 76 void setStop( bool b );
77 void setPosition( long p ); 77 void setPosition( long p );
78 void updatePosition( long p ); 78 void updatePosition( long p );
79 void setLength( long l ); 79 void setLength( long l );
80 void setView( char v ); 80 void setView( char v );
81 void setBlanked( bool b ); 81 void setBlanked( bool b );
82 82
83 void setPrev(); 83 void setPrev();
84 void setNext(); 84 void setNext();
85 void setList(); 85 void setList();
86 void setVideo(); 86 void setVideo();
87 void setAudio(); 87 void setAudio();
88 88
89 void toggleFullscreen(); 89 void toggleFullscreen();
90 void toggleScaled(); 90 void toggleScaled();
91 void toggleLooping(); 91 void toggleLooping();
92 void toggleShuffled(); 92 void toggleShuffled();
93 void togglePlaylist(); 93 void togglePlaylist();
94 void togglePaused(); 94 void togglePaused();
95 void togglePlaying(); 95 void togglePlaying();
96 void toggleBlank(); 96 void toggleBlank();
97 void writeConfig( Config& cfg ) const;
98
97 99
98signals: 100signals:
99 void fullscreenToggled( bool ); 101 void fullscreenToggled( bool );
100 void scaledToggled( bool ); 102 void scaledToggled( bool );
101 void loopingToggled( bool ); 103 void loopingToggled( bool );
102 void shuffledToggled( bool ); 104 void shuffledToggled( bool );
103 void playlistToggled( bool ); 105 void playlistToggled( bool );
104 void pausedToggled( bool ); 106 void pausedToggled( bool );
105 void playingToggled( bool ); 107 void playingToggled( bool );
106 void stopToggled( bool ); 108 void stopToggled( bool );
107 void positionChanged( long ); // When the slider is moved 109 void positionChanged( long ); // When the slider is moved
108 void positionUpdated( long ); // When the media file progresses 110 void positionUpdated( long ); // When the media file progresses
109 void lengthChanged( long ); 111 void lengthChanged( long );
110 void viewChanged( char ); 112 void viewChanged( char );
111 void blankToggled( bool ); 113 void blankToggled( bool );
112 void prev(); 114 void prev();
113 void next(); 115 void next();
114 116
115private: 117private:
116 bool isStreaming; 118 bool isStreaming;
117 bool isFullscreen; 119 bool isFullscreen;
118 bool isScaled; 120 bool isScaled;
119 bool isBlanked; 121 bool isBlanked;
120 bool isLooping; 122 bool isLooping;
121 bool isShuffled; 123 bool isShuffled;
122 bool usePlaylist; 124 bool usePlaylist;
123 long curPosition; 125 long curPosition;
124 long curLength; 126 long curLength;
125 char curView; 127 char curView;
126 128
127 void readConfig( Config& cfg ); 129 void readConfig( Config& cfg );
128 void writeConfig( Config& cfg ) const;
129
130 130
131}; 131};
132 132
133 133
134#endif // MEDIA_PLAYER_STATE_H 134#endif // MEDIA_PLAYER_STATE_H
135 135