/*****************************************************************************
* open.m: MacOS X plugin for vlc
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: open.m,v 1.10 2003/01/18 04:57:08 hartman Exp $
+ * Copyright (C) 2002-2003 VideoLAN
+ * $Id: open.m,v 1.27 2003/04/01 22:29:41 massiot Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
+ * Derk-Jan Hartman <thedj@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <IOKit/storage/IOCDMedia.h>
#include <IOKit/storage/IODVDMedia.h>
-#import <Cocoa/Cocoa.h>
-
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include "intf.h"
+#include "playlist.h"
+#include "open.h"
#include "netutils.h"
-#import "intf.h"
-#import "playlist.h"
-#import "open.h"
-
/*****************************************************************************
* GetEjectableMediaOfClass
*****************************************************************************/
if ( psz_sout != NULL && *psz_sout )
{
[o_sout_cbox setState: YES];
-
- NSRect s_rect = [o_panel frame];
- s_rect.size.height = OPEN_PANEL_FULL_HEIGHT + WINDOW_TITLE_HEIGHT;
- [o_panel setFrame: s_rect display: NO];
-
- NSPoint s_point;
- s_point.x = 0;
- s_point.y = 0;
- [[o_panel contentView] setBoundsOrigin: s_point];
}
else
{
[o_sout_cbox setState: NO];
-
- NSRect s_rect = [o_panel frame];
- s_rect.size.height = OPEN_PANEL_SHORT_HEIGHT + WINDOW_TITLE_HEIGHT;
- [o_panel setFrame: s_rect display: NO];
-
- NSPoint s_point;
- s_point.x = 0;
- s_point.y = OPEN_PANEL_FULL_HEIGHT - OPEN_PANEL_SHORT_HEIGHT;
- [[o_panel contentView] setBoundsOrigin: s_point];
}
free(psz_sout);
[o_panel setTitle: _NS("Open Source")];
[o_mrl_lbl setTitle: _NS("Media Resource Locator (MRL)")];
+ [o_ckbox_enqueue setTitle: _NS("Only enqueue in playlist, do not play")];
[o_btn_ok setTitle: _NS("OK")];
[o_btn_cancel setTitle: _NS("Cancel")];
[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 setStringValue: _NS("Browse...")];
- [o_disc_dvd_menus setTitle: _NS("Use DVD menus")];
+ [o_disc_videots_btn_browse setTitle: _NS("Browse...")];
+ [o_disc_dvd_menus setTitle: _NS("Use DVD menus (EXPERIMENTAL)")];
[[o_disc_type cellAtRow:0 column:0] setTitle: _NS("VIDEO_TS folder")];
[[o_disc_type cellAtRow:1 column:0] setTitle: _NS("DVD")];
[o_net_udp_port_lbl setStringValue: _NS("Port")];
[o_net_udpm_addr_lbl setStringValue: _NS("Address")];
[o_net_udpm_port_lbl setStringValue: _NS("Port")];
- [o_net_cs_addr_lbl setStringValue: _NS("Address")];
- [o_net_cs_port_lbl setStringValue: _NS("Port")];
[o_net_http_url_lbl setStringValue: _NS("URL")];
[[o_net_mode cellAtRow:0 column:0] setTitle: _NS("UDP/RTP")];
[[o_net_mode cellAtRow:1 column:0] setTitle: _NS("UDP/RTP Multicast")];
- [[o_net_mode cellAtRow:2 column:0] setTitle: _NS("Channel server")];
- [[o_net_mode cellAtRow:3 column:0] setTitle: _NS("HTTP/FTP/MMS")];
+ [[o_net_mode cellAtRow:2 column:0] setTitle: _NS("HTTP/FTP/MMS")];
[o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )];
[o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )];
- [o_net_cs_port setIntValue: config_GetInt( p_intf, "channel-port" )];
- [o_net_cs_port_stp setIntValue: config_GetInt( p_intf, "channel-port" )];
- [o_sout_cbox setTitle: _NS("Stream output")];
+ [o_sout_cbox setTitle: _NS("Stream output:")];
+ [o_sout_btn_ok setTitle: _NS("OK")];
+ [o_sout_settings setTitle: _NS("Settings...")];
[o_sout_mrl_lbl setTitle: _NS("Stream output MRL")];
+
+ [o_sout_access_lbl setTitle: _NS("Output Method")];
[[o_sout_access cellAtRow:0 column:0] setTitle: _NS("File")];
- [[o_sout_access cellAtRow:1 column:0] setTitle: _NS("UDP")];
- [[o_sout_access cellAtRow:2 column:0] setTitle: _NS("RTP")];
+ [[o_sout_access cellAtRow:1 column:0] setTitle: _NS("HTTP")];
+ [[o_sout_access cellAtRow:2 column:0] setTitle: _NS("UDP")];
+ [[o_sout_access cellAtRow:3 column:0] setTitle: _NS("RTP")];
- [o_sout_file_btn_browse setStringValue: _NS("Browse...")];
+ [o_sout_file_btn_browse setTitle: _NS("Browse...")];
[o_sout_udp_addr_lbl setStringValue: _NS("Address")];
[o_sout_udp_port_lbl setStringValue: _NS("Port")];
- [[o_sout_mux cellAtRow:0 column:0] setTitle: _NS("PS")];
- [[o_sout_mux cellAtRow:0 column:1] setTitle: _NS("TS")];
-
+ [o_sout_mux_lbl setTitle: _NS("Encapsulation Method")];
+ [[o_sout_mux cellAtRow:0 column:0] setTitle: _NS("MPEG TS")];
+ [[o_sout_mux cellAtRow:0 column:1] setTitle: _NS("MPEG PS")];
+ [[o_sout_mux cellAtRow:0 column:2] setTitle: _NS("AVI")];
+ [[o_sout_mux cellAtRow:0 column:3] setTitle: _NS("Ogg")];
+
+ [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
selector: @selector(openNetInfoChanged:)
name: NSControlTextDidChangeNotification
object: o_net_udpm_port];
- [[NSNotificationCenter defaultCenter] addObserver: self
- selector: @selector(openNetInfoChanged:)
- name: NSControlTextDidChangeNotification
- object: o_net_cs_addr];
- [[NSNotificationCenter defaultCenter] addObserver: self
- selector: @selector(openNetInfoChanged:)
- name: NSControlTextDidChangeNotification
- object: o_net_cs_port];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(openNetInfoChanged:)
name: NSControlTextDidChangeNotification
int i_result;
[o_tabview selectTabViewItemAtIndex: i_type];
-
+ [o_ckbox_enqueue setState: NSOnState];
+ [o_file_sub_ckbox setState: NSOffState];
+
i_result = [NSApp runModalForWindow: o_panel];
[o_panel close];
if( i_result )
{
NSString *o_sout = [o_sout_mrl stringValue];
-
+ intf_thread_t * p_intf = [NSApp getIntf];
+
if ( [o_sout_cbox state] )
{
- intf_thread_t * p_intf = [NSApp getIntf];
config_PutPsz( p_intf, "sout", [o_sout lossyCString] );
}
NSString *o_source = [o_mrl stringValue];
-
+ BOOL b_enq = [o_ckbox_enqueue state] == NSOnState ? YES : NO;
+ NSString *subPath = [o_file_sub_path stringValue];
+
[o_playlist appendArray:
- [NSArray arrayWithObject: o_source] atPos: -1];
+ [NSArray arrayWithObject: o_source] atPos: -1 enqueue:b_enq];
+
+ if (([o_file_sub_ckbox state] == NSOnState) && !([subPath isEqualTo: @""]))
+ {
+ config_PutPsz( p_intf, "sub-file", strdup( [subPath cString] ) );
+ if ( [o_file_sub_override state] )
+ {
+ config_PutInt( p_intf, "sub-delay", (int)( [o_file_sub_delay intValue] * 10 ) );
+ config_PutFloat( p_intf, "sub-fps", [o_file_sub_fps floatValue] );
+ }
+ }
+ else
+ {
+ config_PutPsz( p_intf, "sub-file", "" );
+ config_PutInt( p_intf, "sub-delay", 0 );
+ config_PutFloat( p_intf, "sub-fps", 0.0 );
+ }
}
-
[self soutModeChanged: nil];
}
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];
- if ([o_ext isEqualToString: @"bin"] ||
+ 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"])
+ [o_ext isEqualToString: @"iso"] )
{
o_mrl_string = o_filename;
}
NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
[o_open_panel setAllowsMultipleSelection: NO];
+ [o_open_panel setCanChooseDirectories: YES];
[o_open_panel setTitle: _NS("Open File")];
[o_open_panel setPrompt: _NS("Open")];
- if( [o_open_panel runModalForDirectory: nil
- file: nil types: nil] == NSOKButton )
+ [o_open_panel beginSheetForDirectory:nil
+ file:nil
+ types:nil
+ modalForWindow:[sender window]
+ modalDelegate: self
+ didEndSelector: @selector(pathChosenInPanel:
+ withReturn:
+ contextInfo:)
+ contextInfo: nil];
+}
+
+- (void)pathChosenInPanel: (NSOpenPanel *) sheet withReturn:(int)returnCode contextInfo:(void *)contextInfo
+{
+ if (returnCode == NSFileHandlingPanelOKButton)
{
- NSString *o_filename = [[o_open_panel filenames] objectAtIndex: 0];
+ NSString *o_filename = [[sheet filenames] objectAtIndex: 0];
[o_file_path setStringValue: o_filename];
[self openFilePathChanged: nil];
}
NSString *o_mode;
BOOL b_udp = FALSE;
BOOL b_udpm = FALSE;
- BOOL b_cs = FALSE;
BOOL b_http = FALSE;
o_mode = [[o_net_mode selectedCell] title];
if( [o_mode isEqualToString: _NS("UDP/RTP")] ) b_udp = TRUE;
else if( [o_mode isEqualToString: _NS("UDP/RTP Multicast")] ) b_udpm = TRUE;
- else if( [o_mode isEqualToString: _NS("Channel server")] ) b_cs = TRUE;
else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS")] ) b_http = TRUE;
[o_net_udp_port setEnabled: b_udp];
[o_net_udpm_addr setEnabled: b_udpm];
[o_net_udpm_port setEnabled: b_udpm];
[o_net_udpm_port_stp setEnabled: b_udpm];
- [o_net_cs_addr setEnabled: b_cs];
- [o_net_cs_port setEnabled: b_cs];
- [o_net_cs_port_stp setEnabled: b_cs];
[o_net_http_url setEnabled: b_http];
[self openNetInfoChanged: nil];
{
[o_net_udpm_port setIntValue: [o_net_udpm_port_stp intValue]];
}
- else if( i_tag == 2 )
- {
- [o_net_cs_port setIntValue: [o_net_cs_port_stp intValue]];
- }
[self openNetInfoChanged: nil];
}
- (void)openNetInfoChanged:(NSNotification *)o_notification
{
NSString *o_mode;
- vlc_bool_t b_channel;
NSString *o_mrl_string = [NSString string];
intf_thread_t * p_intf = [NSApp getIntf];
o_mode = [[o_net_mode selectedCell] title];
- b_channel = (vlc_bool_t)[o_mode isEqualToString: _NS("Channel server")];
- config_PutInt( p_intf, "network-channel", b_channel );
-
if( [o_mode isEqualToString: _NS("UDP/RTP")] )
{
int i_port = [o_net_udp_port intValue];
[o_mrl_string stringByAppendingFormat: @":%i", i_port];
}
}
- else if( [o_mode isEqualToString: _NS("Channel server")] )
- {
- NSString *o_addr = [o_net_cs_addr stringValue];
- int i_port = [o_net_cs_port intValue];
-
- if( p_intf->p_vlc->p_channel == NULL )
- {
- network_ChannelCreate( p_intf );
- }
-
- config_PutPsz( p_intf, "channel-server", [o_addr lossyCString] );
- if( i_port < 65536 )
- {
- config_PutInt( p_intf, "channel-port", i_port );
- }
-
- /* FIXME: we should use a playlist server instead */
- o_mrl_string = [NSString stringWithString: @"udp://"];
- }
else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS")] )
{
NSString *o_url = [o_net_http_url stringValue];
- (IBAction)soutChanged:(id)sender;
{
- [self soutModeChanged: nil];
-
- if ( [o_sout_cbox state] )
+ if ([o_sout_cbox state] == NSOnState)
{
- NSPoint s_point;
- s_point.x = 0;
- s_point.y = 0;
- [[o_panel contentView] setBoundsOrigin: s_point];
- [[o_panel contentView] setNeedsDisplay: YES];
-
- NSRect s_rect = [o_panel frame];
- s_rect.size.height = OPEN_PANEL_FULL_HEIGHT + WINDOW_TITLE_HEIGHT;
- s_rect.origin.y -= OPEN_PANEL_FULL_HEIGHT - OPEN_PANEL_SHORT_HEIGHT;
- [o_panel setFrame: s_rect display: YES animate: NO];
+ [o_sout_settings setEnabled:YES];
}
else
{
- NSPoint s_point;
- s_point.x = 0;
- s_point.y = OPEN_PANEL_FULL_HEIGHT - OPEN_PANEL_SHORT_HEIGHT;
- [[o_panel contentView] setBoundsOrigin: s_point];
- [[o_panel contentView] setNeedsDisplay: YES];
-
- NSRect s_rect = [o_panel frame];
- s_rect.size.height = OPEN_PANEL_SHORT_HEIGHT + WINDOW_TITLE_HEIGHT;
- s_rect.origin.y += OPEN_PANEL_FULL_HEIGHT - OPEN_PANEL_SHORT_HEIGHT;
- [o_panel setFrame: s_rect display: YES animate:NO];
+ [o_sout_settings setEnabled:NO];
}
}
+- (IBAction)soutSettings:(id)sender
+{
+ [self soutModeChanged: nil];
+ [NSApp beginSheet: o_sout_sheet
+ modalForWindow: [sender window]
+ modalDelegate: self
+ didEndSelector: NULL
+ contextInfo: nil];
+}
+
- (IBAction)soutFileBrowse:(id)sender
{
NSSavePanel *o_save_panel = [NSSavePanel savePanel];
NSString *o_mux_string;
- if ( [[[o_sout_mux selectedCell] title] isEqualToString: _NS("PS")] )
+ if ( [[[o_sout_mux selectedCell] title] isEqualToString: _NS("MPEG PS")] )
o_mux_string = @"vob";
+ else if ( [[[o_sout_mux selectedCell] title] isEqualToString: _NS("AVI")] )
+ o_mux_string = @"avi";
+ else if ( [[[o_sout_mux selectedCell] title] isEqualToString: _NS("Ogg")] )
+ o_mux_string = @"ogm";
else
o_mux_string = @"ts";
{
NSString *o_mode;
BOOL b_file = FALSE;
- BOOL b_udp = FALSE;
- BOOL b_rtp = FALSE;
+ BOOL b_net = FALSE;
o_mode = [[o_sout_access selectedCell] title];
if( [o_mode isEqualToString: _NS("File")] ) b_file = TRUE;
- else if( [o_mode isEqualToString: _NS("UDP")] ) b_udp = TRUE;
- else if( [o_mode isEqualToString: _NS("RTP")] ) b_rtp = TRUE;
+ else if( [o_mode isEqualToString: _NS("UDP")] ) b_net = TRUE;
+ else if( [o_mode isEqualToString: _NS("RTP")] ) b_net = TRUE;
[o_sout_file_path setEnabled: b_file];
[o_sout_file_btn_browse setEnabled: b_file];
- [o_sout_udp_addr setEnabled: b_udp|b_rtp];
- [o_sout_udp_port setEnabled: b_udp|b_rtp];
- [o_sout_udp_port_stp setEnabled: b_udp|b_rtp];
- [[o_sout_mux cellAtRow:0 column: 0] setEnabled: !b_rtp];
-
- if ( b_rtp )
+ [o_sout_udp_addr setEnabled: !b_file];
+ [o_sout_udp_port setEnabled: !b_file];
+ [o_sout_udp_port_stp setEnabled: !b_file ];
+
+ [[o_sout_mux cellAtRow:0 column: 1] setEnabled: !b_net];
+ [[o_sout_mux cellAtRow:0 column: 2] setEnabled: !b_net];
+ [[o_sout_mux cellAtRow:0 column: 3] setEnabled: !b_net];
+ if ( b_net )
{
- [[o_sout_mux cellAtRow: 0 column:1] setState: YES];
+ [o_sout_mux selectCellAtRow:0 column: 0];
}
[self soutInfoChanged: nil];
o_mode = [[o_sout_access selectedCell] title];
o_mux = [[o_sout_mux selectedCell] title];
- if ( [o_mux isEqualToString: _NS("PS")] ) o_mux_string = @"ps";
+ if ( [o_mux isEqualToString: _NS("AVI")] ) o_mux_string = @"avi";
+ else if ( [o_mux isEqualToString: _NS("Ogg")] ) o_mux_string = @"ogg";
+ else if ( [o_mux isEqualToString: _NS("MPEG PS")] ) o_mux_string = @"ps";
else o_mux_string = @"ts";
if ( [o_mode isEqualToString: _NS("File")] )
o_mrl_string = [NSString stringWithFormat: @"file/%@://%@",
o_mux_string, [o_sout_file_path stringValue]];
}
+ else if ( [o_mode isEqualToString: _NS("HTTP")] )
+ {
+ o_mrl_string = [NSString stringWithFormat: @"http/%@://%@:%i",
+ o_mux_string, [o_sout_udp_addr stringValue],
+ [o_sout_udp_port intValue]];
+ }
else if ( [o_mode isEqualToString: _NS("UDP")] )
{
o_mrl_string = [NSString stringWithFormat: @"udp/%@://%@:%i",
- (IBAction)soutStepperChanged:(id)sender
{
- [o_sout_udp_port setIntValue: [o_net_udp_port_stp intValue]];
-
+ [o_sout_udp_port setIntValue: [o_sout_udp_port_stp intValue]];
[self soutInfoChanged: nil];
}
+- (IBAction)soutCloseSheet:(id)sender
+{
+ [o_sout_sheet orderOut:sender];
+ [NSApp endSheet: o_sout_sheet];
+}
+
- (IBAction)openFile:(id)sender
{
NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
-
- [o_open_panel setAllowsMultipleSelection: NO];
+
+ [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 )
{
intf_thread_t * p_intf = [NSApp getIntf];
config_PutPsz( p_intf, "sout", NULL );
- [o_playlist appendArray: [o_open_panel filenames] atPos: -1];
+ [o_playlist appendArray: [o_open_panel filenames] atPos: -1 enqueue:NO];
+ }
+}
+
+- (IBAction)subsChanged:(id)sender
+{
+ if ([o_file_sub_ckbox state] == NSOnState)
+ {
+ [o_file_sub_btn_settings setEnabled:YES];
+ }
+ else
+ {
+ [o_file_sub_btn_settings setEnabled:NO];
}
}
+- (IBAction)subSettings:(id)sender
+{
+ [NSApp beginSheet: o_file_sub_sheet
+ modalForWindow: [sender window]
+ modalDelegate: self
+ didEndSelector: NULL
+ contextInfo: nil];
+}
+
+- (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 )
+ {
+ NSString *o_filename = [[o_open_panel filenames] objectAtIndex: 0];
+ [o_file_sub_path setStringValue: o_filename];
+ }
+}
+
+- (IBAction)subOverride:(id)sender
+{
+ BOOL b_state = [o_file_sub_override state];
+ [o_file_sub_delay setEnabled: b_state];
+ [o_file_sub_delay_stp setEnabled: b_state];
+ [o_file_sub_fps setEnabled: b_state];
+ [o_file_sub_fps_stp setEnabled: b_state];
+}
+
+- (IBAction)subDelayStepperChanged:(id)sender
+{
+ [o_file_sub_delay setIntValue: [o_file_sub_delay_stp intValue]];
+}
+
+- (IBAction)subFpsStepperChanged:(id)sender;
+{
+ [o_file_sub_fps setFloatValue: [o_file_sub_fps_stp floatValue]];
+}
+
+- (IBAction)subCloseSheet:(id)sender
+{
+ [o_file_sub_sheet orderOut:sender];
+ [NSApp endSheet: o_file_sub_sheet];
+}
+
- (IBAction)panelCancel:(id)sender
{
[NSApp stopModalWithCode: 0];
projects / vlc / blobdiff