]> git.sesse.net Git - vlc/blobdiff - modules/gui/macosx/open.m
macosx: added native fullscreen support for OS X Lion
[vlc] / modules / gui / macosx / open.m
index 495c1bc1b86e64ae894ca0e5d39d7cab1249ee45..d47f59329c4c9175a71533db7cc00be6f2f52083 100644 (file)
@@ -1,20 +1,20 @@
 /*****************************************************************************
- * open.m: MacOS X module for vlc
+ * open.m: Open dialogues for VLC's MacOS X port
  *****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2011 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 K\9fhne <fkuehne 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
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <sys/param.h>                                    /* for MAXPATHLEN */
-#include <string.h>
-
-#include <paths.h>
-#include <IOKit/IOKitLib.h>
-#include <IOKit/IOBSD.h>
-#include <IOKit/storage/IOMedia.h>
-#include <IOKit/storage/IOCDMedia.h>
-#include <IOKit/storage/IODVDMedia.h>
-
-#include "intf.h"
-#include "playlist.h"
-#include "open.h"
-#include "output.h"
-#import <vlc_interface.h>
-
-/*****************************************************************************
- * GetEjectableMediaOfClass 
- *****************************************************************************/
-NSArray *GetEjectableMediaOfClass( const char *psz_class )
-{
-    io_object_t next_media;
-    mach_port_t master_port;
-    kern_return_t kern_result;
-    NSArray *o_devices = nil;
-    NSMutableArray *p_list = nil;
-    io_iterator_t media_iterator;
-    CFMutableDictionaryRef classes_to_match;
+#import <stdlib.h>                                      /* malloc(), free() */
+#import <sys/param.h>                                    /* for MAXPATHLEN */
+
+#import <paths.h>
+#import <IOKit/IOBSD.h>
+#import <IOKit/storage/IOMedia.h>
+#import <IOKit/storage/IOCDMedia.h>
+#import <IOKit/storage/IODVDMedia.h>
+#import <IOKit/storage/IOBDMedia.h>
+#import <Cocoa/Cocoa.h>
+#import <QTKit/QTKit.h>
+
+#import "intf.h"
+#import "playlist.h"
+#import "open.h"
+#import "output.h"
+#import "eyetv.h"
+
+#import <vlc_url.h>
+
+NSArray               *qtkvideoDevices;
+#define setEyeTVUnconnected \
+[o_capture_lbl setStringValue: _NS("No device is selected")]; \
+[o_capture_long_lbl setStringValue: _NS("Any device is not selected.\n\nChose abailable device in above pull-down menu\n.")]; \
+[o_capture_lbl displayIfNeeded]; \
+[o_capture_long_lbl displayIfNeeded]; \
+[self showCaptureView: o_capture_label_view]
+
+#define kVLCMediaAudioCD "AudioCD"
+#define kVLCMediaDVD "DVD"
+#define kVLCMediaVCD "VCD"
+#define kVLCMediaSVCD "SVCD"
+#define kVLCMediaBD "Bluray"
+#define kVLCMediaVideoTSFolder "VIDEO_TS"
+#define kVLCMediaBDMVFolder "BDMV"
+#define kVLCMediaUnknown "Unknown"
 
-    kern_result = IOMasterPort( MACH_PORT_NULL, &master_port );
-    if( kern_result != KERN_SUCCESS )
-    {
-        return( nil );
-    }
-    
-    classes_to_match = IOServiceMatching( psz_class );
-    if( classes_to_match == NULL )
-    {
-        return( nil );
-    }
-    
-    CFDictionarySetValue( classes_to_match, CFSTR( kIOMediaEjectableKey ), 
-                          kCFBooleanTrue );
-    
-    kern_result = IOServiceGetMatchingServices( master_port, classes_to_match, 
-                                                &media_iterator );
-    if( kern_result != KERN_SUCCESS )
-    {
-        return( nil );
-    }
-
-    p_list = [NSMutableArray arrayWithCapacity: 1];
-    
-    next_media = IOIteratorNext( media_iterator );
-    if( next_media != nil )
-    {
-        char psz_buf[0x32];
-        size_t dev_path_length;
-        CFTypeRef str_bsd_path;
-    
-        do
-        {
-            str_bsd_path = IORegistryEntryCreateCFProperty( next_media,
-                                                            CFSTR( kIOBSDNameKey ),
-                                                            kCFAllocatorDefault,
-                                                            0 );
-            if( str_bsd_path == NULL )
-            {
-                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]];
-            }
-            
-            CFRelease( str_bsd_path );
-            
-            IOObjectRelease( next_media );
-        
-        } while( ( next_media = IOIteratorNext( media_iterator ) ) != nil );
-    }
-    
-    IOObjectRelease( media_iterator );
-
-    o_devices = [NSArray arrayWithArray: p_list];
-
-    return( o_devices );
-}
 
 /*****************************************************************************
- * VLCOpen implementation 
+ * VLCOpen implementation
  *****************************************************************************/
 @implementation VLCOpen
 
@@ -144,76 +84,148 @@ static VLCOpen *_o_sharedMainInstance = nil;
         [self dealloc];
     } else {
         _o_sharedMainInstance = [super init];
+        p_intf = VLCIntf;
     }
-    
     return _o_sharedMainInstance;
 }
 
