Changeset ad1fb8798056bb4d298aae0d9d053f8872fc4a79

Timestamp:

14/11/07 16:18:02 (1 year ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1195053482 +0000

git-parent:

[e467dc8322347bfa6d74af8854e1004da073297d]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1195053482 +0000

Message:

Further factoring out osdmenu parser functionality from osdmenu handling. Started a dummy modules/misc/osd/xml.c osdmenu parser.

Files:

• include/vlc_osd.h (modified) (2 diffs)
• modules/misc/osd/Modules.am (modified) (1 diff)
• modules/misc/osd/parser.c (modified) (3 diffs)
• src/Makefile.am (modified) (1 diff)
• src/osd/osd.c (modified) (5 diffs)

include/vlc_osd.h

@@ -398 +398 @@
-
-    /* misc parser */
-module
+parser
-    char            *psz_file;  /*< Config file name */
-    image_handler_t *p_image;   /*< handler to image loading and conversion libraries */
@@ -598 +598 @@
-VLC_EXPORT( int, osd_Slider, ( vlc_object_t *, spu_t *, int, int, int, int, int, int, short ) );
-VLC_EXPORT( int, osd_Icon, ( vlc_object_t *, spu_t *, int, int, int, int, int, short ) );
-
-/**
- * Loading and parse the OSD Configuration file
- *
- * These functions load/unload the OSD menu configuration file and
- * create/destroy the themable OSD menu structure on the OSD object.
- */
-VLC_EXPORT( int,  osd_ConfigLoader, ( vlc_object_t *, const char *, osd_menu_t ** ) );
-VLC_EXPORT( void, osd_ConfigUnload, ( vlc_object_t *, osd_menu_t ** ) );
-
-/** @} */

modules/misc/osd/Modules.am

@@ -1 +1 @@
-SOURCES_osd_parser = \
-            parser.c \
-            simple.c \
-            osd_menu.c \
-            osd_menu.h \
+            simple.c \
-            xml.c \
-            $(NULL)

modules/misc/osd/parser.c

@@ -39 +39 @@
- * Prototypes
- ***************************************************************************/
-osd_parser_simpleOpen
-void osd_parser_simpleClose
+ E_(osd_parser_simpleOpen)
+int  E_(osd_parser_xmlOpen) 
-
-
-
+
-
-/*****************************************************************************
@@ -57 +56 @@
-        add_shortcut( "import-osd" );
-        set_capability( "osd parser" , 0);
-osd_parser_simpleOpen, osd_parser_simple
+E_(osd_parser_simpleOpen), osd_parser_
-
-    add_submodule();
@@ -63 +62 @@
-        add_shortcut( "import-osd-xml" );
-        set_capability( "osd parser" , 0);
-osd_parser_xmlOpen, osd_parser_xml
+E_(osd_parser_xmlOpen), osd_parser_
-
-vlc_module_end();
+
+/*****************************************************************************
+ * osd_parser_Close: Free all osd menu structure resources
+ *****************************************************************************/
+
+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 );
+}

src/Makefile.am

@@ -272 +272 @@
-    stream_output/sdp.c \
-    osd/osd.c \
-    osd/osd_parser.c \
-    osd/osd_text.c \
-    osd/osd_widgets.c \

src/osd/osd.c

@@ -2 +2 @@
- * osd.c - The OSD Menu core code.
- *****************************************************************************
-
+-2007
- * $Id$
- *
@@ -42 +42 @@
-static int osd_VolumeStep( vlc_object_t *, int, int );
-static vlc_bool_t osd_isVisible( osd_menu_t *p_osd );
+static int  osd_ParserLoad( vlc_object_t *, const char *, osd_menu_t ** );
+static void osd_ParserUnload( vlc_object_t *, osd_menu_t ** );
-
-static vlc_bool_t osd_isVisible( osd_menu_t *p_osd )
@@ -49 +51 @@
-    var_Get( p_osd, "osd-menu-visible", &val );
-    return val.b_bool;
+}
+
+/*****************************************************************************
+ * Wrappers for loading and unloading osd parser modules.
+ *****************************************************************************/
+static int osd_ParserLoad( vlc_object_t *p_this, const char *psz_file, osd_menu_t **pp_menu )
+{
+    osd_menu_t *p_menu = *pp_menu;
+
+    if( pp_menu && p_menu ) return VLC_EGENERIC;
+
+    p_menu = vlc_object_create( p_this, VLC_OBJECT_OSDMENU );
+    if( !p_menu )
+    {
+        msg_Err( p_this, "out of memory" );
+        return VLC_ENOMEM;
+    }
+    vlc_object_attach( p_this, p_menu );
+
+    /* Stuff needed for Parser */
+    p_menu->psz_file = strdup( psz_file );
+    p_menu->p_image = image_HandlerCreate( p_this );
+    if( !p_menu->p_image || !p_menu->psz_file )
+    {
+        msg_Err( p_this, "unable to load images, aborting .." );
+        osd_ParserUnload( p_this, pp_menu );
+        return VLC_ENOMEM;
+    }
+    else
+    {
+        char *psz_type;
+        char *psz_ext = strrchr( p_menu->psz_file, '.' );
+
+        if( psz_ext && !strcmp( psz_ext, ".cfg") )
+            psz_type = "import-osd";
+        else
+            psz_type = "import-osd-xml";
+
+        p_menu->p_parser = module_Need( p_menu, "osd parser", psz_type, VLC_TRUE );
+        if( !p_menu->p_parser )
+        {
+            osd_ParserUnload( p_this, pp_menu );
+            return VLC_ENOOBJ;
+        }
+    }
+    return VLC_SUCCESS;
+}
+
+static void osd_ParserUnload( vlc_object_t *p_this, osd_menu_t **pp_menu )
+{
+    osd_menu_t *p_menu = (osd_menu_t *) *pp_menu;
+
+    if( p_menu->p_parser )
+    {
+        module_Unneed( p_menu, p_menu->p_parser );
+    }
+    p_menu->p_parser = NULL;
+
+    if( p_menu->p_image )
+        image_HandlerDelete( p_menu->p_image );
+    if( p_menu->psz_file )
+        free( p_menu->psz_file );
+
+    vlc_object_detach( p_menu );
+    vlc_object_destroy( p_menu );
+    p_menu = NULL;
-}
-
@@ -71 +139 @@
-        vlc_value_t val;
-
-        msg_Dbg( p_this, "creating OSD menu object" );
-        if( ( p_osd = vlc_object_create( p_this, VLC_OBJECT_OSDMENU ) ) == NULL )
-        {
-            msg_Err( p_this, "out of memory" );
-            vlc_mutex_unlock( lockval.p_address );
-            return NULL;
-        }
-
-        /* Stuff needed for Parser */
-        p_osd->p_image = image_HandlerCreate( p_this );
-        if( !p_osd->p_image )
-            msg_Err( p_this, "unable to load images" );
-        p_osd->psz_file = strdup( psz_file );
-
-        /* Parse configuration file */
-ConfigLoader
+ParserLoad
-            goto error;
-
@@ -155 +209 @@
-    var_Destroy( p_osd, "osd-menu-update" );
-
-
-
-
-
-
-
-
-
-
-
+
-
-    vlc_mutex_unlock( lockval.p_address );