From: Daniel Caujolle-B. <f1...@us...> - 2004-07-21 06:26:25
|
Update of /cvsroot/xine/xine-ui/src/xitk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25782 Modified Files: actions.c event.c Log Message: Reset spu and audio channels on stop. Index: actions.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/actions.c,v retrieving revision 1.244 retrieving revision 1.245 diff -u -r1.244 -r1.245 --- actions.c 2 Jul 2004 21:40:53 -0000 1.244 +++ actions.c 21 Jul 2004 06:26:06 -0000 1.245 @@ -181,6 +181,10 @@ if(gGui->visual_anim.running) visual_anim_stop(); + xine_set_param(gGui->stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, -1); + xine_set_param(gGui->stream, XINE_PARAM_SPU_CHANNEL, -1); + panel_update_channel_display(); + if(gGui->display_logo) (void) gui_xine_open_and_play((char *)gGui->logo_mrl, NULL, 0, 0, 0, 0, 1); Index: event.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/event.c,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- event.c 20 Jul 2004 08:22:44 -0000 1.257 +++ event.c 21 Jul 2004 06:26:07 -0000 1.258 @@ -1018,13 +1018,11 @@ gGui->mmk.start, gGui->mmk.av_offset, gGui->mmk.spu_offset, !mediamark_have_alternates(&(gGui->mmk)))) { - if(!mediamark_have_alternates(&(gGui->mmk)) || - !gui_open_and_play_alternates(&(gGui->mmk), gGui->mmk.sub)) { - gui_display_logo(); + if(!mediamark_have_alternates(&(gGui->mmk)) || !gui_open_and_play_alternates(&(gGui->mmk), gGui->mmk.sub)) { if(mediamark_all_played() && (gGui->actions_on_start[0] == ACTID_QUIT)) gui_exit(NULL, NULL); - - gui_display_logo(); + + gui_display_logo(); } } } @@ -1040,6 +1038,7 @@ if(mediamark_have_alternates(&(gGui->mmk))) { if(!gui_open_and_play_alternates(&(gGui->mmk), gGui->mmk.sub)) gui_display_logo(); + } } break; |