+- (void)dealloc
+{
+    [o_specialMediaFolders release];
+    [o_opticalDevices release];
+    if( o_file_slave_path )
+        [o_file_slave_path release];
+    [o_mrl release];
+    [o_currentOpticalMediaIconView release];
+    [o_currentOpticalMediaView release];
+    [super dealloc];
+}
+
 - (void)awakeFromNib
 {
-    intf_thread_t * p_intf = VLCIntf;
+    if (NSAppKitVersionNumber >= 1115.2)
+        [o_panel setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
 
     [o_panel setTitle: _NS("Open Source")];
-    [o_mrl_lbl setTitle: _NS("Media Resource Locator (MRL)")];
+    [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_name setStringValue: @""];
+    [o_file_name_stub setStringValue: _NS("Choose a file")];
+    [o_file_icon_well setImage: [NSImage imageNamed:@"generic"]];
     [o_file_btn_browse setTitle: _NS("Browse...")];
     [o_file_stream setTitle: _NS("Treat as a pipe rather than as a file")];
-
-    [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")];
-
-    [[o_disc_type cellAtRow:0 column:0] setTitle: _NS("VIDEO_TS directory")];
-    [[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_file_stream setHidden: NO];
+    [o_file_slave_ckbox setTitle: _NS("Play another media synchronously")];
+    [o_file_slave_select_btn setTitle: _NS("Choose...")];
+    [o_file_slave_filename_lbl setStringValue: @""];
+    [o_file_slave_icon_well setImage: NULL];
+    [o_file_subtitles_filename_lbl setStringValue: @""];
+    [o_file_subtitles_icon_well setImage: NULL];
+
+    [o_disc_selector_pop removeAllItems];
+    [o_disc_selector_pop setHidden: NO];
+    NSString *o_videots = _NS("Open VIDEO_TS folder");
+    NSString *o_bdmv = _NS("Open BDMV folder");
+    [o_disc_nodisc_lbl setStringValue: _NS("Insert Disc")];
+    [o_disc_nodisc_videots_btn setTitle: o_videots];
+    [o_disc_nodisc_bdmv_btn setTitle: o_bdmv];
+    [o_disc_audiocd_lbl setStringValue: _NS("Audio CD")];
+    [o_disc_audiocd_trackcount_lbl setStringValue: @""];
+    [o_disc_audiocd_videots_btn setTitle: o_videots];
+    [o_disc_audiocd_bdmv_btn setTitle: o_bdmv];
+    [o_disc_dvd_lbl setStringValue: @""];
+    [o_disc_dvd_disablemenus_btn setTitle: _NS("Disable DVD menus")];
+    [o_disc_dvd_videots_btn setTitle: o_videots];
+    [o_disc_dvd_bdmv_btn setTitle: o_bdmv];
+    [o_disc_dvdwomenus_lbl setStringValue: @""];
+    [o_disc_dvdwomenus_enablemenus_btn setTitle: _NS("Enable DVD menus")];
+    [o_disc_dvdwomenus_videots_btn setTitle: o_videots];
+    [o_disc_dvdwomenus_bdmv_btn setTitle: o_bdmv];
+    [o_disc_dvdwomenus_title_lbl setStringValue: _NS("Title")];
+    [o_disc_dvdwomenus_chapter_lbl setStringValue: _NS("Chapter")];
+    [o_disc_vcd_title_lbl setStringValue: _NS("Title")];
+    [o_disc_vcd_chapter_lbl setStringValue: _NS("Chapter")];
+    [o_disc_vcd_videots_btn setTitle: o_videots];
+    [o_disc_vcd_bdmv_btn setTitle: o_bdmv];
+    [o_disc_bd_videots_btn setTitle: o_videots];
+    [o_disc_bd_bdmv_btn setTitle: o_bdmv];
 
     [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_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("HTTP/FTP/MMS/RTSP")];
-    [o_net_timeshift_ckbox setTitle: _NS("Allow timeshifting")];
+    [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" )];
 
-    [self setSubPanel];
-
-
-    [[NSNotificationCenter defaultCenter] addObserver: self
-        selector: @selector(openFilePathChanged:)
-        name: NSControlTextDidChangeNotification
-        object: o_file_path];
+    [o_eyetv_chn_bgbar setUsesThreadedAnimation: YES];
+
+    [o_capture_mode_pop removeAllItems];
+    [o_capture_mode_pop addItemWithTitle: _NS("Capture Device")];
+    [o_capture_mode_pop addItemWithTitle: _NS("Screen")];
+    [o_capture_mode_pop addItemWithTitle: @"EyeTV"];
+    [o_screen_long_lbl setStringValue: _NS("This input allows you to save, stream or display your current screen contents.")];
+    [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")];
+    [o_qtk_long_lbl setStringValue: _NS("This input allows you to process input signals from QuickTime-compatible video devices.\nLive Audio input is not supported.")];
+    [o_capture_width_lbl setStringValue: _NS("Image width:")];
+    [o_capture_height_lbl setStringValue: _NS("Image height:")];
+
+    [self qtkvideoDevices];
+    [o_qtk_device_pop removeAllItems];
+    msg_Dbg( VLCIntf, "Found %lu capture devices", [qtkvideoDevices count] );
+    if([qtkvideoDevices count] == 0){
+        [o_qtk_device_pop addItemWithTitle: _NS("None")];
+        [qtk_currdevice_uid release];
+    }else {
+        if (!qtk_currdevice_uid) {
+            qtk_currdevice_uid = [[[QTCaptureDevice defaultInputDeviceWithMediaType: QTMediaTypeVideo] uniqueID]
+                                                                stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+        }
+        NSUInteger deviceCount = [qtkvideoDevices count];
+        for(int ivideo = 0; ivideo < deviceCount; ivideo++){
+            QTCaptureDevice *qtk_device;
+            qtk_device = [qtkvideoDevices objectAtIndex:ivideo];
+            [o_qtk_device_pop addItemWithTitle: [qtk_device localizedDisplayName]];
+            if([[[qtk_device uniqueID]stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] isEqualToString:qtk_currdevice_uid]){
+                [o_qtk_device_pop selectItemAtIndex:ivideo];
+            }
+        }
+    }
 
-    [[NSNotificationCenter defaultCenter] addObserver: self
-        selector: @selector(openDiscInfoChanged:)
-        name: NSControlTextDidChangeNotification
-        object: o_disc_device];
-    [[NSNotificationCenter defaultCenter] addObserver: self
-        selector: @selector(openDiscInfoChanged:)
-        name: NSControlTextDidChangeNotification
-        object: o_disc_title];
-    [[NSNotificationCenter defaultCenter] addObserver: self
-        selector: @selector(openDiscInfoChanged:)
-        name: NSControlTextDidChangeNotification
-        object: o_disc_chapter];
-    [[NSNotificationCenter defaultCenter] addObserver: self
-        selector: @selector(openDiscInfoChanged:)
-        name: NSControlTextDidChangeNotification
-        object: o_disc_videots_folder];
+    [self setSubPanel];
 
     [[NSNotificationCenter defaultCenter] addObserver: self
         selector: @selector(openNetInfoChanged:)
@@ -231,11 +243,54 @@ static VLCOpen *_o_sharedMainInstance = nil;
         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(screenFPSfieldChanged:)
+                                                 name: NSControlTextDidChangeNotification
+                                               object: o_screen_fps_fld];
+
+    /* register clicks on text fields */
+    [[NSNotificationCenter defaultCenter] addObserver: self
+                                             selector: @selector(textFieldWasClicked:)
+                                                 name: @"VLCOpenTextFieldWasClicked"
+                                               object: nil];
+
+    /* we want to be notified about removed or added media */
+    o_specialMediaFolders = [[NSMutableArray alloc] init];
+    o_opticalDevices = [[NSMutableArray alloc] init];
+    NSWorkspace *sharedWorkspace = [NSWorkspace sharedWorkspace];
+       [[sharedWorkspace notificationCenter] addObserver:self selector:@selector(scanOpticalMedia:) name:NSWorkspaceDidMountNotification object:nil];
+       [[sharedWorkspace notificationCenter] addObserver:self selector:@selector(scanOpticalMedia:) name:NSWorkspaceDidUnmountNotification object:nil];
+    [self scanOpticalMedia:nil];
+
+    [self setMRL: @""];
+}
+
+- (void)setMRL:(NSString *)newMRL
+{
+    [o_mrl release];
+    o_mrl = newMRL;
+    [o_mrl retain];
+    [o_mrl_fld setStringValue: newMRL];
+    if ([o_mrl length] > 0)
+        [o_btn_ok setEnabled: YES];
+    else
+        [o_btn_ok setEnabled: NO];
+}
+
+- (NSString *)MRL
+{
+    return o_mrl;
 }
 
 - (void)setSubPanel
 {
-    intf_thread_t * p_intf = VLCIntf;
     int i_index;
     module_config_t * p_item;
 
@@ -265,12 +320,10 @@ static VLCOpen *_o_sharedMainInstance = nil;
              i_index++ )
         {
             [o_file_sub_encoding_pop addItemWithTitle:
-                [NSString stringWithCString:
-                p_item->ppsz_list[i_index]]];
+                [NSString stringWithUTF8String: p_item->ppsz_list[i_index]]];
         }
         [o_file_sub_encoding_pop selectItemWithTitle:
-                [NSString stringWithCString:
-                p_item->value.psz]];
+                [NSString stringWithUTF8String: p_item->value.psz]];
     }
 
     p_item = config_FindConfig( VLC_OBJECT(p_intf), "subsdec-align" );
@@ -306,13 +359,12 @@ static VLCOpen *_o_sharedMainInstance = nil;
 - (void)openTarget:(int)i_type
 {
     int i_result;
-    intf_thread_t * p_intf = VLCIntf;
 
-    b_autoplay = (BOOL *)config_GetInt( VLCIntf, "macosx-autoplay" );
+    b_autoplay = config_GetInt( VLCIntf, "macosx-autoplay" );
 
     [o_tabview selectTabViewItemAtIndex: i_type];
     [o_file_sub_ckbox setState: NSOffState];
-    
     i_result = [NSApp runModalForWindow: o_panel];
     [o_panel close];
 
@@ -320,9 +372,8 @@ static VLCOpen *_o_sharedMainInstance = nil;
     {
         NSMutableDictionary *o_dic;
         NSMutableArray *o_options = [NSMutableArray array];
-        unsigned int i;
 
-        o_dic = [NSMutableDictionary dictionaryWithObject: [o_mrl stringValue] forKey: @"ITEM_URL"];
+        o_dic = [NSMutableDictionary dictionaryWithObject: [self MRL] forKey: @"ITEM_URL"];
         if( [o_file_sub_ckbox state] == NSOnState )
         {
             module_config_t * p_item;
@@ -352,17 +403,36 @@ static VLCOpen *_o_sharedMainInstance = nil;
         }
         if( [o_output_ckbox state] == NSOnState )
         {
-            for (i = 0 ; i < [[o_sout_options getMRL] count] ; i++)
+            NSUInteger count = [[o_sout_options mrl] count];
+            for (NSUInteger i = 0 ; i < count ; i++)
             {
-                [o_options addObject: [NSString stringWithString:
-                      [[(VLCOutput *)o_sout_options getMRL] objectAtIndex: i]]];
+                [o_options addObject: [NSString stringWithString: [[(VLCOutput *)o_sout_options mrl] objectAtIndex: i]]];
             }
         }
-        if( [o_net_timeshift_ckbox state] == NSOnState )
+        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")] )
         {
-            [o_options addObject: [NSString stringWithString:
-                                                @"access-filter=timeshift"]];
+            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"];
+            }
+            else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Capture Device")] )
+            {
+                [o_options addObject: [NSString stringWithFormat: @"qtcapture-width=%i", [o_capture_width_fld intValue]]];
+                [o_options addObject: [NSString stringWithFormat: @"qtcapture-height=%i", [o_capture_height_fld intValue]]];
+            }
         }
+
+        /* 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];
@@ -371,6 +441,19 @@ static VLCOpen *_o_sharedMainInstance = nil;
     }
 }
 
+- (IBAction)qtkChanged:(id)sender
+{
+    NSValue *sizes = [[[[qtkvideoDevices objectAtIndex:[o_qtk_device_pop indexOfSelectedItem]] formatDescriptions] objectAtIndex: 0] attributeForKey: QTFormatDescriptionVideoEncodedPixelsSizeAttribute];
+
+    [o_capture_width_fld setIntValue: [sizes sizeValue].width];
+    [o_capture_height_fld setIntValue: [sizes sizeValue].height];
+    [o_capture_width_stp setIntValue: [o_capture_width_fld intValue]];
+    [o_capture_height_stp setIntValue: [o_capture_height_fld intValue]];
+    qtk_currdevice_uid = [[[qtkvideoDevices objectAtIndex:[o_qtk_device_pop indexOfSelectedItem]] uniqueID]
+                          stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+    [self setMRL:[NSString stringWithFormat:@"qtcapture://%@", qtk_currdevice_uid]];
+}
+
 - (void)tabView:(NSTabView *)o_tv didSelectTabViewItem:(NSTabViewItem *)o_tvi
 {
     NSString *o_label = [o_tvi label];
@@ -381,12 +464,79 @@ static VLCOpen *_o_sharedMainInstance = nil;
     }
     else if( [o_label isEqualToString: _NS("Disc")] )
     {
-        [self openDiscTypeChanged: nil];
+        [self scanOpticalMedia: nil];
     }
     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 removeFromSuperview];
+    } 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: NO];
+        [o_mrl_view setAutoresizesSubviews: YES];
+
+        /* enlarge panel size for MRL view */
+        o_win_rect.size.height = o_win_rect.size.height + o_view_rect.size.height;
+    }
+
+    [[o_panel animator] setFrame: o_win_rect display:YES];
+//    [o_panel displayIfNeeded];
+    if( [o_mrl_btn state] == NSOnState )
+        [[o_panel contentView] addSubview: o_mrl_view];
+}
+
+- (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 runModal] == NSOKButton )
+        {
+            if( o_file_slave_path )
+                [o_file_slave_path release];
+            o_file_slave_path = [[[o_open_panel URLs] objectAtIndex: 0] path];
+            [o_file_slave_path retain];
+        }
+    }
+    if( o_file_slave_path && [o_file_slave_ckbox state] == NSOnState)
+    {
+        [o_file_slave_filename_lbl setStringValue: [[NSFileManager defaultManager] displayNameAtPath:o_file_slave_path]];
+        [o_file_slave_icon_well setImage: [[NSWorkspace sharedWorkspace] iconForFile: o_file_slave_path]];
+    }
+    else
+    {
+        [o_file_slave_filename_lbl setStringValue: @""];
+        [o_file_slave_icon_well setImage: NULL];
+    }
 }
 
 - (void)openFileGeneric
