]> git.sesse.net Git - vlc/blobdiff - modules/gui/macosx/open.m
MacOS: more compile fixes
[vlc] / modules / gui / macosx / open.m
index 6b99d5b76df6651b95ff909e8e2f065535b6639f..030742625d8361700ca31708f51b12750bd3ae05 100644 (file)
@@ -1,18 +1,20 @@
 /*****************************************************************************
- * open.m: MacOS X plugin for vlc
+ * open.m: Open dialogues for VLC's MacOS X port
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: open.m,v 1.21 2003/02/05 22:48:13 hartman Exp $
+ * Copyright (C) 2002-2009 the VideoLAN team
+ * $Id$
  *
- * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
+ * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
  *          Derk-Jan Hartman <thedj@users.sourceforge.net>
+ *          Benjamin Pracht <bigben at videolan dot org>
+ *          Felix Paul Kühne <fkuehne at videolan dot org>
  *
  * 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
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -20,7 +22,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
 #include <IOKit/storage/IOCDMedia.h>
 #include <IOKit/storage/IODVDMedia.h>
 
-#include "intf.h"
-#include "playlist.h"
-#include "open.h"
+#import "intf.h"
+#import "playlist.h"
+#import "open.h"
+#import "output.h"
+#import "eyetv.h"
+
+#include <vlc_url.h>
+
+#define setEyeTVUnconnected \
+[o_capture_lbl setStringValue: _NS("No device connected")]; \
+[o_capture_long_lbl setStringValue: _NS("VLC could not detect any EyeTV compatible device.\n\nCheck the device's connection, make sure that the latest EyeTV software is installed and try again.")]; \
+[o_capture_lbl displayIfNeeded]; \
+[o_capture_long_lbl displayIfNeeded]; \
+[self showCaptureView: o_capture_label_view]
 
-#include "netutils.h"
 
 /*****************************************************************************
- * GetEjectableMediaOfClass 
+ * GetEjectableMediaOfClass
  *****************************************************************************/
 NSArray *GetEjectableMediaOfClass( const char *psz_class )
 {
@@ -61,17 +73,17 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     {
         return( nil );
     }
-    
     classes_to_match = IOServiceMatching( psz_class );
     if( classes_to_match == NULL )
     {
         return( nil );
     }
-    
-    CFDictionarySetValue( classes_to_match, CFSTR( kIOMediaEjectable ), 
+    CFDictionarySetValue( classes_to_match, CFSTR( kIOMediaEjectableKey ),
                           kCFBooleanTrue );
-    
-    kern_result = IOServiceGetMatchingServices( master_port, classes_to_match, 
+    kern_result = IOServiceGetMatchingServices( master_port, classes_to_match,
                                                 &media_iterator );
     if( kern_result != KERN_SUCCESS )
     {
@@ -79,18 +91,18 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     }
 
     p_list = [NSMutableArray arrayWithCapacity: 1];
-    
     next_media = IOIteratorNext( media_iterator );
-    if( next_media != NULL )
+    if( next_media )
     {
         char psz_buf[0x32];
         size_t dev_path_length;
         CFTypeRef str_bsd_path;
-    
         do
         {
             str_bsd_path = IORegistryEntryCreateCFProperty( next_media,
-                                                            CFSTR( kIOBSDName ),
+                                                            CFSTR( kIOBSDNameKey ),
                                                             kCFAllocatorDefault,
                                                             0 );
             if( str_bsd_path == NULL )
@@ -98,25 +110,25 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
                 IOObjectRelease( next_media );
                 continue;
             }
-            
             snprintf( psz_buf, sizeof(psz_buf), "%s%c", _PATH_DEV, 'r' );
             dev_path_length = strlen( psz_buf );
-            
             if( CFStringGetCString( str_bsd_path,
                                     (char*)&psz_buf + dev_path_length,
                                     sizeof(psz_buf) - dev_path_length,
                                     kCFStringEncodingASCII ) )
             {
-                [p_list addObject: [NSString stringWithCString: psz_buf]];
+                [p_list addObject: [NSString stringWithUTF8String: psz_buf]];
             }
-            
             CFRelease( str_bsd_path );
-            
             IOObjectRelease( next_media );
-        
-        } while( ( next_media = IOIteratorNext( media_iterator ) ) != NULL );
+        } while( ( next_media = IOIteratorNext( media_iterator ) ) );
     }
-    
     IOObjectRelease( media_iterator );
 
     o_devices = [NSArray arrayWithArray: p_list];
@@ -125,100 +137,109 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 }
 
 /*****************************************************************************
- * VLCOpen implementation 
+ * VLCOpen implementation
  *****************************************************************************/
 @implementation VLCOpen
 
-- (void)awakeFromNib
-{
-    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];
+static VLCOpen *_o_sharedMainInstance = nil;
 
-        NSRect s_rect = [o_panel frame];
-        s_rect.size.height = OPEN_PANEL_FULL_HEIGHT + WINDOW_TITLE_HEIGHT;
-        [o_panel setFrame: s_rect display: NO];
++ (VLCOpen *)sharedInstance
+{
+    return _o_sharedMainInstance ? _o_sharedMainInstance : [[self alloc] init];
+}
 
-        NSPoint s_point;
-        s_point.x = 0;
-        s_point.y = 0;
-        [[o_panel contentView] setBoundsOrigin: s_point];
+- (id)init
+{
+    if( _o_sharedMainInstance) {
+        [self dealloc];
+    } else {
+        _o_sharedMainInstance = [super init];
+        p_intf = VLCIntf;
     }
-    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];
+    return _o_sharedMainInstance;
+}
 
-        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);
+- (void)dealloc
+{
+    if( o_file_slave_path )
+        [o_file_slave_path release];
+    [super dealloc];
+}
 
