]> git.sesse.net Git - vlc/blobdiff - modules/gui/macosx/open.m
* Minor typographic corrections,
[vlc] / modules / gui / macosx / open.m
index 32c23ccf80e05b7639050221da6cc28222e9e60e..6fa69038ae5fad7386101af593c28aabe11db0b7 100644 (file)
@@ -2,9 +2,11 @@
  * open.m: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: open.m,v 1.3 2002/10/05 00:10:17 jlj Exp $
+ * $Id: open.m,v 1.22 2003/02/09 19:28:43 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
+ *          Christophe Massiot <massiot@via.ecp.fr>
+ *          Derk-Jan Hartman <thedj@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #include <IOKit/storage/IOCDMedia.h>
 #include <IOKit/storage/IODVDMedia.h>
 
-#import <Cocoa/Cocoa.h>
-
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include "intf.h"
+#include "playlist.h"
+#include "open.h"
 
 #include "netutils.h"
 
-#import "intf.h"
-#import "playlist.h"
-#import "open.h"
-
 /*****************************************************************************
  * GetEjectableMediaOfClass 
  *****************************************************************************/
@@ -134,7 +131,40 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 
 - (void)awakeFromNib
 {
-    [o_panel setTitle: _NS("Open Target")];
+    intf_thread_t * p_intf = [NSApp getIntf];
+    char * psz_sout = config_GetPsz( p_intf, "sout" );
+
+    if ( psz_sout != NULL && *psz_sout )
+    {
+        [o_sout_cbox setState: YES];
+
+        NSRect s_rect = [o_panel frame];
+        s_rect.size.height = OPEN_PANEL_FULL_HEIGHT + WINDOW_TITLE_HEIGHT;
+        [o_panel setFrame: s_rect display: NO];
+
+        NSPoint s_point;
+        s_point.x = 0;
+        s_point.y = 0;
+        [[o_panel contentView] setBoundsOrigin: s_point];
+    }
+    else
+    {
+        [o_sout_cbox setState: NO];
+
+        NSRect s_rect = [o_panel frame];
+        s_rect.size.height = OPEN_PANEL_SHORT_HEIGHT + WINDOW_TITLE_HEIGHT;
+        [o_panel setFrame: s_rect display: NO];
+
+        NSPoint s_point;
+        s_point.x = 0;
+        s_point.y = OPEN_PANEL_FULL_HEIGHT - OPEN_PANEL_SHORT_HEIGHT;
+        [[o_panel contentView] setBoundsOrigin: s_point];
+    }
+    free(psz_sout);
+
+    [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")];
@@ -144,11 +174,20 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     [[o_tabview tabViewItemAtIndex: 2] setLabel: _NS("Network")];
 
     [o_file_btn_browse setTitle: _NS("Browse...")];
+    [o_file_stream setTitle: _NS("Treat as a pipe rather than as a file")];
+
+    [o_file_sub_btn_browse setTitle: _NS("Browse...")];
+    [o_file_sub_ckbox setTitle: _NS("Load subtitles file:")];
 
-    [o_disc_type_lbl setStringValue: _NS("Disc type")];
     [o_disc_device_lbl setStringValue: _NS("Device name")];
     [o_disc_title_lbl setStringValue: _NS("Title")];
     [o_disc_chapter_lbl setStringValue: _NS("Chapter")];
+    [o_disc_videots_btn_browse setTitle: _NS("Browse...")];
+    [o_disc_dvd_menus setTitle: _NS("Use DVD menus (EXPERIMENTAL)")];
+
+    [[o_disc_type cellAtRow:0 column:0] setTitle: _NS("VIDEO_TS folder")];
+    [[o_disc_type cellAtRow:1 column:0] setTitle: _NS("DVD")];
+    [[o_disc_type cellAtRow:2 column:0] setTitle: _NS("VCD")];
 
     [o_net_udp_port_lbl setStringValue: _NS("Port")];
     [o_net_udpm_addr_lbl setStringValue: _NS("Address")];
@@ -157,6 +196,30 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     [o_net_cs_port_lbl setStringValue: _NS("Port")];
     [o_net_http_url_lbl setStringValue: _NS("URL")];
 
+    [[o_net_mode cellAtRow:0 column:0] setTitle: _NS("UDP/RTP")];
+    [[o_net_mode cellAtRow:1 column:0] setTitle: _NS("UDP/RTP Multicast")];
+    [[o_net_mode cellAtRow:2 column:0] setTitle: _NS("Channel server")];
+    [[o_net_mode cellAtRow:3 column:0] setTitle: _NS("HTTP/FTP/MMS")];
+
+    [o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )];
+    [o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )];
+    [o_net_cs_port setIntValue: config_GetInt( p_intf, "channel-port" )];
+    [o_net_cs_port_stp setIntValue: config_GetInt( p_intf, "channel-port" )];
+
+    [o_sout_cbox setTitle: _NS("Stream output")];
+    [o_sout_mrl_lbl setTitle: _NS("Stream output MRL")];
+    [[o_sout_access cellAtRow:0 column:0] setTitle: _NS("File")];
+    [[o_sout_access cellAtRow:1 column:0] setTitle: _NS("UDP")];
+    [[o_sout_access cellAtRow:2 column:0] setTitle: _NS("RTP")];
+
+    [o_sout_file_btn_browse setTitle: _NS("Browse...")];
+    [o_sout_udp_addr_lbl setStringValue: _NS("Address")];
+    [o_sout_udp_port_lbl setStringValue: _NS("Port")];
+
+    [[o_sout_mux cellAtRow:0 column:0] setTitle: _NS("AVI")];
+    [[o_sout_mux cellAtRow:0 column:1] setTitle: _NS("PS")];
+    [[o_sout_mux cellAtRow:0 column:2] setTitle: _NS("TS")];
+
     [[NSNotificationCenter defaultCenter] addObserver: self
         selector: @selector(openFilePathChanged:)
         name: NSControlTextDidChangeNotification
@@ -174,6 +237,10 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
         selector: @selector(openDiscInfoChanged:)
         name: NSControlTextDidChangeNotification
         object: o_disc_chapter];
