codecleanup: Replace input_Item by input_item.

[vlc] / modules / services_discovery / hal.c

diff --git a/modules/services_discovery/hal.c b/modules/services_discovery/hal.c
index 00c5bf15f435032a6e8653da8f7a82950622c441..b45b5fdee0485db9e789c5b4fa601b05a91dddae 100644 (file)
--- a/modules/services_discovery/hal.c
+++ b/modules/services_discovery/hal.c
@@ -213,7 +213,7 @@ static void AddDvd( services_discovery_t *p_sd, const char *psz_device )
     if( asprintf( &psz_uri, "dvd://%s", psz_blockdevice ) == -1 )
         return;
     /* Create the playlist item here */
-    p_input = input_ItemNew( p_sd, psz_uri, psz_name );
+    p_input = input_item_New( p_sd, psz_uri, psz_name );
     free( psz_uri );
     if( !p_input )
     {
@@ -255,7 +255,7 @@ static void AddCdda( services_discovery_t *p_sd, const char *psz_device )
     if( asprintf( &psz_uri, "cdda://%s", psz_blockdevice ) == -1 )
         return;
     /* Create the item here */
-    p_input = input_ItemNew( p_sd, psz_uri, "Audio CD" );
+    p_input = input_item_New( p_sd, psz_uri, "Audio CD" );
     free( psz_uri );
     if( !p_input )
         return;
@@ -270,7 +270,7 @@ static void ParseDevice( services_discovery_t *p_sd, const char *psz_device )
     char *psz_disc_type;
     services_discovery_sys_t    *p_sys  = p_sd->p_sys;
 
-    if( libhal_device_property_exists( p_sys->p_ctx, psz_device,
+    if( !libhal_device_property_exists( p_sys->p_ctx, psz_device,
                                        "volume.disc.type", NULL ) )
         return;
 
@@ -310,7 +310,7 @@ static void Run( services_discovery_t *p_sd )
             libhal_free_string( devices[ i ] );
         }
     }
-    while( !p_sd->b_die )
+    while( vlc_object_alive (p_sd) )
     {
         /* look for events on the bus, blocking 1 second */
         dbus_connection_read_write_dispatch( p_sys->p_connection, 1000 );