@@ -397,50 +547,66 @@ static VLCOpen *_o_sharedMainInstance = nil;
 
 - (void)openDisc
 {
-    [self openDiscTypeChanged: nil];
+    [o_specialMediaFolders removeAllObjects];
+    [o_opticalDevices removeAllObjects];
+    [self scanOpticalMedia: nil];
     [self openTarget: 1];
 }
 
 - (void)openNet
 {
-    [self openNetModeChanged: nil];
+    [self openNetInfoChanged: nil];
     [self openTarget: 2];
 }
 
-- (void)openFilePathChanged:(NSNotification *)o_notification
+- (void)openCapture
 {
-    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_dir = NO;
-    
-    [[NSFileManager defaultManager] fileExistsAtPath:o_filename isDirectory:&b_dir];
+    [self openCaptureModeChanged: nil];
+    [self openTarget: 3];
+}
 
-    if( b_dir )
-    {
-        o_mrl_string = [NSString stringWithFormat: @"dir:%@", o_filename];
-    }
-    else if( [o_ext isEqualToString: @"bin"] ||
-        [o_ext isEqualToString: @"cue"] ||
-        [o_ext isEqualToString: @"vob"] ||
-        [o_ext isEqualToString: @"iso"] )
+- (void)openFilePathChanged:(NSNotification *)o_notification
+{
+    if ( o_file_path && [o_file_path length] > 0 )
     {
-        o_mrl_string = o_filename;
+        bool b_stream = [o_file_stream state];
+        BOOL b_dir = NO;
+
+        [[NSFileManager defaultManager] fileExistsAtPath:o_file_path isDirectory:&b_dir];
+
+        char *psz_uri = make_URI([o_file_path 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( b_dir )
+            [o_mrl_string replaceCharactersInRange:offile withString: @"directory"];
+        else if( b_stream )
+            [o_mrl_string replaceCharactersInRange:offile withString: @"stream"];
+
+        [o_file_name setStringValue: [[NSFileManager defaultManager] displayNameAtPath:o_file_path]];
+        [o_file_name_stub setHidden: YES];
+        [o_file_stream setHidden: NO];
+        [o_file_icon_well setImage: [[NSWorkspace sharedWorkspace] iconForFile: o_file_path]];
+        [o_file_icon_well setHidden: NO];
+        [self setMRL: o_mrl_string];
     }
     else
     {
-        o_mrl_string = [NSString stringWithFormat: @"%s://%@",
-                        b_stream ? "stream" : "file",
-                        o_filename];
+        [o_file_name setStringValue: @""];
+        [o_file_name_stub setHidden: NO];
+        [o_file_stream setHidden: YES];
+        [o_file_icon_well setImage: [NSImage imageNamed:@"generic"]];
+        [self setMRL: @""];
     }
-    [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")];
@@ -451,7 +617,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
         types:nil
         modalForWindow:[sender window]
         modalDelegate: self
-        didEndSelector: @selector(pathChosenInPanel: 
+        didEndSelector: @selector(pathChosenInPanel:
                         withReturn:
                         contextInfo:)
         contextInfo: nil];
@@ -461,8 +627,10 @@ static VLCOpen *_o_sharedMainInstance = nil;
 {
     if (returnCode == NSFileHandlingPanelOKButton)
     {
-        NSString *o_filename = [[sheet filenames] objectAtIndex: 0];
-        [o_file_path setStringValue: o_filename];
+        if( o_file_path )
+            [o_file_path release];
+        o_file_path = [[[sheet URLs] objectAtIndex: 0] path];
+        [o_file_path retain];
         [self openFilePathChanged: nil];
     }
 }
@@ -472,202 +640,319 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [self openFilePathChanged: nil];
 }
 
-- (IBAction)openDiscTypeChanged:(id)sender
+- (void)showOpticalMediaView: theView withIcon:(NSImage *)icon
 {
-    NSString *o_type;
-    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: _NS("VIDEO_TS directory")] )
+    NSRect o_view_rect;
+    o_view_rect = [theView frame];
+    [theView setFrame: NSMakeRect( 233, 0, o_view_rect.size.width, o_view_rect.size.height)];
+    [theView setAutoresizesSubviews: YES];
+    if (o_currentOpticalMediaView)
     {
-        b_device = 0; b_menus = 1;
+        [[[[o_tabview tabViewItemAtIndex: [o_tabview indexOfTabViewItemWithIdentifier:@"optical"]] view] animator] replaceSubview: o_currentOpticalMediaView with: theView];
+        [o_currentOpticalMediaView release];
     }
     else
+        [[[[o_tabview tabViewItemAtIndex: [o_tabview indexOfTabViewItemWithIdentifier:@"optical"]] view] animator] addSubview: theView];
+    o_currentOpticalMediaView = theView;
+    [o_currentOpticalMediaView retain];
+
+    NSImageView *imageView;
+    imageView = [[NSImageView alloc] init];
+    [imageView setFrame: NSMakeRect( 53, 61, 128, 128 )];
+    [icon setSize: NSMakeSize(128,128)];
+    [imageView setImage: icon];
+    if (o_currentOpticalMediaIconView)
     {
-        NSArray *o_devices;
-        NSString *o_disc;
-        const char *psz_class = NULL;
-        b_device = 1;
+        [[[[o_tabview tabViewItemAtIndex: [o_tabview indexOfTabViewItemWithIdentifier:@"optical"]] view] animator] replaceSubview: o_currentOpticalMediaIconView with: imageView];
+        [o_currentOpticalMediaIconView release];
+    }
+    else
+         [[[[o_tabview tabViewItemAtIndex: [o_tabview indexOfTabViewItemWithIdentifier:@"optical"]] view] animator] addSubview: imageView];
+    o_currentOpticalMediaIconView = imageView;
+    [o_currentOpticalMediaIconView retain];
+}
 
-        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];
+- (NSString *) getBSDNodeFromMountPath:(NSString *)mountPath
+{
+    OSStatus err;
+    FSRef ref;
+    FSVolumeRefNum actualVolume;
+    err = FSPathMakeRef ( (const UInt8 *) [mountPath fileSystemRepresentation], &ref, NULL );
+
+    // get a FSVolumeRefNum from mountPath
+    if ( noErr == err ) {
+        FSCatalogInfo   catalogInfo;
+        err = FSGetCatalogInfo ( &ref,
+                                kFSCatInfoVolume,
+                                &catalogInfo,
+                                NULL,
+                                NULL,
+                                NULL
+                                );
+        if ( noErr == err ) {
+            actualVolume = catalogInfo.volume;
         }
-        else if ( [o_type isEqualToString: _NS("Audio CD")])
-        {
-            psz_class = kIOCDMediaClass;
-            o_disc = o_type;
-            b_menus = 0; b_title_chapter = 0;
-            [o_disc_dvd_menus setState: FALSE];
+    }
+
+    GetVolParmsInfoBuffer volumeParms;
+    err = FSGetVolumeParms( actualVolume, &volumeParms, sizeof(volumeParms) );
+    if ( noErr != err ) {
+        msg_Err( p_intf, "error retrieving volume params, bailing out" );
+        return @"";
+    }
+
+    NSString *bsdName = [NSString stringWithUTF8String:(char *)volumeParms.vMDeviceID];
+    return [NSString stringWithFormat:@"/dev/r%@", bsdName];
+}
+
+- (char *)getVolumeTypeFromMountPath:(NSString *)mountPath
+{
+    OSStatus err;
+    FSRef ref;
+    FSVolumeRefNum actualVolume;
+    err = FSPathMakeRef ( (const UInt8 *) [mountPath fileSystemRepresentation], &ref, NULL );
+
+    // get a FSVolumeRefNum from mountPath
+    if ( noErr == err ) {
+        FSCatalogInfo   catalogInfo;
+        err = FSGetCatalogInfo ( &ref,
+                                kFSCatInfoVolume,
+                                &catalogInfo,
+                                NULL,
+                                NULL,
+                                NULL
+                                );
+        if ( noErr == err ) {
+            actualVolume = catalogInfo.volume;
         }
-        else
-        {
-            psz_class = kIODVDMediaClass;
-            o_disc = o_type;
-            b_menus = 1;
+    }
+
+    GetVolParmsInfoBuffer volumeParms;
+    err = FSGetVolumeParms( actualVolume, &volumeParms, sizeof(volumeParms) );
+
+    CFMutableDictionaryRef     matchingDict;
+    io_service_t                       service;
+
+    matchingDict = IOBSDNameMatching(kIOMasterPortDefault, 0, volumeParms.vMDeviceID);
+    service = IOServiceGetMatchingService(kIOMasterPortDefault, matchingDict);
+
+    char *returnValue;
+    if (IO_OBJECT_NULL != service) {
+        if (IOObjectConformsTo(service, kIOCDMediaClass)) {
+            returnValue = kVLCMediaAudioCD;
         }
-    
-        o_devices = GetEjectableMediaOfClass( psz_class );
-        if ( o_devices != nil )
+        else if(IOObjectConformsTo(service, kIODVDMediaClass))
+            returnValue = kVLCMediaDVD;
+        else if(IOObjectConformsTo(service, kIOBDMediaClass))
+            returnValue = kVLCMediaBD;
+        else
         {
-            int i_devices = [o_devices count];
-        
-            if ( i_devices )
-            {
-                int i;
-        
-                for( i = 0; i < i_devices; i++ )
-                {
-                    [o_disc_device 
-                        addItemWithObjectValue: [o_devices objectAtIndex: i]];
-                }
-
-                [o_disc_device selectItemAtIndex: 0];
-            }
+            if ([mountPath rangeOfString:@"VIDEO_TS"].location != NSNotFound)
+                returnValue = kVLCMediaVideoTSFolder;
+            else if ([mountPath rangeOfString:@"BDMV"].location != NSNotFound)
+                returnValue = kVLCMediaBDMVFolder;
             else
             {
-                [o_disc_device setStringValue: 
-                    [NSString stringWithFormat: _NS("No %@s found"), o_disc]];
+                NSArray * topLevelItems;
+                topLevelItems = [[NSFileManager defaultManager] subpathsOfDirectoryAtPath: mountPath error: NULL];
+                NSUInteger itemCount = [topLevelItems count];
+                for (int i = 0; i < itemCount; i++) {
+                    if([[topLevelItems objectAtIndex:i] rangeOfString:@"SVCD"].location != NSNotFound) {
+                        returnValue = kVLCMediaSVCD;
+                        break;
+                    }
+                    if([[topLevelItems objectAtIndex:i] rangeOfString:@"VCD"].location != NSNotFound) {
+                        returnValue = kVLCMediaVCD;
+                        break;
+                    }
+                }
+                if(!returnValue)
+                    returnValue = kVLCMediaUnknown;
             }
         }
-    }
-
-    [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];
+        IOObjectRelease(service);
+    }
+    return returnValue;
 }
 
-- (IBAction)openDiscStepperChanged:(id)sender
+- (void)showOpticalAtIndex: (NSNumber *)n_index
 {
-    int i_tag = [sender tag];
+    NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
 
-    if( i_tag == 0 )
+    unsigned int index = [n_index intValue];
+    char *diskType = [self getVolumeTypeFromMountPath:[o_opticalDevices objectAtIndex: index]];
+
+    if (diskType == kVLCMediaDVD || diskType == kVLCMediaVideoTSFolder)
     {
-        [o_disc_title setIntValue: [o_disc_title_stp intValue]];
+        [o_disc_dvd_lbl setStringValue: [[NSFileManager defaultManager] displayNameAtPath:[o_opticalDevices objectAtIndex: index]]];
+        [o_disc_dvdwomenus_lbl setStringValue: [o_disc_dvd_lbl stringValue]];
+        NSString *pathToOpen;
+        if (diskType == kVLCMediaVideoTSFolder)
+            pathToOpen = [o_opticalDevices objectAtIndex: index];
+        else
+            pathToOpen = [self getBSDNodeFromMountPath:[o_opticalDevices objectAtIndex: index]];
+        if (!b_nodvdmenus) {
+            [self setMRL: [NSString stringWithFormat: @"dvdnav://%@", pathToOpen]];
+            [self showOpticalMediaView: o_disc_dvd_view withIcon: [[NSWorkspace sharedWorkspace] iconForFile: [o_opticalDevices objectAtIndex: index]]];
+        } else {
+            [self setMRL: [NSString stringWithFormat: @"dvdread://%@@%i:%i-", pathToOpen, [o_disc_dvdwomenus_title intValue], [o_disc_dvdwomenus_chapter intValue]]];
+            [self showOpticalMediaView: o_disc_dvdwomenus_view withIcon: [[NSWorkspace sharedWorkspace] iconForFile: [o_opticalDevices objectAtIndex: index]]];
+        }
     }
-    else if( i_tag == 1 )
+    else if (diskType == kVLCMediaAudioCD)
     {
-        [o_disc_chapter setIntValue: [o_disc_chapter_stp intValue]];
+        [o_disc_audiocd_lbl setStringValue: [[NSFileManager defaultManager] displayNameAtPath:[o_opticalDevices objectAtIndex: index]]];
+        [o_disc_audiocd_trackcount_lbl setStringValue: [NSString stringWithFormat:_NS("%i tracks"), [[[NSFileManager defaultManager] subpathsOfDirectoryAtPath: [o_opticalDevices objectAtIndex: index] error:NULL] count] - 1]]; // minus .TOC.plist
+        [self showOpticalMediaView: o_disc_audiocd_view withIcon: [[NSWorkspace sharedWorkspace] iconForFile: [o_opticalDevices objectAtIndex: index]]];
+        [self setMRL: [NSString stringWithFormat: @"cdda://%@", [self getBSDNodeFromMountPath:[o_opticalDevices objectAtIndex: index]]]];
     }
-
-    [self openDiscInfoChanged: nil];
-}
-
-- (void)openDiscInfoChanged:(NSNotification *)o_notification
-{
-    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_videots = [o_disc_videots_folder stringValue];
-    b_menus = [o_disc_dvd_menus state];
-
-    if ( [o_type isEqualToString: _NS("VCD")] )
+    else if (diskType == kVLCMediaVCD || diskType == kVLCMediaSVCD)
     {
-        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_disc_vcd_lbl setStringValue: [[NSFileManager defaultManager] displayNameAtPath:[o_opticalDevices objectAtIndex: index]]];
+        [self showOpticalMediaView: o_disc_vcd_view withIcon: [[NSWorkspace sharedWorkspace] iconForFile: [o_opticalDevices objectAtIndex: index]]];
+        [self setMRL: [NSString stringWithFormat: @"vcd://%@@%i:%i", [self getBSDNodeFromMountPath:[o_opticalDevices objectAtIndex: index]], [o_disc_vcd_title intValue], [o_disc_vcd_chapter intValue]]];
     }
-    else if ( [o_type isEqualToString: _NS("Audio CD")] )
+    else if (diskType == kVLCMediaBD || diskType == kVLCMediaBDMVFolder)
     {
-        if ( [o_device isEqualToString:
-                [NSString stringWithFormat: _NS("No %@s found"), o_type]] )
-            o_device = @"";
-        o_mrl_string = [NSString stringWithFormat: @"cdda://%@",
-                        o_device]; 
+        [o_disc_bd_lbl setStringValue: [[NSFileManager defaultManager] displayNameAtPath:[o_opticalDevices objectAtIndex: index]]];
+        [self showOpticalMediaView: o_disc_bd_view withIcon: [[NSWorkspace sharedWorkspace] iconForFile: [o_opticalDevices objectAtIndex: index]]];
+        if (diskType == kVLCMediaBD)
+            [self setMRL: [NSString stringWithFormat: @"bluray://%@", [self getBSDNodeFromMountPath:[o_opticalDevices objectAtIndex: index]]]];
+        else
+            [self setMRL: [NSString stringWithFormat: @"bluray://%@", [o_opticalDevices objectAtIndex: index]]];
     }
-    else if ( [o_type isEqualToString: _NS("DVD")] )
+    else
     {
-        if ( [o_device isEqualToString:
-                [NSString stringWithFormat: _NS("No %@s found"), o_type]] )
-            o_device = @"";
-        if ( b_menus )
-            o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@",
-                            o_device]; 
+        msg_Warn( VLCIntf, "unknown disk type, no idea what to display" );
+        [self showOpticalMediaView: o_disc_nodisc_view withIcon: [NSImage imageNamed:@"NSApplicationIcon"]];
+    }
+
+    [o_pool release];
+}
+
+- (void)scanOpticalMedia:(NSNotification *)o_notification
+{
+    [o_opticalDevices removeAllObjects];
+    [o_disc_selector_pop removeAllItems];
+    [o_opticalDevices addObjectsFromArray: [[NSWorkspace sharedWorkspace] mountedRemovableMedia]];
+    if ([o_specialMediaFolders count] > 0)
+        [o_opticalDevices addObjectsFromArray: o_specialMediaFolders];
+    if ([o_opticalDevices count] > 0) {
+        NSUInteger deviceCount = [o_opticalDevices count];
+        for (NSUInteger i = 0; i < deviceCount ; i++)
+            [o_disc_selector_pop addItemWithTitle: [[NSFileManager defaultManager] displayNameAtPath:[o_opticalDevices objectAtIndex: i]]];
+
+        if ([o_disc_selector_pop numberOfItems] <= 1)
+            [o_disc_selector_pop setHidden: YES];
         else
-            o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i:%i-",
-                            o_device, i_title, i_chapter]; 
+            [o_disc_selector_pop setHidden: NO];
+
+        [NSThread detachNewThreadSelector:@selector(showOpticalAtIndex:) toTarget:self withObject:[NSNumber numberWithInt:[o_disc_selector_pop indexOfSelectedItem]]];
     }