+- (void)awakeFromNib
+{
     [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_mrl_lbl setStringValue: _NS("Media Resource Locator (MRL)")];
 
-    [o_btn_ok setTitle: _NS("OK")];
+    [o_btn_ok setTitle: _NS("Open")];
     [o_btn_cancel setTitle: _NS("Cancel")];
 
     [[o_tabview tabViewItemAtIndex: 0] setLabel: _NS("File")];
     [[o_tabview tabViewItemAtIndex: 1] setLabel: _NS("Disc")];
     [[o_tabview tabViewItemAtIndex: 2] setLabel: _NS("Network")];
+    [[o_tabview tabViewItemAtIndex: 3] setLabel: _NS("Capture")];
 
     [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")];
+    [o_file_slave_ckbox setTitle: _NS("Play another media synchronously")];
+    [o_file_slave_select_btn setTitle: _NS("Choose...")];
+    [o_file_slave_filename_txt setStringValue: @""];
 
     [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_dvd_menus setTitle: _NS("No DVD menus")];
 
     [[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_disc_type cellAtRow:3 column:0] setTitle: _NS("Audio CD")];
 
     [o_net_udp_port_lbl setStringValue: _NS("Port")];
-    [o_net_udpm_addr_lbl setStringValue: _NS("Address")];
+    [o_net_udpm_addr_lbl setStringValue: _NS("IP Address")];
     [o_net_udpm_port_lbl setStringValue: _NS("Port")];
-    [o_net_cs_addr_lbl setStringValue: _NS("Address")];
-    [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_help_lbl setStringValue: _NS("To Open a usual network stream (HTTP, RTSP, RTMP, MMS, FTP, etc.), just enter the URL in the field above. If you want to open a RTP or UDP stream, press the button below.")];
+    [o_net_help_udp_lbl setStringValue: _NS("If you want to open a multicast stream, enter the respective IP address given by the stream provider. In unicast mode, VLC will use your machine's IP automatically.\n\nTo open a stream using a different protocol, just press Cancel to close this sheet.")];
+    [o_net_udp_cancel_btn setTitle: _NS("Cancel")];
+    [o_net_udp_ok_btn setTitle: _NS("Open")];
+    [o_net_openUDP_btn setTitle: _NS("Open RTP/UDP Stream")];
+    [o_net_udp_mode_lbl setStringValue: _NS("Mode")];
+    [o_net_udp_protocol_lbl setStringValue: _NS("Protocol")];
+    [o_net_udp_address_lbl setStringValue: _NS("Address")];
+
+    [[o_net_mode cellAtRow:0 column:0] setTitle: _NS("Unicast")];
+    [[o_net_mode cellAtRow:1 column:0] setTitle: _NS("Multicast")];
 
     [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")];
+    [o_eyetv_chn_bgbar setUsesThreadedAnimation: YES];
+
+    [o_capture_mode_pop removeAllItems];
+    [o_capture_mode_pop addItemWithTitle: @"iSight"];
+    [o_capture_mode_pop addItemWithTitle: _NS("Screen")];
+    [o_capture_mode_pop addItemWithTitle: @"EyeTV"];
+    [o_screen_lbl setStringValue: _NS("Screen Capture Input")];
+    [o_screen_long_lbl setStringValue: _NS("This facility allows you to process your screen's output.")];
+    [o_screen_fps_lbl setStringValue: _NS("Frames per Second:")];
+    [o_screen_left_lbl setStringValue: _NS("Subscreen left:")];
+    [o_screen_top_lbl setStringValue: _NS("Subscreen top:")];
+    [o_screen_width_lbl setStringValue: _NS("Subscreen width:")];
+    [o_screen_height_lbl setStringValue: _NS("Subscreen height:")];
+    [o_screen_follow_mouse_ckb setTitle: _NS("Follow the mouse")];
+    [o_eyetv_currentChannel_lbl setStringValue: _NS("Current channel:")];
+    [o_eyetv_previousProgram_btn setTitle: _NS("Previous Channel")];
+    [o_eyetv_nextProgram_btn setTitle: _NS("Next Channel")];
+    [o_eyetv_chn_status_txt setStringValue: _NS("Retrieving Channel Info...")];
+    [o_eyetv_noInstance_lbl setStringValue: _NS("EyeTV is not launched")];
+    [o_eyetv_noInstanceLong_lbl setStringValue: _NS("VLC could not connect to EyeTV.\nMake sure that you installed VLC's EyeTV plugin.")];
+    [o_eyetv_launchEyeTV_btn setTitle: _NS("Launch EyeTV now")];
+    [o_eyetv_getPlugin_btn setTitle: _NS("Download Plugin")];
+
+    [self setSubPanel];
 
     [[NSNotificationCenter defaultCenter] addObserver: self
         selector: @selector(openFilePathChanged:)
@@ -254,69 +275,173 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
         selector: @selector(openNetInfoChanged:)
         name: NSControlTextDidChangeNotification
         object: o_net_udpm_port];
-    [[NSNotificationCenter defaultCenter] addObserver: self
-        selector: @selector(openNetInfoChanged:)
-        name: NSControlTextDidChangeNotification
-        object: o_net_cs_addr];
-    [[NSNotificationCenter defaultCenter] addObserver: self
-        selector: @selector(openNetInfoChanged:)
-        name: NSControlTextDidChangeNotification
-        object: o_net_cs_port];
     [[NSNotificationCenter defaultCenter] addObserver: self
         selector: @selector(openNetInfoChanged:)
         name: NSControlTextDidChangeNotification
         object: o_net_http_url];
 
+    [[NSDistributedNotificationCenter defaultCenter] addObserver: self
+                                                        selector: @selector(eyetvChanged:)
+                                                            name: NULL
+                                                          object: @"VLCEyeTVSupport"
+                                              suspensionBehavior: NSNotificationSuspensionBehaviorDeliverImmediately];
+
     [[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];
+                                             selector: @selector(screenFPSfieldChanged:)
+                                                 name: NSControlTextDidChangeNotification
+                                               object: o_screen_fps_fld];
+
+    /* register clicks on text fields */
     [[NSNotificationCenter defaultCenter] addObserver: self
-        selector: @selector(soutInfoChanged:)
-        name: NSControlTextDidChangeNotification
-        object: o_sout_udp_port];
+                                             selector: @selector(textFieldWasClicked:)
+                                                 name: @"VLCOpenTextFieldWasClicked"
+                                               object: nil];
+}
+
+- (void)setSubPanel
+{
+    int i_index;
+    module_config_t * p_item;
+
+    [o_file_sub_ckbox setTitle: _NS("Load subtitles file:")];
+    [o_file_sub_btn_settings setTitle: _NS("Settings...")];
+    [o_file_sub_btn_browse setTitle: _NS("Browse...")];
+    [o_file_sub_override setTitle: _NS("Override parametters")];
+    [o_file_sub_delay_lbl setStringValue: _NS("Delay")];
+    [o_file_sub_delay_stp setEnabled: NO];
+    [o_file_sub_fps_lbl setStringValue: _NS("FPS")];
+    [o_file_sub_fps_stp setEnabled: NO];
+    [o_file_sub_encoding_lbl setStringValue: _NS("Subtitles encoding")];
+    [o_file_sub_encoding_pop removeAllItems];
+    [o_file_sub_size_lbl setStringValue: _NS("Font size")];
+    [o_file_sub_size_pop removeAllItems];
+    [o_file_sub_align_lbl setStringValue: _NS("Subtitles alignment")];
+    [o_file_sub_align_pop removeAllItems];
+    [o_file_sub_ok_btn setStringValue: _NS("OK")];
+    [o_file_sub_font_box setTitle: _NS("Font Properties")];
+    [o_file_sub_file_box setTitle: _NS("Subtitle File")];
+
+    p_item = config_FindConfig( VLC_OBJECT(p_intf), "subsdec-encoding" );
+
+    if( p_item )
+    {
+        for( i_index = 0; p_item->ppsz_list && p_item->ppsz_list[i_index];
+             i_index++ )
+        {
+            [o_file_sub_encoding_pop addItemWithTitle:
+                [NSString stringWithUTF8String: p_item->ppsz_list[i_index]]];
+        }
+        [o_file_sub_encoding_pop selectItemWithTitle:
+                [NSString stringWithUTF8String: p_item->value.psz]];
+    }
+
+    p_item = config_FindConfig( VLC_OBJECT(p_intf), "subsdec-align" );
+
+    if ( p_item )
+    {
+        for ( i_index = 0; i_index < p_item->i_list; i_index++ )
+        {
+            [o_file_sub_align_pop addItemWithTitle:
+                [NSString stringWithUTF8String:
+                p_item->ppsz_list_text[i_index]]];
+        }
+        [o_file_sub_align_pop selectItemAtIndex: p_item->value.i];
+    }
+
+    p_item = config_FindConfig( VLC_OBJECT(p_intf), "freetype-rel-fontsize" );
+
+    if ( p_item )
+    {
+        for ( i_index = 0; i_index < p_item->i_list; i_index++ )
+        {
+            [o_file_sub_size_pop addItemWithTitle:
+                [NSString stringWithUTF8String:
+                p_item->ppsz_list_text[i_index]]];
+            if ( p_item->value.i == p_item->pi_list[i_index] )
+            {
+                [o_file_sub_size_pop selectItemAtIndex: i_index];
+            }
+        }
+    }
 }
 
 - (void)openTarget:(int)i_type
 {
     int i_result;
 
+    b_autoplay = config_GetInt( VLCIntf, "macosx-autoplay" );
+
     [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_sout = [o_sout_mrl stringValue];
-        intf_thread_t * p_intf = [NSApp getIntf];
-        
-        if ( [o_sout_cbox state] )
+        NSMutableDictionary *o_dic;
+        NSMutableArray *o_options = [NSMutableArray array];
+        unsigned int i;
+
+        o_dic = [NSMutableDictionary dictionaryWithObject: [o_mrl stringValue] forKey: @"ITEM_URL"];
+        if( [o_file_sub_ckbox state] == NSOnState )
+        {
+            module_config_t * p_item;
+
+            [o_options addObject: [NSString stringWithFormat: @"sub-file=%@", [o_file_sub_path stringValue]]];
+            if( [o_file_sub_override state] == NSOnState )
+            {
+                [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]]];
+            }
+            [o_options addObject: [NSString stringWithFormat:
+                    @"subsdec-encoding=%@",
+                    [o_file_sub_encoding_pop titleOfSelectedItem]]];
+            [o_options addObject: [NSString stringWithFormat:
+                    @"subsdec-align=%i",
+                    [o_file_sub_align_pop indexOfSelectedItem]]];
+
+            p_item = config_FindConfig( VLC_OBJECT(p_intf),
+                                            "freetype-rel-fontsize" );
+
+            if ( p_item )
+            {
+                [o_options addObject: [NSString stringWithFormat:
+                    @"freetype-rel-fontsize=%i",
+                    p_item->pi_list[[o_file_sub_size_pop indexOfSelectedItem]]]];
+            }
+        }
+        if( [o_output_ckbox state] == NSOnState )
+        {
+            for (i = 0 ; i < [[o_sout_options mrl] count] ; i++)
+            {
+                [o_options addObject: [NSString stringWithString:
+                      [[(VLCOutput *)o_sout_options mrl] objectAtIndex: i]]];
+            }
+        }
+        if( [o_file_slave_ckbox state] && o_file_slave_path )
+           [o_options addObject: [NSString stringWithFormat: @"input-slave=%@", o_file_slave_path]];
+        if( [[[o_tabview selectedTabViewItem] label] isEqualToString: _NS("Capture")] )
         {
-            config_PutPsz( p_intf, "sout", [o_sout lossyCString] );
+            if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Screen")] )
+                [o_options addObject: [NSString stringWithFormat: @"screen-fps=%f", [o_screen_fps_fld floatValue]]];
+                [o_options addObject: [NSString stringWithFormat: @"screen-left=%i", [o_screen_left_fld intValue]]];
+                [o_options addObject: [NSString stringWithFormat: @"screen-top=%i", [o_screen_top_fld intValue]]];
+                [o_options addObject: [NSString stringWithFormat: @"screen-width=%i", [o_screen_width_fld intValue]]];
+                [o_options addObject: [NSString stringWithFormat: @"screen-height=%i", [o_screen_height_fld intValue]]];
+                if( [o_screen_follow_mouse_ckb intValue] == YES )
+                    [o_options addObject: @"screen-follow-mouse"];
+                else
+                    [o_options addObject: @"no-screen-follow-mouse"];
         }
 
-        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 enqueue:b_enq];
-        
-        if (([o_file_sub_ckbox state] == NSOnState) && !([subPath isEqualTo: @""]))
-            config_PutPsz( p_intf, "sub-file", strdup( [subPath cString] ) );
+        /* apply the options to our item(s) */
+        [o_dic setObject: (NSArray *)[o_options copy] forKey: @"ITEM_OPTIONS"];
+        if( b_autoplay )
+            [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue:NO];
+        else
+            [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue:YES];
     }
