/*****************************************************************************
* open.m: MacOS X module for vlc
*****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
+ * Copyright (C) 2002-2005 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
*
* 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.
*****************************************************************************/
/*****************************************************************************
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;
IOObjectRelease( next_media );
- } while( ( next_media = IOIteratorNext( media_iterator ) ) != NULL );
+ } while( ( next_media = IOIteratorNext( media_iterator ) ) != nil );
}
IOObjectRelease( media_iterator );
*****************************************************************************/
@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;
[[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_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 text encoding")];
+ [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 justification")];
[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" );
intf_thread_t * p_intf = VLCIntf;
module_config_t * p_item;
- [o_options addObject: [NSString stringWithFormat: @"sub-file=%s", [[o_file_sub_path stringValue] fileSystemRepresentation]]];
+ [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 )]];
[[(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];
}
}
}
-- (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 openTarget: 2];
if ( [o_device isEqualToString:
[NSString stringWithFormat: _NS("No %@s found"), o_type]] )
o_device = @"";
- o_mrl_string = [NSString stringWithFormat: @"vcd://%@@%i,%i",
+ o_mrl_string = [NSString stringWithFormat: @"vcd://%@@%i:%i",
o_device, i_title, i_chapter];
}
else if ( [o_type isEqualToString: _NS("Audio CD")] )
o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@",
o_device];
else
- o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i,%i",
+ o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i:%i-",
o_device, i_title, i_chapter];
}
else /* VIDEO_TS folder */
o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@",
o_videots];
else
- o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i,%i",
+ o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i:%i",
o_videots, i_title, i_chapter];
}
o_mode = [[o_net_mode selectedCell] title];
- if( [o_mode isEqualToString: _NS("UDP/RTP")] ) b_udp = TRUE;
+ if( [o_mode isEqualToString: _NS("UDP/RTP")] ) b_udp = TRUE;
else if( [o_mode isEqualToString: _NS("UDP/RTP Multicast")] ) b_udpm = TRUE;
- else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS")] ) b_http = TRUE;
+ else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS/RTSP")] ) b_http = TRUE;
[o_net_udp_port setEnabled: b_udp];
[o_net_udp_port_stp setEnabled: b_udp];
[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;
projects / vlc / blobdiff