Changeset 4ff5e969b5892a9f56ee1b5d77d86bdc7202250f

Timestamp:

11/14/07 16:17:57 (10 months ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

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

git-parent:

[6f7b6bf6fd00917d97fb297db4c9f53bd44fe2bb]

git-author:

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

Message:

Fix merge conflicts for src/osd/osd.c

Files:

• include/vlc_configuration.h (modified) (1 diff)
• include/vlc_osd.h (modified) (1 diff)
• modules/misc/osd/Modules.am (added)
• modules/misc/osd/osd_menu.c (added)
• modules/misc/osd/osd_menu.h (added)
• modules/misc/osd/parser.c (added)
• src/osd/osd.c (modified) (4 diffs)
• src/osd/osd_parser.c (deleted)

include/vlc_configuration.h

@@ -124 +124 @@
-   #define SUBCAT_PLAYLIST_EXPORT 703
-
+#define CAT_OSD 8
+   #define SUBCAT_OSD_IMPORT 801
+
-struct config_category_t
-{

include/vlc_osd.h

@@ -396 +396 @@
-    /* quick link in the linked list. */
-    osd_button_t  *p_last_button; /*< pointer to last button in the list */
+
+    /* misc parser */
+    module_t        *p_module;  /*< pointer to parser module */
+    char            *psz_file;  /*< Config file name */
+    image_handler_t *p_image;   /*< handler to image loading and conversion libraries */
-};
-

src/osd/osd.c

@@ -30 +30 @@
-#include <vlc_osd.h>
-#include "libvlc.h"
+#include <vlc_image.h>
-
-#undef OSD_MENU_DEBUG
@@ -77 +78 @@
-            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 */
@@ -117 +124 @@
-error:
-    msg_Err( p_this, "creating OSD menu object failed" );
+
+    if( p_osd->p_image )
+        image_HandlerDelete( p_osd->p_image );
+    if( p_osd->psz_file )
+        free( p_osd->psz_file );
+
+    vlc_mutex_unlock( lockval.p_address );
-    vlc_object_destroy( p_osd );
-    vlc_mutex_unlock( lockval.p_address );
@@ -142 +156 @@
-
-    osd_ConfigUnload( p_this, &p_osd );
+
+    if( p_osd->p_image )
+        image_HandlerDelete( p_osd->p_image );
+    if( p_osd->psz_file )
+        free( p_osd->psz_file );
+
-    vlc_object_detach( p_osd );
-    vlc_object_destroy( p_osd );