author | skyhusker <skyhusker> | 2005-03-24 16:52:08 (UTC) |
---|---|---|
committer | skyhusker <skyhusker> | 2005-03-24 16:52:08 (UTC) |
commit | 38ace7e9b3c9665336c0e6d2350895b147858f1f (patch) (unidiff) | |
tree | b82538e70104d8ea179b3364b1d592e7cfb4c650 /noncore | |
parent | 76db09fe0448c68496055f5e2b5c672fea1df5df (diff) | |
download | opie-38ace7e9b3c9665336c0e6d2350895b147858f1f.zip opie-38ace7e9b3c9665336c0e6d2350895b147858f1f.tar.gz opie-38ace7e9b3c9665336c0e6d2350895b147858f1f.tar.bz2 |
Keep paused when sliding the progress bar in paused state. Block de audio device only while playing.
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index f1b9773..6ed4cea 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp | |||
@@ -122,24 +122,25 @@ void Lib::initialize() | |||
122 | 122 | ||
123 | QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf"; | 123 | QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf"; |
124 | xine_config_load( m_xine, QFile::encodeName( configPath ) ); | 124 | xine_config_load( m_xine, QFile::encodeName( configPath ) ); |
125 | 125 | ||
126 | xine_init( m_xine ); | 126 | xine_init( m_xine ); |
127 | 127 | ||
128 | // allocate oss for sound | 128 | // allocate oss for sound |
129 | // and fb for framebuffer | 129 | // and fb for framebuffer |
130 | m_audioOutput = xine_open_audio_driver( m_xine, "oss", NULL ); | 130 | m_audioOutput = xine_open_audio_driver( m_xine, "oss", NULL ); |
131 | m_videoOutput = ::init_video_out_plugin( m_xine, NULL, xine_display_frame, this ); | 131 | m_videoOutput = ::init_video_out_plugin( m_xine, NULL, xine_display_frame, this ); |
132 | 132 | ||
133 | m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput ); | 133 | m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput ); |
134 | xine_set_param( m_stream, XINE_PARAM_AUDIO_CLOSE_DEVICE, 1); | ||
134 | 135 | ||
135 | if (m_wid != 0 ) | 136 | if (m_wid != 0 ) |
136 | setWidget( m_wid ); | 137 | setWidget( m_wid ); |
137 | 138 | ||
138 | 139 | ||
139 | m_queue = xine_event_new_queue (m_stream); | 140 | m_queue = xine_event_new_queue (m_stream); |
140 | xine_event_create_listener_thread (m_queue, xine_event_handler, this); | 141 | xine_event_create_listener_thread (m_queue, xine_event_handler, this); |
141 | 142 | ||
142 | ::null_preload_decoders( m_stream ); | 143 | ::null_preload_decoders( m_stream ); |
143 | 144 | ||
144 | m_duringInitialization = false; | 145 | m_duringInitialization = false; |
145 | } | 146 | } |
@@ -193,30 +194,38 @@ int Lib::play( const QString& fileName, int startPos, int start_time ) { | |||
193 | QString str = fileName.stripWhiteSpace(); | 194 | QString str = fileName.stripWhiteSpace(); |
194 | 195 | ||
195 | 196 | ||
196 | if ( !xine_open( m_stream, str.utf8().data() ) ) { | 197 | if ( !xine_open( m_stream, str.utf8().data() ) ) { |
197 | return 0; | 198 | return 0; |
198 | } | 199 | } |
199 | return xine_play( m_stream, startPos, start_time); | 200 | return xine_play( m_stream, startPos, start_time); |
200 | } | 201 | } |
201 | 202 | ||
202 | void Lib::stop() { | 203 | void Lib::stop() { |
203 | assert( m_initialized ); | 204 | assert( m_initialized ); |
204 | xine_stop( m_stream ); | 205 | xine_stop( m_stream ); |
206 | xine_set_param( m_stream, XINE_PARAM_AUDIO_CLOSE_DEVICE, 1); | ||
205 | } | 207 | } |
206 | 208 | ||
207 | void Lib::pause( bool toggle ) { | 209 | void Lib::pause( bool toggle ) { |
208 | assert( m_initialized ); | 210 | assert( m_initialized ); |
209 | 211 | ||
210 | xine_set_param( m_stream, XINE_PARAM_SPEED, toggle ? XINE_SPEED_PAUSE : XINE_SPEED_NORMAL ); | 212 | if ( toggle ) { |
213 | xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE ); | ||
214 | xine_set_param( m_stream, XINE_PARAM_AUDIO_CLOSE_DEVICE, 1); | ||
215 | } | ||
216 | |||
217 | else { | ||
218 | xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL ); | ||
219 | } | ||
211 | } | 220 | } |
212 | 221 | ||
213 | int Lib::speed() const { | 222 | int Lib::speed() const { |
214 | assert( m_initialized ); | 223 | assert( m_initialized ); |
215 | 224 | ||
216 | return xine_get_param ( m_stream, XINE_PARAM_SPEED ); | 225 | return xine_get_param ( m_stream, XINE_PARAM_SPEED ); |
217 | } | 226 | } |
218 | 227 | ||
219 | void Lib::setSpeed( int speed ) { | 228 | void Lib::setSpeed( int speed ) { |
220 | assert( m_initialized ); | 229 | assert( m_initialized ); |
221 | 230 | ||
222 | xine_set_param ( m_stream, XINE_PARAM_SPEED, speed ); | 231 | xine_set_param ( m_stream, XINE_PARAM_SPEED, speed ); |
@@ -273,25 +282,35 @@ unseekable, but it should never occur!! Mr. Murphy ? :) ) */ | |||
273 | return -1; | 282 | return -1; |
274 | } | 283 | } |
275 | 284 | ||
276 | bool Lib::isSeekable() const { | 285 | bool Lib::isSeekable() const { |
277 | assert( m_initialized ); | 286 | assert( m_initialized ); |
278 | 287 | ||
279 | return xine_get_stream_info( m_stream, XINE_STREAM_INFO_SEEKABLE ); | 288 | return xine_get_stream_info( m_stream, XINE_STREAM_INFO_SEEKABLE ); |
280 | } | 289 | } |
281 | 290 | ||
282 | void Lib::seekTo( int time ) { | 291 | void Lib::seekTo( int time ) { |
283 | assert( m_initialized ); | 292 | assert( m_initialized ); |
284 | 293 | ||
285 | xine_play( m_stream, 0, time*1000 ); | 294 | odebug << "Seeking to second " << time << oendl; |
295 | //Keep it paused if it was in that state | ||
296 | if ( xine_get_param( m_stream, XINE_PARAM_SPEED ) ) { | ||
297 | xine_play( m_stream, 0, time*1000 ); | ||
298 | } | ||
299 | |||
300 | else { | ||
301 | xine_play( m_stream, 0, time*1000 ); | ||
302 | xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE ); | ||
303 | } | ||
304 | |||
286 | } | 305 | } |
287 | 306 | ||
288 | 307 | ||
289 | Frame Lib::currentFrame() const { | 308 | Frame Lib::currentFrame() const { |
290 | assert( m_initialized ); | 309 | assert( m_initialized ); |
291 | 310 | ||
292 | Frame frame; | 311 | Frame frame; |
293 | return frame; | 312 | return frame; |
294 | }; | 313 | }; |
295 | 314 | ||
296 | QString Lib::metaInfo( int number) const { | 315 | QString Lib::metaInfo( int number) const { |
297 | assert( m_initialized ); | 316 | assert( m_initialized ); |