]> git.sesse.net Git - vlc/blobdiff - modules/gui/macosx/open.m
Make the playlist info window a new object
[vlc] / modules / gui / macosx / open.m
index 33a55beb8434e9723bacd738ea83a9c2665b0f47..0f393197e956b04e2cab5926deb4c577ed0b96aa 100644 (file)
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * open.m: MacOS X plugin for vlc
+ * open.m: MacOS X module for vlc
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: open.m,v 1.39 2003/10/19 23:12:16 hartman Exp $
+ * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -67,7 +67,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
         return( nil );
     }
     
-    CFDictionarySetValue( classes_to_match, CFSTR( kIOMediaEjectable ), 
+    CFDictionarySetValue( classes_to_match, CFSTR( kIOMediaEjectableKey ), 
                           kCFBooleanTrue );
     
     kern_result = IOServiceGetMatchingServices( master_port, classes_to_match, 
@@ -89,7 +89,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
         do
         {
             str_bsd_path = IORegistryEntryCreateCFProperty( next_media,
-                                                            CFSTR( kIOBSDName ),
+                                                            CFSTR( kIOBSDNameKey ),
                                                             kCFAllocatorDefault,
                                                             0 );
             if( str_bsd_path == NULL )
@@ -245,7 +245,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
         }
         if( [o_output_ckbox state] == NSOnState )
         {
-            [o_options addObject: [NSString stringWithFormat: @"sout=%@", [(VLCOutput *)o_sout_options getMRL]]];
+            [o_options addObject: [NSString stringWithString: [(VLCOutput *)o_sout_options getMRL]]];
         }
         [o_dic setObject: (NSArray *)[o_options copy] forKey: @"ITEM_OPTIONS"];
         [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue:NO];