-
-    [self soutModeChanged: nil];
 }
 
 - (void)tabView:(NSTabView *)o_tv didSelectTabViewItem:(NSTabViewItem *)o_tvi
@@ -333,63 +458,151 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     }
     else if( [o_label isEqualToString: _NS("Network")] )
     {
-        [self openNetModeChanged: nil];
-    }  
+        [self openNetInfoChanged: nil];
+    }
+    else if( [o_label isEqualToString: _NS("Capture")] )
+    {
+        [self openCaptureModeChanged: nil];
+    }
+}
+
+- (IBAction)expandMRLfieldAction:(id)sender
+{
+    NSRect o_win_rect, o_view_rect;
+    o_win_rect = [o_panel frame];
+    o_view_rect = [o_mrl_view frame];
+
+    if( [o_mrl_btn state] == NSOffState )
+    {
+        /* we need to collaps, restore the panel size */
+        o_win_rect.size.height = o_win_rect.size.height - o_view_rect.size.height;
+        o_win_rect.origin.y = ( o_win_rect.origin.y + o_view_rect.size.height ) - o_view_rect.size.height;
+
+        /* remove the MRL view */
+        [o_mrl_view removeFromSuperviewWithoutNeedingDisplay];
+    } else {
+        /* we need to expand */
+        [o_mrl_view setFrame: NSMakeRect( 0,
+                                         [o_mrl_btn frame].origin.y,
+                                         o_view_rect.size.width,
+                                         o_view_rect.size.height )];
+        [o_mrl_view setNeedsDisplay: YES];
+        [o_mrl_view setAutoresizesSubviews: YES];
+
+        /* add the MRL view */
+        [[o_panel contentView] addSubview: o_mrl_view];
+        o_win_rect.size.height = o_win_rect.size.height + o_view_rect.size.height;
+    }
+
+    [o_panel setFrame: o_win_rect display:YES animate: YES];
+    [o_panel displayIfNeeded];
+}
+
+- (IBAction)inputSlaveAction:(id)sender
+{
+    if( sender == o_file_slave_ckbox )
+        [o_file_slave_select_btn setEnabled: [o_file_slave_ckbox state]];
+    else
+    {
+        NSOpenPanel *o_open_panel;
+        o_open_panel = [NSOpenPanel openPanel];
+        [o_open_panel setCanChooseFiles: YES];
+        [o_open_panel setCanChooseDirectories: NO];
+        if( [o_open_panel runModalForDirectory: nil file: nil types: nil] == NSOKButton )
+        {
+            if( o_file_slave_path )
+                [o_file_slave_path release];
+            o_file_slave_path = [[o_open_panel filenames] objectAtIndex: 0];
+            [o_file_slave_path retain];
+        }
+        else
+            [o_file_slave_filename_txt setStringValue: @""];
+    }
+    if( o_file_slave_path )
+    {
+        NSFileWrapper *o_file_wrapper;
+        o_file_wrapper = [[NSFileWrapper alloc] initWithPath: o_file_slave_path];
+        [o_file_slave_filename_txt setStringValue: [NSString stringWithFormat: @"\"%@\"", [o_file_wrapper preferredFilename]]];
+        [o_file_wrapper release];
+    }
 }
 
