Changeset 64595f0c4ccd8b19941e294584e5391e3e08b8e1

Timestamp:

08/20/05 11:48:31 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1124531311 +0000

git-parent:

[48b0025af3d608513a51af4a3232734a45ebce69]

git-author:

Clément Stenac <zorglub@videolan.org> 1124531311 +0000

Message:

Fix Xosd interface (Debian #324039)

Files:

• modules/visualization/xosd.c (modified) (3 diffs)

modules/visualization/xosd.c

@@ -100 +100 @@
-{
-    intf_thread_t *p_intf = (intf_thread_t *)p_this;
+    xosd *p_osd;
-
-    /* Allocate instance and initialize some members */
@@ -116 +117 @@
-
-    /* Initialize library */
-    p_intf->p_sys->p_osd =
-#if defined(HAVE_XOSD_VERSION_0) || defined(HAVE_XOSD_VERSION_1)
+    p_osd  = p_intf->p_sys->p_osd =
-        xosd_init( config_GetPsz( p_intf, "xosd-font" ),
-                   config_GetPsz( p_intf,"xosd-colour" ), 3,
-                   XOSD_top, 0, 1 );
+    if( p_intf->p_sys->p_osd == NULL )
+    {
+        msg_Err( p_intf, "couldn't initialize libxosd" );
+        return VLC_EGENERIC;
+    }
-#else
-
-
-
+
+
+
+
+
+
+
+
-#endif
-
-    if( p_intf->p_sys->p_osd == NULL )
-    {
-        msg_Err( p_intf, "couldn't initialize libxosd" );
-        return VLC_EGENERIC;
-    }
-
-    playlist_t *p_playlist =
@@ -166 +172 @@
-
-    /* Initialize to NULL */
-
-
-
-
+
-
-    p_intf->pf_run = Run;