[MPlayer-cvslog] r32478 - in trunk: DOCS/tech/slave.txt command.c input/input.c input/input.h

[Reimar Döffinger]

On Mon, Oct 11, 2010 at 08:00:17PM +0200, Nicolas George wrote:
> Le nonidi 19 vendémiaire, an CCXIX, Reimar Döffinger a écrit :
> > Is this certain to work correctly when playing multiple
> > files?
> > At least some subtitle stuff gets reset on each new file.
> > If not, does the ASS stuff get correctly reset on a new file?
> > In general it might be nicer to have a function that checks
> > if a particular source is already registered.
> 
> You are right, there was a catch here, and I fall into it, not at the place
> you point (It works, I'll discuss it later), but at the ASS source.
> 
> Here is the fix; probably to apply in two steps.

No need/point to split it in two commits.

> diff --git a/ass_mp.c b/ass_mp.c
> index 557c696..7650e72 100644
> --- a/ass_mp.c
> +++ b/ass_mp.c
> @@ -374,5 +374,6 @@ void eosd_ass_init(ASS_Library *ass_library)
>  	if (!ass_renderer)
>  		return;
>  	ass_configure_fonts(ass_renderer);
> -	eosd_register(&eosd_ass);
> +	if (!eosd_registered(&eosd_ass))
> +		eosd_register(&eosd_ass);

Seems fine.
I understood your comment above to mean you checked that the source does get
emptied at some point though (would be ugly if subtitles
carried on from one file to the next).