<p>What do you intend to fix with all of these patches, what is broken?</p>
<div class="gmail_quote">On May 12, 2013 6:22 AM, "Benedikt Bergenthal" <<a href="mailto:benedikt@kdrennert.de">benedikt@kdrennert.de</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
diff --git a/modules/gui/macosx/AudioEffects.m b/modules/gui/macosx/AudioEffects.m<br>
index 98a0cd8..9a0e59b 100644<br>
--- a/modules/gui/macosx/AudioEffects.m<br>
+++ b/modules/gui/macosx/AudioEffects.m<br>
@@ -308,11 +308,11 @@ static VLCAudioEffects *_o_sharedInstance = nil;<br>
vlc_object_t *p_object = VLC_OBJECT(getAout());<br>
if (p_object == NULL)<br>
p_object = vlc_object_hold(pl_Get(p_intf));<br>
- var_SetString(p_object,"equalizer-preset",vlc_b64_decode([items[0] UTF8String]));<br>
+ var_SetString(p_object,"equalizer-preset",vlc_b64_decode([[items objectAtIndex:0] UTF8String]));<br>
vlc_object_release(p_object);<br>
<br>
/* filter handling */<br>
- NSString *tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([items[1] UTF8String])];<br>
+ NSString *tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([[items objectAtIndex:1] UTF8String])];<br>
NSArray *tempArray;<br>
NSUInteger count;<br>
/* enable the new filters, if we have an aout */<br>
@@ -321,43 +321,43 @@ static VLCAudioEffects *_o_sharedInstance = nil;<br>
tempArray = [tempString componentsSeparatedByString:@":"];<br>
count = [tempArray count];<br>
for (NSUInteger x = 0; x < count; x++)<br>
- playlist_EnableAudioFilter(p_playlist, (char *)[tempArray[x] UTF8String], true);<br>
+ playlist_EnableAudioFilter(p_playlist, (char *)[[tempArray objectAtIndex:x] UTF8String], true);<br>
}<br>
}<br>
config_PutPsz(p_intf,"audio-filter",[tempString UTF8String]);<br>
<br>
/* values */<br>
- config_PutFloat(p_intf, "compressor-rms-peak",[items[2] floatValue]);<br>
- config_PutFloat(p_intf, "compressor-attack",[items[3] floatValue]);<br>
- config_PutFloat(p_intf, "compressor-release",[items[4] floatValue]);<br>
- config_PutFloat(p_intf, "compressor-threshold",[items[5] floatValue]);<br>
- config_PutFloat(p_intf, "compressor-ratio",[items[6] floatValue]);<br>
- config_PutFloat(p_intf, "compressor-knee",[items[7] floatValue]);<br>
- config_PutFloat(p_intf, "compressor-makeup-gain",[items[8] floatValue]);<br>
- config_PutFloat(p_intf, "spatializer-roomsize",[items[9] floatValue]);<br>
- config_PutFloat(p_intf, "spatializer-width",[items[10] floatValue]);<br>
- config_PutFloat(p_intf, "spatializer-wet",[items[11] floatValue]);<br>
- config_PutFloat(p_intf, "spatializer-dry",[items[12] floatValue]);<br>
- config_PutFloat(p_intf, "spatializer-damp",[items[13] floatValue]);<br>
- config_PutFloat(p_intf, "norm-max-level",[items[14] floatValue]);<br>
- config_PutInt(p_intf, "equalizer-2pass",[items[15] intValue]);<br>
+ config_PutFloat(p_intf, "compressor-rms-peak",[[items objectAtIndex:2] floatValue]);<br>
+ config_PutFloat(p_intf, "compressor-attack",[[items objectAtIndex:3] floatValue]);<br>
+ config_PutFloat(p_intf, "compressor-release",[[items objectAtIndex:4] floatValue]);<br>
+ config_PutFloat(p_intf, "compressor-threshold",[[items objectAtIndex:5] floatValue]);<br>
+ config_PutFloat(p_intf, "compressor-ratio",[[items objectAtIndex:6] floatValue]);<br>
+ config_PutFloat(p_intf, "compressor-knee",[[items objectAtIndex:7] floatValue]);<br>
+ config_PutFloat(p_intf, "compressor-makeup-gain",[[items objectAtIndex:8] floatValue]);<br>
+ config_PutFloat(p_intf, "spatializer-roomsize",[[items objectAtIndex:9] floatValue]);<br>
+ config_PutFloat(p_intf, "spatializer-width",[[items objectAtIndex:10] floatValue]);<br>
+ config_PutFloat(p_intf, "spatializer-wet",[[items objectAtIndex:11] floatValue]);<br>
+ config_PutFloat(p_intf, "spatializer-dry",[[items objectAtIndex:12] floatValue]);<br>
+ config_PutFloat(p_intf, "spatializer-damp",[[items objectAtIndex:13] floatValue]);<br>
+ config_PutFloat(p_intf, "norm-max-level",[[items objectAtIndex:14] floatValue]);<br>
+ config_PutInt(p_intf, "equalizer-2pass",[[items objectAtIndex:15] intValue]);<br>
<br>
/* set values on-the-fly if we have an aout */<br>
if (p_aout) {<br>
- var_SetFloat(p_aout, "compressor-rms-peak", [items[2] floatValue]);<br>
- var_SetFloat(p_aout, "compressor-attack", [items[3] floatValue]);<br>
- var_SetFloat(p_aout, "compressor-release", [items[4] floatValue]);<br>
- var_SetFloat(p_aout, "compressor-threshold", [items[5] floatValue]);<br>
- var_SetFloat(p_aout, "compressor-ratio", [items[6] floatValue]);<br>
- var_SetFloat(p_aout, "compressor-knee", [items[7] floatValue]);<br>
- var_SetFloat(p_aout, "compressor-makeup-gain", [items[8] floatValue]);<br>
- var_SetFloat(p_aout, "spatializer-roomsize", [items[9] floatValue]);<br>
- var_SetFloat(p_aout, "spatializer-width", [items[10] floatValue]);<br>
- var_SetFloat(p_aout, "spatializer-wet", [items[11] floatValue]);<br>
- var_SetFloat(p_aout, "spatializer-dry", [items[12] floatValue]);<br>
- var_SetFloat(p_aout, "spatializer-damp", [items[13] floatValue]);<br>
- var_SetFloat(p_aout, "norm-max-level", [items[14] floatValue]);<br>
- var_SetBool(p_aout, "equalizer-2pass", (BOOL)[items[15] intValue]);<br>
+ var_SetFloat(p_aout, "compressor-rms-peak", [[items objectAtIndex:2] floatValue]);<br>
+ var_SetFloat(p_aout, "compressor-attack", [[items objectAtIndex:3] floatValue]);<br>
+ var_SetFloat(p_aout, "compressor-release", [[items objectAtIndex:4] floatValue]);<br>
+ var_SetFloat(p_aout, "compressor-threshold", [[items objectAtIndex:5] floatValue]);<br>
+ var_SetFloat(p_aout, "compressor-ratio", [[items objectAtIndex:6] floatValue]);<br>
+ var_SetFloat(p_aout, "compressor-knee", [[items objectAtIndex:7] floatValue]);<br>
+ var_SetFloat(p_aout, "compressor-makeup-gain", [[items objectAtIndex:8] floatValue]);<br>
+ var_SetFloat(p_aout, "spatializer-roomsize", [[items objectAtIndex:9] floatValue]);<br>
+ var_SetFloat(p_aout, "spatializer-width", [[items objectAtIndex:10] floatValue]);<br>
+ var_SetFloat(p_aout, "spatializer-wet", [[items objectAtIndex:11] floatValue]);<br>
+ var_SetFloat(p_aout, "spatializer-dry", [[items objectAtIndex:12] floatValue]);<br>
+ var_SetFloat(p_aout, "spatializer-damp", [[items objectAtIndex:13] floatValue]);<br>
+ var_SetFloat(p_aout, "norm-max-level", [[items objectAtIndex:14] floatValue]);<br>
+ var_SetBool(p_aout, "equalizer-2pass", (BOOL)[[items objectAtIndex:15] intValue]);<br>
}<br>
<br>
/* update UI */<br>
@@ -365,7 +365,7 @@ static VLCAudioEffects *_o_sharedInstance = nil;<br>
[o_eq_enable_ckb setState:NSOffState];<br>
else<br>
[o_eq_enable_ckb setState:NSOnState];<br>
- [o_eq_twopass_ckb setState:[items[15] intValue]];<br>
+ [o_eq_twopass_ckb setState:[[items objectAtIndex:15] intValue]];<br>
[self resetCompressor];<br>
[self resetSpatializer];<br>
[self resetAudioFilters];<br>
@@ -532,7 +532,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,<br>
NSArray *values = [preset componentsSeparatedByString:@" "];<br>
NSUInteger count = [values count];<br>
for (NSUInteger x = 0; x < count; x++)<br>
- [self setValue:[values[x] floatValue] forSlider:x];<br>
+ [self setValue:[[values objectAtIndex:x] floatValue] forSlider:x];<br>
}<br>
<br>
- (NSString *)generatePresetString<br>
diff --git a/modules/gui/macosx/ConvertAndSave.m b/modules/gui/macosx/ConvertAndSave.m<br>
index 5b39723..910fe8c 100644<br>
--- a/modules/gui/macosx/ConvertAndSave.m<br>
+++ b/modules/gui/macosx/ConvertAndSave.m<br>
@@ -238,9 +238,9 @@ static VLCConvertAndSave *_o_sharedInstance = nil;<br>
[_customize_aud_samplerate_pop removeAllItems];<br>
[_customize_subs_pop removeAllItems];<br>
<br>
- [_customize_vid_codec_pop addItemsWithTitles:_videoCodecs[0]];<br>
- [_customize_aud_codec_pop addItemsWithTitles:_audioCodecs[0]];<br>
- [_customize_subs_pop addItemsWithTitles:_subsCodecs[0]];<br>
+ [_customize_vid_codec_pop addItemsWithTitles:[_videoCodecs objectAtIndex:0]];<br>
+ [_customize_aud_codec_pop addItemsWithTitles:[_audioCodecs objectAtIndex:0]];<br>
+ [_customize_subs_pop addItemsWithTitles:[_subsCodecs objectAtIndex:0]];<br>
<br>
[_customize_aud_samplerate_pop addItemWithTitle:@"8000"];<br>
[_customize_aud_samplerate_pop addItemWithTitle:@"11025"];<br>
@@ -259,7 +259,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;<br>
<br>
[_ok_btn setEnabled: NO];<br>
<br>
- [self resetCustomizationSheetBasedOnProfile:self.profileValueList[0]];<br>
+ [self resetCustomizationSheetBasedOnProfile:[self.profileValueList objectAtIndex:0]];<br>
}<br>
<br>
# pragma mark -<br>
@@ -277,7 +277,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;<br>
{<br>
if (b_streaming) {<br>
if ([[[_stream_type_pop selectedItem] title] isEqualToString:@"HTTP"]) {<br>
- NSString *muxformat = self.currentProfile[0];<br>
+ NSString *muxformat = [self.currentProfile objectAtIndex:0];<br>
if ([muxformat isEqualToString:@"wav"] || [muxformat isEqualToString:@"mov"] || [muxformat isEqualToString:@"mp4"] || [muxformat isEqualToString:@"mkv"]) {<br>
NSBeginInformationalAlertSheet(_NS("Invalid container format for HTTP streaming"), _NS("OK"), @"", @"", _window,<br>
nil, nil, nil, nil,<br>
@@ -339,7 +339,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;<br>
{<br>
NSUInteger index = [_profile_pop indexOfSelectedItem];<br>
if (index < ([self.profileValueList count] - 1))<br>
- [self resetCustomizationSheetBasedOnProfile:self.profileValueList[index]];<br>
+ [self resetCustomizationSheetBasedOnProfile:[self.profileValueList objectAtIndex:index]];<br>
}<br>
<br>
- (IBAction)customizeProfile:(id)sender<br>
@@ -551,7 +551,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;<br>
NSArray *values = [[paste propertyListForType: NSFilenamesPboardType] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];<br>
<br>
if ([values count] > 0) {<br>
- [self setMRL: @(vlc_path2uri([values[0] UTF8String], NULL))];<br>
+ [self setMRL: @(vlc_path2uri([[values objectAtIndex:0] UTF8String], NULL))];<br>
[self updateOKButton];<br>
[self updateDropView];<br>
return YES;<br>
@@ -566,7 +566,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;<br>
PL_LOCK;<br>
/* let's look for the first proper input item */<br>
for (NSUInteger x = 0; x < count; x++) {<br>
- p_item = [array[x] pointerValue];<br>
+ p_item = [[array objectAtIndex:x] pointerValue];<br>
if (p_item) {<br>
if (p_item->p_input) {<br>
if (p_item->p_input->psz_uri != nil) {<br>
@@ -692,57 +692,57 @@ static VLCConvertAndSave *_o_sharedInstance = nil;<br>
return;<br>
}<br>
<br>
- [self selectCellByEncapsulationFormat:components[0]];<br>
- [_customize_vid_ckb setState:[components[1] intValue]];<br>
- [_customize_aud_ckb setState:[components[2] intValue]];<br>
- [_customize_subs_ckb setState:[components[3] intValue]];<br>
- [self setVidBitrate:[components[5] intValue]];<br>
- [_customize_vid_scale_pop selectItemWithTitle:components[6]];<br>
- [self setVidFramerate:[components[7] intValue]];<br>
- [_customize_vid_width_fld setStringValue:components[8]];<br>
- [_customize_vid_height_fld setStringValue:components[9]];<br>
- [self setAudBitrate:[components[11] intValue]];<br>
- [self setAudChannels:[components[12] intValue]];<br>
- [_customize_aud_samplerate_pop selectItemWithTitle:components[13]];<br>
- [_customize_subs_overlay_ckb setState:[components[15] intValue]];<br>
+ [self selectCellByEncapsulationFormat:[components objectAtIndex:0]];<br>
+ [_customize_vid_ckb setState:[[components objectAtIndex:1] intValue]];<br>
+ [_customize_aud_ckb setState:[[components objectAtIndex:2] intValue]];<br>
+ [_customize_subs_ckb setState:[[components objectAtIndex:3] intValue]];<br>
+ [self setVidBitrate:[[components objectAtIndex:5] intValue]];<br>
+ [_customize_vid_scale_pop selectItemWithTitle:[components objectAtIndex:6]];<br>
+ [self setVidFramerate:[[components objectAtIndex:7] intValue]];<br>
+ [_customize_vid_width_fld setStringValue:[components objectAtIndex:8]];<br>
+ [_customize_vid_height_fld setStringValue:[components objectAtIndex:9]];<br>
+ [self setAudBitrate:[[components objectAtIndex:11] intValue]];<br>
+ [self setAudChannels:[[components objectAtIndex:12] intValue]];<br>
+ [_customize_aud_samplerate_pop selectItemWithTitle:[components objectAtIndex:13]];<br>
+ [_customize_subs_overlay_ckb setState:[[components objectAtIndex:15] intValue]];<br>
<br>
/* since there is no proper lookup mechanism in arrays, we need to implement a string specific one ourselves */<br>
- NSArray * tempArray = _videoCodecs[1];<br>
+ NSArray * tempArray = [_videoCodecs objectAtIndex:1];<br>
NSUInteger count = [tempArray count];<br>
- NSString * searchString = components[4];<br>
+ NSString * searchString = [components objectAtIndex:4];<br>
if ([searchString isEqualToString:@"none"] || [searchString isEqualToString:@"0"]) {<br>
[_customize_vid_codec_pop selectItemAtIndex:-1];<br>
} else {<br>
for (NSUInteger x = 0; x < count; x++) {<br>
- if ([tempArray[x] isEqualToString: searchString]) {<br>
+ if ([[tempArray objectAtIndex:x] isEqualToString: searchString]) {<br>
[_customize_vid_codec_pop selectItemAtIndex:x];<br>
break;<br>
}<br>
}<br>
}<br>
<br>
- tempArray = _audioCodecs[1];<br>
+ tempArray = [_audioCodecs objectAtIndex:1];<br>
count = [tempArray count];<br>
- searchString = components[10];<br>
+ searchString = [components objectAtIndex:10];<br>
if ([searchString isEqualToString:@"none"] || [searchString isEqualToString:@"0"]) {<br>
[_customize_aud_codec_pop selectItemAtIndex:-1];<br>
} else {<br>
for (NSUInteger x = 0; x < count; x++) {<br>
- if ([tempArray[x] isEqualToString: searchString]) {<br>
+ if ([[tempArray objectAtIndex:x] isEqualToString: searchString]) {<br>
[_customize_aud_codec_pop selectItemAtIndex:x];<br>
break;<br>
}<br>
}<br>
}<br>
<br>
- tempArray = _subsCodecs[1];<br>
+ tempArray = [_subsCodecs objectAtIndex:1];<br>
count = [tempArray count];<br>
- searchString = components[14];<br>
+ searchString = [components objectAtIndex:14];<br>
if ([searchString isEqualToString:@"none"] || [searchString isEqualToString:@"0"]) {<br>
[_customize_subs_pop selectItemAtIndex:-1];<br>
} else {<br>
for (NSUInteger x = 0; x < count; x++) {<br>
- if ([tempArray[x] isEqualToString: searchString]) {<br>
+ if ([[tempArray objectAtIndex:x] isEqualToString: searchString]) {<br>
[_customize_subs_pop selectItemAtIndex:x];<br>
break;<br>
}<br>
@@ -861,47 +861,47 @@ static VLCConvertAndSave *_o_sharedInstance = nil;<br>
- (NSString *)composedOptions<br>
{<br>
NSMutableString *composedOptions = [[NSMutableString alloc] initWithString:@":sout=#transcode{"];<br>
- if ([self.currentProfile[1] intValue]) {<br>
+ if ([[self.currentProfile objectAtIndex:1] intValue]) {<br>
// video is enabled<br>
- [composedOptions appendFormat:@"vcodec=%@", self.currentProfile[4]];<br>
- if (![self.currentProfile[4] isEqualToString:@"none"]) {<br>
- if ([self.currentProfile[5] intValue] > 0) // bitrate<br>
- [composedOptions appendFormat:@",vb=%@", self.currentProfile[5]];<br>
- if ([self.currentProfile[6] floatValue] > 0.) // scale<br>
- [composedOptions appendFormat:@",scale=%@", self.currentProfile[6]];<br>
- if ([self.currentProfile[7] floatValue] > 0.) // fps<br>
- [composedOptions appendFormat:@",fps=%@", self.currentProfile[7]];<br>
- if ([self.currentProfile[8] intValue] > 0) // width<br>
- [composedOptions appendFormat:@",width=%@", self.currentProfile[8]];<br>
- if ([self.currentProfile[9] intValue] > 0) // height<br>
- [composedOptions appendFormat:@",height=%@", self.currentProfile[9]];<br>
+ [composedOptions appendFormat:@"vcodec=%@", [self.currentProfile objectAtIndex:4]];<br>
+ if (![[self.currentProfile objectAtIndex:4] isEqualToString:@"none"]) {<br>
+ if ([[self.currentProfile objectAtIndex:5] intValue] > 0) // bitrate<br>
+ [composedOptions appendFormat:@",vb=%@", [self.currentProfile objectAtIndex:5]];<br>
+ if ([[self.currentProfile objectAtIndex:6] floatValue] > 0.) // scale<br>
+ [composedOptions appendFormat:@",scale=%@", [self.currentProfile objectAtIndex:6]];<br>
+ if ([[self.currentProfile objectAtIndex:7] floatValue] > 0.) // fps<br>
+ [composedOptions appendFormat:@",fps=%@", [self.currentProfile objectAtIndex:7]];<br>
+ if ([[self.currentProfile objectAtIndex:8] intValue] > 0) // width<br>
+ [composedOptions appendFormat:@",width=%@", [self.currentProfile objectAtIndex:8]];<br>
+ if ([[self.currentProfile objectAtIndex:9] intValue] > 0) // height<br>
+ [composedOptions appendFormat:@",height=%@", [self.currentProfile objectAtIndex:9]];<br>
}<br>
}<br>
- if ([self.currentProfile[2] intValue]) {<br>
+ if ([[self.currentProfile objectAtIndex:2] intValue]) {<br>
// audio is enabled<br>
<br>
// add another comma in case video is enabled<br>
- if ([self.currentProfile[1] intValue])<br>
+ if ([[self.currentProfile objectAtIndex:1] intValue])<br>
[composedOptions appendString:@","];<br>
<br>
- [composedOptions appendFormat:@"acodec=%@", self.currentProfile[10]];<br>
- if (![self.currentProfile[10] isEqualToString:@"none"]) {<br>
- [composedOptions appendFormat:@",ab=%@", self.currentProfile[11]]; // bitrate<br>
- [composedOptions appendFormat:@",channels=%@", self.currentProfile[12]]; // channel number<br>
- [composedOptions appendFormat:@",samplerate=%@", self.currentProfile[13]]; // sample rate<br>
+ [composedOptions appendFormat:@"acodec=%@", [self.currentProfile objectAtIndex:10]];<br>
+ if (![[self.currentProfile objectAtIndex:10] isEqualToString:@"none"]) {<br>
+ [composedOptions appendFormat:@",ab=%@", [self.currentProfile objectAtIndex:11]]; // bitrate<br>
+ [composedOptions appendFormat:@",channels=%@", [self.currentProfile objectAtIndex:12]]; // channel number<br>
+ [composedOptions appendFormat:@",samplerate=%@", [self.currentProfile objectAtIndex:13]]; // sample rate<br>
}<br>
}<br>
- if (self.currentProfile[3]) {<br>
+ if ([self.currentProfile objectAtIndex:3]) {<br>
// subtitles enabled<br>
- [composedOptions appendFormat:@",scodec=%@", self.currentProfile[14]];<br>
- if ([self.currentProfile[15] intValue])<br>
+ [composedOptions appendFormat:@",scodec=%@", [self.currentProfile objectAtIndex:14]];<br>
+ if ([[self.currentProfile objectAtIndex:15] intValue])<br>
[composedOptions appendFormat:@",soverlay"];<br>
}<br>
<br>
if (!b_streaming) {<br>
/* file transcoding */<br>
// add muxer<br>
- [composedOptions appendFormat:@"}:standard{mux=%@", self.currentProfile[0]];<br>
+ [composedOptions appendFormat:@"}:standard{mux=%@", [self.currentProfile objectAtIndex:0]];<br>
<br>
// add output destination<br>
[composedOptions appendFormat:@",access=file{no-overwrite},dst=%@}", _outputDestination];<br>
@@ -914,7 +914,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;<br>
else if ([[[_stream_type_pop selectedItem] title] isEqualToString:@"MMSH"])<br>
[composedOptions appendFormat:@":standard{mux=asfh,dst=%@,port=%@,access=mmsh", _outputDestination, [_stream_port_fld stringValue]];<br>
else<br>
- [composedOptions appendFormat:@":standard{mux=%@,dst=%@,port=%@,access=http", self.currentProfile[0], [_stream_port_fld stringValue], _outputDestination];<br>
+ [composedOptions appendFormat:@":standard{mux=%@,dst=%@,port=%@,access=http", [self.currentProfile objectAtIndex:0], [_stream_port_fld stringValue], _outputDestination];<br>
<br>
if ([_stream_sap_ckb state])<br>
[composedOptions appendFormat:@",sap,name=\"%@\"", [_stream_channel_fld stringValue]];<br>
@@ -954,7 +954,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;<br>
[self.currentProfile addObject: [NSString stringWithFormat:@"%li", [_customize_subs_ckb state]]];<br>
i = [_customize_vid_codec_pop indexOfSelectedItem];<br>
if (i >= 0)<br>
- [self.currentProfile addObject: _videoCodecs[1][i]];<br>
+ [self.currentProfile addObject: [[_videoCodecs objectAtIndex:1] objectAtIndex:i]];<br>
else<br>
[self.currentProfile addObject: @"none"];<br>
[self.currentProfile addObject: [NSString stringWithFormat:@"%i", [self vidBitrate]]];<br>
@@ -964,7 +964,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;<br>
[self.currentProfile addObject: [NSString stringWithFormat:@"%i", [_customize_vid_height_fld intValue]]];<br>
i = [_customize_aud_codec_pop indexOfSelectedItem];<br>
if (i >= 0)<br>
- [self.currentProfile addObject: _audioCodecs[1][i]];<br>
+ [self.currentProfile addObject: [[_audioCodecs objectAtIndex:1] objectAtIndex:i]];<br>
else<br>
[self.currentProfile addObject: @"none"];<br>
[self.currentProfile addObject: [NSString stringWithFormat:@"%i", [self audBitrate]]];<br>
@@ -972,7 +972,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;<br>
[self.currentProfile addObject: [[_customize_aud_samplerate_pop selectedItem] title]];<br>
i = [_customize_subs_pop indexOfSelectedItem];<br>
if (i >= 0)<br>
- [self.currentProfile addObject: _subsCodecs[1][i]];<br>
+ [self.currentProfile addObject: [[_subsCodecs objectAtIndex:1] objectAtIndex:i]];<br>
else<br>
[self.currentProfile addObject: @"none"];<br>
[self.currentProfile addObject: [NSString stringWithFormat:@"%li", [_customize_subs_overlay_ckb state]]];<br>
diff --git a/modules/gui/macosx/MainWindowTitle.m b/modules/gui/macosx/MainWindowTitle.m<br>
index 883a6c6..e95f921 100644<br>
--- a/modules/gui/macosx/MainWindowTitle.m<br>
+++ b/modules/gui/macosx/MainWindowTitle.m<br>
@@ -411,7 +411,7 @@<br>
}<br>
<br>
- (NSNumber*)extendedAccessibilityIsAttributeSettable: (NSString*)theAttributeName {<br>
- return ([theAttributeName isEqualToString: NSAccessibilitySubroleAttribute] ? @NO : nil); // make the Subrole attribute we added non-settable<br>
+ return ([theAttributeName isEqualToString: NSAccessibilitySubroleAttribute] ? NO : nil); // make the Subrole attribute we added non-settable<br>
}<br>
<br>
- (void)accessibilityPerformAction: (NSString*)theActionName {<br>
@@ -493,7 +493,7 @@<br>
for (NSUInteger i = count - 1; i > 0; i--) {<br>
currentPath = [NSMutableString stringWithCapacity:1024];<br>
for (NSUInteger y = 0; y < i; y++)<br>
- [currentPath appendFormat: @"/%@", pathComponents[y + 1]];<br>
+ [currentPath appendFormat: @"/%@", [pathComponents objectAtIndex:(y + 1)]];<br>
<br>
[contextMenu addItemWithTitle: [[NSFileManager defaultManager] displayNameAtPath: currentPath] action:@selector(revealInFinder:) keyEquivalent:@""];<br>
currentItem = [contextMenu itemAtIndex:[contextMenu numberOfItems] - 1];<br>
@@ -504,7 +504,7 @@<br>
[currentItem setImage: icon];<br>
}<br>
<br>
- if ([pathComponents[1] isEqualToString:@"Volumes"]) {<br>
+ if ([[pathComponents objectAtIndex:1] isEqualToString:@"Volumes"]) {<br>
/* we don't want to show the Volumes item, since the Cocoa does it neither */<br>
currentItem = [contextMenu itemWithTitle:[[NSFileManager defaultManager] displayNameAtPath: @"/Volumes"]];<br>
if (currentItem)<br>
@@ -559,11 +559,11 @@<br>
selectedItem = count - selectedItem;<br>
<br>
/* fix for non-startup volumes */<br>
- if ([pathComponents[1] isEqualToString:@"Volumes"])<br>
+ if ([[pathComponents objectAtIndex:1] isEqualToString:@"Volumes"])<br>
selectedItem += 1;<br>
<br>
for (NSUInteger y = 1; y < selectedItem; y++)<br>
- [currentPath appendFormat: @"/%@", pathComponents[y]];<br>
+ [currentPath appendFormat: @"/%@", [pathComponents objectAtIndex:y]];<br>
<br>
[[NSWorkspace sharedWorkspace] selectFile: currentPath inFileViewerRootedAtPath: currentPath];<br>
}<br>
diff --git a/modules/gui/macosx/PXSourceList.m b/modules/gui/macosx/PXSourceList.m<br>
index 1ee3daf..cac5c04 100644<br>
--- a/modules/gui/macosx/PXSourceList.m<br>
+++ b/modules/gui/macosx/PXSourceList.m<br>
@@ -725,7 +725,7 @@ NSString * const PXSLDeleteKeyPressedOnRowsNotification = @"PXSourceListDeleteKe<br>
NSInteger row = [self rowForItem:item];<br>
<br>
//Return the default table column<br>
- return [[self tableColumns][0] dataCellForRow:row];<br>
+ return [[[self tableColumns] objectAtIndex:0] dataCellForRow:row];<br>
}<br>
<br>
- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item<br>
diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m<br>
index 7af4dda..a9fa75f 100644<br>
--- a/modules/gui/macosx/VLCVoutWindowController.m<br>
+++ b/modules/gui/macosx/VLCVoutWindowController.m<br>
@@ -165,7 +165,7 @@<br>
// cascade windows if we have more than one vout<br>
if (b_multiple_vout_windows) {<br>
if ([o_vout_dict count] == 1) {<br>
- NSWindow * o_first_window = [o_vout_dict objectForKey: [o_vout_dict allKeys][0]];<br>
+ NSWindow * o_first_window = [o_vout_dict objectForKey: [[o_vout_dict allKeys] objectAtIndex:0]];<br>
<br>
NSPoint topleftbase = NSMakePoint(0, [o_first_window frame].size.height);<br>
top_left_point = [o_first_window convertBaseToScreen: topleftbase];<br>
diff --git a/modules/gui/macosx/VideoEffects.m b/modules/gui/macosx/VideoEffects.m<br>
index 45e0168..ee15391 100644<br>
--- a/modules/gui/macosx/VideoEffects.m<br>
+++ b/modules/gui/macosx/VideoEffects.m<br>
@@ -761,7 +761,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;<br>
NSArray *items = [[defaults objectForKey:@"VideoEffectProfiles"][selectedProfile] componentsSeparatedByString:@";"];<br>
<br>
/* filter handling */<br>
- NSString *tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([items[0] UTF8String])];<br>
+ NSString *tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([[items objectAtIndex:0] UTF8String])];<br>
NSArray *tempArray;<br>
NSUInteger count;<br>
/* enable the new filters */<br>
@@ -769,61 +769,61 @@ static VLCVideoEffects *_o_sharedInstance = nil;<br>
tempArray = [tempString componentsSeparatedByString:@":"];<br>
count = [tempArray count];<br>
for (NSUInteger x = 0; x < count; x++)<br>
- [self setVideoFilter:(char *)[tempArray[x] UTF8String] on:YES];<br>
+ [self setVideoFilter:(char *)[[tempArray objectAtIndex:x] UTF8String] on:YES];<br>
}<br>
config_PutPsz(p_intf, "video-filter", [tempString UTF8String]);<br>
<br>
- tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([items[1] UTF8String])];<br>
+ tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([[items objectAtIndex:1] UTF8String])];<br>
/* enable another round of new filters */<br>
if ([tempString length] > 0) {<br>
tempArray = [tempString componentsSeparatedByString:@":"];<br>
count = [tempArray count];<br>
for (NSUInteger x = 0; x < count; x++)<br>
- [self setVideoFilter:(char *)[tempArray[x] UTF8String] on:YES];<br>
+ [self setVideoFilter:(char *)[[tempArray objectAtIndex:x] UTF8String] on:YES];<br>
}<br>
config_PutPsz(p_intf,"sub-source", [tempString UTF8String]);<br>
<br>
- tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([items[2] UTF8String])];<br>
+ tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([[items objectAtIndex:2] UTF8String])];<br>
/* enable another round of new filters */<br>
if ([tempString length] > 0) {<br>
tempArray = [tempString componentsSeparatedByString:@":"];<br>
count = [tempArray count];<br>
for (NSUInteger x = 0; x < count; x++)<br>
- [self setVideoFilter:(char *)[tempArray[x] UTF8String] on:YES];<br>
+ [self setVideoFilter:(char *)[[tempArray objectAtIndex:x] UTF8String] on:YES];<br>
}<br>
config_PutPsz(p_intf,"video-splitter", [tempString UTF8String]);<br>
<br>
/* try to set filter values on-the-fly and store them appropriately */<br>
- [self setVideoFilterProperty:"hue" forFilter:"adjust" integer:[items[3] intValue]];<br>
- [self setVideoFilterProperty:"contrast" forFilter:"adjust" float:[items[4] floatValue]];<br>
- [self setVideoFilterProperty:"brightness" forFilter:"adjust" float:[items[5] floatValue]];<br>
- [self setVideoFilterProperty:"saturation" forFilter:"adjust" float:[items[6] floatValue]];<br>
- [self setVideoFilterProperty:"gamma" forFilter:"adjust" float:[items[7] floatValue]];<br>
- [self setVideoFilterProperty:"sharpen-sigma" forFilter:"sharpen" float:[items[8] floatValue]];<br>
- [self setVideoFilterProperty:"gradfun-radius" forFilter:"gradfun" integer:[items[9] intValue]];<br>
- [self setVideoFilterProperty:"grain-variance" forFilter:"grain" float:[items[10] floatValue]];<br>
- [self setVideoFilterProperty:"transform-type" forFilter:"transform" string:vlc_b64_decode([items[11] UTF8String])];<br>
- [self setVideoFilterProperty:"puzzle-rows" forFilter:"puzzle" integer:[items[12] intValue]];<br>
- [self setVideoFilterProperty:"puzzle-cols" forFilter:"puzzle" integer:[items[13] intValue]];<br>
- [self setVideoFilterProperty:"puzzle-black-slot" forFilter:"puzzle" boolean:[items[14] intValue]];<br>
- [self setVideoFilterProperty:"colorthres-color" forFilter:"colorthres" integer:[items[15] intValue]];<br>
- [self setVideoFilterProperty:"colorthres-saturationthres" forFilter:"colorthres" integer:[items[16] intValue]];<br>
- [self setVideoFilterProperty:"colorthres-similaritythres" forFilter:"colorthres" integer:[items[17] intValue]];<br>
- [self setVideoFilterProperty:"sepia-intensity" forFilter:"sepia" integer:[items[18] intValue]];<br>
- [self setVideoFilterProperty:"gradient-mode" forFilter:"gradient" string:vlc_b64_decode([items[19] UTF8String])];<br>
- [self setVideoFilterProperty:"gradient-cartoon" forFilter:"gradient" integer:[items[20] intValue]];<br>
- [self setVideoFilterProperty:"gradient-type" forFilter:"gradient" integer:[items[21] intValue]];<br>
- [self setVideoFilterProperty:"extract-component" forFilter:"extract" integer:[items[22] intValue]];<br>
- [self setVideoFilterProperty:"posterize-level" forFilter:"posterize" integer:[items[23] intValue]];<br>
- [self setVideoFilterProperty:"blur-factor" forFilter:"motionblur" integer:[items[24] intValue]];<br>
- [self setVideoFilterProperty:"marq-marquee" forFilter:"marq" string:vlc_b64_decode([items[25] UTF8String])];<br>
- [self setVideoFilterProperty:"marq-position" forFilter:"marq" integer:[items[26] intValue]];<br>
- [self setVideoFilterProperty:"logo-file" forFilter:"logo" string:vlc_b64_decode([items[27] UTF8String])];<br>
- [self setVideoFilterProperty:"logo-position" forFilter:"logo" integer:[items[28] intValue]];<br>
- [self setVideoFilterProperty:"logo-opacity" forFilter:"logo" integer:[items[29] intValue]];<br>
- [self setVideoFilterProperty:"clone-count" forFilter:"clone" integer:[items[30] intValue]];<br>
- [self setVideoFilterProperty:"wall-rows" forFilter:"wall" integer:[items[31] intValue]];<br>
- [self setVideoFilterProperty:"wall-cols" forFilter:"wall" integer:[items[32] intValue]];<br>
+ [self setVideoFilterProperty:"hue" forFilter:"adjust" integer:[[items objectAtIndex:3] intValue]];<br>
+ [self setVideoFilterProperty:"contrast" forFilter:"adjust" float:[[items objectAtIndex:4] floatValue]];<br>
+ [self setVideoFilterProperty:"brightness" forFilter:"adjust" float:[[items objectAtIndex:5] floatValue]];<br>
+ [self setVideoFilterProperty:"saturation" forFilter:"adjust" float:[[items objectAtIndex:6] floatValue]];<br>
+ [self setVideoFilterProperty:"gamma" forFilter:"adjust" float:[[items objectAtIndex:7] floatValue]];<br>
+ [self setVideoFilterProperty:"sharpen-sigma" forFilter:"sharpen" float:[[items objectAtIndex:8] floatValue]];<br>
+ [self setVideoFilterProperty:"gradfun-radius" forFilter:"gradfun" integer:[[items objectAtIndex:9] intValue]];<br>
+ [self setVideoFilterProperty:"grain-variance" forFilter:"grain" float:[[items objectAtIndex:10] floatValue]];<br>
+ [self setVideoFilterProperty:"transform-type" forFilter:"transform" string:vlc_b64_decode([[items objectAtIndex:11] UTF8String])];<br>
+ [self setVideoFilterProperty:"puzzle-rows" forFilter:"puzzle" integer:[[items objectAtIndex:12] intValue]];<br>
+ [self setVideoFilterProperty:"puzzle-cols" forFilter:"puzzle" integer:[[items objectAtIndex:13] intValue]];<br>
+ [self setVideoFilterProperty:"puzzle-black-slot" forFilter:"puzzle" boolean:[[items objectAtIndex:14] intValue]];<br>
+ [self setVideoFilterProperty:"colorthres-color" forFilter:"colorthres" integer:[[items objectAtIndex:15] intValue]];<br>
+ [self setVideoFilterProperty:"colorthres-saturationthres" forFilter:"colorthres" integer:[[items objectAtIndex:16] intValue]];<br>
+ [self setVideoFilterProperty:"colorthres-similaritythres" forFilter:"colorthres" integer:[[items objectAtIndex:17] intValue]];<br>
+ [self setVideoFilterProperty:"sepia-intensity" forFilter:"sepia" integer:[[items objectAtIndex:18] intValue]];<br>
+ [self setVideoFilterProperty:"gradient-mode" forFilter:"gradient" string:vlc_b64_decode([[items objectAtIndex:19] UTF8String])];<br>
+ [self setVideoFilterProperty:"gradient-cartoon" forFilter:"gradient" integer:[[items objectAtIndex:20] intValue]];<br>
+ [self setVideoFilterProperty:"gradient-type" forFilter:"gradient" integer:[[items objectAtIndex:21] intValue]];<br>
+ [self setVideoFilterProperty:"extract-component" forFilter:"extract" integer:[[items objectAtIndex:22] intValue]];<br>
+ [self setVideoFilterProperty:"posterize-level" forFilter:"posterize" integer:[[items objectAtIndex:23] intValue]];<br>
+ [self setVideoFilterProperty:"blur-factor" forFilter:"motionblur" integer:[[items objectAtIndex:24] intValue]];<br>
+ [self setVideoFilterProperty:"marq-marquee" forFilter:"marq" string:vlc_b64_decode([[items objectAtIndex:25] UTF8String])];<br>
+ [self setVideoFilterProperty:"marq-position" forFilter:"marq" integer:[[items objectAtIndex:26] intValue]];<br>
+ [self setVideoFilterProperty:"logo-file" forFilter:"logo" string:vlc_b64_decode([[items objectAtIndex:27] UTF8String])];<br>
+ [self setVideoFilterProperty:"logo-position" forFilter:"logo" integer:[[items objectAtIndex:28] intValue]];<br>
+ [self setVideoFilterProperty:"logo-opacity" forFilter:"logo" integer:[[items objectAtIndex:29] intValue]];<br>
+ [self setVideoFilterProperty:"clone-count" forFilter:"clone" integer:[[items objectAtIndex:30] intValue]];<br>
+ [self setVideoFilterProperty:"wall-rows" forFilter:"wall" integer:[[items objectAtIndex:31] intValue]];<br>
+ [self setVideoFilterProperty:"wall-cols" forFilter:"wall" integer:[[items objectAtIndex:32] intValue]];<br>
<br>
[defaults setInteger:selectedProfile forKey:@"VideoEffectSelectedProfile"];<br>
[defaults synchronize];<br>
diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m<br>
index dc15ad9..af7e65b 100644<br>
--- a/modules/gui/macosx/Windows.m<br>
+++ b/modules/gui/macosx/Windows.m<br>
@@ -134,7 +134,7 @@<br>
@synchronized(self) {<br>
current_anim = self->o_current_animation;<br>
<br>
- if ([[current_anim viewAnimations][0] objectForKey: NSViewAnimationEffectKey] == NSViewAnimationFadeOutEffect && [current_anim isAnimating]) {<br>
+ if ([[[current_anim viewAnimations] objectAtIndex:0] objectForKey: NSViewAnimationEffectKey] == NSViewAnimationFadeOutEffect && [current_anim isAnimating]) {<br>
[anim release];<br>
} else {<br>
if (current_anim) {<br>
@@ -186,7 +186,7 @@<br>
@synchronized(self) {<br>
current_anim = self->o_current_animation;<br>
<br>
- if ([[current_anim viewAnimations][0] objectForKey: NSViewAnimationEffectKey] == NSViewAnimationFadeInEffect && [current_anim isAnimating]) {<br>
+ if ([[[current_anim viewAnimations] objectAtIndex:0] objectForKey: NSViewAnimationEffectKey] == NSViewAnimationFadeInEffect && [current_anim isAnimating]) {<br>
[anim release];<br>
} else {<br>
if (current_anim) {<br>
@@ -664,8 +664,8 @@<br>
NSUInteger count = [subviews count];<br>
<br>
for (NSUInteger x = 0; x < count; x++) {<br>
- if ([subviews[x] respondsToSelector:@selector(reshape)])<br>
- [subviews[x] reshape];<br>
+ if ([[subviews objectAtIndex:x] respondsToSelector:@selector(reshape)])<br>
+ [[subviews objectAtIndex:x] reshape];<br>
}<br>
<br>
}<br>
@@ -882,7 +882,7 @@<br>
- (void)hasBecomeFullscreen<br>
{<br>
if ([[o_video_view subviews] count] > 0)<br>
- [o_fullscreen_window makeFirstResponder: [o_video_view subviews][0]];<br>
+ [o_fullscreen_window makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]];<br>
<br>
[o_fullscreen_window makeKeyWindow];<br>
[o_fullscreen_window setAcceptsMouseMovedEvents: YES];<br>
@@ -1021,7 +1021,7 @@<br>
[o_video_view release];<br>
[o_video_view setFrame:[o_temp_view frame]];<br>
if ([[o_video_view subviews] count] > 0)<br>
- [self makeFirstResponder: [o_video_view subviews][0]];<br>
+ [self makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]];<br>
<br>
[super makeKeyAndOrderFront:self]; /* our version (in main window) contains a workaround */<br>
<br>
@@ -1055,7 +1055,7 @@<br>
/* Fullscreen ended or started (we are a delegate only for leaveFullscreen's/enterFullscren's anim2) */<br>
viewAnimations = [o_fullscreen_anim2 viewAnimations];<br>
if ([viewAnimations count] >=1 &&<br>
- [[viewAnimations[0] objectForKey: NSViewAnimationEffectKey] isEqualToString:NSViewAnimationFadeInEffect]) {<br>
+ [[[viewAnimations objectAtIndex:0] objectForKey: NSViewAnimationEffectKey] isEqualToString:NSViewAnimationFadeInEffect]) {<br>
/* Fullscreen ended */<br>
[self hasEndedFullscreen];<br>
} else<br>
diff --git a/modules/gui/macosx/bookmarks.m b/modules/gui/macosx/bookmarks.m<br>
index 201ab62..e8ef385 100644<br>
--- a/modules/gui/macosx/bookmarks.m<br>
+++ b/modules/gui/macosx/bookmarks.m<br>
@@ -242,11 +242,11 @@ static VLCBookmarks *_o_sharedInstance = nil;<br>
NSArray * components = [[o_edit_fld_time stringValue] componentsSeparatedByString:@":"];<br>
NSUInteger componentCount = [components count];<br>
if (componentCount == 1)<br>
- pp_bookmarks[i]->i_time_offset = 1000000 * ([components[0] intValue]);<br>
+ pp_bookmarks[i]->i_time_offset = 1000000 * ([[components objectAtIndex:0] intValue]);<br>
else if (componentCount == 2)<br>
- pp_bookmarks[i]->i_time_offset = 1000000 * ([components[0] intValue] * 60 + [components[1] intValue]);<br>
+ pp_bookmarks[i]->i_time_offset = 1000000 * ([[components objectAtIndex:0] intValue] * 60 + [[components objectAtIndex:1] intValue]);<br>
else if (componentCount == 3)<br>
- pp_bookmarks[i]->i_time_offset = 1000000 * ([components[0] intValue] * 3600 + [components[1] intValue] * 60 + [components[2] intValue]);<br>
+ pp_bookmarks[i]->i_time_offset = 1000000 * ([[components objectAtIndex:0] intValue] * 3600 + [[components objectAtIndex:1] intValue] * 60 + [[components objectAtIndex:2] intValue]);<br>
else {<br>
msg_Err(VLCIntf, "Invalid string format for time");<br>
goto clear;<br>
diff --git a/modules/gui/macosx/output.m b/modules/gui/macosx/output.m<br>
index 68aa66c..df84bb2 100644<br>
--- a/modules/gui/macosx/output.m<br>
+++ b/modules/gui/macosx/output.m<br>
@@ -378,10 +378,10 @@<br>
if ([o_urlItems count] == 1)<br>
[o_finalStreamAddress appendFormat: @"\"%@:%@\"", [o_stream_address stringValue],[o_stream_port stringValue]];<br>
else {<br>
- [o_finalStreamAddress appendFormat: @"\"%@:%@", o_urlItems[0], [o_stream_port stringValue]];<br>
+ [o_finalStreamAddress appendFormat: @"\"%@:%@", [o_urlItems objectAtIndex:0], [o_stream_port stringValue]];<br>
NSUInteger itemCount = [o_urlItems count];<br>
for (NSUInteger x = 0; x < itemCount; x++)<br>
- [o_finalStreamAddress appendFormat: @"/%@", o_urlItems[x]];<br>
+ [o_finalStreamAddress appendFormat: @"/%@", [o_urlItems objectAtIndex:x]];<br>
[o_finalStreamAddress appendString: @"\""];<br>
}<br>
<br>
diff --git a/modules/gui/macosx/wizard.m b/modules/gui/macosx/wizard.m<br>
index cf6a8d6..0c6e857 100644<br>
--- a/modules/gui/macosx/wizard.m<br>
+++ b/modules/gui/macosx/wizard.m<br>
@@ -729,73 +729,73 @@ static VLCWizard *_o_sharedInstance = nil;<br>
NSInteger i_selectedVideoCodec = [[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue];<br>
<br>
/* we are transcoding both audio and video, so we need to check both deps */<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_PS"])<br>
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_PS"])<br>
{<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_PS"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_PS"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:0 column:0];<br>
}<br>
}<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_TS"])<br>
+ if ([[o_videoCodecs i_selectedVideoCodec] containsObject: @"MUX_TS"])<br>
{<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_TS"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_TS"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:1 column:0];<br>
}<br>
}<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_MPEG"])<br>
+ if ([[o_videoCodecs i_selectedVideoCodec] containsObject: @"MUX_MPEG"])<br>
{<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_MPEG"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_MPEG"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:2 column:0];<br>
}<br>
}<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_OGG"])<br>
+ if ([[o_videoCodecs i_selectedVideoCodec] containsObject: @"MUX_OGG"])<br>
{<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_OGG"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_OGG"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:3 column:0];<br>
}<br>
}<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_RAW"])<br>
+ if ([[o_videoCodecs i_selectedVideoCodec] containsObject: @"MUX_RAW"])<br>
{<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_RAW"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_RAW"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:4 column:0];<br>
}<br>
}<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_ASF"])<br>
+ if ([[o_videoCodecs i_selectedVideoCodec] containsObject: @"MUX_ASF"])<br>
{<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_ASF"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_ASF"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:5 column:0];<br>
}<br>
}<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_MP4"])<br>
+ if ([[o_videoCodecs i_selectedVideoCodec] containsObject: @"MUX_MP4"])<br>
{<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_MP4"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_MP4"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:6 column:0];<br>
}<br>
}<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_MOV"])<br>
+ if ([[o_videoCodecs i_selectedVideoCodec] containsObject: @"MUX_MOV"])<br>
{<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_MOV"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_MOV"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:7 column:0];<br>
}<br>
}<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_WAV"])<br>
+ if ([[o_videoCodecs i_selectedVideoCodec] containsObject: @"MUX_WAV"])<br>
{<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_WAV"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_WAV"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:8 column:0];<br>
@@ -807,47 +807,47 @@ static VLCWizard *_o_sharedInstance = nil;<br>
/* we just transcoding the audio */<br>
<br>
/* select formats supported by the audio codec */<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_PS"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_PS"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:0 column:0];<br>
}<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_TS"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_TS"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:1 column:0];<br>
}<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_MPEG"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_MPEG"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:2 column:0];<br>
}<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_OGG"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_OGG"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:3 column:0];<br>
}<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_RAW"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_RAW"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:4 column:0];<br>
}<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_ASF"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_ASF"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:5 column:0];<br>
}<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_MP4"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_MP4"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:6 column:0];<br>
}<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_MOV"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_MOV"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:7 column:0];<br>
}<br>
- if ([o_audioCodecs[i_selectedAudioCodec] containsObject: @"MUX_WAV"])<br>
+ if ([[o_audioCodecs objectAtIndex:i_selectedAudioCodec] containsObject: @"MUX_WAV"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:8 column:0];<br>
@@ -861,47 +861,47 @@ static VLCWizard *_o_sharedInstance = nil;<br>
/* select formats supported by the video-codec */<br>
NSInteger i_selectedVideoCodec = [[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue];<br>
<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_PS"])<br>
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_PS"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:0 column:0];<br>
}<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_TS"])<br>
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_TS"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:1 column:0];<br>
}<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_MPEG"])<br>
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_MPEG"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:2 column:0];<br>
}<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_OGG"])<br>
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_OGG"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:3 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:3 column:0];<br>
}<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_RAW"])<br>
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_RAW"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:4 column:0];<br>
}<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_ASF"])<br>
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_ASF"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:5 column:0];<br>
}<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_MP4"])<br>
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_MP4"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:6 column:0];<br>
}<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_MOV"])<br>
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_MOV"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:7 column:0];<br>
}<br>
- if ([o_videoCodecs[i_selectedVideoCodec] containsObject: @"MUX_WAV"])<br>
+ if ([[o_videoCodecs objectAtIndex:i_selectedVideoCodec] containsObject: @"MUX_WAV"])<br>
{<br>
[[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:YES];<br>
[o_t5_matrix_encap selectCellAtRow:8 column:0];<br>
@@ -1085,7 +1085,7 @@ static VLCWizard *_o_sharedInstance = nil;<br>
"button to select a location."));<br>
} else {<br>
/* create a string containing the requested suffix for later usage */<br>
- NSString * theEncapFormat = o_encapFormats[[[o_userSelections objectForKey:@"encapFormat"] intValue]][0];<br>
+ NSString * theEncapFormat = [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:0];<br>
if ([theEncapFormat isEqualToString:@"ps"])<br>
theEncapFormat = @"mpg";<br>
<br>
@@ -1119,11 +1119,8 @@ static VLCWizard *_o_sharedInstance = nil;<br>
fileNameToUse = @"";<br>
while( z < (count - 1))<br>
{<br>
- fileNameToUse = [fileNameToUse stringByAppendingString:<br>
- [[[NSFileManager defaultManager]<br>
- displayNameAtPath:<br>
- [o_userSelections objectForKey:@"pathToStrm"][x]]<br>
- componentsSeparatedByString: @"."][z]];<br>
+ NSString *appendName = [[[[NSFileManager defaultManager] displayNameAtPath:[[o_userSelections objectForKey:@"pathToStrm"] objectAtIndex:x]] componentsSeparatedByString: @"."] objectAtIndex:z];<br>
+ fileNameToUse = [fileNameToUse stringByAppendingString:appendName];<br>
z += 1;<br>
}<br>
}<br>
@@ -1203,11 +1200,11 @@ static VLCWizard *_o_sharedInstance = nil;<br>
NSUInteger componentCount = [components count];<br>
NSUInteger time = 0;<br>
if (componentCount == 1)<br>
- time = 1000000 * ([components[0] intValue]);<br>
+ time = 1000000 * ([[components objectAtIndex:0] intValue]);<br>
else if (componentCount == 2)<br>
- time = 1000000 * ([components[0] intValue] * 60 + [components[1] intValue]);<br>
+ time = 1000000 * ([[components objectAtIndex:0] intValue] * 60 + [[components objectAtIndex:1] intValue]);<br>
else if (componentCount == 3)<br>
- time = 1000000 * ([components[0] intValue] * 3600 + [components[1] intValue] * 60 + [components[2] intValue]);<br>
+ time = 1000000 * ([[components objectAtIndex:0] intValue] * 3600 + [[components objectAtIndex:1] intValue] * 60 + [[components objectAtIndex:2] intValue]);<br>
else<br>
msg_Err(VLCIntf, "Invalid string format for time");<br>
input_item_AddOption(p_input, [[NSString stringWithFormat: @"start-time=%lu", time] UTF8String], VLC_INPUT_OPTION_TRUSTED);<br>
@@ -1219,11 +1216,11 @@ static VLCWizard *_o_sharedInstance = nil;<br>
NSUInteger componentCount = [components count];<br>
NSUInteger time = 0;<br>
if (componentCount == 1)<br>
- time = 1000000 * ([components[0] intValue]);<br>
+ time = 1000000 * ([[components objectAtIndex:0] intValue]);<br>
else if (componentCount == 2)<br>
- time = 1000000 * ([components[0] intValue] * 60 + [components[1] intValue]);<br>
+ time = 1000000 * ([[components objectAtIndex:0] intValue] * 60 + [[components objectAtIndex:1] intValue]);<br>
else if (componentCount == 3)<br>
- time = 1000000 * ([components[0] intValue] * 3600 + [components[1] intValue] * 60 + [components[2] intValue]);<br>
+ time = 1000000 * ([[components objectAtIndex:0] intValue] * 3600 + [[components objectAtIndex:1] intValue] * 60 + [[components objectAtIndex:2] intValue]);<br>
else<br>
msg_Err(VLCIntf, "Invalid string format for time");<br>
input_item_AddOption(p_input, [[NSString stringWithFormat: @"stop-time=%lu", time] UTF8String], VLC_INPUT_OPTION_TRUSTED);<br>
@@ -1263,7 +1260,7 @@ static VLCWizard *_o_sharedInstance = nil;<br>
NSUInteger count = [o_videoCodecs count];<br>
for (NSUInteger x = 0; x < count; x++)<br>
{<br>
- [o_t4_pop_videoCodec addItemWithTitle:o_videoCodecs[x][0]];<br>
+ [o_t4_pop_videoCodec addItemWithTitle:[[o_videoCodecs objectAtIndex:x] objectAtIndex:0]];<br>
[[o_t4_pop_videoCodec lastItem] setTag:x];<br>
}<br>
if (savePreviousSel >= 0)<br>
@@ -1274,7 +1271,7 @@ static VLCWizard *_o_sharedInstance = nil;<br>
count = [o_audioCodecs count];<br>
for (NSUInteger x = 0; x < count; x++)<br>
{<br>
- [o_t4_pop_audioCodec addItemWithTitle:o_audioCodecs[x][0]];<br>
+ [o_t4_pop_audioCodec addItemWithTitle:[[o_audioCodecs objectAtIndex:x] objectAtIndex:0]];<br>
[[o_t4_pop_audioCodec lastItem] setTag:x];<br>
}<br>
if (savePreviousSel >= 0)<br>
@@ -1315,7 +1312,7 @@ static VLCWizard *_o_sharedInstance = nil;<br>
{<br>
[o_t8_fld_trnscdVideo setStringValue: [NSString stringWithFormat:<br>
_NS("yes: %@ @ %@ kb/s"),<br>
- o_videoCodecs[[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]][0],<br>
+ [[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] objectAtIndex:0],<br>
[o_userSelections objectForKey:@"trnscdVideoBitrate"]]];<br>
}<br>
else<br>
@@ -1332,7 +1329,7 @@ static VLCWizard *_o_sharedInstance = nil;<br>
{<br>
[o_t8_fld_trnscdAudio setStringValue: [NSString stringWithFormat:<br>
_NS("yes: %@ @ %@ kb/s"),<br>
- o_audioCodecs[[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]][0],<br>
+ [[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] objectAtIndex:0],<br>
[o_userSelections objectForKey:@"trnscdAudioBitrate"]]];<br>
}<br>
else<br>
@@ -1344,7 +1341,7 @@ static VLCWizard *_o_sharedInstance = nil;<br>
{<br>
/* we are streaming and perhaps also transcoding */<br>
[o_t8_fld_saveFileTo setStringValue: @"-"];<br>
- [o_t8_fld_strmgMthd setStringValue: o_strmgMthds[[[o_userSelections objectForKey:@"stmgMhd"] intValue]][1]];<br>
+ [o_t8_fld_strmgMthd setStringValue: [[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey:@"stmgMhd"] intValue]] objectAtIndex:1]];<br>
[o_t8_fld_destination setStringValue: [o_userSelections objectForKey:<br>
@"stmgDest"]];<br>
[o_t8_fld_ttl setStringValue: [o_userSelections objectForKey:@"ttl"]];<br>
@@ -1372,8 +1369,7 @@ static VLCWizard *_o_sharedInstance = nil;<br>
[o_t8_fld_saveFileTo setStringValue:<br>
[o_userSelections objectForKey: @"trnscdFilePath"][0]];<br>
}<br>
- [o_t8_fld_encapFormat setStringValue: o_encapFormats[<br>
- [[o_userSelections objectForKey:@"encapFormat"] intValue]][1]];<br>
+ [o_t8_fld_encapFormat setStringValue: [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:1]];<br>
<br>
[self createOpts];<br>
[o_t8_fld_mrl setStringValue: [o_userSelections objectForKey:@"opts"]<br>
@@ -1400,7 +1396,7 @@ static VLCWizard *_o_sharedInstance = nil;<br>
{<br>
[o_trnscdCmd appendString: @"transcode{"];<br>
[o_trnscdCmd appendFormat: @"vcodec=%@,vb=%i",<br>
- o_videoCodecs[[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]][1],<br>
+ [[o_videoCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdVideoCodec"] intValue]] objectAtIndex:1],<br>
[[o_userSelections objectForKey:@"trnscdVideoBitrate"] intValue]];<br>
if ([[o_userSelections objectForKey:@"trnscdAudio"] isEqualToString:@"YES"])<br>
{<br>
@@ -1427,7 +1423,7 @@ static VLCWizard *_o_sharedInstance = nil;<br>
[o_trnscdCmd appendString: @"transcode{"];<br>
}<br>
[o_trnscdCmd appendFormat: @"acodec=%@,ab=%i}:",<br>
- o_audioCodecs[[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]][1],<br>
+ [[o_audioCodecs objectAtIndex:[[o_userSelections objectForKey:@"trnscdAudioCodec"] intValue]] objectAtIndex:1],<br>
[[o_userSelections objectForKey:@"trnscdAudioBitrate"] intValue]];<br>
}<br>
<br>
@@ -1438,7 +1434,7 @@ static VLCWizard *_o_sharedInstance = nil;<br>
@":sout=#%@%@standard{mux=%@,access=file{no-overwrite},dst=%@}",<br>
o_duplicateCmd,<br>
o_trnscdCmd,<br>
- o_encapFormats[[[o_userSelections objectForKey:@"encapFormat"] intValue]][0],<br>
+ [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:0],<br>
[o_userSelections objectForKey: @"trnscdFilePath"][x]];<br>
}<br>
else<br>
@@ -1458,13 +1454,13 @@ static VLCWizard *_o_sharedInstance = nil;<br>
[o_sap_option appendFormat: @"sap,name=\"%@\"",<br>
[o_userSelections objectForKey:@"sapText"]];<br>
}<br>
- if ([o_strmgMthds[[[o_userSelections objectForKey: @"stmgMhd"] intValue]][0] isEqualToString:@"rtp"])<br>
+ if ([[[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0] isEqualToString:@"rtp"])<br>
{<br>
/* RTP is no access out, but a stream out module */<br>
[o_opts_string appendFormat:<br>
@":sout=#%@%@rtp{mux=%@,dst=%@,%@}",<br>
o_duplicateCmd, o_trnscdCmd,<br>
- o_encapFormats[[[o_userSelections objectForKey: @"encapFormat"] intValue]][0],<br>
+ [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey: @"encapFormat"] intValue]] objectAtIndex:0],<br>
[o_userSelections objectForKey: @"stmgDest"],<br>
o_sap_option];<br>
}<br>
@@ -1473,23 +1469,23 @@ static VLCWizard *_o_sharedInstance = nil;<br>
[o_opts_string appendFormat:<br>
@":sout=#%@%@standard{mux=%@,dst=%@,access=%@,%@}",<br>
o_duplicateCmd, o_trnscdCmd,<br>
- o_encapFormats[[[o_userSelections objectForKey: @"encapFormat"] intValue]][0],<br>
+ [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey: @"encapFormat"] intValue]] objectAtIndex:0],<br>
[o_userSelections objectForKey: @"stmgDest"],<br>
- o_strmgMthds[[[o_userSelections objectForKey: @"stmgMhd"] intValue]][0],<br>
+ [[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0],<br>
o_sap_option];<br>
}<br>
}<br>
else<br>
{<br>
/* no SAP, just streaming */<br>
- if ([o_strmgMthds[[[o_userSelections objectForKey: @"stmgMhd"] intValue]][0] isEqualToString:@"rtp"])<br>
+ if ([[[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0] isEqualToString:@"rtp"])<br>
{<br>
/* RTP is different from the other protocols, as it isn't provided through an access out module anymore */<br>
[o_opts_string appendFormat:<br>
@":sout=#%@%@rtp{mux=%@,dst=%@}",<br>
o_duplicateCmd,<br>
o_trnscdCmd,<br>
- o_encapFormats[[[o_userSelections objectForKey: @"encapFormat"] intValue]][0],<br>
+ [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey: @"encapFormat"] intValue]] objectAtIndex:0],<br>
[o_userSelections objectForKey: @"stmgDest"]];<br>
}<br>
else<br>
@@ -1499,9 +1495,9 @@ static VLCWizard *_o_sharedInstance = nil;<br>
@":sout=#%@%@standard{mux=%@,dst=%@,access=%@}",<br>
o_duplicateCmd,<br>
o_trnscdCmd,<br>
- o_encapFormats[[[o_userSelections objectForKey: @"encapFormat"] intValue]][0],<br>
+ [[o_encapFormats objectAtIndex:[[o_userSelections objectForKey: @"encapFormat"] intValue]] objectAtIndex:0],<br>
[o_userSelections objectForKey: @"stmgDest"],<br>
- o_strmgMthds[[[o_userSelections objectForKey: @"stmgMhd"] intValue]][0]];<br>
+ [[o_strmgMthds objectAtIndex:[[o_userSelections objectForKey: @"stmgMhd"] intValue]] objectAtIndex:0]];<br>
}<br>
}<br>
}<br>
@@ -1661,46 +1657,46 @@ static VLCWizard *_o_sharedInstance = nil;<br>
if (mode == 0)<br>
{<br>
/* HTTP */<br>
- [o_t3_txt_destInfo setStringValue: o_strmgMthds[0][2]];<br>
- [o_t3_txt_strgMthdInfo setStringValue: o_strmgMthds[0][3]];<br>
+ [o_t3_txt_destInfo setStringValue:[[o_strmgMthds objectAtIndex:0] objectAtIndex:2]];<br>
+ [o_t3_txt_strgMthdInfo setStringValue:[[ o_strmgMthds objectAtIndex:0] objectAtIndex:3]];<br>
}<br>
else if (mode == 1)<br>
{<br>
/* MMS */<br>
- [o_t3_txt_destInfo setStringValue: o_strmgMthds[1][2]];<br>
- [o_t3_txt_strgMthdInfo setStringValue: o_strmgMthds[1][3]];<br>
+ [o_t3_txt_destInfo setStringValue:[[ o_strmgMthds objectAtIndex:1] objectAtIndex:2]];<br>
+ [o_t3_txt_strgMthdInfo setStringValue:[[ o_strmgMthds objectAtIndex:1] objectAtIndex:3]];<br>
}<br>
else if (mode == 2)<br>
{<br>
/* UDP-Unicast */<br>
- [o_t3_txt_destInfo setStringValue: o_strmgMthds[2][2]];<br>
- [o_t3_txt_strgMthdInfo setStringValue: o_strmgMthds[2][3]];<br>
+ [o_t3_txt_destInfo setStringValue:[[ o_strmgMthds objectAtIndex:2] objectAtIndex:2]];<br>
+ [o_t3_txt_strgMthdInfo setStringValue:[[ o_strmgMthds objectAtIndex:2] objectAtIndex:3]];<br>
}<br>
else if (mode == 3)<br>
{<br>
/* UDP-Multicast */<br>
- [o_t3_txt_destInfo setStringValue: o_strmgMthds[3][2]];<br>
- [o_t3_txt_strgMthdInfo setStringValue: o_strmgMthds[3][3]];<br>
+ [o_t3_txt_destInfo setStringValue:[[ o_strmgMthds objectAtIndex:3] objectAtIndex:2]];<br>
+ [o_t3_txt_strgMthdInfo setStringValue:[[ o_strmgMthds objectAtIndex:3] objectAtIndex:3]];<br>
}<br>
else if (mode == 4)<br>
{<br>
/* RTP-Unicast */<br>
- [o_t3_txt_destInfo setStringValue: o_strmgMthds[4][2]];<br>
- [o_t3_txt_strgMthdInfo setStringValue: o_strmgMthds[4][3]];<br>
+ [o_t3_txt_destInfo setStringValue:[[ o_strmgMthds objectAtIndex:4] objectAtIndex:2]];<br>
+ [o_t3_txt_strgMthdInfo setStringValue:[[ o_strmgMthds objectAtIndex:4] objectAtIndex:3]];<br>
}<br>
else if (mode == 5)<br>
{<br>
/* RTP-Multicast */<br>
- [o_t3_txt_destInfo setStringValue: o_strmgMthds[5][2]];<br>
- [o_t3_txt_strgMthdInfo setStringValue: o_strmgMthds[5][3]];<br>
+ [o_t3_txt_destInfo setStringValue: [[o_strmgMthds objectAtIndex:5] objectAtIndex:2]];<br>
+ [o_t3_txt_strgMthdInfo setStringValue:[[ o_strmgMthds objectAtIndex:5] objectAtIndex:3]];<br>
}<br>
}<br>
<br>
- (IBAction)t4_AudCdcChanged:(id)sender<br>
{<br>
/* update codec info */<br>
- [o_t4_txt_hintAudio setStringValue:o_audioCodecs[<br>
- [[o_t4_pop_audioCodec selectedItem]tag]][2]];<br>
+ [o_t4_txt_hintAudio setStringValue:<br>
+ [[o_audioCodecs objectAtIndex:[[o_t4_pop_audioCodec selectedItem]tag]] objectAtIndex:2]];<br>
}<br>
<br>
- (IBAction)t4_enblAudTrnscd:(id)sender<br>
@@ -1741,8 +1737,8 @@ static VLCWizard *_o_sharedInstance = nil;<br>
- (IBAction)t4_VidCdcChanged:(id)sender<br>
{<br>
/* update codec info */<br>
- [o_t4_txt_hintVideo setStringValue:o_videoCodecs[<br>
- [[o_t4_pop_videoCodec selectedItem]tag]][2]];<br>
+ [o_t4_txt_hintVideo setStringValue:[[o_videoCodecs objectAtIndex:<br>
+ [[o_t4_pop_videoCodec selectedItem]tag]] objectAtIndex:2]];<br>
}<br>
<br>
- (IBAction)t6_enblSapAnnce:(id)sender<br>
@@ -1818,8 +1814,8 @@ static VLCWizard *_o_sharedInstance = nil;<br>
/* don't use ".ps" as suffix, since the OSX Finder confuses our<br>
* creations with PostScript-files and wants to open them with<br>
* Preview.app */<br>
- NSString * theEncapFormat = o_encapFormats[<br>
- [[o_userSelections objectForKey:@"encapFormat"] intValue]][0];<br>
+ NSString * theEncapFormat = [[o_encapFormats objectAtIndex:<br>
+ [[o_userSelections objectForKey:@"encapFormat"] intValue]] objectAtIndex:0];<br>
if (![theEncapFormat isEqualToString:@"ps"])<br>
[saveFilePanel setAllowedFileTypes: @[theEncapFormat]];<br>
else<br>
--<br>
1.8.2.2<br>
<br>
_______________________________________________<br>
vlc-devel mailing list<br>
To unsubscribe or modify your subscription options:<br>
<a href="http://mailman.videolan.org/listinfo/vlc-devel" target="_blank">http://mailman.videolan.org/listinfo/vlc-devel</a><br>
</blockquote></div>