-- (IBAction)openFileGeneric:(id)sender
+- (void)openFileGeneric
 {
     [self openFilePathChanged: nil];
     [self openTarget: 0];
 }
 
-- (IBAction)openDisc:(id)sender
+- (void)openDisc
 {
     [self openDiscTypeChanged: nil];
     [self openTarget: 1];
 }
 
-- (IBAction)openNet:(id)sender
+- (void)openNet
 {
-    [self openNetModeChanged: nil];
+    [self openNetInfoChanged: nil];
     [self openTarget: 2];
 }
 
+- (void)openCapture
+{
+    [self openCaptureModeChanged: nil];
+    [self showCaptureView: o_capture_label_view];
+    [self openTarget: 3];
+}
+
 - (void)openFilePathChanged:(NSNotification *)o_notification
 {
-    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];
+    bool b_stream = [o_file_stream state];
+    BOOL b_dir = NO;
+
+    [[NSFileManager defaultManager] fileExistsAtPath:o_filename isDirectory:&b_dir];
+
+    char *psz_uri = make_URI([o_filename UTF8String], "file");
+    if( !psz_uri ) return;
+
+    NSMutableString *o_mrl_string = [NSMutableString stringWithUTF8String: psz_uri ];
+    NSRange offile = [o_mrl_string rangeOfString:@"file"];
+    free( psz_uri );
 
-    if ([o_ext isEqualToString: @"bin"] ||
-        [o_ext isEqualToString: @"cue"] ||
-        [o_ext isEqualToString: @"vob"] ||
-        [o_ext isEqualToString: @"iso"])
+    if( b_dir )
     {
-        o_mrl_string = o_filename;
+        [o_mrl_string replaceCharactersInRange:offile withString: @"directory"];
     }
-    else
+    else if( b_stream )
     {
-        o_mrl_string = [NSString stringWithFormat: @"%s://%@",
-                        b_stream ? "stream" : "file",
-                        o_filename];
+        [o_mrl_string replaceCharactersInRange:offile withString: @"stream"];
     }
-    [o_mrl setStringValue: o_mrl_string]; 
+    [o_mrl setStringValue: o_mrl_string];
 }
 
 - (IBAction)openFileBrowse:(id)sender
 {
     NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
-    
     [o_open_panel setAllowsMultipleSelection: NO];
+    [o_open_panel setCanChooseDirectories: 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 )
+    [o_open_panel beginSheetForDirectory:nil
+        file:nil
+        types:nil
+        modalForWindow:[sender window]
+        modalDelegate: self
+        didEndSelector: @selector(pathChosenInPanel:
+                        withReturn:
+                        contextInfo:)
+        contextInfo: nil];
+}
+
+- (void)pathChosenInPanel: (NSOpenPanel *) sheet withReturn:(int)returnCode contextInfo:(void  *)contextInfo
+{
+    if (returnCode == NSFileHandlingPanelOKButton)
     {
-        NSString *o_filename = [[o_open_panel filenames] objectAtIndex: 0];
+        NSString *o_filename = [[sheet filenames] objectAtIndex: 0];
         [o_file_path setStringValue: o_filename];
         [self openFilePathChanged: nil];
     }
@@ -400,83 +613,56 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     [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;
-    vlc_bool_t b_device, b_menus, b_title_chapter;
-    
+    BOOL b_device, b_no_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: _NS("VIDEO_TS folder")] )
     {
-        b_device = 0; b_menus = 1;
+        b_device = NO; b_no_menus = YES;
     }
     else
     {
         NSArray *o_devices;
         NSString *o_disc;
         const char *psz_class = NULL;
-        b_device = 1;
+        b_device = YES;
 
         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];
