Slightly clearer code.

[vlc] / modules / services_discovery / mediadirs.c

diff --git a/modules/services_discovery/mediadirs.c b/modules/services_discovery/mediadirs.c
index 5c0cd909adc64135c99fb17f5cf5fcce27797ef1..63f9cb7110e9fdf9b3ae1234d16d80b154a5dfcb 100644 (file)
--- a/modules/services_discovery/mediadirs.c
+++ b/modules/services_discovery/mediadirs.c
@@ -190,7 +190,7 @@ static void *Run( void *data )
             !S_ISDIR( st.st_mode ) )
             continue;
 
-        char* psz_uri = make_URI( psz_dir );
+        char* psz_uri = make_URI( psz_dir, "file" );
 
         input_item_t* p_root = input_item_New( p_sd, psz_uri, NULL );
         if( p_sys->i_type == Picture )
@@ -268,7 +268,7 @@ static int onNewFileAdded( vlc_object_t *p_this, char const *psz_var,
     if( !psz_file || !*psz_file )
         return VLC_EGENERIC;
 
-    char* psz_uri = make_URI( psz_file );
+    char* psz_uri = make_URI( psz_file, "file" );
     input_item_t* p_item = input_item_New( p_sd, psz_uri, NULL );
 
     if( p_sys->i_type == Picture )
@@ -312,27 +312,12 @@ void formatSnapshotItem( input_item_t *p_item )
     if( !p_item )
         return;
 
-    char* psz_option = NULL;
     char* psz_uri = input_item_GetURI( p_item );
 
-    if( !psz_uri )
-        goto end;
-
     /* copy the snapshot mrl as a ArtURL */
-    input_item_SetArtURL( p_item, psz_uri );
-
-    if( asprintf( &psz_option, "fake-file=%s", psz_uri ) == -1 )
-    {
-        psz_option = NULL;
-        goto end;
-    }
-
-    /* display still image as a video */
-    input_item_SetURI( p_item, "fake://" );
-    input_item_AddOption( p_item, psz_option, VLC_INPUT_OPTION_TRUSTED );
+    if( psz_uri )
+        input_item_SetArtURL( p_item, psz_uri );
 
-end:
-    free( psz_option );
     free( psz_uri );
 }