Remove most stray semi-colons in module descriptions

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

diff --git a/modules/misc/osd/parser.c b/modules/misc/osd/parser.c
index 5d12d29b1e53d521d6fa028788e11a09fced2dca..48d21c00b125eb19c410b8178999e78df8ce2a45 100644 (file)
--- a/modules/misc/osd/parser.c
+++ b/modules/misc/osd/parser.c
@@ -2,7 +2,7 @@
  * parser.c :  OSD import module
  *****************************************************************************
  * Copyright (C) 2007 M2X
- * $Id: $
+ * $Id$
  *
  * Authors: Jean-Paul Saman
  *
@@ -24,7 +24,12 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_config.h>
 
@@ -39,29 +44,39 @@
  * Prototypes
  ***************************************************************************/
 int osd_parser_simpleOpen ( vlc_object_t *p_this );
-void osd_parser_simpleClose( vlc_object_t *p_this );
+int osd_parser_xmlOpen ( vlc_object_t *p_this );
 
-int osd_parser_xmlOpen    ( vlc_object_t *p_this );
-void osd_parser_xmlClose   ( vlc_object_t *p_this );
+static void osd_parser_Close( vlc_object_t *p_this );
 
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();
+vlc_module_begin ()
+
+    set_category( CAT_OSD )
+    set_subcategory( SUBCAT_OSD_IMPORT )
+
+    add_submodule ()
+        set_description( N_("OSD configuration importer") )
+        add_shortcut( "import-osd" )
+        set_capability( "osd parser", 0)
+        set_callbacks( osd_parser_simpleOpen, osd_parser_Close )
 
-    set_category( CAT_MISC );
-    set_subcategory( SUBCAT_OSD_IMPORT );
+    add_submodule ()
+        set_description( N_("XML OSD configuration importer") )
+        add_shortcut( "import-osd-xml" )
+        set_capability( "osd parser", 0)
+        set_callbacks( osd_parser_xmlOpen, osd_parser_Close )
 
-    add_submodule();
-        set_description( _("OSD configuration importer") );
-        add_shortcut( "import-osd" );
-        set_capability( "osd parser" , 0);
-        set_callbacks( osd_parser_simpleOpen, osd_parser_simpleClose );
+vlc_module_end ()
 
-    add_submodule();
-        set_description( _("XML OSD configuration importer") );
-        add_shortcut( "import-osd-xml" );
-        set_capability( "osd parser" , 0);
-        set_callbacks( osd_parser_xmlOpen, osd_parser_xmlClose );
+/*****************************************************************************
+ * osd_parser_Close: Free all osd menu structure resources
+ *****************************************************************************/
 
-vlc_module_end();
+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_menu );
+}