[Mplayer-cvslog] CVS: main/input input.c,1.63,1.64 input.h,1.27,1.28

[Arpi of Ize]

Update of /cvsroot/mplayer/main/input
In directory mail:/var/tmp.root/cvs-serv8101/input

Modified Files:
	input.c input.h 
Log Message:
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
(skip sections listed in a text file. it also supports creating them)
patch by Michael Halcrow <mah69 at email.byu.edu>


Index: input.c
===================================================================
RCS file: /cvsroot/mplayer/main/input/input.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- input.c	19 Dec 2002 10:09:42 -0000	1.63
+++ input.c	23 Dec 2002 00:33:22 -0000	1.64
@@ -46,6 +46,9 @@
 
 static mp_cmd_t mp_cmds[] = {
   { MP_CMD_SEEK, "seek", 1, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
+#ifdef USE_EDL
+  { MP_CMD_EDL_MARK, "edl_mark", 0, { {-1,{0}} } },
+#endif
   { MP_CMD_AUDIO_DELAY, "audio_delay", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
   { MP_CMD_QUIT, "quit", 0, { {-1,{0}} } },
   { MP_CMD_PAUSE, "pause", 0, { {-1,{0}} } },
@@ -246,6 +249,9 @@
   { { 't', 0 }, "sub_pos +1" },
   { { 'v', 0 }, "sub_visibility" },
   { { 'j', 0 }, "vobsub_lang" },
+#ifdef USE_EDL
+  { { 'i', 0 }, "edl_mark" },
+#endif
 #ifdef USE_TV
   { { 'h', 0 }, "tv_step_channel 1" },
   { { 'k', 0 }, "tv_step_channel -1" },

Index: input.h
===================================================================
RCS file: /cvsroot/mplayer/main/input/input.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- input.h	19 Dec 2002 10:09:42 -0000	1.27
+++ input.h	23 Dec 2002 00:33:22 -0000	1.28
@@ -37,6 +37,10 @@
 #define MP_CMD_GET_TIME_LENGTH 34
 #define MP_CMD_GET_PERCENT_POS 35
 #define MP_CMD_SUB_STEP 36
+//#define MP_CMD_TV_SET_CHANNEL 37
+#ifdef USE_EDL
+#define MP_CMD_EDL_MARK 38
+#endif
 
 #define MP_CMD_GUI_EVENTS       5000
 #define MP_CMD_GUI_LOADFILE     5001