diff options
| -rw-r--r-- | DOCS/man/en/input.rst | 2 | ||||
| -rw-r--r-- | DOCS/man/en/options.rst | 9 | ||||
| -rw-r--r-- | core/cfg-mplayer.h | 2 | ||||
| -rw-r--r-- | core/command.c | 21 | ||||
| -rw-r--r-- | core/input/input.c | 1 | ||||
| -rw-r--r-- | core/input/input.h | 1 | ||||
| -rw-r--r-- | core/mp_core.h | 2 | ||||
| -rw-r--r-- | core/mplayer.c | 14 | ||||
| -rw-r--r-- | etc/input.conf | 1 |
9 files changed, 1 insertions, 52 deletions
diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst index f693436e53..f146208fd3 100644 --- a/DOCS/man/en/input.rst +++ b/DOCS/man/en/input.rst @@ -210,7 +210,7 @@ Undocumented commands: tv_start_scan, tv_step_channel, tv_step_norm, tv_step_chanlist, tv_set_channel, tv_last_channel, tv_set_freq, tv_step_freq, tv_set_norm, dvb_set_channel, radio_step_channel, radio_set_channel, radio_set_freq, radio_step_freq (all of these should be replaced by properties), -edl_mark, stop (questionable use), get_property (?), af_switch, af_add, af_del, +stop (questionable use), get_property (?), af_switch, af_add, af_del, af_clr, af_cmdline, vo_cmdline (experimental). Input command prefixes diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 107e3be377..59697cda28 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -566,15 +566,6 @@ to -1 (the default), mpv will choose the first edition declared as a default, or if there is no default, the first edition defined. ---edlout=<filename> - Creates a new file and writes edit decision list (EDL) records to it. - During playback, the user hits 'i' to mark the start or end of a skip - block. This provides a starting point from which the user can fine-tune - EDL entries later. See http://www.mplayerhq.hu/DOCS/HTML/en/edl.html for - details. - - *NOTE*: broken. - --embeddedfonts, --no-embeddedfonts Use fonts embedded in Matroska container files and ASS scripts (default: enabled). These fonts can be used for SSA/ASS subtitle rendering diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index 9bf6d53d6d..fcaf1c8050 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -560,8 +560,6 @@ const m_option_t mplayer_opts[]={ // override audio buffer size (used only by -ao oss/win32, obsolete) OPT_INT("abs", ao_buffersize, 0), - {"edlout", &edl_output_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, - // set screen dimensions (when not detectable or virtual!=visible) OPT_INTRANGE("screenw", vo_screenwidth, CONF_GLOBAL, 0, 4096), OPT_INTRANGE("screenh", vo_screenheight, CONF_GLOBAL, 0, 4096), diff --git a/core/command.c b/core/command.c index 4f304ded99..90a5dc66f5 100644 --- a/core/command.c +++ b/core/command.c @@ -1844,27 +1844,6 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd) break; } - case MP_CMD_EDL_MARK: - if (edl_fd) { - float v = get_current_time(mpctx); - if (mpctx->begin_skip == MP_NOPTS_VALUE) { - mpctx->begin_skip = v; - mp_tmsg(MSGT_CPLAYER, MSGL_INFO, - "EDL skip start, press 'i' again to end block.\n"); - } else { - if (mpctx->begin_skip > v) - mp_tmsg(MSGT_CPLAYER, MSGL_WARN, - "EDL skip canceled, last start > stop\n"); - else { - fprintf(edl_fd, "%f %f %d\n", mpctx->begin_skip, v, 0); - mp_tmsg(MSGT_CPLAYER, MSGL_INFO, - "EDL skip end, line written.\n"); - } - mpctx->begin_skip = MP_NOPTS_VALUE; - } - } - break; - case MP_CMD_SPEED_MULT: { float v = cmd->args[0].v.f; v *= mpctx->opts.playback_speed; diff --git a/core/input/input.c b/core/input/input.c index a03acd8e76..7e94dbe453 100644 --- a/core/input/input.c +++ b/core/input/input.c @@ -123,7 +123,6 @@ static const mp_cmd_t mp_cmds[] = { {"exact", 1}, {"1", 1}, {"keyframes", -1}, {"-1", -1})), }}, - { MP_CMD_EDL_MARK, "edl_mark", }, { MP_CMD_SPEED_MULT, "speed_mult", { ARG_FLOAT } }, { MP_CMD_QUIT, "quit", { OARG_INT(0) } }, { MP_CMD_STOP, "stop", }, diff --git a/core/input/input.h b/core/input/input.h index 86726719b1..974ca3d6c4 100644 --- a/core/input/input.h +++ b/core/input/input.h @@ -40,7 +40,6 @@ enum mp_command_type { MP_CMD_PLAYLIST_CLEAR, MP_CMD_SUB_STEP, MP_CMD_TV_SET_CHANNEL, - MP_CMD_EDL_MARK, MP_CMD_TV_LAST_CHANNEL, MP_CMD_TV_SET_FREQ, MP_CMD_TV_SET_NORM, diff --git a/core/mp_core.h b/core/mp_core.h index dc541ae55d..37045aeddb 100644 --- a/core/mp_core.h +++ b/core/mp_core.h @@ -235,8 +235,6 @@ typedef struct MPContext { int last_chapter_seek; double last_chapter_pts; - float begin_skip; ///< start time of the current skip while on edlout mode - struct ass_library *ass_library; int file_format; diff --git a/core/mplayer.c b/core/mplayer.c index 819c182a2e..5d63ef9f9b 100644 --- a/core/mplayer.c +++ b/core/mplayer.c @@ -230,9 +230,6 @@ static int play_n_frames_mf = -1; // --- -FILE *edl_fd; // file to write to when in -edlout mode. -char *edl_output_filename; // file to put EDL entries in (-edlout) - int use_filedir_conf; #include "core/mp_common.h" @@ -3898,16 +3895,6 @@ static void play_current_file(struct MPContext *mpctx) mp_tmsg(MSGT_CPLAYER, MSGL_INFO, "Playing %s.\n", mpctx->filename); - if (edl_output_filename) { - if (edl_fd) - fclose(edl_fd); - if ((edl_fd = fopen(edl_output_filename, "w")) == NULL) { - mp_tmsg(MSGT_CPLAYER, MSGL_ERR, - "Can't open EDL file [%s] for writing.\n", - edl_output_filename); - } - } - //============ Open & Sync STREAM --- fork cache2 ==================== assert(mpctx->stream == NULL); @@ -4399,7 +4386,6 @@ int main(int argc, char *argv[]) struct MPContext *mpctx = talloc(NULL, MPContext); *mpctx = (struct MPContext){ - .begin_skip = MP_NOPTS_VALUE, .file_format = DEMUXER_TYPE_UNKNOWN, .last_dvb_step = 1, .terminal_osd_text = talloc_strdup(mpctx, ""), diff --git a/etc/input.conf b/etc/input.conf index d310951ad9..3b34545705 100644 --- a/etc/input.conf +++ b/etc/input.conf @@ -99,7 +99,6 @@ F cycle sub-forced-only SHARP cycle audio # switch audio streams _ cycle video TAB cycle program -i edl_mark # for use with --edlout mode T cycle ontop # toggle video window ontop of other windows f cycle fullscreen # toggle fullscreen s screenshot # take a screenshot |