+            b_no_menus = NO; b_title_chapter = YES;
+               }
+        else if ( [o_type isEqualToString: _NS("Audio CD")])
+        {
+            psz_class = kIOCDMediaClass;
+            o_disc = o_type;
+            b_no_menus = NO; b_title_chapter = NO;
         }
         else
         {
             psz_class = kIODVDMediaClass;
             o_disc = o_type;
-            b_menus = 1;
+            b_no_menus = YES;
         }
-    
         o_devices = GetEjectableMediaOfClass( psz_class );
         if ( o_devices != nil )
         {
             int i_devices = [o_devices count];
-        
             if ( i_devices )
             {
-                int i;
-        
-                for( i = 0; i < i_devices; i++ )
+                               for( int i = 0; i < i_devices; i++ )
                 {
-                    [o_disc_device 
+                    [o_disc_device
                         addItemWithObjectValue: [o_devices objectAtIndex: i]];
                 }
 
@@ -484,7 +670,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
             }
             else
             {
-                [o_disc_device setStringValue: 
+                [o_disc_device setStringValue:
                     [NSString stringWithFormat: _NS("No %@s found"), o_disc]];
             }
         }
@@ -497,7 +683,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     [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];
+    [o_disc_dvd_menus setEnabled: b_no_menus];
 
     [self openDiscInfoChanged: nil];
 }
@@ -525,46 +711,55 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     NSString *o_videots;
     NSString *o_mrl_string;
     int i_title, i_chapter;
-    vlc_bool_t b_menus;
+    BOOL b_no_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_videots = [o_disc_videots_folder stringValue];
-    b_menus = [o_disc_dvd_menus state];
+    b_no_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]; 
+        o_mrl_string = [NSString stringWithFormat: @"vcd://%@@%i:%i",
+                        o_device, i_title, i_chapter];
+    }
+    else if ( [o_type isEqualToString: _NS("Audio CD")] )
+    {
+        if ( [o_device isEqualToString:
+                [NSString stringWithFormat: _NS("No %@s found"), o_type]] )
+            o_device = @"";
+        o_mrl_string = [NSString stringWithFormat: @"cdda://%@",
+                        o_device];
     }
     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]; 
+        if ( b_no_menus )
+            o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i:%i-",
+                            o_device, i_title, i_chapter];
         else
-            o_mrl_string = [NSString stringWithFormat: @"dvdold://%@@%i,%i",
-                            o_device, i_title, i_chapter]; 
+                       o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@",
+                            o_device];
+            
     }
     else /* VIDEO_TS folder */
     {
-        if ( b_menus )
-            o_mrl_string = [NSString stringWithFormat: @"dvdplay://%@",
-                            o_videots]; 
+        if ( b_no_menus )
+            o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i:%i",
+                            o_videots, i_title, i_chapter];
         else
-            o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i,%i",
-                            o_videots, i_title, i_chapter]; 
+                       o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@",
+                            o_videots];            
     }
 
-    [o_mrl setStringValue: o_mrl_string]; 
+    [o_mrl setStringValue: o_mrl_string];
 }
 
 - (IBAction)openDiscMenusChanged:(id)sender
@@ -592,30 +787,30 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     }
 }
 
+- (void)textFieldWasClicked:(NSNotification *)o_notification
+{
+    if( [o_notification object] == o_net_udp_port )
+        [o_net_mode selectCellAtRow: 0 column: 0];
+    else if( [o_notification object] == o_net_udpm_addr ||
+             [o_notification object] == o_net_udpm_port )
+        [o_net_mode selectCellAtRow: 1 column: 0];
+    else
+        [o_net_mode selectCellAtRow: 2 column: 0];
+
+    [self openNetInfoChanged: nil];
+}
+
 - (IBAction)openNetModeChanged:(id)sender
 {
-    NSString *o_mode;
-    BOOL b_udp = FALSE;
-    BOOL b_udpm = FALSE;
-    BOOL b_cs = FALSE;
-    BOOL b_http = FALSE;
-
-    o_mode = [[o_net_mode selectedCell] title];
-
-    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];
-    [o_net_udpm_addr setEnabled: b_udpm];
-    [o_net_udpm_port setEnabled: b_udpm];
-    [o_net_udpm_port_stp setEnabled: b_udpm];
-    [o_net_cs_addr setEnabled: b_cs];
-    [o_net_cs_port setEnabled: b_cs]; 
-    [o_net_cs_port_stp setEnabled: b_cs]; 
-    [o_net_http_url setEnabled: b_http];
+    if( sender == o_net_mode )
+    {
+        if( [[sender selectedCell] tag] == 0 )
+            [o_panel makeFirstResponder: o_net_udp_port];
+        else if ( [[sender selectedCell] tag] == 1 )
+            [o_panel makeFirstResponder: o_net_udpm_addr];
+        else
+            msg_Warn( p_intf, "Unknown sender tried to change UDP/RTP mode" );
+    }
 
     [self openNetInfoChanged: nil];
 }
@@ -627,14 +822,16 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     if( i_tag == 0 )
     {
         [o_net_udp_port setIntValue: [o_net_udp_port_stp intValue]];
+        [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCOpenTextFieldWasClicked"
+                                                            object: o_net_udp_port];
+        [o_panel makeFirstResponder: o_net_udp_port];
     }
     else if( i_tag == 1 )
     {
         [o_net_udpm_port setIntValue: [o_net_udpm_port_stp intValue]];
-    }
-    else if( i_tag == 2 )
-    {
-        [o_net_cs_port setIntValue: [o_net_cs_port_stp intValue]];
+        [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCOpenTextFieldWasClicked"
+                                                            object: o_net_udpm_port];
+        [o_panel makeFirstResponder: o_net_udpm_port];
     }
 
     [self openNetInfoChanged: nil];
