]> git.sesse.net Git - vlc/blobdiff - modules/gui/macosx/open.m
Removes trailing spaces. Removes tabs.
[vlc] / modules / gui / macosx / open.m
index 69faebb0d65af904281ed4e9a62d56e09f000ee3..ae8027b1171e1e4e33ec2211b00b6e49a0653b53 100644 (file)
@@ -1,18 +1,20 @@
 /*****************************************************************************
  * open.m: MacOS X module for vlc
  *****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
+ * Copyright (C) 2002-2007 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>
  *
  * 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"
-#include "output.h"
+#import "intf.h"
+#import "playlist.h"
+#import "open.h"
+#import "output.h"
+#import "eyetv.h"
 
 /*****************************************************************************
- * GetEjectableMediaOfClass 
+ * GetEjectableMediaOfClass
  *****************************************************************************/
 NSArray *GetEjectableMediaOfClass( const char *psz_class )
 {
@@ -60,17 +63,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( kIOMediaEjectableKey ), 
+    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 )
     {
@@ -78,14 +81,14 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     }
 
     p_list = [NSMutableArray arrayWithCapacity: 1];
-    
     next_media = IOIteratorNext( media_iterator );
-    if( next_media != NULL )
+    if( next_media != nil )
     {
         char psz_buf[0x32];
         size_t dev_path_length;
         CFTypeRef str_bsd_path;
-    
         do
         {
             str_bsd_path = IORegistryEntryCreateCFProperty( next_media,
@@ -97,10 +100,10 @@ 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,
@@ -108,14 +111,14 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
             {
                 [p_list addObject: [NSString stringWithCString: psz_buf]];
             }
-            
             CFRelease( str_bsd_path );
-            
             IOObjectRelease( next_media );
-        
-        } while( ( next_media = IOIteratorNext( media_iterator ) ) != NULL );
+        } while( ( next_media = IOIteratorNext( media_iterator ) ) != nil );
     }
-    
     IOObjectRelease( media_iterator );
 
     o_devices = [NSArray arrayWithArray: p_list];
@@ -124,10 +127,28 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 }
 
 /*****************************************************************************
- * VLCOpen implementation 
+ * VLCOpen implementation
  *****************************************************************************/
 @implementation VLCOpen
 
