comparison audacious/playback.c @ 677:f52f596dc0d8 trunk

[svn] - Working exception handling at no extra charge. Closes bugs #408, #409.
author nenolod
date Fri, 24 Feb 2006 23:16:06 -0800
parents 2b9dc862967b
children 41ae3a48e202
comparison
equal deleted inserted replaced
676:2561275dc71b 677:f52f596dc0d8
211 } 211 }
212 212
213 if (cfg.random_skin_on_play) 213 if (cfg.random_skin_on_play)
214 bmp_playback_set_random_skin(); 214 bmp_playback_set_random_skin();
215 215
216 if (!entry->decoder) 216 /*
217 entry->decoder = input_check_file(entry->filename, FALSE); 217 * This is slightly uglier than the original version, but should
218 218 * fix the "crash" issues as seen in 0.2 when dealing with this situation.
219 if (!entry->decoder || !input_is_enabled(entry->decoder->filename)) 219 * - nenolod
220 */
221 if (!entry->decoder &&
222 ((entry->decoder = input_check_file(entry->filename, FALSE)) == NULL) ||
223 !input_is_enabled(entry->decoder->filename))
220 { 224 {
221 input_file_not_playable(entry->filename); 225 input_file_not_playable(entry->filename);
222 226
223 set_current_input_plugin(NULL); 227 set_current_input_plugin(NULL);
224 mainwin_set_info_text(); 228 mainwin_set_info_text();
259 if (!get_current_input_plugin()) 263 if (!get_current_input_plugin())
260 return; 264 return;
261 265
262 /* FIXME WORKAROUND...that should work with all plugins 266 /* FIXME WORKAROUND...that should work with all plugins
263 * mute the volume, start playback again, do the seek, then pause again 267 * mute the volume, start playback again, do the seek, then pause again
264 * -Patrick Sudowe */ 268 * -Patrick Sudowe
269 */
265 if(ip_data.paused) 270 if(ip_data.paused)
266 { 271 {
267 restore_pause = TRUE; 272 restore_pause = TRUE;
268 output_get_volume(&l, &r); 273 output_get_volume(&l, &r);
269 output_set_volume(0,0); 274 output_set_volume(0,0);