+    [[NSNotificationCenter defaultCenter] addObserver: self
+        selector: @selector(openDiscInfoChanged:)
+        name: NSControlTextDidChangeNotification
+        object: o_disc_videots_folder];
 
     [[NSNotificationCenter defaultCenter] addObserver: self
         selector: @selector(openNetInfoChanged:)
@@ -199,6 +266,19 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
         selector: @selector(openNetInfoChanged:)
         name: NSControlTextDidChangeNotification
         object: o_net_http_url];
+
+    [[NSNotificationCenter defaultCenter] addObserver: self
+        selector: @selector(soutInfoChanged:)
+        name: NSControlTextDidChangeNotification
+        object: o_sout_file_path];
+    [[NSNotificationCenter defaultCenter] addObserver: self
+        selector: @selector(soutInfoChanged:)
+        name: NSControlTextDidChangeNotification
+        object: o_sout_udp_addr];
+    [[NSNotificationCenter defaultCenter] addObserver: self
+        selector: @selector(soutInfoChanged:)
+        name: NSControlTextDidChangeNotification
+        object: o_sout_udp_port];
 }
 
 - (void)openTarget:(int)i_type
@@ -206,17 +286,37 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     int i_result;
 
     [o_tabview selectTabViewItemAtIndex: i_type];
-
+    [o_ckbox_enqueue setState: NSOnState];
+    [o_file_sub_path setStringValue: @""];
+    [o_file_sub_ckbox setState: NSOffState];
+    [o_file_sub_path setEnabled: NO];
+    [o_file_sub_btn_browse setEnabled: NO];
+    
     i_result = [NSApp runModalForWindow: o_panel];
     [o_panel close];
 
     if( i_result )
     {
-        NSString *o_source = [o_mrl stringValue];
+        NSString *o_sout = [o_sout_mrl stringValue];
+        intf_thread_t * p_intf = [NSApp getIntf];
+        
+        if ( [o_sout_cbox state] )
+        {
+            config_PutPsz( p_intf, "sout", [o_sout lossyCString] );
+        }
 
+        NSString *o_source = [o_mrl stringValue];
+        BOOL b_enq = [o_ckbox_enqueue state] == NSOnState ? YES : NO;
+        NSString *subPath = [o_file_sub_path stringValue];
+        
         [o_playlist appendArray: 
-            [NSArray arrayWithObject: o_source] atPos: -1];
+            [NSArray arrayWithObject: o_source] atPos: -1 enqueue:b_enq];
+        
+        if (([o_file_sub_ckbox state] == NSOnState) && !([subPath isEqualTo: @""]))
+            config_PutPsz( p_intf, "sub-file", strdup( [subPath cString] ) );
     }
