for ( ivideo = 0; ivideo < deviceCount; ivideo++ )
{
AVCaptureDevice *avf_device;
- avf_device = myVideoDevices[ivideo];
- msg_Dbg(p_demux, "avcapture %u/%u %s %s", ivideo, deviceCount, [[avf_device modelID] UTF8String], [[avf_device uniqueID] UTF8String]);
+ avf_device = [myVideoDevices objectAtIndex:ivideo];
+ msg_Dbg(p_demux, "avcapture %lu/%lu %s %s", ivideo, deviceCount, [[avf_device modelID] UTF8String], [[avf_device uniqueID] UTF8String]);
if ([[[avf_device uniqueID]stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] isEqualToString:avf_currdevice_uid]) {
break;
}
if ( ivideo < [myVideoDevices count] )
{
- p_sys->device = myVideoDevices[ivideo];
+ p_sys->device = [myVideoDevices objectAtIndex:ivideo];
}
else
{
NSUInteger deviceCount = [myVideoDevices count];
for (ivideo = 0; ivideo < deviceCount; ivideo++) {
QTCaptureDevice *qtk_device;
- qtk_device = myVideoDevices[ivideo];
+ qtk_device = [myVideoDevices objectAtIndex:ivideo];
msg_Dbg(p_demux, "qtcapture %lu/%lu %s %s", ivideo, deviceCount, [[qtk_device localizedDisplayName] UTF8String], [[qtk_device uniqueID] UTF8String]);
if ([[[qtk_device uniqueID]stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] isEqualToString:qtk_currdevice_uid]) {
break;
QTCaptureDeviceInput * input = nil;
NSError *o_returnedError;
if (ivideo < [myVideoDevices count])
- p_sys->device = myVideoDevices[ivideo];
+ p_sys->device = [myVideoDevices objectAtIndex:ivideo];
else {
/* cannot found designated device, fall back to open default device */
msg_Dbg(p_demux, "Cannot find designated uid device as %s, falling back to default.", [qtk_currdevice_uid UTF8String]);
QTFormatDescription* camera_format = NULL;
NSUInteger formatCount = [format_array count];
for (NSUInteger k = 0; k < formatCount; k++) {
- camera_format = format_array[k];
+ camera_format = [format_array objectAtIndex:k];
msg_Dbg(p_demux, "localized Format: %s", [[camera_format localizedFormatSummary] UTF8String]);
msg_Dbg(p_demux, "format description: %s", [[[camera_format formatDescriptionAttributes] description] UTF8String]);
}
if ([format_array count])
- camera_format = format_array[0];
+ camera_format = [format_array objectAtIndex:0];
else
goto error;
unsigned iaudio;
for (iaudio = 0; iaudio < [myAudioDevices count]; iaudio++) {
QTCaptureDevice *qtk_audioDevice;
- qtk_audioDevice = myAudioDevices[iaudio];
+ qtk_audioDevice = [myAudioDevices objectAtIndex:iaudio];
msg_Dbg(p_demux, "qtsound audio %u/%lu localizedDisplayName: %s uniqueID: %s", iaudio, [myAudioDevices count], [[qtk_audioDevice localizedDisplayName] UTF8String], [[qtk_audioDevice uniqueID] UTF8String]);
if ([[[qtk_audioDevice uniqueID]stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] isEqualToString:qtk_curraudiodevice_uid]) {
msg_Dbg(p_demux, "Device found");
audioInput = nil;
if(iaudio < [myAudioDevices count])
- p_sys->audiodevice = myAudioDevices[iaudio];
+ p_sys->audiodevice = [myAudioDevices objectAtIndex:iaudio];
else {
/* cannot find designated audio device, fall back to open default audio device */
msg_Dbg(p_demux, "Cannot find designated uid audio device as %s. Fall back to open default audio device.", [qtk_curraudiodevice_uid UTF8String]);
audioformat_array = [p_sys->audiodevice formatDescriptions];
audio_format = NULL;
for(int k = 0; k < [audioformat_array count]; k++) {
- audio_format = (QTFormatDescription *)audioformat_array[k];
+ audio_format = (QTFormatDescription *)[audioformat_array objectAtIndex:k];
msg_Dbg(p_demux, "Audio localized format summary: %s", [[audio_format localizedFormatSummary] UTF8String]);
msg_Dbg(p_demux, "Audio format description attributes: %s",[[[audio_format formatDescriptionAttributes] description] UTF8String]);
}
if([audioformat_array count])
- audio_format = audioformat_array[0];
+ audio_format = [audioformat_array objectAtIndex:0];
else
goto error;
}
- (void) executeClickCountEvent: (NSArray*) values {
- AppleRemoteEventIdentifier event = [values[0] unsignedIntValue];
- NSTimeInterval eventTimePoint = [values[1] doubleValue];
+ AppleRemoteEventIdentifier event = [[values objectAtIndex:0] unsignedIntValue];
+ NSTimeInterval eventTimePoint = [[values objectAtIndex:1] doubleValue];
BOOL finishedClicking = NO;
int finalClickCount = eventClickCount;
NSMutableArray *mutableAllCookies = [[NSMutableArray alloc] init];
NSUInteger elementCount = [elements count];
for (NSUInteger i=0; i< elementCount; i++) {
- element = elements[i];
+ element = [elements objectAtIndex:i];
//Get cookie
object = [element valueForKey: (NSString*)CFSTR(kIOHIDElementCookieKey) ];
NSUInteger cookieCount = [_allCookies count];
for(NSUInteger i=0; i<cookieCount; i++) {
- IOHIDElementCookie cookie = (IOHIDElementCookie)[_allCookies[i] intValue];
+ IOHIDElementCookie cookie = (IOHIDElementCookie)[[_allCookies objectAtIndex:i] intValue];
(*queue)->addElement(queue, cookie, 0);
}
}
/* fetch preset */
- NSArray *items = [[defaults objectForKey:@"AudioEffectProfiles"][selectedProfile] componentsSeparatedByString:@";"];
+ NSArray *items = [[[defaults objectForKey:@"AudioEffectProfiles"] objectAtIndex:selectedProfile] componentsSeparatedByString:@";"];
/* eq preset */
vlc_object_t *p_object = VLC_OBJECT(getAout());
if (p_object == NULL)
p_object = vlc_object_hold(pl_Get(p_intf));
- var_SetString(p_object,"equalizer-preset",vlc_b64_decode([items[0] UTF8String]));
+ var_SetString(p_object,"equalizer-preset",vlc_b64_decode([[items objectAtIndex:0] UTF8String]));
vlc_object_release(p_object);
/* filter handling */
- NSString *tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([items[1] UTF8String])];
+ NSString *tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([[items objectAtIndex:1] UTF8String])];
NSArray *tempArray;
NSUInteger count;
/* enable the new filters, if we have an aout */
tempArray = [tempString componentsSeparatedByString:@":"];
count = [tempArray count];
for (NSUInteger x = 0; x < count; x++)
- playlist_EnableAudioFilter(p_playlist, (char *)[tempArray[x] UTF8String], true);
+ playlist_EnableAudioFilter(p_playlist, (char *)[[tempArray objectAtIndex:x] UTF8String], true);
}
}
config_PutPsz(p_intf,"audio-filter",[tempString UTF8String]);
/* values */
- config_PutFloat(p_intf, "compressor-rms-peak",[items[2] floatValue]);
- config_PutFloat(p_intf, "compressor-attack",[items[3] floatValue]);
- config_PutFloat(p_intf, "compressor-release",[items[4] floatValue]);
- config_PutFloat(p_intf, "compressor-threshold",[items[5] floatValue]);
- config_PutFloat(p_intf, "compressor-ratio",[items[6] floatValue]);
- config_PutFloat(p_intf, "compressor-knee",[items[7] floatValue]);
- config_PutFloat(p_intf, "compressor-makeup-gain",[items[8] floatValue]);
- config_PutFloat(p_intf, "spatializer-roomsize",[items[9] floatValue]);
- config_PutFloat(p_intf, "spatializer-width",[items[10] floatValue]);
- config_PutFloat(p_intf, "spatializer-wet",[items[11] floatValue]);
- config_PutFloat(p_intf, "spatializer-dry",[items[12] floatValue]);
- config_PutFloat(p_intf, "spatializer-damp",[items[13] floatValue]);
- config_PutFloat(p_intf, "norm-max-level",[items[14] floatValue]);
- config_PutInt(p_intf, "equalizer-2pass",[items[15] intValue]);
+ config_PutFloat(p_intf, "compressor-rms-peak",[[items objectAtIndex:2] floatValue]);
+ config_PutFloat(p_intf, "compressor-attack",[[items objectAtIndex:3] floatValue]);
+ config_PutFloat(p_intf, "compressor-release",[[items objectAtIndex:4] floatValue]);
+ config_PutFloat(p_intf, "compressor-threshold",[[items objectAtIndex:5] floatValue]);
+ config_PutFloat(p_intf, "compressor-ratio",[[items objectAtIndex:6] floatValue]);
+ config_PutFloat(p_intf, "compressor-knee",[[items objectAtIndex:7] floatValue]);
+ config_PutFloat(p_intf, "compressor-makeup-gain",[[items objectAtIndex:8] floatValue]);
+ config_PutFloat(p_intf, "spatializer-roomsize",[[items objectAtIndex:9] floatValue]);
+ config_PutFloat(p_intf, "spatializer-width",[[items objectAtIndex:10] floatValue]);
+ config_PutFloat(p_intf, "spatializer-wet",[[items objectAtIndex:11] floatValue]);
+ config_PutFloat(p_intf, "spatializer-dry",[[items objectAtIndex:12] floatValue]);
+ config_PutFloat(p_intf, "spatializer-damp",[[items objectAtIndex:13] floatValue]);
+ config_PutFloat(p_intf, "norm-max-level",[[items objectAtIndex:14] floatValue]);
+ config_PutInt(p_intf, "equalizer-2pass",[[items objectAtIndex:15] intValue]);
/* set values on-the-fly if we have an aout */
if (p_aout) {
- var_SetFloat(p_aout, "compressor-rms-peak", [items[2] floatValue]);
- var_SetFloat(p_aout, "compressor-attack", [items[3] floatValue]);
- var_SetFloat(p_aout, "compressor-release", [items[4] floatValue]);
- var_SetFloat(p_aout, "compressor-threshold", [items[5] floatValue]);
- var_SetFloat(p_aout, "compressor-ratio", [items[6] floatValue]);
- var_SetFloat(p_aout, "compressor-knee", [items[7] floatValue]);
- var_SetFloat(p_aout, "compressor-makeup-gain", [items[8] floatValue]);
- var_SetFloat(p_aout, "spatializer-roomsize", [items[9] floatValue]);
- var_SetFloat(p_aout, "spatializer-width", [items[10] floatValue]);
- var_SetFloat(p_aout, "spatializer-wet", [items[11] floatValue]);
- var_SetFloat(p_aout, "spatializer-dry", [items[12] floatValue]);
- var_SetFloat(p_aout, "spatializer-damp", [items[13] floatValue]);
- var_SetFloat(p_aout, "norm-max-level", [items[14] floatValue]);
- var_SetBool(p_aout, "equalizer-2pass", (BOOL)[items[15] intValue]);
+ var_SetFloat(p_aout, "compressor-rms-peak", [[items objectAtIndex:2] floatValue]);
+ var_SetFloat(p_aout, "compressor-attack", [[items objectAtIndex:3] floatValue]);
+ var_SetFloat(p_aout, "compressor-release", [[items objectAtIndex:4] floatValue]);
+ var_SetFloat(p_aout, "compressor-threshold", [[items objectAtIndex:5] floatValue]);
+ var_SetFloat(p_aout, "compressor-ratio", [[items objectAtIndex:6] floatValue]);
+ var_SetFloat(p_aout, "compressor-knee", [[items objectAtIndex:7] floatValue]);
+ var_SetFloat(p_aout, "compressor-makeup-gain", [[items objectAtIndex:8] floatValue]);
+ var_SetFloat(p_aout, "spatializer-roomsize", [[items objectAtIndex:9] floatValue]);
+ var_SetFloat(p_aout, "spatializer-width", [[items objectAtIndex:10] floatValue]);
+ var_SetFloat(p_aout, "spatializer-wet", [[items objectAtIndex:11] floatValue]);
+ var_SetFloat(p_aout, "spatializer-dry", [[items objectAtIndex:12] floatValue]);
+ var_SetFloat(p_aout, "spatializer-damp", [[items objectAtIndex:13] floatValue]);
+ var_SetFloat(p_aout, "norm-max-level", [[items objectAtIndex:14] floatValue]);
+ var_SetBool(p_aout, "equalizer-2pass", (BOOL)[[items objectAtIndex:15] intValue]);
}
/* update UI */
[o_eq_enable_ckb setState:NSOffState];
else
[o_eq_enable_ckb setState:NSOnState];
- [o_eq_twopass_ckb setState:[items[15] intValue]];
+ [o_eq_twopass_ckb setState:[[items objectAtIndex:15] intValue]];
[self resetCompressor];
[self resetSpatializer];
[self resetAudioFilters];
[self eq_changePreset: o_eq_presets_popup];
- [o_eq_preamp_sld setFloatValue:[[defaults objectForKey:@"EQPreampValues"][currentPresetIndex] floatValue]];
+ [o_eq_preamp_sld setFloatValue:[[[defaults objectForKey:@"EQPreampValues"] objectAtIndex:currentPresetIndex] floatValue]];
[self setBandSliderValuesForPreset:currentPresetIndex];
}
- (void)setBandSliderValuesForPreset:(NSInteger)presetID
{
- NSString *preset = [[NSUserDefaults standardUserDefaults] objectForKey:@"EQValues"][presetID];
+ NSString *preset = [[[NSUserDefaults standardUserDefaults] objectForKey:@"EQValues"] objectAtIndex:presetID];
NSArray *values = [preset componentsSeparatedByString:@" "];
NSUInteger count = [values count];
for (NSUInteger x = 0; x < count; x++)
- [self setValue:[values[x] floatValue] forSlider:x];
+ [self setValue:[[values objectAtIndex:x] floatValue] forSlider:x];
}
- (NSString *)generatePresetString
NSInteger numberOfChosenPreset = [sender indexOfSelectedItem];
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- NSString *preset = [defaults objectForKey:@"EQValues"][numberOfChosenPreset];
- NSString *preamp = [defaults objectForKey:@"EQPreampValues"][numberOfChosenPreset];
+ NSString *preset = [[defaults objectForKey:@"EQValues"] objectAtIndex:numberOfChosenPreset];
+ NSString *preamp = [[defaults objectForKey:@"EQPreampValues"] objectAtIndex:numberOfChosenPreset];
audio_output_t *p_aout = getAout();
if (p_aout) {
var_SetString(p_aout, "equalizer-bands", [preset UTF8String]);
var_SetFloat(p_aout, "equalizer-preamp", [preamp floatValue]);
- var_SetString(p_aout, "equalizer-preset" , [[defaults objectForKey:@"EQNames"][numberOfChosenPreset] UTF8String]);
+ var_SetString(p_aout, "equalizer-preset" , [[[defaults objectForKey:@"EQNames"] objectAtIndex:numberOfChosenPreset] UTF8String]);
vlc_object_release(p_aout);
}
/* save changed to config */
config_PutPsz(p_intf, "equalizer-bands", [preset UTF8String]);
config_PutFloat(p_intf, "equalizer-preamp", [preamp floatValue]);
- config_PutPsz(p_intf, "equalizer-preset", [[defaults objectForKey:@"EQNames"][numberOfChosenPreset] UTF8String]);
+ config_PutPsz(p_intf, "equalizer-preset", [[[defaults objectForKey:@"EQNames"] objectAtIndex:numberOfChosenPreset] UTF8String]);
}
[_customize_aud_samplerate_pop removeAllItems];
[_customize_subs_pop removeAllItems];
- [_customize_vid_codec_pop addItemsWithTitles:_videoCodecs[0]];
- [_customize_aud_codec_pop addItemsWithTitles:_audioCodecs[0]];
- [_customize_subs_pop addItemsWithTitles:_subsCodecs[0]];
+ [_customize_vid_codec_pop addItemsWithTitles:[_videoCodecs objectAtIndex:0]];
+ [_customize_aud_codec_pop addItemsWithTitles:[_audioCodecs objectAtIndex:0]];
+ [_customize_subs_pop addItemsWithTitles:[_subsCodecs objectAtIndex:0]];
[_customize_aud_samplerate_pop addItemWithTitle:@"8000"];
[_customize_aud_samplerate_pop addItemWithTitle:@"11025"];
[_ok_btn setEnabled: NO];
- [self resetCustomizationSheetBasedOnProfile:self.profileValueList[0]];
+ [self resetCustomizationSheetBasedOnProfile:[self.profileValueList objectAtIndex:0]];
}
# pragma mark -
{
if (b_streaming) {
if ([[[_stream_type_pop selectedItem] title] isEqualToString:@"HTTP"]) {
- NSString *muxformat = self.currentProfile[0];
+ NSString *muxformat = [self.currentProfile objectAtIndex:0];
if ([muxformat isEqualToString:@"wav"] || [muxformat isEqualToString:@"mov"] || [muxformat isEqualToString:@"mp4"] || [muxformat isEqualToString:@"mkv"]) {
NSBeginInformationalAlertSheet(_NS("Invalid container format for HTTP streaming"), _NS("OK"), @"", @"", _window,
nil, nil, nil, nil,
{
NSUInteger index = [_profile_pop indexOfSelectedItem];
if (index < ([self.profileValueList count] - 1))
- [self resetCustomizationSheetBasedOnProfile:self.profileValueList[index]];
+ [self resetCustomizationSheetBasedOnProfile:[self.profileValueList objectAtIndex:index]];
}
- (IBAction)customizeProfile:(id)sender
NSArray *values = [[paste propertyListForType: NSFilenamesPboardType] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
if ([values count] > 0) {
- [self setMRL: @(vlc_path2uri([values[0] UTF8String], NULL))];
+ [self setMRL: @(vlc_path2uri([[values objectAtIndex:0] UTF8String], NULL))];
[self updateOKButton];
[self updateDropView];
return YES;
PL_LOCK;
/* let's look for the first proper input item */
for (NSUInteger x = 0; x < count; x++) {
- p_item = [array[x] pointerValue];
+ p_item = [[array objectAtIndex:x] pointerValue];
if (p_item) {
if (p_item->p_input) {
if (p_item->p_input->psz_uri != nil) {
return;
}
- [self selectCellByEncapsulationFormat:components[0]];
- [_customize_vid_ckb setState:[components[1] intValue]];
- [_customize_aud_ckb setState:[components[2] intValue]];
- [_customize_subs_ckb setState:[components[3] intValue]];
- [self setVidBitrate:[components[5] intValue]];
- [_customize_vid_scale_pop selectItemWithTitle:components[6]];
- [self setVidFramerate:[components[7] intValue]];
- [_customize_vid_width_fld setStringValue:components[8]];
- [_customize_vid_height_fld setStringValue:components[9]];
- [self setAudBitrate:[components[11] intValue]];
- [self setAudChannels:[components[12] intValue]];
- [_customize_aud_samplerate_pop selectItemWithTitle:components[13]];
- [_customize_subs_overlay_ckb setState:[components[15] intValue]];
+ [self selectCellByEncapsulationFormat:[components objectAtIndex:0]];
+ [_customize_vid_ckb setState:[[components objectAtIndex:1] intValue]];
+ [_customize_aud_ckb setState:[[components objectAtIndex:2] intValue]];
+ [_customize_subs_ckb setState:[[components objectAtIndex:3] intValue]];
+ [self setVidBitrate:[[components objectAtIndex:5] intValue]];
+ [_customize_vid_scale_pop selectItemWithTitle:[components objectAtIndex:6]];
+ [self setVidFramerate:[[components objectAtIndex:7] intValue]];
+ [_customize_vid_width_fld setStringValue:[components objectAtIndex:8]];
+ [_customize_vid_height_fld setStringValue:[components objectAtIndex:9]];
+ [self setAudBitrate:[[components objectAtIndex:11] intValue]];
+ [self setAudChannels:[[components objectAtIndex:12] intValue]];
+ [_customize_aud_samplerate_pop selectItemWithTitle:[components objectAtIndex:13]];
+ [_customize_subs_overlay_ckb setState:[[components objectAtIndex:15] intValue]];
/* since there is no proper lookup mechanism in arrays, we need to implement a string specific one ourselves */
- NSArray * tempArray = _videoCodecs[1];
+ NSArray * tempArray = [_videoCodecs objectAtIndex:1];
NSUInteger count = [tempArray count];
- NSString * searchString = components[4];
+ NSString * searchString = [components objectAtIndex:4];
if ([searchString isEqualToString:@"none"] || [searchString isEqualToString:@"0"]) {
[_customize_vid_codec_pop selectItemAtIndex:-1];
} else {
for (NSUInteger x = 0; x < count; x++) {
- if ([tempArray[x] isEqualToString: searchString]) {
+ if ([[tempArray objectAtIndex:x] isEqualToString: searchString]) {
[_customize_vid_codec_pop selectItemAtIndex:x];
break;
}
}
}
- tempArray = _audioCodecs[1];
+ tempArray = [_audioCodecs objectAtIndex:1];
count = [tempArray count];
- searchString = components[10];
+ searchString = [components objectAtIndex:10];
if ([searchString isEqualToString:@"none"] || [searchString isEqualToString:@"0"]) {
[_customize_aud_codec_pop selectItemAtIndex:-1];
} else {
for (NSUInteger x = 0; x < count; x++) {
- if ([tempArray[x] isEqualToString: searchString]) {
+ if ([[tempArray objectAtIndex:x] isEqualToString: searchString]) {
[_customize_aud_codec_pop selectItemAtIndex:x];
break;
}
}
}
- tempArray = _subsCodecs[1];
+ tempArray = [_subsCodecs objectAtIndex:1];
count = [tempArray count];
- searchString = components[14];
+ searchString = [components objectAtIndex:14];
if ([searchString isEqualToString:@"none"] || [searchString isEqualToString:@"0"]) {
[_customize_subs_pop selectItemAtIndex:-1];
} else {
for (NSUInteger x = 0; x < count; x++) {
- if ([tempArray[x] isEqualToString: searchString]) {
+ if ([[tempArray objectAtIndex:x] isEqualToString: searchString]) {
[_customize_subs_pop selectItemAtIndex:x];
break;
}
- (NSString *)composedOptions
{
NSMutableString *composedOptions = [[NSMutableString alloc] initWithString:@":sout=#transcode{"];
- if ([self.currentProfile[1] intValue]) {
+ if ([[self.currentProfile objectAtIndex:1] intValue]) {
// video is enabled
- [composedOptions appendFormat:@"vcodec=%@", self.currentProfile[4]];
- if (![self.currentProfile[4] isEqualToString:@"none"]) {
- if ([self.currentProfile[5] intValue] > 0) // bitrate
- [composedOptions appendFormat:@",vb=%@", self.currentProfile[5]];
- if ([self.currentProfile[6] floatValue] > 0.) // scale
- [composedOptions appendFormat:@",scale=%@", self.currentProfile[6]];
- if ([self.currentProfile[7] floatValue] > 0.) // fps
- [composedOptions appendFormat:@",fps=%@", self.currentProfile[7]];
- if ([self.currentProfile[8] intValue] > 0) // width
- [composedOptions appendFormat:@",width=%@", self.currentProfile[8]];
- if ([self.currentProfile[9] intValue] > 0) // height
- [composedOptions appendFormat:@",height=%@", self.currentProfile[9]];
+ [composedOptions appendFormat:@"vcodec=%@", [self.currentProfile objectAtIndex:4]];
+ if (![[self.currentProfile objectAtIndex:4] isEqualToString:@"none"]) {
+ if ([[self.currentProfile objectAtIndex:5] intValue] > 0) // bitrate
+ [composedOptions appendFormat:@",vb=%@", [self.currentProfile objectAtIndex:5]];
+ if ([[self.currentProfile objectAtIndex:6] floatValue] > 0.) // scale
+ [composedOptions appendFormat:@",scale=%@", [self.currentProfile objectAtIndex:6]];
+ if ([[self.currentProfile objectAtIndex:7] floatValue] > 0.) // fps
+ [composedOptions appendFormat:@",fps=%@", [self.currentProfile objectAtIndex:7]];
+ if ([[self.currentProfile objectAtIndex:8] intValue] > 0) // width
+ [composedOptions appendFormat:@",width=%@", [self.currentProfile objectAtIndex:8]];
+ if ([[self.currentProfile objectAtIndex:9] intValue] > 0) // height
+ [composedOptions appendFormat:@",height=%@", [self.currentProfile objectAtIndex:9]];
}
}
- if ([self.currentProfile[2] intValue]) {
+ if ([[self.currentProfile objectAtIndex:2] intValue]) {
// audio is enabled
// add another comma in case video is enabled
- if ([self.currentProfile[1] intValue])
+ if ([[self.currentProfile objectAtIndex:1] intValue])
[composedOptions appendString:@","];
- [composedOptions appendFormat:@"acodec=%@", self.currentProfile[10]];
- if (![self.currentProfile[10] isEqualToString:@"none"]) {
- [composedOptions appendFormat:@",ab=%@", self.currentProfile[11]]; // bitrate
- [composedOptions appendFormat:@",channels=%@", self.currentProfile[12]]; // channel number
- [composedOptions appendFormat:@",samplerate=%@", self.currentProfile[13]]; // sample rate
+ [composedOptions appendFormat:@"acodec=%@", [self.currentProfile objectAtIndex:10]];
+ if (![[self.currentProfile objectAtIndex:10] isEqualToString:@"none"]) {
+ [composedOptions appendFormat:@",ab=%@", [self.currentProfile objectAtIndex:11]]; // bitrate
+ [composedOptions appendFormat:@",channels=%@", [self.currentProfile objectAtIndex:12]]; // channel number
+ [composedOptions appendFormat:@",samplerate=%@", [self.currentProfile objectAtIndex:13]]; // sample rate
}
}
- if (self.currentProfile[3]) {
+ if ([self.currentProfile objectAtIndex:3]) {
// subtitles enabled
- [composedOptions appendFormat:@",scodec=%@", self.currentProfile[14]];
- if ([self.currentProfile[15] intValue])
+ [composedOptions appendFormat:@",scodec=%@", [self.currentProfile objectAtIndex:14]];
+ if ([[self.currentProfile objectAtIndex:15] intValue])
[composedOptions appendFormat:@",soverlay"];
}
if (!b_streaming) {
/* file transcoding */
// add muxer
- [composedOptions appendFormat:@"}:standard{mux=%@", self.currentProfile[0]];
+ [composedOptions appendFormat:@"}:standard{mux=%@", [self.currentProfile objectAtIndex:0]];
// add output destination
[composedOptions appendFormat:@",access=file{no-overwrite},dst=%@}", _outputDestination];
else if ([[[_stream_type_pop selectedItem] title] isEqualToString:@"MMSH"])
[composedOptions appendFormat:@":standard{mux=asfh,dst=%@,port=%@,access=mmsh", _outputDestination, [_stream_port_fld stringValue]];
else
- [composedOptions appendFormat:@":standard{mux=%@,dst=%@,port=%@,access=http", self.currentProfile[0], [_stream_port_fld stringValue], _outputDestination];
+ [composedOptions appendFormat:@":standard{mux=%@,dst=%@,port=%@,access=http", [self.currentProfile objectAtIndex:0], [_stream_port_fld stringValue], _outputDestination];
if ([_stream_sap_ckb state])
[composedOptions appendFormat:@",sap,name=\"%@\"", [_stream_channel_fld stringValue]];
[self.currentProfile addObject: [NSString stringWithFormat:@"%li", [_customize_subs_ckb state]]];
i = [_customize_vid_codec_pop indexOfSelectedItem];
if (i >= 0)
- [self.currentProfile addObject: _videoCodecs[1][i]];
+ [self.currentProfile addObject: [[_videoCodecs objectAtIndex:1] objectAtIndex:i]];
else
[self.currentProfile addObject: @"none"];
[self.currentProfile addObject: [NSString stringWithFormat:@"%i", [self vidBitrate]]];
[self.currentProfile addObject: [NSString stringWithFormat:@"%i", [_customize_vid_height_fld intValue]]];
i = [_customize_aud_codec_pop indexOfSelectedItem];
if (i >= 0)
- [self.currentProfile addObject: _audioCodecs[1][i]];
+ [self.currentProfile addObject: [[_audioCodecs objectAtIndex:1] objectAtIndex:i]];
else
[self.currentProfile addObject: @"none"];
[self.currentProfile addObject: [NSString stringWithFormat:@"%i", [self audBitrate]]];
[self.currentProfile addObject: [[_customize_aud_samplerate_pop selectedItem] title]];
i = [_customize_subs_pop indexOfSelectedItem];
if (i >= 0)
- [self.currentProfile addObject: _subsCodecs[1][i]];
+ [self.currentProfile addObject: [[_subsCodecs objectAtIndex:1] objectAtIndex:i]];
else
[self.currentProfile addObject: @"none"];
[self.currentProfile addObject: [NSString stringWithFormat:@"%li", [_customize_subs_overlay_ckb state]]];
BOOL b_returned = NO;
if (count == 1 && p_input) {
- b_returned = input_AddSubtitle(p_input, [o_values[0] UTF8String], true);
+ b_returned = input_AddSubtitle(p_input, [[o_values objectAtIndex:0] UTF8String], true);
vlc_object_release(p_input);
if (!b_returned)
return YES;
for (NSUInteger i = 0; i < count; i++) {
NSDictionary *o_dic;
- char *psz_uri = vlc_path2uri([o_values[i] UTF8String], NULL);
+ char *psz_uri = vlc_path2uri([[o_values objectAtIndex:i] UTF8String], NULL);
if (!psz_uri)
continue;
/* check whether the user runs OSX with a RTL language */
NSArray* languages = [NSLocale preferredLanguages];
- NSString* preferredLanguage = languages[0];
+ NSString* preferredLanguage = [languages objectAtIndex:0];
if ([NSLocale characterDirectionForLanguage:preferredLanguage] == NSLocaleLanguageDirectionRightToLeft) {
msg_Dbg(VLCIntf, "adapting interface since '%s' is a RTL language", [preferredLanguage UTF8String]);
NSMenuItem *o_mi_tmp;
NSUInteger count = [o_ptc_menuorder count];
for (NSUInteger i = 0; i < count; i++) {
- NSString *o_title = [o_ptc_translation_dict objectForKey:o_ptc_menuorder[i]];
+ NSString *o_title = [o_ptc_translation_dict objectForKey:[o_ptc_menuorder objectAtIndex:i]];
o_mi_tmp = [o_mu_playlistTableColumns addItemWithTitle:o_title
action:@selector(togglePlaylistColumnTable:)
keyEquivalent:@""];
/* don't set a valid target for the title column selector, since we want it to be disabled */
- if (![o_ptc_menuorder[i] isEqualToString: TITLE_COLUMN])
+ if (![[o_ptc_menuorder objectAtIndex:i] isEqualToString: TITLE_COLUMN])
[o_mi_tmp setTarget:self];
[o_mi_tmp setTag:i];
action:@selector(togglePlaylistColumnTable:)
keyEquivalent:@""];
/* don't set a valid target for the title column selector, since we want it to be disabled */
- if (![o_ptc_menuorder[i] isEqualToString: TITLE_COLUMN])
+ if (![[o_ptc_menuorder objectAtIndex:i] isEqualToString: TITLE_COLUMN])
[o_mi_tmp setTarget:self];
[o_mi_tmp setTag:i];
}
NSArray *menuitems_array = [the_menu itemArray];
NSUInteger menuItemCount = [menuitems_array count];
for (NSUInteger i=0; i < menuItemCount; i++) {
- NSMenuItem *one_item = menuitems_array[i];
+ NSMenuItem *one_item = [menuitems_array objectAtIndex:i];
if ([one_item hasSubmenu])
[self releaseRepresentedObjects: [one_item submenu]];
[o_mitem setTarget: self];
NSRect s_rect;
for (NSUInteger i = 0; i < count; i++) {
- s_rect = [o_screens[i] frame];
+ s_rect = [[o_screens objectAtIndex:i] frame];
[o_submenu addItemWithTitle: [NSString stringWithFormat: @"%@ %li (%ix%i)", _NS("Screen"), i+1,
(int)s_rect.size.width, (int)s_rect.size.height] action:@selector(toggleFullscreenDevice:) keyEquivalent:@""];
o_mitem = [o_submenu itemAtIndex:i+1];
- [o_mitem setTag: (int)[o_screens[i] displayID]];
+ [o_mitem setTag: (int)[[o_screens objectAtIndex:i] displayID]];
[o_mitem setEnabled: YES];
[o_mitem setTarget: self];
}
[[o_mu_playlistTableColumns itemWithTag: i_tag] setState: i_new_state];
[[o_mu_playlistTableColumnsContextMenu itemWithTag: i_tag] setState: i_new_state];
- NSString *o_column = o_ptc_menuorder[i_tag];
+ NSString *o_column = [o_ptc_menuorder objectAtIndex:i_tag];
[[[VLCMain sharedInstance] playlist] setColumn: o_column state: i_new_state translationDict: o_ptc_translation_dict];
}
c = [[openPanel URLs] count];
for (int i = 0; i < c ; i++) {
- msg_Dbg(VLCIntf, "loading subs from %s", [[[openPanel URLs][i] path] UTF8String]);
- if (input_AddSubtitle(p_input, [[[openPanel URLs][i] path] UTF8String], TRUE))
+ msg_Dbg(VLCIntf, "loading subs from %s", [[[[openPanel URLs] objectAtIndex:i] path] UTF8String]);
+ if (input_AddSubtitle(p_input, [[[[openPanel URLs] objectAtIndex:i] path] UTF8String], TRUE))
msg_Warn(VLCIntf, "unable to load subtitles from '%s'",
- [[[openPanel URLs][i] path] UTF8String]);
+ [[[[openPanel URLs] objectAtIndex:i] path] UTF8String]);
}
}
vlc_object_release(p_input);
NSUInteger i_sidebaritem_count = [o_sidebaritems count];
for (NSUInteger x = 0; x < i_sidebaritem_count; x++)
- [o_sidebar_view expandItem: o_sidebaritems[x] expandChildren: YES];
+ [o_sidebar_view expandItem: [o_sidebaritems objectAtIndex:x] expandChildren: YES];
[o_fspanel center];
}
}
if ([[o_video_view subviews] count] > 0)
- [self makeFirstResponder: [o_video_view subviews][0]];
+ [self makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]];
}
// only exception for an controls bar button action
{
//Works the same way as the NSOutlineView data source: `nil` means a parent item
if (item==nil)
- return o_sidebaritems[index];
+ return [o_sidebaritems objectAtIndex:index];
else
- return [item children][index];
+ return [[item children] objectAtIndex:index];
}
for(NSUInteger i = 0; i < count; i++) {
NSDictionary *o_dic;
- char *psz_uri = vlc_path2uri([o_values[i] UTF8String], NULL);
+ char *psz_uri = vlc_path2uri([[o_values objectAtIndex:i] UTF8String], NULL);
if (!psz_uri)
continue;
PL_LOCK;
for(NSUInteger i = 0; i < count; i++) {
- p_item = [array[i] pointerValue];
+ p_item = [[array objectAtIndex:i] pointerValue];
if (!p_item) continue;
playlist_NodeAddCopy(p_playlist, p_item, p_node, PLAYLIST_END);
}
return nil;
for (NSUInteger x = 0; x < count; x++) {
- id item = array[x]; // save one objc selector call
+ id item = [array objectAtIndex:x]; // save one objc selector call
if ([[item identifier] isEqualToString:object])
return item;
}
for (NSUInteger i = count - 1; i > 0; i--) {
currentPath = [NSMutableString stringWithCapacity:1024];
for (NSUInteger y = 0; y < i; y++)
- [currentPath appendFormat: @"/%@", pathComponents[y + 1]];
+ [currentPath appendFormat: @"/%@", [pathComponents objectAtIndex:y + 1]];
[contextMenu addItemWithTitle: [[NSFileManager defaultManager] displayNameAtPath: currentPath] action:@selector(revealInFinder:) keyEquivalent:@""];
currentItem = [contextMenu itemAtIndex:[contextMenu numberOfItems] - 1];
[currentItem setImage: icon];
}
- if ([pathComponents[1] isEqualToString:@"Volumes"]) {
+ if ([[pathComponents objectAtIndex:1] isEqualToString:@"Volumes"]) {
/* we don't want to show the Volumes item, since the Cocoa does it neither */
currentItem = [contextMenu itemWithTitle:[[NSFileManager defaultManager] displayNameAtPath: @"/Volumes"]];
if (currentItem)
selectedItem = count - selectedItem;
/* fix for non-startup volumes */
- if ([pathComponents[1] isEqualToString:@"Volumes"])
+ if ([[pathComponents objectAtIndex:1] isEqualToString:@"Volumes"])
selectedItem += 1;
for (NSUInteger y = 1; y < selectedItem; y++)
- [currentPath appendFormat: @"/%@", pathComponents[y]];
+ [currentPath appendFormat: @"/%@", [pathComponents objectAtIndex:y]];
[[NSWorkspace sharedWorkspace] selectFile: currentPath inFileViewerRootedAtPath: currentPath];
}
NSInteger row = [self rowForItem:item];
//Return the default table column
- return [[self tableColumns][0] dataCellForRow:row];
+ return [[[self tableColumns] objectAtIndex:0] dataCellForRow:row];
}
- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
ProcessSerialNumber mySerial, topSerial;
GetCurrentProcess(&mySerial);
- [_mediaKeyAppList[0] getValue:&topSerial];
+ [[_mediaKeyAppList objectAtIndex:0] getValue:&topSerial];
Boolean same;
OSErr err = SameProcess(&mySerial, &topSerial, &same);
- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
{
- return [contentArray[rowIndex] objectForKey:@"text"];
+ return [[contentArray objectAtIndex:rowIndex] objectForKey:@"text"];
}
@end
// cascade windows if we have more than one vout
if (b_multiple_vout_windows) {
if ([o_vout_dict count] == 1) {
- NSWindow * o_first_window = [o_vout_dict objectForKey: [o_vout_dict allKeys][0]];
+ NSWindow * o_first_window = [o_vout_dict objectForKey: [[o_vout_dict allKeys] objectAtIndex:0]];
NSPoint topleftbase = NSMakePoint(0, [o_first_window frame].size.height);
top_left_point = [o_first_window convertBaseToScreen: topleftbase];
}
/* fetch preset */
- NSArray *items = [[defaults objectForKey:@"VideoEffectProfiles"][selectedProfile] componentsSeparatedByString:@";"];
+ NSArray *items = [[[defaults objectForKey:@"VideoEffectProfiles"] objectAtIndex:selectedProfile] componentsSeparatedByString:@";"];
/* filter handling */
- NSString *tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([items[0] UTF8String])];
+ NSString *tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([[items objectAtIndex:0] UTF8String])];
NSArray *tempArray;
NSUInteger count;
/* enable the new filters */
tempArray = [tempString componentsSeparatedByString:@":"];
count = [tempArray count];
for (NSUInteger x = 0; x < count; x++)
- [self setVideoFilter:(char *)[tempArray[x] UTF8String] on:YES];
+ [self setVideoFilter:(char *)[[tempArray objectAtIndex:x] UTF8String] on:YES];
}
config_PutPsz(p_intf, "video-filter", [tempString UTF8String]);
- tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([items[1] UTF8String])];
+ tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([[items objectAtIndex:1] UTF8String])];
/* enable another round of new filters */
if ([tempString length] > 0) {
tempArray = [tempString componentsSeparatedByString:@":"];
count = [tempArray count];
for (NSUInteger x = 0; x < count; x++)
- [self setVideoFilter:(char *)[tempArray[x] UTF8String] on:YES];
+ [self setVideoFilter:(char *)[[tempArray objectAtIndex:x] UTF8String] on:YES];
}
config_PutPsz(p_intf,"sub-source", [tempString UTF8String]);
- tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([items[2] UTF8String])];
+ tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([[items objectAtIndex:2] UTF8String])];
/* enable another round of new filters */
if ([tempString length] > 0) {
tempArray = [tempString componentsSeparatedByString:@":"];
count = [tempArray count];
for (NSUInteger x = 0; x < count; x++)
- [self setVideoFilter:(char *)[tempArray[x] UTF8String] on:YES];
+ [self setVideoFilter:(char *)[[tempArray objectAtIndex:x] UTF8String] on:YES];
}
config_PutPsz(p_intf,"video-splitter", [tempString UTF8String]);
/* try to set filter values on-the-fly and store them appropriately */
- [self setVideoFilterProperty:"hue" forFilter:"adjust" integer:[items[3] intValue]];
- [self setVideoFilterProperty:"contrast" forFilter:"adjust" float:[items[4] floatValue]];
- [self setVideoFilterProperty:"brightness" forFilter:"adjust" float:[items[5] floatValue]];
- [self setVideoFilterProperty:"saturation" forFilter:"adjust" float:[items[6] floatValue]];
- [self setVideoFilterProperty:"gamma" forFilter:"adjust" float:[items[7] floatValue]];
- [self setVideoFilterProperty:"sharpen-sigma" forFilter:"sharpen" float:[items[8] floatValue]];
- [self setVideoFilterProperty:"gradfun-radius" forFilter:"gradfun" integer:[items[9] intValue]];
- [self setVideoFilterProperty:"grain-variance" forFilter:"grain" float:[items[10] floatValue]];
- [self setVideoFilterProperty:"transform-type" forFilter:"transform" string:vlc_b64_decode([items[11] UTF8String])];
- [self setVideoFilterProperty:"puzzle-rows" forFilter:"puzzle" integer:[items[12] intValue]];
- [self setVideoFilterProperty:"puzzle-cols" forFilter:"puzzle" integer:[items[13] intValue]];
- [self setVideoFilterProperty:"colorthres-color" forFilter:"colorthres" integer:[items[14] intValue]];
- [self setVideoFilterProperty:"colorthres-saturationthres" forFilter:"colorthres" integer:[items[15] intValue]];
- [self setVideoFilterProperty:"colorthres-similaritythres" forFilter:"colorthres" integer:[items[16] intValue]];
- [self setVideoFilterProperty:"sepia-intensity" forFilter:"sepia" integer:[items[17] intValue]];
- [self setVideoFilterProperty:"gradient-mode" forFilter:"gradient" string:vlc_b64_decode([items[18] UTF8String])];
- [self setVideoFilterProperty:"gradient-cartoon" forFilter:"gradient" integer:[items[19] intValue]];
- [self setVideoFilterProperty:"gradient-type" forFilter:"gradient" integer:[items[20] intValue]];
- [self setVideoFilterProperty:"extract-component" forFilter:"extract" integer:[items[21] intValue]];
- [self setVideoFilterProperty:"posterize-level" forFilter:"posterize" integer:[items[22] intValue]];
- [self setVideoFilterProperty:"blur-factor" forFilter:"motionblur" integer:[items[23] intValue]];
- [self setVideoFilterProperty:"marq-marquee" forFilter:"marq" string:vlc_b64_decode([items[24] UTF8String])];
- [self setVideoFilterProperty:"marq-position" forFilter:"marq" integer:[items[25] intValue]];
- [self setVideoFilterProperty:"logo-file" forFilter:"logo" string:vlc_b64_decode([items[26] UTF8String])];
- [self setVideoFilterProperty:"logo-position" forFilter:"logo" integer:[items[27] intValue]];
- [self setVideoFilterProperty:"logo-opacity" forFilter:"logo" integer:[items[28] intValue]];
- [self setVideoFilterProperty:"clone-count" forFilter:"clone" integer:[items[29] intValue]];
- [self setVideoFilterProperty:"wall-rows" forFilter:"wall" integer:[items[30] intValue]];
- [self setVideoFilterProperty:"wall-cols" forFilter:"wall" integer:[items[31] intValue]];
+ [self setVideoFilterProperty:"hue" forFilter:"adjust" integer:[[items objectAtIndex:3] intValue]];
+ [self setVideoFilterProperty:"contrast" forFilter:"adjust" float:[[items objectAtIndex:4] floatValue]];
+ [self setVideoFilterProperty:"brightness" forFilter:"adjust" float:[[items objectAtIndex:5] floatValue]];
+ [self setVideoFilterProperty:"saturation" forFilter:"adjust" float:[[items objectAtIndex:6] floatValue]];
+ [self setVideoFilterProperty:"gamma" forFilter:"adjust" float:[[items objectAtIndex:7] floatValue]];
+ [self setVideoFilterProperty:"sharpen-sigma" forFilter:"sharpen" float:[[items objectAtIndex:8] floatValue]];
+ [self setVideoFilterProperty:"gradfun-radius" forFilter:"gradfun" integer:[[items objectAtIndex:9] intValue]];
+ [self setVideoFilterProperty:"grain-variance" forFilter:"grain" float:[[items objectAtIndex:10] floatValue]];
+ [self setVideoFilterProperty:"transform-type" forFilter:"transform" string:vlc_b64_decode([[items objectAtIndex:11] UTF8String])];
+ [self setVideoFilterProperty:"puzzle-rows" forFilter:"puzzle" integer:[[items objectAtIndex:12] intValue]];
+ [self setVideoFilterProperty:"puzzle-cols" forFilter:"puzzle" integer:[[items objectAtIndex:13] intValue]];
+ [self setVideoFilterProperty:"colorthres-color" forFilter:"colorthres" integer:[[items objectAtIndex:14] intValue]];
+ [self setVideoFilterProperty:"colorthres-saturationthres" forFilter:"colorthres" integer:[[items objectAtIndex:15] intValue]];
+ [self setVideoFilterProperty:"colorthres-similaritythres" forFilter:"colorthres" integer:[[items objectAtIndex:16] intValue]];
+ [self setVideoFilterProperty:"sepia-intensity" forFilter:"sepia" integer:[[items objectAtIndex:17] intValue]];
+ [self setVideoFilterProperty:"gradient-mode" forFilter:"gradient" string:vlc_b64_decode([[items objectAtIndex:18] UTF8String])];
+ [self setVideoFilterProperty:"gradient-cartoon" forFilter:"gradient" integer:[[items objectAtIndex:19] intValue]];
+ [self setVideoFilterProperty:"gradient-type" forFilter:"gradient" integer:[[items objectAtIndex:20] intValue]];
+ [self setVideoFilterProperty:"extract-component" forFilter:"extract" integer:[[items objectAtIndex:21] intValue]];
+ [self setVideoFilterProperty:"posterize-level" forFilter:"posterize" integer:[[items objectAtIndex:22] intValue]];
+ [self setVideoFilterProperty:"blur-factor" forFilter:"motionblur" integer:[[items objectAtIndex:23] intValue]];
+ [self setVideoFilterProperty:"marq-marquee" forFilter:"marq" string:vlc_b64_decode([[items objectAtIndex:24] UTF8String])];
+ [self setVideoFilterProperty:"marq-position" forFilter:"marq" integer:[[items objectAtIndex:25] intValue]];
+ [self setVideoFilterProperty:"logo-file" forFilter:"logo" string:vlc_b64_decode([[items objectAtIndex:26] UTF8String])];
+ [self setVideoFilterProperty:"logo-position" forFilter:"logo" integer:[[items objectAtIndex:27] intValue]];
+ [self setVideoFilterProperty:"logo-opacity" forFilter:"logo" integer:[[items objectAtIndex:28] intValue]];
+ [self setVideoFilterProperty:"clone-count" forFilter:"clone" integer:[[items objectAtIndex:29] intValue]];
+ [self setVideoFilterProperty:"wall-rows" forFilter:"wall" integer:[[items objectAtIndex:30] intValue]];
+ [self setVideoFilterProperty:"wall-cols" forFilter:"wall" integer:[[items objectAtIndex:31] intValue]];
[defaults setInteger:selectedProfile forKey:@"VideoEffectSelectedProfile"];
[defaults synchronize];
@synchronized(self) {
current_anim = self->o_current_animation;
- if ([[current_anim viewAnimations][0] objectForKey: NSViewAnimationEffectKey] == NSViewAnimationFadeOutEffect && [current_anim isAnimating]) {
+ if ([[[current_anim viewAnimations] objectAtIndex:0] objectForKey: NSViewAnimationEffectKey] == NSViewAnimationFadeOutEffect && [current_anim isAnimating]) {
[anim release];
} else {
if (current_anim) {
@synchronized(self) {
current_anim = self->o_current_animation;
- if ([[current_anim viewAnimations][0] objectForKey: NSViewAnimationEffectKey] == NSViewAnimationFadeInEffect && [current_anim isAnimating]) {
+ if ([[[current_anim viewAnimations] objectAtIndex:0] objectForKey: NSViewAnimationEffectKey] == NSViewAnimationFadeInEffect && [current_anim isAnimating]) {
[anim release];
} else {
if (current_anim) {
NSUInteger count = [subviews count];
for (NSUInteger x = 0; x < count; x++) {
- if ([subviews[x] respondsToSelector:@selector(reshape)])
- [subviews[x] reshape];
+ if ([[subviews objectAtIndex:x] respondsToSelector:@selector(reshape)])
+ [[subviews objectAtIndex:x] reshape];
}
}
- (void)hasBecomeFullscreen
{
if ([[o_video_view subviews] count] > 0)
- [o_fullscreen_window makeFirstResponder: [o_video_view subviews][0]];
+ [o_fullscreen_window makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]];
[o_fullscreen_window makeKeyWindow];
[o_fullscreen_window setAcceptsMouseMovedEvents: YES];
[o_video_view release];
[o_video_view setFrame:[o_temp_view frame]];
if ([[o_video_view subviews] count] > 0)
- [self makeFirstResponder: [o_video_view subviews][0]];
+ [self makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]];
[super makeKeyAndOrderFront:self]; /* our version (in main window) contains a workaround */
/* Fullscreen ended or started (we are a delegate only for leaveFullscreen's/enterFullscren's anim2) */
viewAnimations = [o_fullscreen_anim2 viewAnimations];
if ([viewAnimations count] >=1 &&
- [[viewAnimations[0] objectForKey: NSViewAnimationEffectKey] isEqualToString:NSViewAnimationFadeInEffect]) {
+ [[[viewAnimations objectAtIndex:0] objectForKey: NSViewAnimationEffectKey] isEqualToString:NSViewAnimationFadeInEffect]) {
/* Fullscreen ended */
[self hasEndedFullscreen];
} else
NSArray * components = [[o_edit_fld_time stringValue] componentsSeparatedByString:@":"];
NSUInteger componentCount = [components count];
if (componentCount == 1)
- pp_bookmarks[i]->i_time_offset = 1000000 * ([components[0] intValue]);
+ pp_bookmarks[i]->i_time_offset = 1000000 * ([[components objectAtIndex:0] intValue]);
else if (componentCount == 2)
- pp_bookmarks[i]->i_time_offset = 1000000 * ([components[0] intValue] * 60 + [components[1] intValue]);
+ pp_bookmarks[i]->i_time_offset = 1000000 * ([[components objectAtIndex:0] intValue] * 60 + [[components objectAtIndex:1] intValue]);
else if (componentCount == 3)
- pp_bookmarks[i]->i_time_offset = 1000000 * ([components[0] intValue] * 3600 + [components[1] intValue] * 60 + [components[2] intValue]);
+ pp_bookmarks[i]->i_time_offset = 1000000 * ([[components objectAtIndex:0] intValue] * 3600 + [[components objectAtIndex:1] intValue] * 60 + [[components objectAtIndex:2] intValue]);
else {
msg_Err(VLCIntf, "Invalid string format for time");
goto clear;
[fieldContent componentsSeparatedByString: @":"];
if ([[fieldContent componentsSeparatedByString: @":"] count] == 3) {
- timeInSec += ([ourTempArray[0] intValue] * 3600); //h
- timeInSec += ([ourTempArray[1] intValue] * 60); //m
- timeInSec += [ourTempArray[2] intValue]; //s
+ timeInSec += ([[ourTempArray objectAtIndex:0] intValue] * 3600); //h
+ timeInSec += ([[ourTempArray objectAtIndex:1] intValue] * 60); //m
+ timeInSec += [[ourTempArray objectAtIndex:2] intValue]; //s
} else {
- timeInSec += ([ourTempArray[0] intValue] * 60); //m
- timeInSec += [ourTempArray[1] intValue]; //s
+ timeInSec += ([[ourTempArray objectAtIndex:0] intValue] * 60); //m
+ timeInSec += [[ourTempArray objectAtIndex:1] intValue]; //s
}
}
else
(NSTableColumn *)theTableColumn row: (NSInteger)row
{
if ([[theTableColumn identifier] isEqualToString: @"error_msg"])
- return o_errors[row];
+ return [o_errors objectAtIndex:row];
if ([[theTableColumn identifier] isEqualToString: @"icon"])
- return o_icons[row];
+ return [o_icons objectAtIndex:row];
return @"unknown identifier";
}
- (void)application:(NSApplication *)o_app openFiles:(NSArray *)o_names
{
BOOL b_autoplay = config_GetInt(VLCIntf, "macosx-autoplay");
- char *psz_uri = vlc_path2uri([o_names[0] UTF8String], "file");
+ char *psz_uri = vlc_path2uri([[o_names objectAtIndex:0] UTF8String], "file");
// try to add file as subtitle
if ([o_names count] == 1 && psz_uri) {
NSArray *o_sorted_names = [o_names sortedArrayUsingSelector: @selector(caseInsensitiveCompare:)];
NSMutableArray *o_result = [NSMutableArray arrayWithCapacity: [o_sorted_names count]];
for (int i = 0; i < [o_sorted_names count]; i++) {
- psz_uri = vlc_path2uri([o_sorted_names[i] UTF8String], "file");
+ psz_uri = vlc_path2uri([[o_sorted_names objectAtIndex:i] UTF8String], "file");
if (!psz_uri)
continue;
BOOL b_found_key = NO;
for (int i = 0; i < [o_usedHotkeys count]; i++) {
- NSString *str = o_usedHotkeys[i];
+ NSString *str = [o_usedHotkeys objectAtIndex:i];
unsigned int i_keyModifiers = [[VLCStringUtility sharedInstance] VLCModifiersToCocoa: str];
if ([[characters lowercaseString] isEqualToString: [[VLCStringUtility sharedInstance] VLCKeyToString: str]] &&
NSArray * compo = [fname componentsSeparatedByString:@"_"];
if ([compo count] < 3)
continue;
- compo = [compo[1] componentsSeparatedByString:@"-"];
+ compo = [[compo objectAtIndex:1] componentsSeparatedByString:@"-"];
if ([compo count] < 4)
continue;
// Dooh. ugly.
- if (year < [compo[0] intValue] ||
- (year ==[compo[0] intValue] &&
- (month < [compo[1] intValue] ||
- (month ==[compo[1] intValue] &&
- (day < [compo[2] intValue] ||
- (day ==[compo[2] intValue] &&
- hours < [compo[3] intValue])))))) {
- year = [compo[0] intValue];
- month = [compo[1] intValue];
- day = [compo[2] intValue];
- hours = [compo[3] intValue];
+ if (year < [[compo objectAtIndex:0] intValue] ||
+ (year ==[[compo objectAtIndex:0] intValue] &&
+ (month < [[compo objectAtIndex:1] intValue] ||
+ (month ==[[compo objectAtIndex:1] intValue] &&
+ (day < [[compo objectAtIndex:2] intValue] ||
+ (day ==[[compo objectAtIndex:2] intValue] &&
+ hours < [[compo objectAtIndex:3] intValue])))))) {
+ year = [[compo objectAtIndex:0] intValue];
+ month = [[compo objectAtIndex:1] intValue];
+ day = [[compo objectAtIndex:2] intValue];
+ hours = [[compo objectAtIndex:3] intValue];
latestLog = [crashReporter stringByAppendingPathComponent:fname];
}
}
NSArray *libraries = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
NSUserDomainMask, YES);
if (!libraries || [libraries count] == 0) return;
- NSString * preferences = [libraries[0] stringByAppendingPathComponent:@"Preferences"];
+ NSString * preferences = [[libraries objectAtIndex:0] stringByAppendingPathComponent:@"Preferences"];
/* File not found, don't attempt anything */
if (![[NSFileManager defaultManager] fileExistsAtPath:[preferences stringByAppendingPathComponent:@"org.videolan.vlc"]] &&
[o_msg_lock lock];
if (rowIndex < [o_msg_arr count])
- result = o_msg_arr[rowIndex];
+ result = [o_msg_arr objectAtIndex:rowIndex];
[o_msg_lock unlock];
if (result != NULL)
NSUInteger count = [o_msg_arr count];
NSMutableAttributedString * string = [[NSMutableAttributedString alloc] init];
for (NSUInteger i = 0; i < count; i++)
- [string appendAttributedString: o_msg_arr[i]];
+ [string appendAttributedString: [o_msg_arr objectAtIndex:i]];
NSData *data = [string RTFFromRange:NSMakeRange(0, [string length])
documentAttributes:[NSDictionary dictionaryWithObject: NSRTFTextDocumentType forKey: NSDocumentTypeDocumentAttribute]];
NSUInteger count = [[NSScreen screens] count];
for ( NSUInteger i = 0; i < count; i++ ) {
- NSScreen *screen = [NSScreen screens][i];
+ NSScreen *screen = [[NSScreen screens] objectAtIndex:i];
if ([screen displayID] == displayID)
return screen;
}
- (BOOL)hasMenuBar
{
- return ([self displayID] == [[NSScreen screens][0] displayID]);
+ return ([self displayID] == [[[NSScreen screens] objectAtIndex:0] displayID]);
}
- (BOOL)hasDock
NSUInteger screenCount = [[NSScreen screens] count];
for (NSUInteger i = 0; i < screenCount; i++) {
- NSScreen *screen = [NSScreen screens][i];
+ NSScreen *screen = [[NSScreen screens] objectAtIndex:i];
VLCWindow *blackoutWindow;
NSRect screen_rect;
NSUInteger blackoutWindowCount = [blackoutWindows count];
for (NSUInteger i = 0; i < blackoutWindowCount; i++) {
- VLCWindow *blackoutWindow = blackoutWindows[i];
+ VLCWindow *blackoutWindow = [blackoutWindows objectAtIndex:i];
[[blackoutWindow screen] setNonFullscreenPresentationOptions];
[blackoutWindow closeAndAnimate: YES];
}
[o_currentOpticalMediaIconView release];
[o_currentOpticalMediaView release];
for (int i = 0; i < [o_displayInfos count]; i ++) {
- NSValue *v = o_displayInfos[i];
+ NSValue *v = [o_displayInfos objectAtIndex:i];
free([v pointerValue]);
}
[o_displayInfos removeAllObjects];
NSUInteger deviceCount = [qtkvideoDevices count];
for (int ivideo = 0; ivideo < deviceCount; ivideo++) {
QTCaptureDevice *qtk_device;
- qtk_device = qtkvideoDevices[ivideo];
+ qtk_device = [qtkvideoDevices objectAtIndex:ivideo];
[o_qtk_video_device_pop addItemWithTitle: [qtk_device localizedDisplayName]];
if ([[[qtk_device uniqueID]stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] isEqualToString:qtk_currdevice_uid])
NSUInteger deviceCount = [qtkaudioDevices count];
for (int iaudio = 0; iaudio < deviceCount; iaudio++) {
QTCaptureDevice *qtkaudio_device;
- qtkaudio_device = qtkaudioDevices[iaudio];
+ qtkaudio_device = [qtkaudioDevices objectAtIndex:iaudio];
[o_qtk_audio_device_pop addItemWithTitle: [qtkaudio_device localizedDisplayName]];
[o_screen_qtk_audio_pop addItemWithTitle: [qtkaudio_device localizedDisplayName]];
if ([[[qtkaudio_device uniqueID]stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] isEqualToString:qtkaudio_currdevice_uid]) {
NSUInteger componentCount = [components count];
NSInteger tempValue;
if (componentCount == 1)
- tempValue = [components[0] intValue];
+ tempValue = [[components objectAtIndex:0] intValue];
else if (componentCount == 2)
- tempValue = [components[0] intValue] * 60 + [components[1] intValue];
+ tempValue = [[components objectAtIndex:0] intValue] * 60 + [[components objectAtIndex:1] intValue];
else if (componentCount == 3)
- tempValue = [components[0] intValue] * 3600 + [components[1] intValue] * 60 + [components[2] intValue];
+ tempValue = [[components objectAtIndex:0] intValue] * 3600 + [[components objectAtIndex:1] intValue] * 60 + [[components objectAtIndex:2] intValue];
if (tempValue > 0)
[o_options addObject: [NSString stringWithFormat:@"start-time=%li", tempValue]];
components = [[o_file_stoptime_fld stringValue] componentsSeparatedByString:@":"];
componentCount = [components count];
if (componentCount == 1)
- tempValue = [components[0] intValue];
+ tempValue = [[components objectAtIndex:0] intValue];
else if (componentCount == 2)
- tempValue = [components[0] intValue] * 60 + [components[1] intValue];
+ tempValue = [[components objectAtIndex:0] intValue] * 60 + [[components objectAtIndex:1] intValue];
else if (componentCount == 3)
- tempValue = [components[0] intValue] * 3600 + [components[1] intValue] * 60 + [components[2] intValue];
+ tempValue = [[components objectAtIndex:0] intValue] * 3600 + [[components objectAtIndex:1] intValue] * 60 + [[components objectAtIndex:2] intValue];
if (tempValue > 0)
[o_options addObject: [NSString stringWithFormat:@"stop-time=%li", tempValue]];
}
NSArray * soutMRL = [o_sout_options soutMRL];
NSUInteger count = [soutMRL count];
for (NSUInteger i = 0 ; i < count ; i++)
- [o_options addObject: [NSString stringWithString: soutMRL[i]]];
+ [o_options addObject: [NSString stringWithString: [soutMRL objectAtIndex:i]]];
}
if ([o_file_slave_ckbox state] && o_file_slave_path)
[o_options addObject: [NSString stringWithFormat: @"input-slave=%@", o_file_slave_path]];
if ([[[o_tabview selectedTabViewItem] label] isEqualToString: _NS("Capture")]) {
if ([[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Screen")]) {
int selected_index = [o_screen_screen_pop indexOfSelectedItem];
- NSValue *v = o_displayInfos[selected_index];
+ NSValue *v = [o_displayInfos objectAtIndex:selected_index];
struct display_info_t *item = (struct display_info_t *)[v pointerValue];
[o_options addObject: [NSString stringWithFormat: @"screen-fps=%f", [o_screen_fps_fld floatValue]]];
int selected_index = [o_screen_screen_pop indexOfSelectedItem];
if (selected_index >= [o_displayInfos count]) return;
- NSValue *v = o_displayInfos[selected_index];
+ NSValue *v = [o_displayInfos objectAtIndex:selected_index];
struct display_info_t *item = (struct display_info_t *)[v pointerValue];
[o_screen_left_stp setMaxValue: item->rect.size.width];
{
NSInteger i_selectedDevice = [o_qtk_video_device_pop indexOfSelectedItem];
if ([qtkvideoDevices count] >= 1) {
- NSValue *sizes = [[qtkvideoDevices[i_selectedDevice] formatDescriptions][0] attributeForKey: QTFormatDescriptionVideoEncodedPixelsSizeAttribute];
+ NSValue *sizes = [[[[qtkvideoDevices objectAtIndex:i_selectedDevice] 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 = [[(QTCaptureDevice *)qtkvideoDevices[i_selectedDevice] uniqueID] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+ qtk_currdevice_uid = [[(QTCaptureDevice *)[qtkvideoDevices objectAtIndex:i_selectedDevice] uniqueID] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
}
}
{
NSInteger i_selectedDevice = [o_qtk_audio_device_pop indexOfSelectedItem];
if ([qtkaudioDevices count] >= 1) {
- qtkaudio_currdevice_uid = [[(QTCaptureDevice *)qtkaudioDevices[i_selectedDevice] uniqueID] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+ qtkaudio_currdevice_uid = [[(QTCaptureDevice *)[qtkaudioDevices objectAtIndex:i_selectedDevice] uniqueID] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
}
[o_screen_qtk_audio_pop selectItemAtIndex: i_selectedDevice];
[o_qtk_audio_device_pop selectItemAtIndex: i_selectedDevice];
NSMutableArray *o_values = [NSMutableArray arrayWithCapacity:count];
NSMutableArray *o_array = [NSMutableArray arrayWithCapacity:count];
for (NSUInteger i = 0; i < count; i++)
- [o_values addObject: [o_urls[i] path]];
+ [o_values addObject: [[o_urls objectAtIndex:i] path]];
[o_values sortUsingSelector:@selector(caseInsensitiveCompare:)];
for (NSUInteger i = 0; i < count; i++) {
NSDictionary *o_dic;
- char *psz_uri = vlc_path2uri([o_values[i] UTF8String], "file");
+ char *psz_uri = vlc_path2uri([[o_values objectAtIndex:i] UTF8String], "file");
if (!psz_uri)
continue;
if (returnCode == NSFileHandlingPanelOKButton) {
if (o_file_path)
[o_file_path release];
- o_file_path = [[o_open_panel URLs][0] path];
+ o_file_path = [[[o_open_panel URLs] objectAtIndex:0] path];
[o_file_path retain];
[self openFilePathChanged: nil];
}
if ([o_open_panel runModal] == NSOKButton) {
if (o_file_slave_path)
[o_file_slave_path release];
- o_file_slave_path = [[o_open_panel URLs][0] path];
+ o_file_slave_path = [[[o_open_panel URLs] objectAtIndex:0] path];
[o_file_slave_path retain];
}
}
NSArray *dirContents = [fm contentsOfDirectoryAtPath:mountPath error:nil];
for (int i = 0; i < [dirContents count]; i++) {
- NSString *currentFile = dirContents[i];
+ NSString *currentFile = [dirContents objectAtIndex:i];
NSString *fullPath = [mountPath stringByAppendingPathComponent:currentFile];
BOOL isDir;
NSUInteger count = [o_paths count];
NSMutableArray *o_result = [NSMutableArray arrayWithCapacity:count];
for (NSUInteger i = 0; i < count; i++)
- [o_result addObject: [self scanPath:o_paths[i]]];
+ [o_result addObject: [self scanPath:[o_paths objectAtIndex:i]]];
@synchronized (self) {
if (o_opticalDevices)
NSUInteger count = [o_allMediaDevices count];
if (count > 0) {
for (NSUInteger i = 0; i < count ; i++) {
- NSDictionary *o_dict = o_allMediaDevices[i];
+ NSDictionary *o_dict = [o_allMediaDevices objectAtIndex:i];
[o_disc_selector_pop addItemWithTitle: [[NSFileManager defaultManager] displayNameAtPath:[o_dict objectForKey:@"path"]]];
}
- (IBAction)discSelectorChanged:(id)sender
{
- NSDictionary *o_dict = o_allMediaDevices[[o_disc_selector_pop indexOfSelectedItem]];
+ NSDictionary *o_dict = [o_allMediaDevices objectAtIndex:[o_disc_selector_pop indexOfSelectedItem]];
[self showOpticalAtPath:o_dict];
}
[o_open_panel setAllowedFileTypes:@[@"public.directory"]];
if ([o_open_panel runModal] == NSOKButton) {
- NSString *o_path = [[o_open_panel URLs][0] path];
+ NSString *o_path = [[[o_open_panel URLs] objectAtIndex:0] path];
if ([o_path length] > 0) {
[NSThread detachNewThreadSelector:@selector(scanSpecialPath:) toTarget:self withObject:o_path];
}
- (IBAction)dvdreadOptionChanged:(id)sender
{
- NSDictionary *o_dict = o_allMediaDevices[[o_disc_selector_pop indexOfSelectedItem]];
+ NSDictionary *o_dict = [o_allMediaDevices objectAtIndex:[o_disc_selector_pop indexOfSelectedItem]];
NSString *o_device_path = [o_dict objectForKey:@"devicePath"];
if (sender == o_disc_dvdwomenus_enablemenus_btn) {
if (sender == o_disc_vcd_chapter_stp)
[o_disc_vcd_chapter setIntValue: [o_disc_vcd_chapter_stp intValue]];
- NSString *o_device_path = [o_allMediaDevices[[o_disc_selector_pop indexOfSelectedItem]] objectForKey:@"devicePath"];
+ NSString *o_device_path = [[o_allMediaDevices objectAtIndex:[o_disc_selector_pop indexOfSelectedItem]] objectForKey:@"devicePath"];
[self setMRL: [NSString stringWithFormat: @"vcd://%@@%i:%i", o_device_path, [o_disc_vcd_title intValue], [o_disc_vcd_chapter intValue]]];
}
returnedError = CGGetOnlineDisplayList(displayCount, ids, &displayCount);
if (!returnedError) {
for (i = 0; i < [o_displayInfos count]; i ++) {
- v = o_displayInfos[i];
+ v = [o_displayInfos objectAtIndex:i];
free([v pointerValue]);
}
[o_displayInfos removeAllObjects];
[o_open_panel setPrompt: _NS("Open")];
if ([o_open_panel runModal] == NSOKButton) {
- o_sub_path = [[o_open_panel URLs][0] path];
+ o_sub_path = [[[o_open_panel URLs] objectAtIndex:0] path];
[o_sub_path retain];
[o_file_subtitles_filename_lbl setStringValue: [[NSFileManager defaultManager] displayNameAtPath:o_sub_path]];
[o_file_sub_path_fld setStringValue: [o_file_subtitles_filename_lbl stringValue]];
if ([o_urlItems count] == 1)
[o_finalStreamAddress appendFormat: @"\"%@:%@\"", [o_stream_address stringValue],[o_stream_port stringValue]];
else {
- [o_finalStreamAddress appendFormat: @"\"%@:%@", o_urlItems[0], [o_stream_port stringValue]];
+ [o_finalStreamAddress appendFormat: @"\"%@:%@", [o_urlItems objectAtIndex:0], [o_stream_port stringValue]];
NSUInteger itemCount = [o_urlItems count];
for (NSUInteger x = 0; x < itemCount; x++)
- [o_finalStreamAddress appendFormat: @"/%@", o_urlItems[x]];
+ [o_finalStreamAddress appendFormat: @"/%@", [o_urlItems objectAtIndex:x]];
[o_finalStreamAddress appendString: @"\""];
}
[o_playlist_header setMenu: o_context_menu];
for (NSUInteger i = 0; i < count; i++) {
- o_column = o_columnArray[i][0];
+ o_column = [[o_columnArray objectAtIndex:i] objectAtIndex:0];
if ([o_column isEqualToString:@"status"])
continue;
[o_menu setPlaylistColumnTableState: NSOnState forColumn: o_column];
- [[o_outline_view tableColumnWithIdentifier: o_column] setWidth: [o_columnArray[i][1] floatValue]];
+ [[o_outline_view tableColumnWithIdentifier: o_column] setWidth: [[[o_columnArray objectAtIndex:i] objectAtIndex:1] floatValue]];
}
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(applicationWillTerminate:) name: NSApplicationWillTerminateNotification object: nil];
/* Clear indications of any existing column sorting */
NSUInteger count = [[o_outline_view tableColumns] count];
for (NSUInteger i = 0 ; i < count ; i++)
- [o_outline_view setIndicatorImage:nil inTableColumn: [o_outline_view tableColumns][i]];
+ [o_outline_view setIndicatorImage:nil inTableColumn: [[o_outline_view tableColumns] objectAtIndex:i]];
[o_outline_view setHighlightedTableColumn:nil];
o_tc_sortColumn = nil;
id o_item;
if ((o_item = [o_outline_dict objectForKey:
[NSString stringWithFormat: @"%p",
- [o_array[j] pointerValue]]]) != nil) {
+ [[o_array objectAtIndex:j] pointerValue]]]) != nil) {
[o_outline_view expandItem: o_item];
}
}
if (o_items == o_nodes) {
if (j == i) continue;
}
- if ([self isItem: [o_items[i] pointerValue]
- inNode: [o_nodes[j] pointerValue]
+ if ([self isItem: [[o_items objectAtIndex:i] pointerValue]
+ inNode: [[o_nodes objectAtIndex:j] pointerValue]
checkItemExistence: NO locked:NO]) {
[o_items removeObjectAtIndex:i];
/* We need to execute the next iteration with the same index
if (o_options) {
NSUInteger count = [o_options count];
for (NSUInteger i = 0; i < count; i++)
- input_item_AddOption(p_input, [o_options[i] UTF8String], VLC_INPUT_OPTION_TRUSTED);
+ input_item_AddOption(p_input, [[o_options objectAtIndex:i] UTF8String], VLC_INPUT_OPTION_TRUSTED);
}
/* Recent documents menu */
NSDictionary *o_one_item;
/* Get the item */
- o_one_item = o_array[i_item];
+ o_one_item = [o_array objectAtIndex:i_item];
p_input = [self createItem: o_one_item];
if (!p_input)
continue;
NSDictionary *o_one_item;
/* Get the item */
- o_one_item = o_array[i_item];
+ o_one_item = [o_array objectAtIndex:i_item];
p_input = [self createItem: o_one_item];
if (!p_input)
if (o_result != NULL) {
int i_start;
- if ([o_result[0] pointerValue] == p_playlist->p_local_category)
+ if ([[o_result objectAtIndex:0] pointerValue] == p_playlist->p_local_category)
i_start = 1;
else
i_start = 0;
for (NSUInteger i = i_start ; i < count - 1 ; i++) {
[o_outline_view expandItem: [o_outline_dict objectForKey:
[NSString stringWithFormat: @"%p",
- [o_result[i] pointerValue]]]];
+ [[o_result objectAtIndex:i] pointerValue]]]];
}
i_row = [o_outline_view rowForItem: [o_outline_dict objectForKey:
[NSString stringWithFormat: @"%p",
- [o_result[count - 1] pointerValue]]]];
+ [[o_result objectAtIndex:count - 1 ]
+ pointerValue]]]];
}
if (i_row > -1) {
[o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:i_row] byExtendingSelection:NO];
NSUInteger count = [o_columns count];
NSTableColumn * o_currentColumn;
for (NSUInteger i = 0; i < count; i++) {
- o_currentColumn = o_columns[i];
+ o_currentColumn = [o_columns objectAtIndex:i];
[o_arrayToSave addObject: @[[o_currentColumn identifier], @([o_currentColumn width])]];
}
[[NSUserDefaults standardUserDefaults] setObject: o_arrayToSave forKey:@"PlaylistColumnSelection"];
NSUInteger itemCount = [items count];
for (NSUInteger i = 0 ; i < itemCount ; i++) {
- id o_item = items[i];
+ id o_item = [items objectAtIndex:i];
/* Fill the items and nodes to move in 2 different arrays */
if (((playlist_item_t *)[o_item pointerValue])->i_children > 0)
NSUInteger count = [o_nodes_array count];
for (NSUInteger i = 0 ; i < count ; i++) {
/* We refuse to Drop in a child of an item we are moving */
- if ([self isItem: [item pointerValue] inNode: [o_nodes_array[i] pointerValue] checkItemExistence: NO locked:NO]) {
+ if ([self isItem: [item pointerValue] inNode: [[o_nodes_array objectAtIndex:i] pointerValue] checkItemExistence: NO locked:NO]) {
return NSDragOperationNone;
}
}
PL_LOCK;
NSUInteger j = 0;
for (NSUInteger i = 0; i < count; i++) {
- p_item = [o_all_items[i] pointerValue];
+ p_item = [[o_all_items objectAtIndex:i] pointerValue];
if (p_item)
pp_items[j++] = p_item;
}
free(pp_items);
[self playlistUpdated];
- i_row = [o_outline_view rowForItem:[o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", [o_all_items[0] pointerValue]]]];
+ i_row = [o_outline_view rowForItem:[o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", [[o_all_items objectAtIndex:0] pointerValue]]]];
if (i_row == -1)
i_row = [o_outline_view rowForItem:[o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", p_new_parent]]];
BOOL b_returned = NO;
if (count == 1 && p_input) {
- b_returned = input_AddSubtitle(p_input, vlc_path2uri([o_values[0] UTF8String], NULL), true);
+ b_returned = input_AddSubtitle(p_input, vlc_path2uri([[o_values objectAtIndex:0] UTF8String], NULL), true);
vlc_object_release(p_input);
if (!b_returned)
return YES;
for (NSUInteger i = 0; i < count; i++) {
NSDictionary *o_dic;
- char *psz_uri = vlc_path2uri([o_values[i] UTF8String], NULL);
+ char *psz_uri = vlc_path2uri([[o_values objectAtIndex:i] UTF8String], NULL);
if (!psz_uri)
continue;
}
- (VLCInfoTreeItem *)childAtIndex:(NSUInteger)i_index {
- return [self children][i_index];
+ return [[self children] objectAtIndex:i_index];
}
- (int)numberOfChildren {
{
NSUInteger childrenCount = [[self children] count];
for (int i = 0; i < childrenCount; i++) {
- VLCTreeCategoryItem * categoryItem = [self children][i];
+ VLCTreeCategoryItem * categoryItem = [[self children] objectAtIndex:i];
if ([categoryItem category] == category)
return categoryItem;
}
assert([self isKindOfClass:[VLCTreeCategoryItem class]]);
NSUInteger childrenCount = [[self children] count];
for (NSUInteger i = 0; i < childrenCount; i++) {
- VLCTreeSubCategoryItem * subCategoryItem = [self children][i];
+ VLCTreeSubCategoryItem * subCategoryItem = [[self children] objectAtIndex:i];
if ([subCategoryItem subCategory] == subCategory)
return subCategoryItem;
}
- (VLCTreeItem *)childAtIndex:(NSInteger)i_index
{
- return [self children][i_index];
+ return [[self children] objectAtIndex:i_index];
}
- (int)numberOfChildren
NSUInteger count = [[self options] count];
for (NSUInteger i = 0; i < count; i++) {
- VLCTreeLeafItem * item = [self options][i];
+ VLCTreeLeafItem * item = [[self options] objectAtIndex:i];
VLCConfigControl *control;
control = [VLCConfigControl newControl:[item configItem] withView:view];
NSUInteger i;
NSUInteger count = [_subviews count];
for (i = 0 ; i < count ; i++)
- [_subviews[i] applyChanges];
+ [[_subviews objectAtIndex:i] applyChanges];
count = [_children count];
for (i = 0 ; i < count ; i++)
- [_children[i] applyChanges];
+ [[_children objectAtIndex:i] applyChanges];
}
- (void)resetView
{
NSUInteger count = [_subviews count];
for (NSUInteger i = 0 ; i < count ; i++)
- [_subviews[i] resetValues];
+ [[_subviews objectAtIndex:i] resetValues];
count = [_options count];
for (NSUInteger i = 0 ; i < count ; i++)
- [_options[i] resetView];
+ [[_options objectAtIndex:i] resetView];
count = [_children count];
for (NSUInteger i = 0 ; i < count ; i++)
- [_children[i] resetView];
+ [[_children objectAtIndex:i] resetView];
}
[o_open_panel setCanChooseDirectories: b_directory];
[o_open_panel beginSheetModalForWindow:[sender window] completionHandler:^(NSInteger returnCode) {
if (returnCode == NSOKButton) {
- NSString *o_path = [[o_open_panel URLs][0] path];
+ NSString *o_path = [[[o_open_panel URLs] objectAtIndex:0] path];
[o_textfield setStringValue: o_path];
}
}];
NSString *o_newstring = @"";
NSUInteger count = [o_modulearray count];
for (NSUInteger i = 0 ; i < count ; i++)
- if ([o_modulearray[i][2]
+ if ([[[o_modulearray objectAtIndex:i] objectAtIndex:2]
boolValue] != NO) {
- o_newstring = [o_newstring stringByAppendingString:o_modulearray[i][0]];
+ o_newstring = [o_newstring stringByAppendingString:
+ [[o_modulearray objectAtIndex:i] objectAtIndex:0]];
o_newstring = [o_newstring stringByAppendingString:@":"];
}
// Move the modules
iter = [array objectEnumerator];
while ((val = [iter nextObject]) != NULL) {
- NSArray *o_tmp = [o_modulearray[[val intValue]] mutableCopyWithZone:nil];
+ NSArray *o_tmp = [[o_modulearray objectAtIndex:
+ [val intValue]] mutableCopyWithZone:nil];
[o_modulearray removeObject:o_tmp];
[o_modulearray insertObject:o_tmp
atIndex:(dropRow>[val intValue]) ? dropRow - 1 : dropRow];
objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
{
if ([[aTableColumn identifier] isEqualToString: @"Enabled"])
- return o_modulearray[rowIndex][2];
+ return [[o_modulearray objectAtIndex:rowIndex] objectAtIndex:2];
if ([[aTableColumn identifier] isEqualToString: @"Module"])
- return o_modulearray[rowIndex][1];
+ return [[o_modulearray objectAtIndex:rowIndex] objectAtIndex:1];
return nil;
}
- (void)tableView:(NSTableView *)aTableView setObjectValue:(id)anObject
forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
{
- [o_modulearray[rowIndex] replaceObjectAtIndex:2
+ [[o_modulearray objectAtIndex:rowIndex] replaceObjectAtIndex:2
withObject: anObject];
}
@end
[o_video_device_pop addItemWithTitle: _NS("Default")];
[[o_video_device_pop lastItem] setTag: 0];
while (i < y) {
- NSRect s_rect = [[NSScreen screens][i] frame];
+ NSRect s_rect = [[[NSScreen screens] objectAtIndex:i] frame];
[o_video_device_pop addItemWithTitle:
[NSString stringWithFormat: @"%@ %i (%ix%i)", _NS("Screen"), i+1,
(int)s_rect.size.width, (int)s_rect.size.height]];
- [[o_video_device_pop lastItem] setTag: (int)[[NSScreen screens][i] displayID]];
+ [[o_video_device_pop lastItem] setTag: (int)[[[NSScreen screens] objectAtIndex:i] displayID]];
i++;
}
[o_video_device_pop selectItemAtIndex: 0];
if (b_hotkeyChanged) {
NSUInteger hotKeyCount = [o_hotkeySettings count];
for (NSUInteger i = 0; i < hotKeyCount; i++)
- config_PutPsz(p_intf, [o_hotkeyNames[i] UTF8String], [o_hotkeySettings[i]UTF8String]);
+ config_PutPsz(p_intf, [[o_hotkeyNames objectAtIndex:i] UTF8String], [[o_hotkeySettings objectAtIndex:i]UTF8String]);
b_hotkeyChanged = NO;
}
[object removeAllItems]; \
count = [handlers count]; \
for (NSUInteger x = 0; x < count; x++) { \
- rawhandler = handlers[x]; \
+ rawhandler = [handlers objectAtIndex:x]; \
handler = [self applicationNameForBundleIdentifier:rawhandler]; \
if (handler && ![handler isEqualToString:@""]) { \
[object addItemWithTitle:handler]; \
- [[object lastItem] setImage: [self iconForBundleIdentifier:handlers[x]]]; \
+ [[object lastItem] setImage: [self iconForBundleIdentifier:[handlers objectAtIndex:x]]]; \
[rawHandlers addObject: rawhandler]; \
} \
} \
{
if (sender == o_hotkeys_change_btn || sender == o_hotkeys_listbox) {
[o_hotkeys_change_lbl setStringValue: [NSString stringWithFormat: _NS("Press new keys for\n\"%@\""),
- o_hotkeyDescriptions[[o_hotkeys_listbox selectedRow]]]];
- [o_hotkeys_change_keys_lbl setStringValue: [[VLCStringUtility sharedInstance] OSXStringKeyToString:o_hotkeySettings[[o_hotkeys_listbox selectedRow]]]];
+ [o_hotkeyDescriptions objectAtIndex:[o_hotkeys_listbox selectedRow]]]];
+ [o_hotkeys_change_keys_lbl setStringValue: [[VLCStringUtility sharedInstance] OSXStringKeyToString:[o_hotkeySettings objectAtIndex:[o_hotkeys_listbox selectedRow]]]];
[o_hotkeys_change_taken_lbl setStringValue: @""];
[o_hotkeys_change_win setInitialFirstResponder: [o_hotkeys_change_win contentView]];
[o_hotkeys_change_win makeFirstResponder: [o_hotkeys_change_win contentView]];
NSString * identifier = [aTableColumn identifier];
if ([identifier isEqualToString: @"action"])
- return o_hotkeyDescriptions[rowIndex];
+ return [o_hotkeyDescriptions objectAtIndex:rowIndex];
else if ([identifier isEqualToString: @"shortcut"])
- return [[VLCStringUtility sharedInstance] OSXStringKeyToString:o_hotkeySettings[rowIndex]];
+ return [[VLCStringUtility sharedInstance] OSXStringKeyToString:[o_hotkeySettings objectAtIndex:rowIndex]];
else {
msg_Err(p_intf, "unknown TableColumn identifier (%s)!", [identifier UTF8String]);
return NULL;
if (i_returnValue != NSNotFound)
[o_hotkeys_change_taken_lbl setStringValue: [NSString stringWithFormat:
_NS("This combination is already taken by \"%@\"."),
- o_hotkeyDescriptions[i_returnValue]]];
+ [o_hotkeyDescriptions objectAtIndex:i_returnValue]]];
else if (i_returnValue2 != NSNotFound)
[o_hotkeys_change_taken_lbl setStringValue: [NSString stringWithFormat:
_NS("This combination is already taken by \"%@\"."),
- o_hotkeyDescriptions[i_returnValue2]]];
+ [o_hotkeyDescriptions objectAtIndex:i_returnValue2]]];
else
[o_hotkeys_change_taken_lbl setStringValue: @""];
NSInteger i_selectedVideoCodec = [[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue];
/* we are transcoding both audio and video, so we need to check both deps */
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_PS"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_PS"])
{
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_PS"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_PS"])
{
[[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:0 column:0];
}
}
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_TS"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_TS"])
{
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_TS"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_TS"])
{
[[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:1 column:0];
}
}
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_MPEG"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_MPEG"])
{
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_MPEG"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_MPEG"])
{
[[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:2 column:0];
}
}
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_OGG"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_OGG"])
{
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_OGG"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_OGG"])
{
[[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:3 column:0];
}
}
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_RAW"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_RAW"])
{
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_RAW"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_RAW"])
{
[[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:4 column:0];
}
}
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_ASF"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_ASF"])
{
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_ASF"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_ASF"])
{
[[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:5 column:0];
}
}
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_MP4"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_MP4"])
{
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_MP4"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_MP4"])
{
[[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:6 column:0];
}
}
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_MOV"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_MOV"])
{
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_MOV"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_MOV"])
{
[[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:7 column:0];
}
}
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_WAV"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_WAV"])
{
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_WAV"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_WAV"])
{
[[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:8 column:0];
/* we just transcoding the audio */
/* select formats supported by the audio codec */
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_PS"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_PS"])
{
[[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:0 column:0];
}
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_TS"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_TS"])
{
[[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:1 column:0];
}
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_MPEG"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_MPEG"])
{
[[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:2 column:0];
}
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_OGG"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_OGG"])
{
[[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:3 column:0];
}
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_RAW"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_RAW"])
{
[[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:4 column:0];
}
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_ASF"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_ASF"])
{
[[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:5 column:0];
}
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_MP4"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_MP4"])
{
[[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:6 column:0];
}
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_MOV"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_MOV"])
{
[[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:7 column:0];
}
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_WAV"])
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_WAV"])
{
[[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:8 column:0];
/* select formats supported by the video-codec */
NSInteger i_selectedVideoCodec = [[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue];
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_PS"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_PS"])
{
[[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:0 column:0];
}
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_TS"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_TS"])
{
[[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:1 column:0];
}
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_MPEG"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_MPEG"])
{
[[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:2 column:0];
}
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_OGG"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_OGG"])
{
[[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:3 column:0];
}
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_RAW"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_RAW"])
{
[[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:4 column:0];
}
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_ASF"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_ASF"])
{
[[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:5 column:0];
}
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_MP4"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_MP4"])
{
[[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:6 column:0];
}
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_MOV"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_MOV"])
{
[[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:7 column:0];
}
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_WAV"])
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_WAV"])
{
[[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:YES];
[o_t5_matrix_encap selectCellAtRow:8 column:0];
"button to select a location."));
} else {
/* create a string containing the requested suffix for later usage */
- NSString * theEncapFormat = o_encapFormats[[[o_userSelections objectForKey:@"encapFormat"] intValue]][0];
+ NSString * theEncapFormat = [[o_encapFormats objectAtIndex:
+ [[o_userSelections objectForKey:@"encapFormat"] intValue]]
+ objectAtIndex:0];
if ([theEncapFormat isEqualToString:@"ps"])
theEncapFormat = @"mpg";
* if not, remove it
* we need the casting to make GCC4 happy */
if ([[[NSFileManager defaultManager] attributesOfItemAtPath:
- [o_userSelections objectForKey:@"pathToStrm"][x] error:nil] objectForKey:
+ [[o_userSelections objectForKey:@"pathToStrm"]
+ objectAtIndex:x] error:nil] objectForKey:
NSFileExtensionHidden])
fileNameToUse = [NSString stringWithString:
[[NSFileManager defaultManager] displayNameAtPath:
- [o_userSelections objectForKey:@"pathToStrm"][x]]];
+ [[o_userSelections objectForKey:@"pathToStrm"]
+ objectAtIndex:x]]];
else
{
int z = 0;
int count = [[[[NSFileManager defaultManager]
displayNameAtPath:
- [o_userSelections objectForKey:@"pathToStrm"][x]]
+ [[o_userSelections objectForKey:@"pathToStrm"]
+ objectAtIndex:x]]
componentsSeparatedByString: @"."] count];
fileNameToUse = @"";
while( z < (count - 1))
{
fileNameToUse = [fileNameToUse stringByAppendingString:
- [[[NSFileManager defaultManager]
+ [[[[NSFileManager defaultManager]
displayNameAtPath:
- [o_userSelections objectForKey:@"pathToStrm"][x]]
- componentsSeparatedByString: @"."][z]];
+ [[o_userSelections objectForKey:@"pathToStrm"]
+ objectAtIndex:x]]
+ componentsSeparatedByString: @"."]
+ objectAtIndex:z]];
z += 1;
}
}
@"%@ (%i/%i)", _NS("Streaming/Transcoding Wizard"),
( x + 1), y];
input_item_t *p_input = input_item_New(
- [[o_userSelections objectForKey:@"pathToStrm"][x] UTF8String],
+ [[[o_userSelections objectForKey:@"pathToStrm"]
+ objectAtIndex:x] UTF8String],
[tempString UTF8String]);
/* use the MRL from the text field, in case the user
NSUInteger componentCount = [components count];
NSUInteger time = 0;
if (componentCount == 1)
- time = 1000000 * ([components[0] intValue]);
+ time = 1000000 * ([[components objectAtIndex:0] intValue]);
else if (componentCount == 2)
- time = 1000000 * ([components[0] intValue] * 60 + [components[1] intValue]);
+ time = 1000000 * ([[components objectAtIndex:0] intValue] * 60 + [[components objectAtIndex:1] intValue]);
else if (componentCount == 3)
- time = 1000000 * ([components[0] intValue] * 3600 + [components[1] intValue] * 60 + [components[2] intValue]);
+ time = 1000000 * ([[components objectAtIndex:0] intValue] * 3600 + [[components objectAtIndex:1] intValue] * 60 + [[components objectAtIndex:2] intValue]);
else
msg_Err(VLCIntf, "Invalid string format for time");
input_item_AddOption(p_input, [[NSString stringWithFormat: @"start-time=%lu", time] UTF8String], VLC_INPUT_OPTION_TRUSTED);
NSUInteger componentCount = [components count];
NSUInteger time = 0;
if (componentCount == 1)
- time = 1000000 * ([components[0] intValue]);
+ time = 1000000 * ([[components objectAtIndex:0] intValue]);
else if (componentCount == 2)
- time = 1000000 * ([components[0] intValue] * 60 + [components[1] intValue]);
+ time = 1000000 * ([[components objectAtIndex:0] intValue] * 60 + [[components objectAtIndex:1] intValue]);
else if (componentCount == 3)
- time = 1000000 * ([components[0] intValue] * 3600 + [components[1] intValue] * 60 + [components[2] intValue]);
+ time = 1000000 * ([[components objectAtIndex:0] intValue] * 3600 + [[components objectAtIndex:1] intValue] * 60 + [[components objectAtIndex:2] intValue]);
else
msg_Err(VLCIntf, "Invalid string format for time");
input_item_AddOption(p_input, [[NSString stringWithFormat: @"stop-time=%lu", time] UTF8String], VLC_INPUT_OPTION_TRUSTED);
NSUInteger count = [o_videoCodecs count];
for (NSUInteger x = 0; x < count; x++)
{
- [o_t4_pop_videoCodec addItemWithTitle:o_videoCodecs[x][0]];
+ [o_t4_pop_videoCodec addItemWithTitle:[[o_videoCodecs objectAtIndex:x]
+ objectAtIndex:0]];
[[o_t4_pop_videoCodec lastItem] setTag:x];
}
if (savePreviousSel >= 0)
count = [o_audioCodecs count];
for (NSUInteger x = 0; x < count; x++)
{
- [o_t4_pop_audioCodec addItemWithTitle:o_audioCodecs[x][0]];
+ [o_t4_pop_audioCodec addItemWithTitle:[[o_audioCodecs objectAtIndex:x]
+ objectAtIndex:0]];
[[o_t4_pop_audioCodec lastItem] setTag:x];
}
if (savePreviousSel >= 0)
[[o_userSelections objectForKey:@"pathToStrm"] count]]];
else
[o_t8_fld_inptStream setStringValue:
- [o_userSelections objectForKey:@"pathToStrm"][0]];
+ [[o_userSelections objectForKey:@"pathToStrm"] objectAtIndex:0]];
if ([[o_userSelections objectForKey:@"localPb"] isEqualToString: @"YES"])
{
{
[o_t8_fld_trnscdVideo setStringValue: [NSString stringWithFormat:
_NS("yes: %@ @ %@ kb/s"),
- o_videoCodecs[[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]][0],
+ [[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:
+ @"trnscdVideoCodec"] intValue]] objectAtIndex:0],
[o_userSelections objectForKey:@"trnscdVideoBitrate"]]];
}
else
{
[o_t8_fld_trnscdAudio setStringValue: [NSString stringWithFormat:
_NS("yes: %@ @ %@ kb/s"),
- o_audioCodecs[[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]][0],
+ [[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:
+ @"trnscdAudioCodec"] intValue]] objectAtIndex:0],
[o_userSelections objectForKey:@"trnscdAudioBitrate"]]];
}
else
{
/* we are streaming and perhaps also transcoding */
[o_t8_fld_saveFileTo setStringValue: @"-"];
- [o_t8_fld_strmgMthd setStringValue: o_strmgMthds[[[o_userSelections objectForKey:@"stmgMhd"] intValue]][1]];
+ [o_t8_fld_strmgMthd setStringValue: [[o_strmgMthds objectAtIndex:
+ [[o_userSelections objectForKey:@"stmgMhd"] intValue]]
+ objectAtIndex:1]];
[o_t8_fld_destination setStringValue: [o_userSelections objectForKey:
@"stmgDest"]];
[o_t8_fld_ttl setStringValue: [o_userSelections objectForKey:@"ttl"]];
if ([[o_userSelections objectForKey: @"trnscdFilePath"] count] > 1)
[o_t8_fld_saveFileTo setStringValue:
[NSString stringWithFormat: @"%@ (+%li)",
- [o_userSelections objectForKey: @"trnscdFilePath"][0],
+ [[o_userSelections objectForKey: @"trnscdFilePath"] objectAtIndex:0],
([[o_userSelections objectForKey: @"trnscdFilePath"] count] - 1)]];
else
[o_t8_fld_saveFileTo setStringValue:
- [o_userSelections objectForKey: @"trnscdFilePath"][0]];
+ [[o_userSelections objectForKey: @"trnscdFilePath"] objectAtIndex:0]];
}
- [o_t8_fld_encapFormat setStringValue: o_encapFormats[
- [[o_userSelections objectForKey:@"encapFormat"] intValue]][1]];
+ [o_t8_fld_encapFormat setStringValue: [[o_encapFormats objectAtIndex:
+ [[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:1]];
[self createOpts];
- [o_t8_fld_mrl setStringValue: [o_userSelections objectForKey:@"opts"]
- [0]];
+ [o_t8_fld_mrl setStringValue: [[o_userSelections objectForKey:@"opts"]
+ objectAtIndex:0]];
[o_tab_pageHolder selectTabViewItemAtIndex:7];
}
{
[o_trnscdCmd appendString: @"transcode{"];
[o_trnscdCmd appendFormat: @"vcodec=%@,vb=%i",
- o_videoCodecs[[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]][1],
+ [[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] objectAtIndex:1],
[[o_userSelections objectForKey:@"trnscdVideoBitrate"] intValue]];
if ([[o_userSelections objectForKey:@"trnscdAudio"] isEqualToString:@"YES"])
{
[o_trnscdCmd appendString: @"transcode{"];
}
[o_trnscdCmd appendFormat: @"acodec=%@,ab=%i}:",
- o_audioCodecs[[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]][1],
+ [[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] objectAtIndex:1],
[[o_userSelections objectForKey:@"trnscdAudioBitrate"] intValue]];
}
@":sout=#%@%@standard{mux=%@,access=file{no-overwrite},dst=%@}",
o_duplicateCmd,
o_trnscdCmd,
- o_encapFormats[[[o_userSelections objectForKey:@"encapFormat"] intValue]][0],
- [o_userSelections objectForKey: @"trnscdFilePath"][x]];
+ [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:0],
+ [[o_userSelections objectForKey: @"trnscdFilePath"] objectAtIndex:x]];
}
else
{
[o_sap_option appendFormat: @"sap,name=\"%@\"",
[o_userSelections objectForKey:@"sapText"]];
}
- if ([o_strmgMthds[[[o_userSelections objectForKey: @"stmgMhd"] intValue]][0] isEqualToString:@"rtp"])
+ if ([[[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0] isEqualToString:@"rtp"])
{
/* RTP is no access out, but a stream out module */
[o_opts_string appendFormat:
@":sout=#%@%@rtp{mux=%@,dst=%@,%@}",
o_duplicateCmd, o_trnscdCmd,
- o_encapFormats[[[o_userSelections objectForKey: @"encapFormat"] intValue]][0],
+ [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey: @"encapFormat"] intValue]] objectAtIndex:0],
[o_userSelections objectForKey: @"stmgDest"],
o_sap_option];
}
[o_opts_string appendFormat:
@":sout=#%@%@standard{mux=%@,dst=%@,access=%@,%@}",
o_duplicateCmd, o_trnscdCmd,
- o_encapFormats[[[o_userSelections objectForKey: @"encapFormat"] intValue]][0],
+ [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey: @"encapFormat"] intValue]] objectAtIndex:0],
[o_userSelections objectForKey: @"stmgDest"],
- o_strmgMthds[[[o_userSelections objectForKey: @"stmgMhd"] intValue]][0],
+ [[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0],
o_sap_option];
}
}
else
{
/* no SAP, just streaming */
- if ([o_strmgMthds[[[o_userSelections objectForKey: @"stmgMhd"] intValue]][0] isEqualToString:@"rtp"])
+ if ([[[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0] isEqualToString:@"rtp"])
{
/* RTP is different from the other protocols, as it isn't provided through an access out module anymore */
[o_opts_string appendFormat:
@":sout=#%@%@rtp{mux=%@,dst=%@}",
o_duplicateCmd,
o_trnscdCmd,
- o_encapFormats[[[o_userSelections objectForKey: @"encapFormat"] intValue]][0],
+ [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey: @"encapFormat"] intValue]] objectAtIndex:0],
[o_userSelections objectForKey: @"stmgDest"]];
}
else
@":sout=#%@%@standard{mux=%@,dst=%@,access=%@}",
o_duplicateCmd,
o_trnscdCmd,
- o_encapFormats[[[o_userSelections objectForKey: @"encapFormat"] intValue]][0],
+ [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey: @"encapFormat"] intValue]] objectAtIndex:0],
[o_userSelections objectForKey: @"stmgDest"],
- o_strmgMthds[[[o_userSelections objectForKey: @"stmgMhd"] intValue]][0]];
+ [[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0]];
}
}
}
if (mode == 0)
{
/* HTTP */
- [o_t3_txt_destInfo setStringValue: o_strmgMthds[0][2]];
- [o_t3_txt_strgMthdInfo setStringValue: o_strmgMthds[0][3]];
+ [o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:0]
+ objectAtIndex:2]];
+ [o_t3_txt_strgMthdInfo setStringValue: [[o_strmgMthds objectAtIndex:0]
+ objectAtIndex:3]];
}
else if (mode == 1)
{
/* MMS */
- [o_t3_txt_destInfo setStringValue: o_strmgMthds[1][2]];
- [o_t3_txt_strgMthdInfo setStringValue: o_strmgMthds[1][3]];
+ [o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:1]
+ objectAtIndex:2]];
+ [o_t3_txt_strgMthdInfo setStringValue: [[o_strmgMthds objectAtIndex:1]
+ objectAtIndex:3]];
}
else if (mode == 2)
{
/* UDP-Unicast */
- [o_t3_txt_destInfo setStringValue: o_strmgMthds[2][2]];
- [o_t3_txt_strgMthdInfo setStringValue: o_strmgMthds[2][3]];
+ [o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:2]
+ objectAtIndex:2]];
+ [o_t3_txt_strgMthdInfo setStringValue: [[o_strmgMthds objectAtIndex:2]
+ objectAtIndex:3]];
}
else if (mode == 3)
{
/* UDP-Multicast */
- [o_t3_txt_destInfo setStringValue: o_strmgMthds[3][2]];
- [o_t3_txt_strgMthdInfo setStringValue: o_strmgMthds[3][3]];
+ [o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:3]
+ objectAtIndex:2]];
+ [o_t3_txt_strgMthdInfo setStringValue: [[o_strmgMthds objectAtIndex:3]
+ objectAtIndex:3]];
}
else if (mode == 4)
{
/* RTP-Unicast */
- [o_t3_txt_destInfo setStringValue: o_strmgMthds[4][2]];
- [o_t3_txt_strgMthdInfo setStringValue: o_strmgMthds[4][3]];
+ [o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:4]
+ objectAtIndex:2]];
+ [o_t3_txt_strgMthdInfo setStringValue: [[o_strmgMthds objectAtIndex:4]
+ objectAtIndex:3]];
}
else if (mode == 5)
{
/* RTP-Multicast */
- [o_t3_txt_destInfo setStringValue: o_strmgMthds[5][2]];
- [o_t3_txt_strgMthdInfo setStringValue: o_strmgMthds[5][3]];
+ [o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:5]
+ objectAtIndex:2]];
+ [o_t3_txt_strgMthdInfo setStringValue: [[o_strmgMthds objectAtIndex:5]
+ objectAtIndex:3]];
}
}
- (IBAction)t4_AudCdcChanged:(id)sender
{
/* update codec info */
- [o_t4_txt_hintAudio setStringValue:o_audioCodecs[
- [[o_t4_pop_audioCodec selectedItem]tag]][2]];
+ [o_t4_txt_hintAudio setStringValue:[[o_audioCodecs objectAtIndex:
+ [[o_t4_pop_audioCodec selectedItem]tag]] objectAtIndex:2]];
}
- (IBAction)t4_enblAudTrnscd:(id)sender
- (IBAction)t4_VidCdcChanged:(id)sender
{
/* update codec info */
- [o_t4_txt_hintVideo setStringValue:o_videoCodecs[
- [[o_t4_pop_videoCodec selectedItem]tag]][2]];
+ [o_t4_txt_hintVideo setStringValue:[[o_videoCodecs objectAtIndex:
+ [[o_t4_pop_videoCodec selectedItem]tag]] objectAtIndex:2]];
}
- (IBAction)t6_enblSapAnnce:(id)sender
/* don't use ".ps" as suffix, since the OSX Finder confuses our
* creations with PostScript-files and wants to open them with
* Preview.app */
- NSString * theEncapFormat = o_encapFormats[
- [[o_userSelections objectForKey:@"encapFormat"] intValue]][0];
+ NSString * theEncapFormat = [[o_encapFormats objectAtIndex:
+ [[o_userSelections objectForKey:@"encapFormat"] intValue]]
+ objectAtIndex:0];
if (![theEncapFormat isEqualToString:@"ps"])
[saveFilePanel setAllowedFileTypes: @[theEncapFormat]];
else
projects / vlc / commitdiff