-    else /* VIDEO_TS folder */
+    else
     {
-        if ( b_menus )
-            o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@",
-                            o_videots]; 
-        else
-            o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i:%i",
-                            o_videots, i_title, i_chapter]; 
+        msg_Dbg( VLCIntf, "no optical media found" );
+        [o_disc_selector_pop setHidden: YES];
+        [self showOpticalMediaView: o_disc_nodisc_view withIcon: [NSImage imageNamed: @"NSApplicationIcon"]];
     }
-
-    [o_mrl setStringValue: o_mrl_string]; 
 }
 
-- (IBAction)openDiscMenusChanged:(id)sender
+- (IBAction)discSelectorChanged:(id)sender
 {
-    [self openDiscInfoChanged: nil];
-    [self openDiscTypeChanged: nil];
+    [NSThread detachNewThreadSelector:@selector(showOpticalAtIndex:) toTarget:self withObject:[NSNumber numberWithInt:[o_disc_selector_pop indexOfSelectedItem]]];
 }
 
-- (IBAction)openVTSBrowse:(id)sender
+- (IBAction)openSpecialMediaFolder:(id)sender
 {
+    /* this is currently for VIDEO_TS and BDMV folders */
     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 setTitle: [sender title]];
     [o_open_panel setPrompt: _NS("Open")];
 