+
+    [self soutModeChanged: nil];
 }
 
 - (void)tabView:(NSTabView *)o_tv didSelectTabViewItem:(NSTabViewItem *)o_tvi
@@ -237,7 +337,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     }  
 }
 
-- (IBAction)openFile:(id)sender
+- (IBAction)openFileGeneric:(id)sender
 {
     [self openFilePathChanged: nil];
     [self openTarget: 0];
@@ -259,54 +359,146 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 {
     NSString *o_mrl_string;
     NSString *o_filename = [o_file_path stringValue];
+    NSString *o_ext = [o_filename pathExtension];
+    vlc_bool_t b_stream = [o_file_stream state];
 
-    o_mrl_string = [NSString stringWithFormat: @"file://%@", o_filename];
+    if ([o_ext isEqualToString: @"bin"] ||
+        [o_ext isEqualToString: @"cue"] ||
+        [o_ext isEqualToString: @"vob"] ||
+        [o_ext isEqualToString: @"iso"])
+    {
+        o_mrl_string = o_filename;
+    }
+    else
+    {
+        o_mrl_string = [NSString stringWithFormat: @"%s://%@",
+                        b_stream ? "stream" : "file",
+                        o_filename];
+    }
     [o_mrl setStringValue: o_mrl_string]; 
 }
 
+- (IBAction)openFileBrowse:(id)sender
+{
+    NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
+    
+    [o_open_panel setAllowsMultipleSelection: NO];
+    [o_open_panel setTitle: _NS("Open File")];
+    [o_open_panel setPrompt: _NS("Open")];
+
+    if( [o_open_panel runModalForDirectory: nil 
+            file: nil types: nil] == NSOKButton )
+    {
+        NSString *o_filename = [[o_open_panel filenames] objectAtIndex: 0];
+        [o_file_path setStringValue: o_filename];
+        [self openFilePathChanged: nil];
+    }
+}
+
+- (IBAction)openFileStreamChanged:(id)sender
+{
+    [self openFilePathChanged: nil];
+}
+
+- (IBAction)loadSubsChanged:(id)sender
+{
+    if ([o_file_sub_ckbox state] == NSOnState)
+    {
+        [o_file_sub_path setEnabled:YES];
+        [o_file_sub_btn_browse setEnabled:YES];
+    }
+    else
+    {
+        [o_file_sub_path setEnabled:NO];
+        [o_file_sub_btn_browse setEnabled:NO];
+    }
+}
+
+- (IBAction)openSubBrowse:(id)sender
+{
+    NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
+    
+    [o_open_panel setAllowsMultipleSelection: NO];
+    [o_open_panel setTitle: _NS("Open File")];
+    [o_open_panel setPrompt: _NS("Open")];
+
+    if( [o_open_panel runModalForDirectory: nil 
+            file: nil types: nil] == NSOKButton )
+    {
+        NSString *o_filename = [[o_open_panel filenames] objectAtIndex: 0];
+        [o_file_sub_path setStringValue: o_filename];
+    }
+}
+
 - (IBAction)openDiscTypeChanged:(id)sender
 {
     NSString *o_type;
-    NSArray *o_devices;
-    const char *psz_class = NULL;
+    vlc_bool_t b_device, b_menus, b_title_chapter;
     
     [o_disc_device removeAllItems];
+    b_title_chapter = ![o_disc_dvd_menus state];
     
     o_type = [[o_disc_type selectedCell] title];
 
-    if( [o_type isEqualToString: @"DVD"] )
+    if ( [o_type isEqualToString: _NS("VIDEO_TS folder")] )
     {
-        psz_class = kIODVDMediaClass;
+        b_device = 0; b_menus = 1;
     }
     else
     {
-        psz_class = kIOCDMediaClass;
-    }
+        NSArray *o_devices;
+        NSString *o_disc;
+        const char *psz_class = NULL;
+        b_device = 1;
+
+        if ( [o_type isEqualToString: _NS("VCD")] )
+        {
+            psz_class = kIOCDMediaClass;
+            o_disc = o_type;
+            b_menus = 0; b_title_chapter = 1;
+            [o_disc_dvd_menus setState: FALSE];
+        }
+        else
+        {
+            psz_class = kIODVDMediaClass;
+            o_disc = o_type;
+            b_menus = 1;
+        }
     
-    o_devices = GetEjectableMediaOfClass( psz_class );
-    if( o_devices != nil )
-    {
-        int i_devices = [o_devices count];
-        
-        if( i_devices )
+        o_devices = GetEjectableMediaOfClass( psz_class );
+        if ( o_devices != nil )
         {
-            int i;
+            int i_devices = [o_devices count];
+        
+            if ( i_devices )
+            {
+                int i;
         
-            for( i = 0; i < i_devices; i++ )
+                for( i = 0; i < i_devices; i++ )
+                {
+                    [o_disc_device 
+                        addItemWithObjectValue: [o_devices objectAtIndex: i]];
+                }
+
+                [o_disc_device selectItemAtIndex: 0];
+            }
+            else
             {
-                [o_disc_device 
-                    addItemWithObjectValue: [o_devices objectAtIndex: i]];
+                [o_disc_device setStringValue: 
+                    [NSString stringWithFormat: _NS("No %@s found"), o_disc]];
             }
-            
-            [o_disc_device selectItemAtIndex: 0];
-        }
-        else
-        {
-            [o_disc_device setStringValue: 
-                [NSString stringWithFormat: @"No %@s found", o_type]];
         }
     }
 
+    [o_disc_device setEnabled: b_device];
+    [o_disc_title setEnabled: b_title_chapter];
+    [o_disc_title_stp setEnabled: b_title_chapter];
+    [o_disc_chapter setEnabled: b_title_chapter];
+    [o_disc_chapter_stp setEnabled: b_title_chapter];
+    [o_disc_videots_folder setEnabled: !b_device];
+    [o_disc_videots_btn_browse setEnabled: !b_device];
+    [o_disc_dvd_menus setEnabled: b_menus];
+
     [self openDiscInfoChanged: nil];
 }
 
@@ -330,20 +522,76 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 {
     NSString *o_type;
     NSString *o_device;
+    NSString *o_videots;
     NSString *o_mrl_string;
     int i_title, i_chapter;
+    vlc_bool_t b_menus;
 
     o_type = [[o_disc_type selectedCell] title];
     o_device = [o_disc_device stringValue];
     i_title = [o_disc_title intValue];
     i_chapter = [o_disc_chapter intValue];
-    
-    o_mrl_string = [NSString stringWithFormat: @"%@://%@@%i,%i",
-        [o_type lowercaseString], o_device, i_title, i_chapter]; 
+    o_videots = [o_disc_videots_folder stringValue];
+    b_menus = [o_disc_dvd_menus state];
+
+    if ( [o_type isEqualToString: _NS("VCD")] )
+    {
+        if ( [o_device isEqualToString:
+                [NSString stringWithFormat: _NS("No %@s found"), o_type]] )
+            o_device = @"";
+        o_mrl_string = [NSString stringWithFormat: @"vcd://%@@%i,%i",
+                        o_device, i_title, i_chapter]; 
+    }
+    else if ( [o_type isEqualToString: _NS("DVD")] )
+    {
+        if ( [o_device isEqualToString:
+                [NSString stringWithFormat: _NS("No %@s found"), o_type]] )
+            o_device = @"";
+        if ( b_menus )
+            o_mrl_string = [NSString stringWithFormat: @"dvdplay://%@",
+                            o_device]; 
+        else
+            o_mrl_string = [NSString stringWithFormat: @"dvdold://%@@%i,%i",
+                            o_device, i_title, i_chapter]; 
+    }
+    else /* VIDEO_TS folder */
+    {
+        if ( b_menus )
+            o_mrl_string = [NSString stringWithFormat: @"dvdplay://%@",
+                            o_videots]; 
+        else
+            o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i,%i",
+                            o_videots, i_title, i_chapter]; 
+    }
 
     [o_mrl setStringValue: o_mrl_string]; 
 }
 