@@ -642,218 +839,390 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 
 - (void)openNetInfoChanged:(NSNotification *)o_notification
 {
-    NSString *o_mode;
-    vlc_bool_t b_channel;
     NSString *o_mrl_string = [NSString string];
-    intf_thread_t * p_intf = [NSApp getIntf];
-
-    o_mode = [[o_net_mode selectedCell] title];
-
-    b_channel = (vlc_bool_t)[o_mode isEqualToString: _NS("Channel server")]; 
-    config_PutInt( p_intf, "network-channel", b_channel );
 
-    if( [o_mode isEqualToString: _NS("UDP/RTP")] )
+    if( [o_net_udp_panel isVisible] )
     {
-        int i_port = [o_net_udp_port intValue];
+        NSString *o_mode;
+        o_mode = [[o_net_mode selectedCell] title];
 
-        o_mrl_string = [NSString stringWithString: @"udp://"]; 
-
-        if( i_port != config_GetInt( p_intf, "server-port" ) )
+        if( [o_mode isEqualToString: _NS("Unicast")] )
         {
-            o_mrl_string = 
-                [o_mrl_string stringByAppendingFormat: @"@:%i", i_port]; 
-        } 
-    }
-    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];
+            int i_port = [o_net_udp_port intValue];
 
-        o_mrl_string = [NSString stringWithFormat: @"udp://@%@", o_addr]; 
+            if( [[o_net_udp_protocol_mat selectedCell] tag] == 0 )
+                o_mrl_string = [NSString stringWithString: @"udp://"];
+            else
+                o_mrl_string = [NSString stringWithString: @"rtp://"];
 
-        if( i_port != config_GetInt( p_intf, "server-port" ) )
+            if( i_port != config_GetInt( p_intf, "server-port" ) )
+            {
+                o_mrl_string =
+                    [o_mrl_string stringByAppendingFormat: @"@:%i", i_port];
+            }
+        }
+        else if( [o_mode isEqualToString: _NS("Multicast")] )
         {
-            o_mrl_string = 
-                [o_mrl_string stringByAppendingFormat: @":%i", i_port]; 
-        } 
-    }
-    else if( [o_mode isEqualToString: _NS("Channel server")] )
-    {
-        NSString *o_addr = [o_net_cs_addr stringValue];
-        int i_port = [o_net_cs_port intValue];
+            NSString *o_addr = [o_net_udpm_addr stringValue];
+            int i_port = [o_net_udpm_port intValue];
 
-        if( p_intf->p_vlc->p_channel == NULL )
-        {
-            network_ChannelCreate( p_intf );
-        } 
+            if( [[o_net_udp_protocol_mat selectedCell] tag] == 0 )
+                o_mrl_string = [NSString stringWithFormat: @"udp://@%@", o_addr];
+            else
+                o_mrl_string = [NSString stringWithFormat: @"rtp://@%@", o_addr];
 
-        config_PutPsz( p_intf, "channel-server", [o_addr lossyCString] ); 
-        if( i_port < 65536 )
-        {
-            config_PutInt( p_intf, "channel-port", i_port );
+            if( i_port != config_GetInt( p_intf, "server-port" ) )
+            {
+                o_mrl_string =
+                    [o_mrl_string stringByAppendingFormat: @":%i", i_port];
+            }
         }
-
-        /* FIXME: we should use a playlist server instead */
-        o_mrl_string = [NSString stringWithString: @"udp://"];
     }
-    else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS")] )
+    else
     {
-        NSString *o_url = [o_net_http_url stringValue];
-
-        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_string = [o_net_http_url stringValue];
     }
-
     [o_mrl setStringValue: o_mrl_string];
 }
 
-- (IBAction)soutChanged:(id)sender;
+- (IBAction)openNetUDPButtonAction:(id)sender
 {
-    [self soutModeChanged: nil];
-
-    if ( [o_sout_cbox state] )
+    if( sender == o_net_openUDP_btn )
     {
-        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];
+        [NSApp beginSheet: o_net_udp_panel
+           modalForWindow: o_panel
+            modalDelegate: self
+           didEndSelector: NULL
+              contextInfo: nil];
+        [self openNetInfoChanged: nil];
     }
-    else
+    else if( sender == o_net_udp_cancel_btn )
     {
-        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];
+        [o_net_udp_panel orderOut: sender];
+        [NSApp endSheet: o_net_udp_panel];
+    }
+    else if( sender == o_net_udp_ok_btn )
+    {
+        NSString *o_mrl_string = [NSString string];
+        if( [[[o_net_mode selectedCell] title] isEqualToString: _NS("Unicast")] )
+        {
+            int i_port = [o_net_udp_port intValue];
+            
+            if( [[o_net_udp_protocol_mat selectedCell] tag] == 0 )
+                o_mrl_string = [NSString stringWithString: @"udp://"];
+            else
+                o_mrl_string = [NSString stringWithString: @"rtp://"];
+
+            if( i_port != config_GetInt( p_intf, "server-port" ) )
+            {
+                o_mrl_string =
+                [o_mrl_string stringByAppendingFormat: @"@:%i", i_port];
+            }
+        }
+        else if( [[[o_net_mode selectedCell] title] isEqualToString: _NS("Multicast")] )
+        {
+            NSString *o_addr = [o_net_udpm_addr stringValue];
+            int i_port = [o_net_udpm_port intValue];
+            
+            if( [[o_net_udp_protocol_mat selectedCell] tag] == 0 )
+                o_mrl_string = [NSString stringWithFormat: @"udp://@%@", o_addr];
+            else
+                o_mrl_string = [NSString stringWithFormat: @"rtp://@%@", o_addr];
 
-        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];
+            if( i_port != config_GetInt( p_intf, "server-port" ) )
+            {
+                o_mrl_string =
+                [o_mrl_string stringByAppendingFormat: @":%i", i_port];
+            }
+        }
+        [o_mrl setStringValue: o_mrl_string];
+        [o_net_http_url setStringValue: o_mrl_string];
+        [o_net_udp_panel orderOut: sender];
+        [NSApp endSheet: o_net_udp_panel];
     }
 }
-
-- (IBAction)soutFileBrowse:(id)sender
+    
+- (void)openFile
 {
-    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";
+    NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
+    int i;
+    b_autoplay = config_GetInt( VLCIntf, "macosx-autoplay" );
+    [o_open_panel setAllowsMultipleSelection: YES];
+    [o_open_panel setCanChooseDirectories: 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 )
+    {
+        NSArray *o_array = [NSArray array];
+        NSArray *o_values = [[o_open_panel filenames]
+                sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
+
+        for( i = 0; i < (int)[o_values count]; i++)
+        {
+            NSDictionary *o_dic;
+            char *psz_uri = make_URI([[o_values objectAtIndex:i] UTF8String], "file");
+            if( !psz_uri )
+                continue;
 
-    NSString * o_name = [NSString stringWithFormat: @"vlc-output.%@",
-                         o_mux_string];
+            o_dic = [NSDictionary dictionaryWithObject:[NSString stringWithCString:psz_uri encoding:NSUTF8StringEncoding] forKey:@"ITEM_URL"];
 
-    [o_save_panel setTitle: _NS("Save File")];
-    [o_save_panel setPrompt: _NS("Save")];
+            free( psz_uri );
 
-    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];
+            o_array = [o_array arrayByAddingObject: o_dic];
+        }
+        if( b_autoplay )
+            [o_playlist appendArray: o_array atPos: -1 enqueue:NO];
+        else
+            [o_playlist appendArray: o_array atPos: -1 enqueue:YES];
     }
 }
 