-    if( [o_open_panel runModalForDirectory: nil
-            file: nil types: nil] == NSOKButton )
+    if ([o_open_panel runModal] == NSOKButton)
     {
-        NSString *o_dirname = [[o_open_panel filenames] objectAtIndex: 0];
-        [o_disc_videots_folder setStringValue: o_dirname];
-        [self openDiscInfoChanged: nil];
+        NSString *o_path = [[[o_open_panel URLs] objectAtIndex: 0] path];
+        if ([o_path length] > 0 )
+        {
+            if ([o_path rangeOfString:@"VIDEO_TS"].location != NSNotFound || [o_path rangeOfString:@"BDMV"].location != NSNotFound)
+            {
+                [o_specialMediaFolders addObject: o_path];
+                [self scanOpticalMedia: nil];
+            }
+            else
+                msg_Dbg( VLCIntf, "chosen directory is no suitable special media folder" );
+        }
     }
 }
 
-- (IBAction)openNetModeChanged:(id)sender
+- (IBAction)dvdreadOptionChanged:(id)sender
 {
-    NSString *o_mode;
-    BOOL b_udp = FALSE;
-    BOOL b_udpm = FALSE;
-    BOOL b_http = FALSE;
+    if (sender == o_disc_dvdwomenus_enablemenus_btn) {
+        b_nodvdmenus = NO;
+        [self setMRL: [NSString stringWithFormat: @"dvdnav://%@", [self getBSDNodeFromMountPath:[o_opticalDevices objectAtIndex: [o_disc_selector_pop indexOfSelectedItem]]]]];
+        [self showOpticalMediaView: o_disc_dvd_view withIcon: [o_currentOpticalMediaIconView image]];
+        return;
+    }
+    if (sender == o_disc_dvd_disablemenus_btn) {
+        b_nodvdmenus = YES;
+        [self showOpticalMediaView: o_disc_dvdwomenus_view withIcon: [o_currentOpticalMediaIconView image]];
+    }
+
+    if (sender == o_disc_dvdwomenus_title)
+        [o_disc_dvdwomenus_title_stp setIntValue: [o_disc_dvdwomenus_title intValue]];
+    if (sender == o_disc_dvdwomenus_title_stp)
+        [o_disc_dvdwomenus_title setIntValue: [o_disc_dvdwomenus_title_stp intValue]];
+    if (sender == o_disc_dvdwomenus_chapter)
+        [o_disc_dvdwomenus_chapter_stp setIntValue: [o_disc_dvdwomenus_chapter intValue]];
+    if (sender == o_disc_dvdwomenus_chapter_stp)
+        [o_disc_dvdwomenus_chapter setIntValue: [o_disc_dvdwomenus_chapter_stp intValue]];
+
+    [self setMRL: [NSString stringWithFormat: @"dvdread://%@@%i:%i-", [self getBSDNodeFromMountPath:[o_opticalDevices objectAtIndex: [o_disc_selector_pop indexOfSelectedItem]]], [o_disc_dvdwomenus_title intValue], [o_disc_dvdwomenus_chapter intValue]]];
+}
 
