Refactor osdmenu parsing logic.

[vlc] / modules / misc / osd / parser.c

diff --git a/modules/misc/osd/parser.c b/modules/misc/osd/parser.c
index a3389c60185694d700b686d2cca16a5346d9978f..64b9fc853752ef683f70395581f72444b5f9d042 100644 (file)
--- a/modules/misc/osd/parser.c
+++ b/modules/misc/osd/parser.c
@@ -38,8 +38,8 @@
 /***************************************************************************
  * Prototypes
  ***************************************************************************/
-int  E_(osd_parser_simpleOpen) ( vlc_object_t *p_this );
-int  E_(osd_parser_xmlOpen) ( vlc_object_t *p_this );
+int osd_parser_simpleOpen ( vlc_object_t *p_this );
+int osd_parser_xmlOpen ( vlc_object_t *p_this );
 
 static void osd_parser_Close( vlc_object_t *p_this );
 
@@ -48,20 +48,20 @@ static void osd_parser_Close( vlc_object_t *p_this );
  *****************************************************************************/
 vlc_module_begin();
 
-    set_category( CAT_MISC );
+    set_category( CAT_OSD );
     set_subcategory( SUBCAT_OSD_IMPORT );
 
     add_submodule();
         set_description( _("OSD configuration importer") );
         add_shortcut( "import-osd" );
         set_capability( "osd parser" , 0);
-        set_callbacks( E_(osd_parser_simpleOpen), osd_parser_Close );
+        set_callbacks( osd_parser_simpleOpen, osd_parser_Close );
 
     add_submodule();
         set_description( _("XML OSD configuration importer") );
         add_shortcut( "import-osd-xml" );
         set_capability( "osd parser" , 0);
-        set_callbacks( E_(osd_parser_xmlOpen), osd_parser_Close );
+        set_callbacks( osd_parser_xmlOpen, osd_parser_Close );
 
 vlc_module_end();
 
@@ -73,5 +73,5 @@ void osd_parser_Close ( vlc_object_t *p_this )
 {
     osd_menu_t *p_menu = (osd_menu_t *) p_this;
     if( p_menu )
-        osd_MenuFree( p_this, &p_menu );
+        osd_MenuFree( p_menu );
 }