+- (IBAction)openDiscMenusChanged:(id)sender
+{
+    [self openDiscInfoChanged: nil];
+    [self openDiscTypeChanged: nil];
+}
+
+- (IBAction)openVTSBrowse:(id)sender
+{
+    NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
+
+    [o_open_panel setAllowsMultipleSelection: NO];
+    [o_open_panel setCanChooseFiles: NO];
+    [o_open_panel setCanChooseDirectories: YES];
+    [o_open_panel setTitle: _NS("Open VIDEO_TS Directory")];
+    [o_open_panel setPrompt: _NS("Open")];
+
+    if( [o_open_panel runModalForDirectory: nil
+            file: nil types: nil] == NSOKButton )
+    {
+        NSString *o_dirname = [[o_open_panel filenames] objectAtIndex: 0];
+        [o_disc_videots_folder setStringValue: o_dirname];
+        [self openDiscInfoChanged: nil];
+    }
+}
+
 - (IBAction)openNetModeChanged:(id)sender
 {
     NSString *o_mode;
@@ -354,10 +602,10 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 
     o_mode = [[o_net_mode selectedCell] title];
 
-    if( [o_mode isEqualToString: @"UDP"] ) b_udp = TRUE;   
-    else if( [o_mode isEqualToString: @"UDP Multicast"] ) b_udpm = TRUE;
-    else if( [o_mode isEqualToString: @"Channel server"] ) b_cs = TRUE;
-    else if( [o_mode isEqualToString: @"HTTP"] ) b_http = TRUE;
+    if( [o_mode isEqualToString: _NS("UDP/RTP")] ) b_udp = TRUE;   
+    else if( [o_mode isEqualToString: _NS("UDP/RTP Multicast")] ) b_udpm = TRUE;
+    else if( [o_mode isEqualToString: _NS("Channel server")] ) b_cs = TRUE;
+    else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS")] ) b_http = TRUE;
 
     [o_net_udp_port setEnabled: b_udp];
     [o_net_udp_port_stp setEnabled: b_udp];
@@ -401,35 +649,35 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 
     o_mode = [[o_net_mode selectedCell] title];
 
-    b_channel = (vlc_bool_t)[o_mode isEqualToString: @"Channel server"]; 
+    b_channel = (vlc_bool_t)[o_mode isEqualToString: _NS("Channel server")]; 
     config_PutInt( p_intf, "network-channel", b_channel );
 
-    if( [o_mode isEqualToString: @"UDP"] )
+    if( [o_mode isEqualToString: _NS("UDP/RTP")] )
     {
         int i_port = [o_net_udp_port intValue];
 
         o_mrl_string = [NSString stringWithString: @"udp://"]; 
 
-        if( i_port != 1234 )
+        if( i_port != config_GetInt( p_intf, "server-port" ) )
         {
             o_mrl_string = 
                 [o_mrl_string stringByAppendingFormat: @"@:%i", i_port]; 
         } 
     }
-    else if( [o_mode isEqualToString: @"UDP Multicast"] ) 
+    else if( [o_mode isEqualToString: _NS("UDP/RTP Multicast")] ) 
     {
         NSString *o_addr = [o_net_udpm_addr stringValue];
         int i_port = [o_net_udpm_port intValue];
 
         o_mrl_string = [NSString stringWithFormat: @"udp://@%@", o_addr]; 
 
-        if( i_port != 1234 )
+        if( i_port != config_GetInt( p_intf, "server-port" ) )
         {
             o_mrl_string = 
                 [o_mrl_string stringByAppendingFormat: @":%i", i_port]; 
         } 
     }
-    else if( [o_mode isEqualToString: @"Channel server"] )
+    else if( [o_mode isEqualToString: _NS("Channel server")] )
     {
         NSString *o_addr = [o_net_cs_addr stringValue];
         int i_port = [o_net_cs_port intValue];
@@ -448,28 +696,161 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
         /* FIXME: we should use a playlist server instead */
         o_mrl_string = [NSString stringWithString: @"udp://"];
     }
-    else if( [o_mode isEqualToString: @"HTTP"] )
+    else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS")] )
     {
         NSString *o_url = [o_net_http_url stringValue];
 
-        o_mrl_string = [NSString stringWithFormat: @"http://%@", o_url];
+        if ( ![o_url hasPrefix:@"http:"] && ![o_url hasPrefix:@"ftp:"]
+              && ![o_url hasPrefix:@"mms"] )
+            o_mrl_string = [NSString stringWithFormat: @"http://%@", o_url];
+        else
+            o_mrl_string = o_url;
     }
 
     [o_mrl setStringValue: o_mrl_string];
 }
 
