[MPlayer-cvslog] r32040 - in trunk: DOCS/tech/slave.txt help/help_mp-en.h input/input.c input/input.h mplayer.c mplayer.h

[Diego Biurrun]

On Fri, Sep 03, 2010 at 08:50:04PM +0200, reynaldo wrote:
> 
> --- trunk/DOCS/tech/slave.txt	Thu Sep  2 21:48:07 2010	(r32039)
> +++ trunk/DOCS/tech/slave.txt	Fri Sep  3 20:50:03 2010	(r32040)
> @@ -105,6 +105,9 @@ dvdnav <button_name>
>  
> +edl_loadfile <filename>
> +    Load new EDL file

.

> --- trunk/mplayer.c	Thu Sep  2 21:48:07 2010	(r32039)
> +++ trunk/mplayer.c	Fri Sep  3 20:50:03 2010	(r32040)
> @@ -3211,10 +3222,7 @@ while (player_idle_mode && !filename) {
>              vo_wintitle = strdup ( mp_basename2 (filename));
>      }
>  
> -if (edl_filename) {
> -    if (edl_records) free_edl(edl_records);
> -    next_edl_record = edl_records = edl_parse_file();
> -}
> +    edl_loadfile();

Indentation looks off.

> @@ -3975,6 +3983,15 @@ if(step_sec>0) {
>    int brk_cmd = 0;
>    while( !brk_cmd && (cmd = mp_input_get_cmd(0,0,0)) != NULL) {
>        brk_cmd = run_command(mpctx, cmd);
> +      if (cmd->id == MP_CMD_EDL_LOADFILE) {
> +          if (edl_filename) free(edl_filename);

Break this line.

> +          edl_filename = strdup(cmd->args[0].v.s);
> +          if (edl_filename)
> +              edl_loadfile();
> +          else
> +              mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlOutOfMemFile,
> +                    cmd->args[0].v.s);

Indentation is off.

> --- trunk/mplayer.h	Thu Sep  2 21:48:07 2010	(r32039)
> +++ trunk/mplayer.h	Fri Sep  3 20:50:03 2010	(r32040)
> @@ -44,7 +44,7 @@ extern char * filename;
>  
>  extern int stream_cache_size;
>  extern int autosync;
> -
> +extern double start_pts;
>  extern int frame_dropping;

This looks unrelated.

Diego