summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-12-23 00:33:22 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-12-23 00:33:22 +0000
commit7f1c5834473c4041337e30f5e606aca629498aa7 (patch)
treee4d54c5ec378c502d6f8ffe19c068c8295ee5735 /input
parentda027164877a7a8c2288256145ee16c7878c36b2 (diff)
downloadmpv-7f1c5834473c4041337e30f5e606aca629498aa7.tar.bz2
mpv-7f1c5834473c4041337e30f5e606aca629498aa7.tar.xz
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@email.byu.edu> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8532 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'input')
-rw-r--r--input/input.c6
-rw-r--r--input/input.h4
2 files changed, 10 insertions, 0 deletions
diff --git a/input/input.c b/input/input.c
index 3cce4ebf33..3b580bd06b 100644
--- a/input/input.c
+++ b/input/input.c
@@ -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 @@ static mp_cmd_bind_t def_cmd_binds[] = {
{ { '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" },
diff --git a/input/input.h b/input/input.h
index 95b606bc6e..b55aaa40cd 100644
--- a/input/input.h
+++ b/input/input.h
@@ -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