+static VLCOpen *_o_sharedMainInstance = nil;
+
++ (VLCOpen *)sharedInstance
+{
+    return _o_sharedMainInstance ? _o_sharedMainInstance : [[self alloc] init];
+}
+
+- (id)init
+{
+    if( _o_sharedMainInstance) {
+        [self dealloc];
+    } else {
+        _o_sharedMainInstance = [super init];
+    }
+    return _o_sharedMainInstance;
+}
+
 - (void)awakeFromNib
 {
     intf_thread_t * p_intf = VLCIntf;
@@ -151,7 +172,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     [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 folder")];
+    [[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")];
@@ -163,21 +184,18 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 
     [[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")];
+    [[o_net_mode cellAtRow:2 column:0] setTitle: _NS("HTTP/FTP/MMS/RTSP")];
+    [o_net_timeshift_ckbox setTitle: _NS("Allow timeshifting")];
 
     [o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )];
     [o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )];
+    [o_eyetv_chn_bgbar setUsesThreadedAnimation: YES];
+    /* FIXME: implement EyeTV l10n here */
+    [self setSubPanel];
+
 
-    [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")];
-    [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_ok_btn setStringValue: _NS("OK")];
-    
     [[NSNotificationCenter defaultCenter] addObserver: self
         selector: @selector(openFilePathChanged:)
         name: NSControlTextDidChangeNotification
@@ -216,15 +234,109 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
         selector: @selector(openNetInfoChanged:)
         name: NSControlTextDidChangeNotification
         object: o_net_http_url];
+
+    /* wake up with the correct GUI */
+    if( [[[VLCMain sharedInstance] getEyeTVController] isEyeTVrunning] == YES )
+        [o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"];
+    if( [[[VLCMain sharedInstance] getEyeTVController] isDeviceConnected] == YES )
+    {
+        [o_eyetv_tabView selectTabViewItemWithIdentifier:@"eyetvup"];
+        [self setupChannelInfo];
+    }
+    [[NSDistributedNotificationCenter defaultCenter] addObserver: self
+                                                        selector: @selector(eyetvChanged:)
+                                                            name: NULL
+                                                          object: @"VLCEyeTVSupport"
+                                              suspensionBehavior: NSNotificationSuspensionBehaviorDeliverImmediately];
+    /* register clicks on text fields */
+    [[NSNotificationCenter defaultCenter] addObserver: self
+                                             selector: @selector(textFieldWasClicked:)
+                                                 name: @"VLCOpenTextFieldWasClicked"
+                                               object: nil];
+}
+
+- (void)setSubPanel
+{
+    intf_thread_t * p_intf = VLCIntf;
+    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 stringWithCString:
+                p_item->ppsz_list[i_index]]];
+        }
+        [o_file_sub_encoding_pop selectItemWithTitle:
+                [NSString stringWithCString:
+                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;
+    intf_thread_t * p_intf = VLCIntf;
+
+    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];
 
@@ -232,23 +344,54 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     {
         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 )
         {
-            [o_options addObject: [NSString stringWithFormat: @"sub-file=%s", [[o_file_sub_path stringValue] UTF8String]]];
+            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 )
         {
-            [o_options addObject: [NSString stringWithString: [(VLCOutput *)o_sout_options getMRL]]];
+            for (i = 0 ; i < [[o_sout_options getMRL] count] ; i++)
+            {
+                [o_options addObject: [NSString stringWithString:
+                      [[(VLCOutput *)o_sout_options getMRL] objectAtIndex: i]]];
+            }
+        }
+        if( [o_net_timeshift_ckbox state] == NSOnState )
+        {
+            [o_options addObject: [NSString stringWithString:
+                                                @"access-filter=timeshift"]];
         }
         [o_dic setObject: (NSArray *)[o_options copy] forKey: @"ITEM_OPTIONS"];
-        [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue:NO];
+        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];
     }
 }
 
@@ -266,25 +409,25 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     }
     else if( [o_label isEqualToString: _NS("Network")] )
     {
-        [self openNetModeChanged: nil];
-    }  
+        [self openNetInfoChanged: nil];
+    }
 }
 
-- (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];
 }
 
@@ -295,7 +438,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     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];
 
     if( b_dir )
@@ -315,13 +458,13 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
                         b_stream ? "stream" : "file",
                         o_filename];
     }
-    [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")];
@@ -332,7 +475,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
         types:nil
         modalForWindow:[sender window]
         modalDelegate: self
-        didEndSelector: @selector(pathChosenInPanel: 
+        didEndSelector: @selector(pathChosenInPanel:
                         withReturn:
                         contextInfo:)
         contextInfo: nil];
@@ -357,13 +500,13 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 {
     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 folder")] )
+    if ( [o_type isEqualToString: _NS("VIDEO_TS directory")] )
     {
         b_device = 0; b_menus = 1;
     }
@@ -394,19 +537,19 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
             o_disc = o_type;
             b_menus = 1;
         }
-    
         o_devices = GetEjectableMediaOfClass( psz_class );
         if ( o_devices != nil )
         {
             int i_devices = [o_devices count];
-        
             if ( i_devices )
             {
                 int i;
-        
                 for( i = 0; i < i_devices; i++ )
                 {
-                    [o_disc_device 
+                    [o_disc_device
                         addItemWithObjectValue: [o_devices objectAtIndex: i]];
                 }
 
@@ -414,7 +557,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
             }
             else
             {
-                [o_disc_device setStringValue: 
+                [o_disc_device setStringValue:
                     [NSString stringWithFormat: _NS("No %@s found"), o_disc]];
             }
         }
@@ -469,8 +612,8 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
         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")] )
     {
@@ -478,7 +621,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
                 [NSString stringWithFormat: _NS("No %@s found"), o_type]] )
             o_device = @"";
         o_mrl_string = [NSString stringWithFormat: @"cdda://%@",
-                        o_device]; 
+                        o_device];
     }
     else if ( [o_type isEqualToString: _NS("DVD")] )
     {
@@ -486,23 +629,23 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
                 [NSString stringWithFormat: _NS("No %@s found"), o_type]] )
             o_device = @"";
         if ( b_menus )