-    o_mode = [[o_net_mode selectedCell] title];
+- (IBAction)vcdOptionChanged:(id)sender
+{
+    if (sender == o_disc_vcd_title)
+        [o_disc_vcd_title_stp setIntValue: [o_disc_vcd_title intValue]];
+    if (sender == o_disc_vcd_title_stp)
+        [o_disc_vcd_title setIntValue: [o_disc_vcd_title_stp intValue]];
+    if (sender == o_disc_vcd_chapter)
+        [o_disc_vcd_chapter_stp setIntValue: [o_disc_vcd_chapter intValue]];
+    if (sender == o_disc_vcd_chapter_stp)
+        [o_disc_vcd_chapter setIntValue: [o_disc_vcd_chapter_stp intValue]];
+
+    [self setMRL: [NSString stringWithFormat: @"vcd://%@@%i:%i", [self getBSDNodeFromMountPath:[o_opticalDevices objectAtIndex: [o_disc_selector_pop indexOfSelectedItem]]], [o_disc_vcd_title intValue], [o_disc_vcd_chapter intValue]]];
+}
+
+- (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];
 
-    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("HTTP/FTP/MMS/RTSP")] ) b_http = TRUE;
+    [self openNetInfoChanged: nil];
+}
 
-    [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_http_url setEnabled: b_http];
+- (IBAction)openNetModeChanged:(id)sender
+{
+    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];
 }