-- (IBAction)openFileBrowse:(id)sender
+- (IBAction)soutChanged:(id)sender;
+{
+    [self soutModeChanged: nil];
+
+    if ( [o_sout_cbox state] )
+    {
+        NSPoint s_point;
+        s_point.x = 0;
+        s_point.y = 0;
+        [[o_panel contentView] setBoundsOrigin: s_point];
+        [[o_panel contentView] setNeedsDisplay: YES];
+
+        NSRect s_rect = [o_panel frame];
+        s_rect.size.height = OPEN_PANEL_FULL_HEIGHT + WINDOW_TITLE_HEIGHT;
+        s_rect.origin.y -= OPEN_PANEL_FULL_HEIGHT - OPEN_PANEL_SHORT_HEIGHT;
+        [o_panel setFrame: s_rect display: YES animate: NO];
+    }
+    else
+    {
+        NSPoint s_point;
+        s_point.x = 0;
+        s_point.y = OPEN_PANEL_FULL_HEIGHT - OPEN_PANEL_SHORT_HEIGHT;
+        [[o_panel contentView] setBoundsOrigin: s_point];
+        [[o_panel contentView] setNeedsDisplay: YES];
+
+        NSRect s_rect = [o_panel frame];
+        s_rect.size.height = OPEN_PANEL_SHORT_HEIGHT + WINDOW_TITLE_HEIGHT;
+        s_rect.origin.y += OPEN_PANEL_FULL_HEIGHT - OPEN_PANEL_SHORT_HEIGHT;
+        [o_panel setFrame: s_rect display: YES animate:NO];
+    }
+}
+
+- (IBAction)soutFileBrowse:(id)sender
+{
+    NSSavePanel *o_save_panel = [NSSavePanel savePanel];
+    NSString *o_mux_string;
+    if ( [[[o_sout_mux selectedCell] title] isEqualToString: _NS("PS")] )
+        o_mux_string = @"vob";
+    else
+        o_mux_string = @"ts";
+
+    NSString * o_name = [NSString stringWithFormat: @"vlc-output.%@",
+                         o_mux_string];
+
+    [o_save_panel setTitle: _NS("Save File")];
+    [o_save_panel setPrompt: _NS("Save")];
+
+    if( [o_save_panel runModalForDirectory: nil
+            file: o_name] == NSOKButton )
+    {
+        NSString *o_filename = [o_save_panel filename];
+        [o_sout_file_path setStringValue: o_filename];
+        [self soutInfoChanged: nil];
+    }
+}
+
+- (void)soutModeChanged:(NSNotification *)o_notification
+{
+    NSString *o_mode;
+    BOOL b_file = FALSE;
+    BOOL b_net = FALSE;
+
+    o_mode = [[o_sout_access selectedCell] title];
+
+    if( [o_mode isEqualToString: _NS("File")] ) b_file = TRUE;   
+    else if( [o_mode isEqualToString: _NS("UDP")] ) b_net = TRUE;
+    else if( [o_mode isEqualToString: _NS("RTP")] ) b_net = TRUE;
+
+    [o_sout_file_path setEnabled: b_file];
+    [o_sout_file_btn_browse setEnabled: b_file];
+    [o_sout_udp_addr setEnabled: b_net];
+    [o_sout_udp_port setEnabled: b_net];
+    [o_sout_udp_port_stp setEnabled: b_net];
+    [[o_sout_mux cellAtRow:0 column: 0] setEnabled: !b_net];
+    [[o_sout_mux cellAtRow:0 column: 1] setEnabled: !b_net];
+
+    if ( b_net )
+    {
+        [[o_sout_mux cellAtRow: 0 column:2] setState: YES];
+    }
+
+    [self soutInfoChanged: nil];
+}
+
+- (void)soutInfoChanged:(NSNotification *)o_notification
+{
+    NSString *o_mode;
+    NSString *o_mux;
+    NSString *o_mrl_string;
+    NSString *o_mux_string;
+
+    o_mode = [[o_sout_access selectedCell] title];
+    o_mux = [[o_sout_mux selectedCell] title];
+
+    if ( [o_mux isEqualToString: _NS("AVI")] ) o_mux_string = @"avi";
+    else if ( [o_mux isEqualToString: _NS("PS")] ) o_mux_string = @"ps";
+    else o_mux_string = @"ts";
+
+    if ( [o_mode isEqualToString: _NS("File")] )
+    {
+        o_mrl_string = [NSString stringWithFormat: @"file/%@://%@",
+                        o_mux_string, [o_sout_file_path stringValue]];
+    }
+    else if ( [o_mode isEqualToString: _NS("UDP")] )
+    {
+        o_mrl_string = [NSString stringWithFormat: @"udp/%@://%@:%i",
+                        o_mux_string, [o_sout_udp_addr stringValue],
+                        [o_sout_udp_port intValue]];
+    }
+    else
+    {
+        o_mrl_string = [NSString stringWithFormat: @"rtp/%@://%@:%i",
+                        o_mux_string, [o_sout_udp_addr stringValue],
+                        [o_sout_udp_port intValue]];
+    }
+
+
+    [o_sout_mrl setStringValue: o_mrl_string];
+}
+
+- (IBAction)soutStepperChanged:(id)sender
+{
+    [o_sout_udp_port setIntValue: [o_net_udp_port_stp intValue]];
+
+    [self soutInfoChanged: nil];
+}
+
+- (IBAction)openFile:(id)sender
 {
     NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
     
-    [o_open_panel setAllowsMultipleSelection: NO];
-
-    if( [o_open_panel runModalForDirectory: nil 
+    [o_open_panel setAllowsMultipleSelection: YES];
+    [o_open_panel setTitle: _NS("Open File")];
+    [o_open_panel setPrompt: _NS("Open")];
+    
+    if( [o_open_panel runModalForDirectory: nil
             file: nil types: nil] == NSOKButton )
     {
-        NSString *o_filename = [[o_open_panel filenames] objectAtIndex: 0];
-        [o_file_path setStringValue: o_filename];
-        [self openFilePathChanged: nil];
+        intf_thread_t * p_intf = [NSApp getIntf];
+        config_PutPsz( p_intf, "sout", NULL );
+        [o_playlist appendArray: [o_open_panel filenames] atPos: -1 enqueue:NO];
     }
 }
 
@@ -491,3 +872,45 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 }
 
 @end
+
+@implementation VLGetURLScriptCommand
+
+- (id)performDefaultImplementation {
+    NSString *o_command = [[self commandDescription] commandName];
+    NSString *o_urlString = [self directParameter];
+
+    NSLog(@"test1");
+    if ( [o_command isEqualToString:@"GetURL"] || [o_command isEqualToString:@"OpenURL"] )
+    {
+        intf_thread_t * p_intf = [NSApp getIntf];
+        NSLog( o_command );
+        playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+                                                        FIND_ANYWHERE );
+        if( p_playlist == NULL )
+        {
+            return nil;
+        }
+
+        if ( o_urlString )
+        {
+            NSURL * o_url;
+    
+            int i_mode = PLAYLIST_INSERT | PLAYLIST_GO;
+            
+            playlist_Add( p_playlist, [o_urlString fileSystemRepresentation],
+                                                    i_mode, PLAYLIST_END );
+            NSLog( o_urlString );
+            o_url = [NSURL fileURLWithPath: o_urlString];
+            if( o_url != nil )
+            { 
+                [[NSDocumentController sharedDocumentController]
+                    noteNewRecentDocumentURL: o_url]; 
+            }
+        }
+        vlc_object_release( p_playlist );
+    }
+    return nil;
+}
+
+@end
+