-- (void)soutModeChanged:(NSNotification *)o_notification
+- (void)showCaptureView: theView
 {
-    NSString *o_mode;
-    BOOL b_file = FALSE;
-    BOOL b_net = FALSE;
+    NSRect o_view_rect;
+    o_view_rect = [theView frame];
+    if( o_currentCaptureView )
+    {
+        [o_currentCaptureView removeFromSuperviewWithoutNeedingDisplay];
+        [o_currentCaptureView release];
+    }
+    [theView setFrame: NSMakeRect( 0, -10, o_view_rect.size.width, o_view_rect.size.height)];
+    [theView setNeedsDisplay: YES];
+    [theView setAutoresizesSubviews: YES];
+    [[[o_tabview tabViewItemAtIndex: 3] view] addSubview: theView];
+    [theView displayIfNeeded];
+    o_currentCaptureView = theView;
+    [o_currentCaptureView retain];
+}
 
-    o_mode = [[o_sout_access selectedCell] title];
+- (IBAction)openCaptureModeChanged:(id)sender
+{
+    if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"EyeTV"] )
+    {
+        if( [[[VLCMain sharedInstance] eyeTVController] isEyeTVrunning] == YES )
+        {
+            if( [[[VLCMain sharedInstance] eyeTVController] isDeviceConnected] == YES )
+            {
+                [self showCaptureView: o_eyetv_running_view];
+                [self setupChannelInfo];
+            }
+            else
+            {
+                setEyeTVUnconnected;
+            }
+        }
+        else
+            [self showCaptureView: o_eyetv_notLaunched_view];
+        [o_mrl setStringValue: @""];
+    } 
+    else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Screen")] )
+    {
+        [self showCaptureView: o_screen_view];
+        [o_mrl setStringValue: @"screen://"];
+        [o_screen_height_fld setIntValue: config_GetInt( p_intf, "screen-height" )];
+        [o_screen_width_fld setIntValue: config_GetInt( p_intf, "screen-width" )];
+        [o_screen_fps_fld setFloatValue: config_GetFloat( p_intf, "screen-fps" )];
+        [o_screen_left_fld setIntValue: config_GetInt( p_intf, "screen-left" )];
+        [o_screen_top_fld setIntValue: config_GetInt( p_intf, "screen-top" )];
+        [o_screen_follow_mouse_ckb setIntValue: config_GetInt( p_intf, "screen-follow-mouse" )];
+    }
+    else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"iSight"] )
+    {
+        [o_capture_lbl setStringValue: _NS("iSight Capture Input")];
+        [o_capture_long_lbl setStringValue: _NS("This facility allows you to process your iSight's input signal.\n\nNo settings are available in this version, so you will be provided a 640px*480px raw video stream.\n\nLive Audio input is not supported.")];
+        [o_capture_lbl displayIfNeeded];
+        [o_capture_long_lbl displayIfNeeded];
+        
+        [self showCaptureView: o_capture_label_view];
+        [o_mrl setStringValue: @"qtcapture://"];
+    }
+}
 
-    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;
+- (IBAction)screenStepperChanged:(id)sender
+{
+    [o_screen_fps_fld setFloatValue: [o_screen_fps_stp floatValue]];
+    [o_panel makeFirstResponder: o_screen_fps_fld];
+    [o_mrl setStringValue: @"screen://"];
+}
 
-    [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];
+- (void)screenFPSfieldChanged:(NSNotification *)o_notification
+{
+    [o_screen_fps_stp setFloatValue: [o_screen_fps_fld floatValue]];
+    if( [[o_screen_fps_fld stringValue] isEqualToString: @""] )
+        [o_screen_fps_fld setFloatValue: 1.0];
+    [o_mrl setStringValue: @"screen://"];
+}
 
-    if ( b_net )
+- (IBAction)eyetvSwitchChannel:(id)sender
+{
+    if( sender == o_eyetv_nextProgram_btn )
     {
-        [[o_sout_mux cellAtRow: 0 column:2] setState: YES];
+        int chanNum = [[[VLCMain sharedInstance] eyeTVController] switchChannelUp: YES];
+        [o_eyetv_channels_pop selectItemWithTag:chanNum];
+        [o_mrl setStringValue: [NSString stringWithFormat:@"eyetv:// :eyetv-channel=%d", chanNum]];
     }
-
-    [self soutInfoChanged: nil];
+    else if( sender == o_eyetv_previousProgram_btn )
+    {
+        int chanNum = [[[VLCMain sharedInstance] eyeTVController] switchChannelUp: NO];
+        [o_eyetv_channels_pop selectItemWithTag:chanNum];
+        [o_mrl setStringValue: [NSString stringWithFormat:@"eyetv:// :eyetv-channel=%d", chanNum]];
+    }
+    else if( sender == o_eyetv_channels_pop )
+    {
+        int chanNum = [[sender selectedItem] tag];
+        [[[VLCMain sharedInstance] eyeTVController] selectChannel:chanNum];
+        [o_mrl setStringValue: [NSString stringWithFormat:@"eyetv:// :eyetv-channel=%d", chanNum]];
+    }
+    else
+        msg_Err( VLCIntf, "eyetvSwitchChannel sent by unknown object" );
 }
 
-- (void)soutInfoChanged:(NSNotification *)o_notification
+- (IBAction)eyetvLaunch:(id)sender
 {
-    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];
+    [[[VLCMain sharedInstance] eyeTVController] launchEyeTV];
+}
 
-    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";
+- (IBAction)eyetvGetPlugin:(id)sender
+{
+    [[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString: @"http://www.videolan.org/vlc/eyetv"]];
+}
 