-            o_mrl_string = [NSString stringWithFormat: @"dvdplay://%@",
-                            o_device]; 
+            o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@",
+                            o_device];
         else
-            o_mrl_string = [NSString stringWithFormat: @"dvdold://%@@%i,%i",
-                            o_device, i_title, i_chapter]; 
+            o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i:%i-",
+                            o_device, i_title, i_chapter];
     }
     else /* VIDEO_TS folder */
     {
         if ( b_menus )
-            o_mrl_string = [NSString stringWithFormat: @"dvdplay://%@",
-                            o_videots]; 
+            o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@",
+                            o_videots];
         else
-            o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i,%i",
-                            o_videots, i_title, i_chapter]; 
+            o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i:%i",
+                            o_videots, i_title, i_chapter];
     }
 
-    [o_mrl setStringValue: o_mrl_string]; 
+    [o_mrl setStringValue: o_mrl_string];
 }
 
 - (IBAction)openDiscMenusChanged:(id)sender
@@ -530,25 +673,27 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     }
 }
 
-- (IBAction)openNetModeChanged:(id)sender
+- (void)textFieldWasClicked:(NSNotification *)o_notification
 {
-    NSString *o_mode;
-    BOOL b_udp = FALSE;
-    BOOL b_udpm = FALSE;
-    BOOL b_http = FALSE;
-
-    o_mode = [[o_net_mode selectedCell] title];
+    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")] ) 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 selectedCell] tag] == 0 )
+        [o_panel makeFirstResponder: o_net_udp_port];
+    else if ( [[sender selectedCell] tag] == 1 )
+        [o_panel makeFirstResponder: o_net_udpm_addr];
+    else
+        [o_panel makeFirstResponder: o_net_http_url];
 
     [self openNetInfoChanged: nil];
 }
@@ -560,10 +705,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]];
+        [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCOpenTextFieldWasClicked"
+                                                            object: o_net_udpm_port];
+        [o_panel makeFirstResponder: o_net_udpm_port];
     }
 
     [self openNetInfoChanged: nil];
@@ -581,51 +732,51 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     {
         int i_port = [o_net_udp_port intValue];
 
-        o_mrl_string = [NSString stringWithString: @"udp://"]; 
+        o_mrl_string = [NSString stringWithString: @"udp://"];
 
         if( i_port != config_GetInt( p_intf, "server-port" ) )
         {
-            o_mrl_string = 
-                [o_mrl_string stringByAppendingFormat: @"@:%i", i_port]; 
-        } 
+            o_mrl_string =
+                [o_mrl_string stringByAppendingFormat: @"@:%i", i_port];
+        }
     }
-    else if( [o_mode isEqualToString: _NS("UDP/RTP Multicast")] ) 
+    else if( [o_mode isEqualToString: _NS("UDP/RTP Multicast")] )
     {
         NSString *o_addr = [o_net_udpm_addr stringValue];
         int i_port = [o_net_udpm_port intValue];
 
-        o_mrl_string = [NSString stringWithFormat: @"udp://@%@", o_addr]; 
+        o_mrl_string = [NSString stringWithFormat: @"udp://@%@", o_addr];
 
         if( i_port != config_GetInt( p_intf, "server-port" ) )
         {
-            o_mrl_string = 
-                [o_mrl_string stringByAppendingFormat: @":%i", i_port]; 
-        } 
+            o_mrl_string =
+                [o_mrl_string stringByAppendingFormat: @":%i", i_port];
+        }
     }
-    else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS")] )
+    else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS/RTSP")] )
     {
         NSString *o_url = [o_net_http_url stringValue];
 
         if ( ![o_url hasPrefix:@"http:"] && ![o_url hasPrefix:@"ftp:"]
-              && ![o_url hasPrefix:@"mms"] )
+              && ![o_url hasPrefix:@"mms"] && ![o_url hasPrefix:@"rtsp"] )
             o_mrl_string = [NSString stringWithFormat: @"http://%@", o_url];
         else
             o_mrl_string = o_url;
     }
