[vlc-devel] commit: macosx: Don't try to guess a name anymore. This is now done in the core. (Derk-Jan Hartman )

git version control git at videolan.org
Fri Jun 26 17:11:10 CEST 2009


vlc | branch: 1.0-bugfix | Derk-Jan Hartman <hartman at videolan.org> | Fri Jun 26 17:08:45 2009 +0200| [5e07008c220ef2675280aeba6b3710363e37ae1a] | committer: Derk-Jan Hartman 

macosx: Don't try to guess a name anymore. This is now done in the core.
(cherry picked from commit 28fd4de956987ccf65cfe02f25363839c9b5af1a)

Signed-off-by: Derk-Jan Hartman <hartman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5e07008c220ef2675280aeba6b3710363e37ae1a
---

 modules/gui/macosx/playlist.m |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index fc36a21..c027363 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -1064,8 +1064,6 @@
             }
         }
     }
-    /* If no name, then make a guess */
-    if( !o_name) o_name = [[NSFileManager defaultManager] displayNameAtPath: o_uri];
 
     if( [[NSFileManager defaultManager] fileExistsAtPath:o_uri isDirectory:&b_dir] && b_dir &&
         [[NSWorkspace sharedWorkspace] getFileSystemInfoForPath: o_uri isRemovable: &b_rem
@@ -1087,7 +1085,7 @@
         o_uri = o_temp;
     }
 
-    p_input = input_item_New( p_playlist, [o_uri fileSystemRepresentation], [o_name UTF8String] );
+    p_input = input_item_New( p_playlist, [o_uri fileSystemRepresentation], o_name ? [o_name UTF8String] : NULL );
     if( !p_input )
     {
         pl_Release( p_intf );




More information about the vlc-devel mailing list