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
@@ -285,17 +285,18 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
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
@@ -85,24 +85,26 @@ public slots:
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
@@ -116,20 +118,18 @@ private:
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