-
     [o_mrl setStringValue: o_mrl_string];
 }
 
-- (IBAction)openFile:(id)sender
+- (void)openFile
 {
     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 )
     {
@@ -639,8 +790,88 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
             o_dic = [NSDictionary dictionaryWithObject:[o_values objectAtIndex:i] forKey:@"ITEM_URL"];
             o_array = [o_array arrayByAddingObject: o_dic];
         }
-        [o_playlist appendArray: o_array atPos: -1 enqueue:NO];
+        if( b_autoplay )
+            [o_playlist appendArray: o_array atPos: -1 enqueue:NO];
+        else
+            [o_playlist appendArray: o_array atPos: -1 enqueue:YES];
+    }
+}
+
+- (IBAction)eyetvSwitchChannel:(id)sender
+{
+    if( sender == o_eyetv_nextProgram_btn )
+        [[[VLCMain sharedInstance] getEyeTVController] switchChannelUp: YES];
+    else if( sender == o_eyetv_previousProgram_btn )
+        [[[VLCMain sharedInstance] getEyeTVController] switchChannelUp: NO];
+    else if( sender == o_eyetv_channels_pop )
+        [[[VLCMain sharedInstance] getEyeTVController] selectChannel:
+            [sender indexOfSelectedItem]];
+    else
+        msg_Err( VLCIntf, "eyetvSwitchChannel sent by unknown object" );
+}
+
+- (IBAction)eyetvLaunch:(id)sender
+{
+    [[[VLCMain sharedInstance] getEyeTVController] launchEyeTV];
+}
+
+- (void)eyetvChanged:(NSNotification *)o_notification
+{
+    if( [[o_notification name] isEqualToString: @"DeviceAdded"] )
+    {
+        msg_Dbg( VLCIntf, "eyetv device was added" );
+        [o_eyetv_tabView selectTabViewItemWithIdentifier:@"eyetvup"];
+        [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" );
+        [o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"];
+    }
+    else if( [[o_notification name] isEqualToString: @"PluginQuit"] )
+    {
+        /* switch to the "launch eyetv" tab */
+        msg_Dbg( VLCIntf, "eyetv was terminated" );
+        [o_eyetv_tabView selectTabViewItemWithIdentifier:@"noeyetv"];
     }
+    else if( [[o_notification name] isEqualToString: @"PluginInit"] )
+    {
+        /* we got no device yet */
+        msg_Dbg( VLCIntf, "eyetv was launched, no device yet" );
+        [o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"];
+    }
+    else
+        msg_Warn( VLCIntf, "unknown external notify '%s' received", [[o_notification name] UTF8String] );
+}
+
+/* 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 */
+    int x = 0;
+    int channelCount = ( [[[VLCMain sharedInstance] getEyeTVController] getNumberOfChannels] + 1 );
+    while( x != channelCount )
+    {
+        /* we have to add items this way, because we accept duplicates
+         * additionally, we save a bit of time */
+        [[o_eyetv_channels_pop menu] addItemWithTitle: [[[VLCMain sharedInstance] getEyeTVController] getNameOfChannel: x]
+                                               action: nil
+                                        keyEquivalent: @""];
+        x += 1;
+    }
+    /* clean up GUI */
+    [o_eyetv_chn_bgbar setHidden: YES];
+    [o_eyetv_chn_status_txt setHidden: YES];
 }
 
 - (IBAction)subsChanged:(id)sender
@@ -667,12 +898,12 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 - (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 
+    if( [o_open_panel runModalForDirectory: nil
             file: nil types: nil] == NSOKButton )
     {
         NSString *o_filename = [[o_open_panel filenames] objectAtIndex: 0];
@@ -723,3 +954,14 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 }
 
 @end
+
+@implementation VLCOpenTextField
+
+- (void)mouseDown:(NSEvent *)theEvent
+{
+    [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCOpenTextFieldWasClicked"
+                                                        object: self];
+    [super mouseDown: theEvent];
+}
+
+@end