[MPlayer-cvslog] r20518 - in trunk: libass/ass_mp.c libass/ass_mp.h mplayer.c

[eugeni]

Author: eugeni
Date: Sun Oct 29 16:26:13 2006
New Revision: 20518

Modified:
   trunk/libass/ass_mp.c
   trunk/libass/ass_mp.h
   trunk/mplayer.c

Log:
Move ass_library initialization code to ass_mp.c.


Modified: trunk/libass/ass_mp.c
==============================================================================
--- trunk/libass/ass_mp.c	(original)
+++ trunk/libass/ass_mp.c	Sun Oct 29 16:26:13 2006
@@ -229,3 +229,14 @@
 	free(path);
 	free(family);
 }
+
+ass_library_t* ass_init() {
+  ass_library_t* priv;
+  char* path = get_path("fonts");
+  priv = ass_library_init();
+  ass_set_fonts_dir(priv, path);
+  ass_set_extract_fonts(priv, extract_embedded_fonts);
+  ass_set_style_overrides(priv, ass_force_style_list);
+  free(path);
+  return priv;
+}

Modified: trunk/libass/ass_mp.h
==============================================================================
--- trunk/libass/ass_mp.h	(original)
+++ trunk/libass/ass_mp.h	Sun Oct 29 16:26:13 2006
@@ -41,6 +41,7 @@
 ass_track_t* ass_read_subdata(ass_library_t* library, sub_data* subdata, double fps);
 
 void ass_configure(ass_renderer_t* priv, int w, int h);
+ass_library_t* ass_init();
 
 #endif
 

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	(original)
+++ trunk/mplayer.c	Sun Oct 29 16:26:13 2006
@@ -3108,14 +3108,7 @@
   vo_init_osd();
 
 #ifdef USE_ASS
-{
-  char* path = get_path("fonts");
-  ass_library = ass_library_init();
-  ass_set_fonts_dir(ass_library, path);
-  ass_set_extract_fonts(ass_library, extract_embedded_fonts);
-  ass_set_style_overrides(ass_library, ass_force_style_list);
-  free(path);
-}
+  ass_library = ass_init();
 #endif
 
 #ifdef HAVE_RTC