-    if ( [o_mode isEqualToString: _NS("File")] )
+- (void)eyetvChanged:(NSNotification *)o_notification
+{
+    if( [[o_notification name] isEqualToString: @"DeviceAdded"] )
     {
-        o_mrl_string = [NSString stringWithFormat: @"file/%@://%@",
-                        o_mux_string, [o_sout_file_path stringValue]];
+        msg_Dbg( VLCIntf, "eyetv device was added" );
+        [self showCaptureView: o_eyetv_running_view];
+        [self setupChannelInfo];
     }
-    else if ( [o_mode isEqualToString: _NS("UDP")] )
+    else if( [[o_notification name] isEqualToString: @"DeviceRemoved"] )
     {
-        o_mrl_string = [NSString stringWithFormat: @"udp/%@://%@:%i",
-                        o_mux_string, [o_sout_udp_addr stringValue],
-                        [o_sout_udp_port intValue]];
+        /* leave the channel selection like that,
+         * switch to our "no device" tab */
+        msg_Dbg( VLCIntf, "eyetv device was removed" );
+        setEyeTVUnconnected;
     }
-    else
+    else if( [[o_notification name] isEqualToString: @"PluginQuit"] )
     {
-        o_mrl_string = [NSString stringWithFormat: @"rtp/%@://%@:%i",
-                        o_mux_string, [o_sout_udp_addr stringValue],
-                        [o_sout_udp_port intValue]];
+        /* switch to the "launch eyetv" tab */
+        msg_Dbg( VLCIntf, "eyetv was terminated" );
+        [self showCaptureView: o_eyetv_notLaunched_view];
     }
+    else if( [[o_notification name] isEqualToString: @"PluginInit"] )
+    {
+        /* we got no device yet */
+        msg_Dbg( VLCIntf, "eyetv was launched, no device yet" );
+        setEyeTVUnconnected;
+    }
+    else
+        msg_Warn( VLCIntf, "unknown external notify '%s' received", [[o_notification name] UTF8String] );
+}    
 
-
-    [o_sout_mrl setStringValue: o_mrl_string];
+/* little helper method, since this code needs to be run by multiple objects */
+- (void)setupChannelInfo
+{
+    /* set up channel selection */
+    [o_eyetv_channels_pop removeAllItems];
+    [o_eyetv_chn_bgbar setHidden: NO];
+    [o_eyetv_chn_bgbar animate: self];
+    [o_eyetv_chn_status_txt setStringValue: _NS("Retrieving Channel Info...")];
+    [o_eyetv_chn_status_txt setHidden: NO];
+    /* retrieve info */
+    NSEnumerator *channels = [[[VLCMain sharedInstance] eyeTVController] allChannels];
+    int x = -2;
+    [[[o_eyetv_channels_pop menu] addItemWithTitle: _NS("Composite input")
+                                               action: nil
+                                        keyEquivalent: @""] setTag:x++];
+    [[[o_eyetv_channels_pop menu] addItemWithTitle: _NS("S-Video input")
+                                               action: nil
+                                        keyEquivalent: @""] setTag:x++];
+    if( channels ) 
+    {
+        NSString *channel;
+        [[o_eyetv_channels_pop menu] addItem: [NSMenuItem separatorItem]];
+        while( channel = [channels nextObject] )
+        {
+            /* we have to add items this way, because we accept duplicates
+             * additionally, we save a bit of time */
+            [[[o_eyetv_channels_pop menu] addItemWithTitle: channel
+                                                   action: nil
+                                            keyEquivalent: @""] setTag:++x];
+        }
+        /* make Tuner the default */
+        [o_eyetv_channels_pop selectItemWithTag:[[[VLCMain sharedInstance] eyeTVController] currentChannel]];
+    }
+    /* clean up GUI */
+    [o_eyetv_chn_bgbar setHidden: YES];
+    [o_eyetv_chn_status_txt setHidden: YES];
 }
 
-- (IBAction)soutStepperChanged:(id)sender
+- (IBAction)subsChanged:(id)sender
 {
-    [o_sout_udp_port setIntValue: [o_net_udp_port_stp intValue]];
+    if ([o_file_sub_ckbox state] == NSOnState)
+    {
+        [o_file_sub_btn_settings setEnabled:YES];
+    }
+    else
+    {
+        [o_file_sub_btn_settings setEnabled:NO];
+    }
+}
 
-    [self soutInfoChanged: nil];
+- (IBAction)subSettings:(id)sender
+{
+    [NSApp beginSheet: o_file_sub_sheet
+        modalForWindow: [sender window]
+        modalDelegate: self
+        didEndSelector: NULL
+        contextInfo: nil];
 }
 
-- (IBAction)openFile:(id)sender
+- (IBAction)subCloseSheet:(id)sender
 {
-    NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
+    [o_file_sub_sheet orderOut:sender];
+    [NSApp endSheet: o_file_sub_sheet];
+}
     
-    [o_open_panel setAllowsMultipleSelection: YES];
+- (IBAction)subFileBrowse:(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 )
     {
-        intf_thread_t * p_intf = [NSApp getIntf];
-        config_PutPsz( p_intf, "sout", NULL );
-        [o_playlist appendArray: [o_open_panel filenames] atPos: -1 enqueue:NO];
+        NSString *o_filename = [[o_open_panel filenames] objectAtIndex: 0];
+        [o_file_sub_path setStringValue: o_filename];
     }
 }
 
+- (IBAction)subOverride:(id)sender
+{
+    BOOL b_state = [o_file_sub_override state];
+    [o_file_sub_delay setEnabled: b_state];
+    [o_file_sub_delay_stp setEnabled: b_state];
+    [o_file_sub_fps setEnabled: b_state];
+    [o_file_sub_fps_stp setEnabled: b_state];
+}
+
+- (IBAction)subDelayStepperChanged:(id)sender
+{
+    [o_file_sub_delay setIntValue: [o_file_sub_delay_stp intValue]];
+}
+
+- (IBAction)subFpsStepperChanged:(id)sender;
+{
+    [o_file_sub_fps setFloatValue: [o_file_sub_fps_stp floatValue]];
+}
+
 - (IBAction)panelCancel:(id)sender
 {
     [NSApp stopModalWithCode: 0];
@@ -873,44 +1242,13 @@ 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;
-        }
+@implementation VLCOpenTextField
 
-        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;
+- (void)mouseDown:(NSEvent *)theEvent
+{
+    [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCOpenTextFieldWasClicked"
+                                                        object: self];
+    [super mouseDown: theEvent];
 }
 
 @end
-