Added a RTP (New) stream outpu method for the rtp sout module. Still lot of work...

[vlc] / modules / gui / macosx / open.m

diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index 9194b30f473b3aaf88f649ecd8e466676ed949e5..95f7e394d4fb0b07d3a8313ed90a71ab860ae499 100644 (file)
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -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.34 2003/05/20 18:53:03 hartman Exp $
+ * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -40,6 +40,7 @@
 #include "intf.h"
 #include "playlist.h"
 #include "open.h"
+#include "output.h"
 
 /*****************************************************************************
  * GetEjectableMediaOfClass 
@@ -66,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, 
@@ -88,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 )
@@ -129,11 +130,10 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 
 - (void)awakeFromNib
 {
-    intf_thread_t * p_intf = [NSApp getIntf];
+    intf_thread_t * p_intf = VLCIntf;
 
     [o_panel setTitle: _NS("Open Source")];
     [o_mrl_lbl setTitle: _NS("Media Resource Locator (MRL)")];
-    [o_ckbox_enqueue setTitle: _NS("Only enqueue in playlist, do not play")];
 
     [o_btn_ok setTitle: _NS("OK")];
     [o_btn_cancel setTitle: _NS("Cancel")];
@@ -230,30 +230,25 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 
     if( i_result )
     {
-        intf_thread_t * p_intf = [NSApp getIntf];
-
-        NSString *o_source = [o_mrl stringValue];
-        BOOL b_enq = [o_ckbox_enqueue state] == NSOnState ? YES : NO;
-        NSString *subPath = [o_file_sub_path stringValue];
+        NSMutableDictionary *o_dic;
+        NSMutableArray *o_options = [NSMutableArray array];
+        o_dic = [NSMutableDictionary dictionaryWithObject: [o_mrl stringValue] forKey: @"ITEM_URL"];
         
-        if (([o_file_sub_ckbox state] == NSOnState) && !([subPath isEqualTo: @""]))
+        if( [o_file_sub_ckbox state] == NSOnState )
         {
-            config_PutPsz( p_intf, "sub-file", strdup( [subPath cString] ) );
-            if ( [o_file_sub_override state] )
+            [o_options addObject: [NSString stringWithFormat: @"sub-file=%s", [[o_file_sub_path stringValue] UTF8String]]];
+            if( [o_file_sub_override state] == NSOnState )
             {
-                config_PutInt( p_intf, "sub-delay", (int)( [o_file_sub_delay intValue] * 10 ) );
-                config_PutFloat( p_intf, "sub-fps", [o_file_sub_fps floatValue] );
+                [o_options addObject: [NSString stringWithFormat: @"sub-delay=%i", (int)( [o_file_sub_delay intValue] * 10 )]];
+                [o_options addObject: [NSString stringWithFormat: @"sub-fps=%f", [o_file_sub_fps floatValue]]];
             }
         }
-        else
+        if( [o_output_ckbox state] == NSOnState )
         {
-            config_PutPsz( p_intf, "sub-file", "" );
-            config_PutInt( p_intf, "sub-delay", 0 );
-            config_PutFloat( p_intf, "sub-fps", 0.0 );
+            [o_options addObject: [NSString stringWithString: [(VLCOutput *)o_sout_options getMRL]]];
         }
-        
-        [o_playlist appendArray: 
-            [NSArray arrayWithObject: o_source] atPos: -1 enqueue:b_enq];
+        [o_dic setObject: (NSArray *)[o_options copy] forKey: @"ITEM_OPTIONS"];
+        [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue:NO];
     }
 }
 
@@ -491,16 +486,16 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
                 [NSString stringWithFormat: _NS("No %@s found"), o_type]] )
             o_device = @"";
         if ( b_menus )
-            o_mrl_string = [NSString stringWithFormat: @"dvdplay://%@",
+            o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@",
                             o_device]; 
         else
-            o_mrl_string = [NSString stringWithFormat: @"dvdold://%@@%i,%i",
+            o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i,%i",
                             o_device, i_title, i_chapter]; 
     }
     else /* VIDEO_TS folder */
     {
         if ( b_menus )
-            o_mrl_string = [NSString stringWithFormat: @"dvdplay://%@",
+            o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@",
                             o_videots]; 
         else
             o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i,%i",
@@ -578,7 +573,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 {
     NSString *o_mode;
     NSString *o_mrl_string = [NSString string];
-    intf_thread_t * p_intf = [NSApp getIntf];
+    intf_thread_t * p_intf = VLCIntf;
 
     o_mode = [[o_net_mode selectedCell] title];
 
@@ -624,6 +619,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 - (IBAction)openFile:(id)sender
 {
     NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
+    int i;
     
     [o_open_panel setAllowsMultipleSelection: YES];
     [o_open_panel setCanChooseDirectories: YES];
@@ -633,18 +629,17 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     if( [o_open_panel runModalForDirectory: nil
             file: nil types: nil] == NSOKButton )
     {
-        intf_thread_t * p_intf = [NSApp getIntf];
-        config_PutPsz( p_intf, "sout", NULL );
-        
+        NSArray *o_array = [NSArray array];
         NSArray *o_values = [[o_open_panel filenames]
                 sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
-        
-        config_PutPsz( p_intf, "sub-file", "" );
-        config_PutInt( p_intf, "sub-delay", 0 );
-        config_PutFloat( p_intf, "sub-fps", 0.0 );
-        config_PutPsz( p_intf, "sout", "" );
-        
-        [o_playlist appendArray: o_values atPos: -1 enqueue:NO];
+
+        for( i = 0; i < (int)[o_values count]; i++)
+        {
+            NSDictionary *o_dic;
+            o_dic = [NSDictionary dictionaryWithObject:[o_values objectAtIndex:i] forKey:@"ITEM_URL"];
+            o_array = [o_array arrayByAddingObject: o_dic];
+        }
+        [o_playlist appendArray: o_array atPos: -1 enqueue:NO];
     }
 }