@@ -679,10 +964,16 @@ static VLCOpen *_o_sharedMainInstance = nil;
     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]];
+        [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCOpenTextFieldWasClicked"
+                                                            object: o_net_udpm_port];
+        [o_panel makeFirstResponder: o_net_udpm_port];
     }
 
     [self openNetInfoChanged: nil];
@@ -690,73 +981,143 @@ static VLCOpen *_o_sharedMainInstance = nil;
 
 - (void)openNetInfoChanged:(NSNotification *)o_notification
 {
-    NSString *o_mode;
     NSString *o_mrl_string = [NSString string];
-    intf_thread_t * p_intf = VLCIntf;
-
-    o_mode = [[o_net_mode selectedCell] title];
 
-    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( [o_mode 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" ) )
+            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]; 
-        } 
+            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];
+
+            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("UDP/RTP Multicast")] ) 
+    else
     {
-        NSString *o_addr = [o_net_udpm_addr stringValue];
-        int i_port = [o_net_udpm_port intValue];
-
-        o_mrl_string = [NSString stringWithFormat: @"udp://@%@", o_addr]; 
+        o_mrl_string = [o_net_http_url stringValue];
+    }
+    [self setMRL: o_mrl_string];
+}
 
-        if( i_port != config_GetInt( p_intf, "server-port" ) )
-        {
-            o_mrl_string = 
-                [o_mrl_string stringByAppendingFormat: @":%i", i_port]; 
-        } 
+- (IBAction)openNetUDPButtonAction:(id)sender
+{
+    if( sender == o_net_openUDP_btn )
+    {
+        [NSApp beginSheet: o_net_udp_panel
+           modalForWindow: o_panel
+            modalDelegate: self
+           didEndSelector: NULL
+              contextInfo: nil];
+        [self openNetInfoChanged: nil];
     }
-    else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS/RTSP")] )
+    else if( sender == o_net_udp_cancel_btn )
     {
-        NSString *o_url = [o_net_http_url stringValue];
+        [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 ( ![o_url hasPrefix:@"http:"] && ![o_url hasPrefix:@"ftp:"]
-              && ![o_url hasPrefix:@"mms"] && ![o_url hasPrefix:@"rtsp"] )
-            o_mrl_string = [NSString stringWithFormat: @"http://%@", o_url];
-        else
-            o_mrl_string = o_url;
+            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];
+
+            if( i_port != config_GetInt( p_intf, "server-port" ) )
+            {
+                o_mrl_string =
+                [o_mrl_string stringByAppendingFormat: @":%i", i_port];
+            }
+        }
+        [self setMRL: o_mrl_string];
+        [o_net_http_url setStringValue: o_mrl_string];
+        [o_net_udp_panel orderOut: sender];
+        [NSApp endSheet: o_net_udp_panel];
     }
-    [o_mrl setStringValue: o_mrl_string];
 }
-
+    
 - (void)openFile
 {
     NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
-    int i;
-    b_autoplay = (BOOL *)config_GetInt( VLCIntf, "macosx-autoplay" );
-    
+    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 )
+    if( [o_open_panel runModal] == NSOKButton )
     {
-        NSArray *o_array = [NSArray array];
-        NSArray *o_values = [[o_open_panel filenames]
-                sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
+        NSArray * o_urls = [o_open_panel URLs];
+        NSUInteger count = [o_urls count];
+        NSMutableArray *o_values = [NSMutableArray arrayWithCapacity:count];
+        NSMutableArray *o_array = [NSMutableArray arrayWithCapacity:count];
+        for( NSUInteger i = 0; i < count; i++ )
+        {
+            [o_values addObject: [[o_urls objectAtIndex: i] path]];
+        }
+        [o_values sortUsingSelector:@selector(caseInsensitiveCompare:)];
 
-        for( i = 0; i < (int)[o_values count]; i++)
+        for( NSUInteger i = 0; i < count; i++ )
         {
             NSDictionary *o_dic;
-            o_dic = [NSDictionary dictionaryWithObject:[o_values objectAtIndex:i] forKey:@"ITEM_URL"];
-            o_array = [o_array arrayByAddingObject: o_dic];
+            char *psz_uri = make_URI([[o_values objectAtIndex:i] UTF8String], "file");
+            if( !psz_uri )
+                continue;
+
+            o_dic = [NSDictionary dictionaryWithObject:[NSString stringWithCString:psz_uri encoding:NSUTF8StringEncoding] forKey:@"ITEM_URL"];
+
+            free( psz_uri );
+
+            [o_array addObject: o_dic];
         }
         if( b_autoplay )
             [o_playlist appendArray: o_array atPos: -1 enqueue:NO];
@@ -765,15 +1126,200 @@ static VLCOpen *_o_sharedMainInstance = nil;
     }
 }
 
