[MPlayer-cvslog] r32812 - in trunk/sub: subreader.c subreader.h

[cboesch]

Author: cboesch
Date: Sun Jan 23 14:10:29 2011
New Revision: 32812

Log:
Typedef the add subtitle function just like open_vob_func.

Modified:
   trunk/sub/subreader.c
   trunk/sub/subreader.h

Modified: trunk/sub/subreader.c
==============================================================================
--- trunk/sub/subreader.c	Sun Jan 23 14:04:15 2011	(r32811)
+++ trunk/sub/subreader.c	Sun Jan 23 14:10:29 2011	(r32812)
@@ -2057,7 +2057,7 @@ static void append_dir_subtitles(struct 
  * @note Subtitles are tracked and scored in various places according to the
  *       user options, sorted, and then added by calling the add_f function.
  */
-void load_subtitles(const char *fname, int fps, void add_f(char *, float, int))
+void load_subtitles(const char *fname, int fps, open_sub_func add_f)
 {
     int i;
     char *mp_subdir, *path = NULL;

Modified: trunk/sub/subreader.h
==============================================================================
--- trunk/sub/subreader.h	Sun Jan 23 14:04:15 2011	(r32811)
+++ trunk/sub/subreader.h	Sun Jan 23 14:10:29 2011	(r32812)
@@ -83,6 +83,7 @@ extern char *fribidi_charset;
 extern int flip_hebrew;
 extern int fribidi_flip_commas;
 
+typedef void (*open_sub_func)(char *, float, int);
 typedef int (*open_vob_func)(const char *, const char * const, int, void *);
 
 sub_data* sub_read_file (char *filename, float pts);
@@ -96,7 +97,7 @@ void subcp_close (void); /* for demux_og
 const char* guess_buffer_cp(unsigned char* buffer, int buflen, const char *preferred_language, const char *fallback);
 const char* guess_cp(struct stream *st, const char *preferred_language, const char *fallback);
 #endif
-void load_subtitles(const char *fname, int fps, void add_f(char *, float, int));
+void load_subtitles(const char *fname, int fps, open_sub_func add_f);
 void load_vob_subtitle(const char *fname, const char * const spudec_ifo, void **spu, open_vob_func add_f);
 void list_sub_file(sub_data* subd);
 void dump_srt(sub_data* subd, float fps);