[Mplayer-cvslog] CVS: main/input input.c, 1.92, 1.93 input.h, 1.42, 1.43

[Joey Parrish CVS]

CVS change done by Joey Parrish CVS

Update of /cvsroot/mplayer/main/input
In directory mail:/var2/tmp/cvs-serv15657/input

Modified Files:
	input.c input.h 
Log Message:
moved combined vobsub_lang into sub_select
add support for dvd subs and ogg subs into sub_select
document sub_select
vobsub_lang left as a link to sub_select for backwards compatibility


Index: input.c
===================================================================
RCS file: /cvsroot/mplayer/main/input/input.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- input.c	3 Aug 2004 12:21:14 -0000	1.92
+++ input.c	22 Aug 2004 18:47:47 -0000	1.93
@@ -77,7 +77,7 @@
   { MP_CMD_SUB_POS, "sub_pos", 1, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
   { MP_CMD_SUB_ALIGNMENT, "sub_alignment",0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
   { MP_CMD_SUB_VISIBILITY, "sub_visibility", 0, { {-1,{0}} } },
-  { MP_CMD_VOBSUB_LANG, "vobsub_lang", 0, { {-1,{0}} } },
+  { MP_CMD_SUB_SELECT, "vobsub_lang", 0, { {-1,{0}} } }, // for compatibility
   { MP_CMD_SUB_SELECT, "sub_select", 0, { {-1,{0}} } },
   { MP_CMD_GET_PERCENT_POS, "get_percent_pos", 0, { {-1,{0}} } },
   { MP_CMD_GET_TIME_LENGTH, "get_time_length", 0, { {-1,{0}} } },

Index: input.h
===================================================================
RCS file: /cvsroot/mplayer/main/input/input.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- input.h	17 Jul 2004 12:47:12 -0000	1.42
+++ input.h	22 Aug 2004 18:47:47 -0000	1.43
@@ -30,7 +30,7 @@
 #define MP_CMD_VF_CHANGE_RECTANGLE 28
 #define MP_CMD_GAMMA 29
 #define MP_CMD_SUB_VISIBILITY 30
-#define MP_CMD_VOBSUB_LANG 31
+// #define MP_CMD_VOBSUB_LANG 31 // combined with SUB_SELECT
 #define MP_CMD_MENU 32
 #define MP_CMD_SET_MENU 33
 #define MP_CMD_GET_TIME_LENGTH 34