macosx: disable extensions submenu when they are no items to display

[vlc] / modules / services_discovery / mtp.c

diff --git a/modules/services_discovery/mtp.c b/modules/services_discovery/mtp.c
index b21621f89d7d63b5793dd2d6a755208ae496375f..a0e4ed5105d59b2df72493c4d9ccc77866c43325 100644 (file)
--- a/modules/services_discovery/mtp.c
+++ b/modules/services_discovery/mtp.c
@@ -26,10 +26,9 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_interface.h>
 #include <vlc_services_discovery.h>
 
-#include "libmtp.h"
+#include <libmtp.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -119,8 +118,8 @@ static void Close( vlc_object_t *p_this )
     services_discovery_t *p_sd = ( services_discovery_t * )p_this;
 
     free( p_sd->p_sys->psz_name );
-    vlc_cancel (p_sd->p_sys->thread);
-    vlc_join (p_sd->p_sys->thread, NULL);
+    vlc_cancel( p_sd->p_sys->thread );
+    vlc_join( p_sd->p_sys->thread, NULL );
     free( p_sd->p_sys );
 }
 
@@ -243,8 +242,7 @@ static void AddTrack( services_discovery_t *p_sd, LIBMTP_track_t *p_track )
         msg_Err( p_sd, "Error adding %s, skipping it", p_track->filename );
         return;
     }
-    if( ( p_input = input_item_New( p_sd, psz_string,
-                                    p_track->title ) ) == NULL )
+    if( ( p_input = input_item_New( psz_string, p_track->title ) ) == NULL )
     {
         msg_Err( p_sd, "Error adding %s, skipping it", p_track->filename );
         free( psz_string );
@@ -274,11 +272,10 @@ static void AddTrack( services_discovery_t *p_sd, LIBMTP_track_t *p_track )
 static void CloseDevice( services_discovery_t *p_sd )
 {
     input_item_t **pp_items = p_sd->p_sys->pp_items;
-    int i_i;
 
     if( pp_items != NULL )
     {
-        for( i_i = 0; i_i < p_sd->p_sys->i_count; i_i++ )
+        for( int i_i = 0; i_i < p_sd->p_sys->i_count; i_i++ )
         {
             if( pp_items[i_i] != NULL )
             {