summaryrefslogtreecommitdiffstats
path: root/Gui/mplayer
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-08-30 19:11:03 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-08-30 19:11:03 +0000
commit25f8352ffe541d6548b0943164d3177c984d6368 (patch)
treef58db5380a728179e729e3a547321b04dbc3bef8 /Gui/mplayer
parent7caf8770b8e61b860b0027e31e419aaa32a13475 (diff)
downloadmpv-25f8352ffe541d6548b0943164d3177c984d6368.tar.bz2
mpv-25f8352ffe541d6548b0943164d3177c984d6368.tar.xz
add subtitle dropping support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7170 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer')
-rw-r--r--Gui/mplayer/gtk/menu.c1
-rw-r--r--Gui/mplayer/gtk/pl.c2
-rw-r--r--Gui/mplayer/mw.h4
3 files changed, 6 insertions, 1 deletions
diff --git a/Gui/mplayer/gtk/menu.c b/Gui/mplayer/gtk/menu.c
index 8d1db72f2d..f78ecc3dee 100644
--- a/Gui/mplayer/gtk/menu.c
+++ b/Gui/mplayer/gtk/menu.c
@@ -282,6 +282,7 @@ GtkWidget * create_PopUpMenu( void )
#endif
AddMenuItem( SubMenu,MSGTR_MENU_PlayURL, evSetURL );
AddMenuItem( SubMenu,MSGTR_MENU_LoadSubtitle" ", evLoadSubtitle );
+ AddMenuItem( SubMenu,MSGTR_MENU_DropSubtitle,evDropSubtitle );
AddMenuItem( SubMenu,MSGTR_MENU_LoadExternAudioFile, evLoadAudioFile );
SubMenu=AddSubMenu( Menu,MSGTR_MENU_Playing );
AddMenuItem( SubMenu,MSGTR_MENU_Play" ", evPlay );
diff --git a/Gui/mplayer/gtk/pl.c b/Gui/mplayer/gtk/pl.c
index 4471251bd6..bfaab179e8 100644
--- a/Gui/mplayer/gtk/pl.c
+++ b/Gui/mplayer/gtk/pl.c
@@ -638,7 +638,7 @@ GtkWidget * create_PlayList( void )
GTK_WIDGET_UNSET_FLAGS( Ok,GTK_CAN_FOCUS );
// gtk_widget_add_accelerator( Ok,"released",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
- Cancel=gtk_button_new_with_label( "Cancel" );
+ Cancel=gtk_button_new_with_label( MSGTR_Cancel );
gtk_widget_ref( Cancel );
gtk_object_set_data_full( GTK_OBJECT( PlayList ),"Cancel",Cancel,(GtkDestroyNotify)gtk_widget_unref );
gtk_widget_show( Cancel );
diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h
index 15f4146839..7500413456 100644
--- a/Gui/mplayer/mw.h
+++ b/Gui/mplayer/mw.h
@@ -356,6 +356,10 @@ NoPause:
gtkShow( evLoad,NULL );
break;
case evLoadSubtitle: gtkShow( evLoadSubtitle,NULL ); break;
+ case evDropSubtitle:
+ gfree( (void **)&guiIntfStruct.Subtitlename );
+ guiLoadSubtitle( NULL );
+ break;
case evLoadAudioFile: gtkShow( evLoadAudioFile,NULL ); break;
case evPrev: mplPrev(); break;
case evNext: mplNext(); break;