diff libass/ass_mp.h @ 31792:55dacfca4a43

Rename libass types to match upstream libass >= 0.9.7

--- a/libass/ass_mp.h	Fri Jul 30 17:02:58 2010 +0000
+++ b/libass/ass_mp.h	Fri Jul 30 18:14:35 2010 +0000
@@ -23,23 +23,16 @@
 #ifndef LIBASS_MP_H
 #define LIBASS_MP_H
 
+#include <stdint.h>
+
 #include "subreader.h"
 #if defined(CONFIG_ASS_INTERNAL) || !defined(CONFIG_ASS)
 #include "ass.h"
 #else
 #include <ass/ass.h>
 #endif
-// FIXME: rename types used by MPlayer
-#define ass_library_t ASS_Library
-#define ass_track_t ASS_Track
-#define ass_track_s ASS_Track
-#define ass_renderer_t ASS_Renderer
-#define ass_image_t ASS_Image
-#define ass_style_t ASS_Style
-#define ass_event_t ASS_Event
-#define process_force_style(t) ass_process_force_style(t)
 
-extern ass_library_t* ass_library;
+extern ASS_Library* ass_library;
 extern int ass_enabled;
 extern float ass_font_scale;
 extern float ass_line_spacing;
@@ -53,21 +46,21 @@
 extern char* ass_styles_file;
 extern int ass_hinting;
 
-ass_track_t* ass_default_track(ass_library_t* library);
-int ass_process_subtitle(ass_track_t* track, subtitle* sub);
-ass_track_t* ass_read_subdata(ass_library_t* library, sub_data* subdata, double fps);
-ass_track_t* ass_read_stream(ass_library_t* library, const char *fname, char *charset);
+ASS_Track* ass_default_track(ASS_Library* library);
+int ass_process_subtitle(ASS_Track* track, subtitle* sub);
+ASS_Track* ass_read_subdata(ASS_Library* library, sub_data* subdata, double fps);
+ASS_Track* ass_read_stream(ASS_Library* library, const char *fname, char *charset);
 
-void ass_configure(ass_renderer_t* priv, int w, int h, int hinting);
-void ass_configure_fonts(ass_renderer_t* priv);
-ass_library_t* ass_init(void);
+void ass_configure(ASS_Renderer* priv, int w, int h, int hinting);
+void ass_configure_fonts(ASS_Renderer* priv);
+ASS_Library* ass_init(void);
 
 typedef struct {
-	ass_image_t* imgs;
+	ASS_Image* imgs;
 	int changed;
-} mp_eosd_images_t;
+} EOSD_ImageList;
 
 extern int ass_force_reload;
-ass_image_t* ass_mp_render_frame(ass_renderer_t *priv, ass_track_t* track, long long now, int* detect_change);
+ASS_Image* ass_mp_render_frame(ASS_Renderer *priv, ASS_Track* track, long long now, int* detect_change);
 
 #endif /* LIBASS_MP_H */