+- (void)showCaptureView: theView
+{
+    NSRect o_view_rect;
+    o_view_rect = [theView frame];
+    [theView setFrame: NSMakeRect( 0, -10, o_view_rect.size.width, o_view_rect.size.height)];
+    [theView setAutoresizesSubviews: YES];
+    if (o_currentCaptureView)
+    {
+        [[[[o_tabview tabViewItemAtIndex: 3] view] animator] replaceSubview: o_currentCaptureView with: theView];
+        [o_currentCaptureView release];
+    }
+    else
+         [[[[o_tabview tabViewItemAtIndex: 3] view] animator] addSubview: theView];
+    o_currentCaptureView = theView;
+    [o_currentCaptureView retain];
+}
+
+- (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];
+        [self setMRL: @""];
+    } 
+    else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Screen")] )
+    {
+        [self showCaptureView: o_screen_view];
+        [self setMRL: @"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: _NS("Capture Device")] )
+    {
+        [self showCaptureView: o_qtk_view];
+        if ([o_capture_width_fld intValue] <= 0)
+            [self qtkChanged:nil];
+
+        if(!qtk_currdevice_uid)
+            [self setMRL: @""];
+        else
+            [self setMRL:[NSString stringWithFormat:@"qtcapture://%@", qtk_currdevice_uid]];
+    }
+}
+
+- (IBAction)screenStepperChanged:(id)sender
+{
+    [o_screen_fps_fld setFloatValue: [o_screen_fps_stp floatValue]];
+    [o_panel makeFirstResponder: o_screen_fps_fld];
+    [self setMRL: @"screen://"];
+}
+
+- (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];
+    [self setMRL: @"screen://"];
+}
+
+- (IBAction)eyetvSwitchChannel:(id)sender
+{
+    if( sender == o_eyetv_nextProgram_btn )
+    {
+        int chanNum = [[[VLCMain sharedInstance] eyeTVController] switchChannelUp: YES];
+        [o_eyetv_channels_pop selectItemWithTag:chanNum];
+        [self setMRL: [NSString stringWithFormat:@"eyetv:// :eyetv-channel=%d", chanNum]];
+    }
+    else if( sender == o_eyetv_previousProgram_btn )
+    {
+        int chanNum = [[[VLCMain sharedInstance] eyeTVController] switchChannelUp: NO];
+        [o_eyetv_channels_pop selectItemWithTag:chanNum];
+        [self setMRL: [NSString stringWithFormat:@"eyetv:// :eyetv-channel=%d", chanNum]];
+    }
+    else if( sender == o_eyetv_channels_pop )
+    {
+        int chanNum = [[sender selectedItem] tag];
+        [[[VLCMain sharedInstance] eyeTVController] selectChannel:chanNum];
+        [self setMRL: [NSString stringWithFormat:@"eyetv:// :eyetv-channel=%d", chanNum]];
+    }
+    else
+        msg_Err( VLCIntf, "eyetvSwitchChannel sent by unknown object" );
+}
+
+- (IBAction)eyetvLaunch:(id)sender
+{
+    [[[VLCMain sharedInstance] eyeTVController] launchEyeTV];
+}
+
+- (IBAction)eyetvGetPlugin:(id)sender
+{
+    [[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString: @"http://www.videolan.org/vlc/eyetv"]];
+}
+
+- (void)eyetvChanged:(NSNotification *)o_notification
+{
+    if( [[o_notification name] isEqualToString: @"DeviceAdded"] )
+    {
+        msg_Dbg( VLCIntf, "eyetv device was added" );
+        [self showCaptureView: o_eyetv_running_view];
+        [self setupChannelInfo];
+    }
+    else if( [[o_notification name] isEqualToString: @"DeviceRemoved"] )
+    {
+        /* leave the channel selection like that,
+         * switch to our "no device" tab */
+        msg_Dbg( VLCIntf, "eyetv device was removed" );
+        setEyeTVUnconnected;
+    }
+    else if( [[o_notification name] isEqualToString: @"PluginQuit"] )
+    {
+        /* 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;
+    }
+}    
+
+/* 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)subsChanged:(id)sender
 {
     if ([o_file_sub_ckbox state] == NSOnState)
     {
         [o_file_sub_btn_settings setEnabled:YES];
+        if ([[o_file_sub_path stringValue] length] > 0) {
+            [o_file_subtitles_filename_lbl setStringValue: [[NSFileManager defaultManager] displayNameAtPath:[o_file_sub_path stringValue]]];
+            [o_file_subtitles_icon_well setImage: [[NSWorkspace sharedWorkspace] iconForFile: [o_file_sub_path stringValue]]];
+        }
     }
     else
     {
         [o_file_sub_btn_settings setEnabled:NO];
+        [o_file_subtitles_filename_lbl setStringValue: @""];
+        [o_file_subtitles_icon_well setImage: NULL];
     }
 }
 
@@ -786,19 +1332,27 @@ static VLCOpen *_o_sharedMainInstance = nil;
         contextInfo: nil];
 }
 
+- (IBAction)subCloseSheet:(id)sender
+{
+    [self subsChanged: nil];
+    [o_file_sub_sheet orderOut:sender];
+    [NSApp endSheet: o_file_sub_sheet];
+}
+    
 - (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 )
+    if( [o_open_panel runModal] == NSOKButton )
     {
-        NSString *o_filename = [[o_open_panel filenames] objectAtIndex: 0];
+        NSString *o_filename = [[[o_open_panel URLs] objectAtIndex: 0] path];
         [o_file_sub_path setStringValue: o_filename];
+        [o_file_subtitles_filename_lbl setStringValue: [[NSFileManager defaultManager] displayNameAtPath:o_filename]];
+        [o_file_subtitles_icon_well setImage: [[NSWorkspace sharedWorkspace] iconForFile: o_filename]];
     }
 }
 
@@ -821,12 +1375,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [o_file_sub_fps setFloatValue: [o_file_sub_fps_stp floatValue]];
 }
 
-- (IBAction)subCloseSheet:(id)sender
-{
-    [o_file_sub_sheet orderOut:sender];
-    [NSApp endSheet: o_file_sub_sheet];
-}
-
 - (IBAction)panelCancel:(id)sender
 {
     [NSApp stopModalWithCode: 0];
@@ -834,14 +1382,34 @@ static VLCOpen *_o_sharedMainInstance = nil;
 
 - (IBAction)panelOk:(id)sender
 {
-    if( [[o_mrl stringValue] length] )
-    {
+    if( [[self MRL] length] )
         [NSApp stopModalWithCode: 1];
-    }
     else
-    {
         NSBeep();
-    }
+}
+
+- (NSArray *)qtkvideoDevices
+{
+    if (!qtkvideoDevices)
+        [self qtkrefreshDevices];
+    return qtkvideoDevices;
+}
+
+- (void)qtkrefreshDevices
+{
+    [qtkvideoDevices release];
+    qtkvideoDevices = [[[QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo] arrayByAddingObjectsFromArray:[QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeMuxed]] retain];
+}
+
+@end
+
+@implementation VLCOpenTextField
+
+- (void)mouseDown:(NSEvent *)theEvent
+{
+    [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCOpenTextFieldWasClicked"
+                                                        object: self];
+    [super mouseDown: theEvent];
 }
 
 @end