Changeset 5f15a425fcaacd155a301ab8324cedad2a3ea651

Timestamp:

27/11/05 12:30:14 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[7af8b2413813eb84e0643109f68b5fbe36b43ca1]

git-author:

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

Message:

Fix new HAL interaction

Files:

• modules/services_discovery/hal.c (modified) (2 diffs)
• src/libvlc.c (modified) (2 diffs)

modules/services_discovery/hal.c

@@ -105 +105 @@
-
-    DBusError           dbus_error;
+    DBusConnection      *p_connection;
-
-    p_sd->pf_run = Run;
@@ -112 +113 @@
-
-#ifdef HAVE_HAL_1
-
-
-
-
-
+
+
+
+
-        free( p_sys );
+        return VLC_EGENERIC;
+    }
+    p_connection = dbus_bus_get( DBUS_BUS_SYSTEM, &dbus_error );
+    if( dbus_error_is_set( &dbus_error ) )
+    {
+        msg_Err( p_sd, "Unable to connect to DBUS: %s", dbus_error.message );
+        dbus_error_free( &dbus_error );
+        free( p_sys );
+        return VLC_EGENERIC;
+    }
+    libhal_ctx_set_dbus_connection( p_sys->p_ctx, p_connection );
+    if( !libhal_ctx_init( p_sys->p_ctx, &dbus_error ) )
+#else
+    if( !(p_sys->p_ctx = hal_initialize( NULL, FALSE ) ) )
+#endif
+    {
-        msg_Err( p_sd, "hal not available : %s", dbus_error.message );
+        dbus_error_free( &dbus_error );
+        free( p_sys );
-        return VLC_EGENERIC;
-    }

src/libvlc.c

@@ -2557 +2557 @@
-    char *block_dev;
-    dbus_bool_t b_dvd;
+    DBusConnection *p_connection;
+    DBusError       error;
-
-#ifdef HAVE_HAL_1
-
+
+
+
+
+
+
+
+
+
+
+
-#else
-    if( ( ctx = hal_initialize( NULL, FALSE ) ) )
@@ -2619 +2631 @@
-#endif
-    }
+    else
+    {
+        msg_Dbg( p_vlc, "Unable to get HAL device properties" );
+    }
-#endif
-}