From 53604e0c213846a6b3cb8f92137c285c7d6ad185 Mon Sep 17 00:00:00 2001 From: gpoirier Date: Sat, 22 Apr 2006 13:24:20 +0000 Subject: simpler and better subtitles switching, patch by Stanislav Maslovski git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18186 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/mplayer/mw.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c index 811d0998c3..77f30c4c9c 100644 --- a/Gui/mplayer/mw.c +++ b/Gui/mplayer/mw.c @@ -25,6 +25,8 @@ #include "../libmpdemux/demuxer.h" #include "../libmpdemux/stheader.h" #include "../codec-cfg.h" +#include "../m_option.h" +#include "../m_property.h" #define GUI_REDRAW_WAIT 375 @@ -32,12 +34,6 @@ #include "widgets.h" extern mixer_t mixer; // mixer from mplayer.c -extern int global_sub_size; -extern int global_sub_pos; -extern int global_sub_indices[]; -extern int sub_source(void); -#define SUB_SOURCE_VOBSUB 1 -#define SUB_SOURCE_DEMUX 2 extern unsigned int GetTimerMS( void ); @@ -117,22 +113,8 @@ void mplEventHandling( int msg,float param ) goto play; case evSetSubtitle: - if ( !guiIntfStruct.demuxer || global_sub_pos == iparam ) break; - global_sub_pos = iparam; - if ( global_sub_pos >= 0 ) - switch ( sub_source() ) - { - case SUB_SOURCE_VOBSUB: - vobsub_id = global_sub_pos - global_sub_indices[SUB_SOURCE_VOBSUB]; - goto play; - case SUB_SOURCE_DEMUX: - vobsub_id = -1; - dvdsub_id = global_sub_pos - global_sub_indices[SUB_SOURCE_DEMUX]; - goto play; - } - vobsub_id = -1; - dvdsub_id = -2; - goto play; + mp_property_do("sub",M_PROPERTY_SET,&iparam); + break; #ifdef HAVE_VCD case evSetVCDTrack: -- cgit v1.2.3