Skip to content

V
vlc-2-2
Commit 3efeac83 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

Revert "macosx: clean code of objectAtIndex" 

This reverts commit 00b2fcce.

[__MNSArray objectAtIndexedSubscript] isn't part of the OS X 10.7 ObjC runtime and in turn, we can't use this feature of the modern ObjC syntax until we drop support for 10.7 some day
parent 2b82c9fd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 415 additions and 385 deletions
modules/access/avcapture.m
View file @ 3efeac83
......@@ -296,8 +296,8 @@ static int Open(vlc_object_t *p_this)
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;
}
......@@ -305,7 +305,7 @@ static int Open(vlc_object_t *p_this)
if ( ivideo < [myVideoDevices count] )
{
p_sys->device = myVideoDevices[ivideo];
p_sys->device = [myVideoDevices objectAtIndex:ivideo];
}
else
{
......
modules/access/qtcapture.m
View file @ 3efeac83
......@@ -256,7 +256,7 @@ static int Open(vlc_object_t *p_this)
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;
......@@ -268,7 +268,7 @@ static int Open(vlc_object_t *p_this)
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]);
......@@ -306,13 +306,13 @@ static int Open(vlc_object_t *p_this)
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;
......
modules/access/qtsound.m
View file @ 3efeac83
......@@ -275,7 +275,7 @@ static int Open(vlc_object_t *p_this)
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");
......@@ -285,7 +285,7 @@ static int Open(vlc_object_t *p_this)
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]);
......@@ -357,7 +357,7 @@ static int Open(vlc_object_t *p_this)
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]);
......@@ -400,7 +400,7 @@ static int Open(vlc_object_t *p_this)
}
if([audioformat_array count])
audio_format = audioformat_array[0];
audio_format = [audioformat_array objectAtIndex:0];
else
goto error;
......
modules/gui/macosx/AppleRemote.m
View file @ 3efeac83
......@@ -388,8 +388,8 @@ static AppleRemote* sharedInstance=nil;
}
- (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;
......@@ -564,7 +564,7 @@ static void QueueCallbackFunction(void* target, IOReturn result, void* refcon,
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) ];
......@@ -610,7 +610,7 @@ static void QueueCallbackFunction(void* target, IOReturn result, void* refcon,
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);
}
......
modules/gui/macosx/AudioEffects.m
View file @ 3efeac83
......@@ -302,17 +302,17 @@ static VLCAudioEffects *_o_sharedInstance = nil;
}
/* 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 */
......@@ -321,43 +321,43 @@ static VLCAudioEffects *_o_sharedInstance = nil;
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 */
......@@ -365,7 +365,7 @@ static VLCAudioEffects *_o_sharedInstance = nil;
[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];
......@@ -491,7 +491,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
[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];
}
......@@ -528,11 +528,11 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
- (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
......@@ -581,14 +581,14 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
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);
}
......@@ -598,7 +598,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
/* 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]);
}
......
modules/gui/macosx/ConvertAndSave.m
View file @ 3efeac83
This diff is collapsed.
modules/gui/macosx/CoreInteraction.m
View file @ 3efeac83
......@@ -566,7 +566,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
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;
......@@ -576,7 +576,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
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;
......
modules/gui/macosx/MainMenu.m
View file @ 3efeac83
......@@ -126,7 +126,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
/* 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]);
......@@ -478,12 +478,12 @@ static VLCMainMenu *_o_sharedInstance = nil;
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];
......@@ -491,7 +491,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
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];
}
......@@ -510,7 +510,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
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]];
......@@ -604,11 +604,11 @@ static VLCMainMenu *_o_sharedInstance = nil;
[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];
}
......@@ -733,7 +733,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
[[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];
}
......@@ -944,10 +944,10 @@ static VLCMainMenu *_o_sharedInstance = nil;
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);
......
modules/gui/macosx/MainWindow.m
View file @ 3efeac83
......@@ -326,7 +326,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
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];
}
......@@ -461,7 +461,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
}
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
......@@ -914,9 +914,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
{
//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];
}
......@@ -1103,7 +1103,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
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;
......@@ -1125,7 +1125,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
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);
}
......@@ -1152,7 +1152,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
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;
}
......
modules/gui/macosx/MainWindowTitle.m
View file @ 3efeac83
......@@ -493,7 +493,7 @@
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];
......@@ -504,7 +504,7 @@
[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)
......@@ -559,11 +559,11 @@
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];
}
......
modules/gui/macosx/PXSourceList.m
View file @ 3efeac83
......@@ -725,7 +725,7 @@ NSString * const PXSLDeleteKeyPressedOnRowsNotification = @"PXSourceListDeleteKe
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
......
modules/gui/macosx/SPMediaKeyTap.m
View file @ 3efeac83
......@@ -276,7 +276,7 @@ NSString *kIgnoreMediaKeysDefaultsKey = @"SPIgnoreMediaKeys";
ProcessSerialNumber mySerial, topSerial;
GetCurrentProcess(&mySerial);
[_mediaKeyAppList[0] getValue:&topSerial];
[[_mediaKeyAppList objectAtIndex:0] getValue:&topSerial];
Boolean same;
OSErr err = SameProcess(&mySerial, &topSerial, &same);
......
modules/gui/macosx/VLCUIWidgets.m
View file @ 3efeac83
......@@ -58,7 +58,7 @@
- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
{
return [contentArray[rowIndex] objectForKey:@"text"];
return [[contentArray objectAtIndex:rowIndex] objectForKey:@"text"];
}
@end
......
modules/gui/macosx/VLCVoutWindowController.m
View file @ 3efeac83
......@@ -165,7 +165,7 @@
// 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];
......
modules/gui/macosx/VideoEffects.m
View file @ 3efeac83
......@@ -757,10 +757,10 @@ static VLCVideoEffects *_o_sharedInstance = nil;
}
/* 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 */
......@@ -768,60 +768,60 @@ static VLCVideoEffects *_o_sharedInstance = nil;
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];
......
modules/gui/macosx/Windows.m
View file @ 3efeac83
......@@ -134,7 +134,7 @@
@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) {
......@@ -186,7 +186,7 @@
@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) {
......@@ -664,8 +664,8 @@
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];
}
}
......@@ -882,7 +882,7 @@
- (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];
......@@ -1021,7 +1021,7 @@
[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 */
......@@ -1055,7 +1055,7 @@
/* 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
......
modules/gui/macosx/bookmarks.m
View file @ 3efeac83
......@@ -242,11 +242,11 @@ static VLCBookmarks *_o_sharedInstance = nil;
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;
......
modules/gui/macosx/controls.m
View file @ 3efeac83
......@@ -223,12 +223,12 @@
[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
......
modules/gui/macosx/coredialogs.m
View file @ 3efeac83
......@@ -317,10 +317,10 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
(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";
}
......
modules/gui/macosx/intf.m
View file @ 3efeac83
......@@ -1061,7 +1061,7 @@ static VLCMain *_o_sharedMainInstance = nil;
- (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) {
......@@ -1081,7 +1081,7 @@ static VLCMain *_o_sharedMainInstance = nil;
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;
......@@ -1269,7 +1269,7 @@ static VLCMain *_o_sharedMainInstance = nil;
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]] &&
......@@ -1784,22 +1784,22 @@ static VLCMain *_o_sharedMainInstance = nil;
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];
}
}
......@@ -1889,7 +1889,7 @@ static VLCMain *_o_sharedMainInstance = nil;
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"]] &&
......@@ -1970,7 +1970,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[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)
......@@ -2027,7 +2027,7 @@ static VLCMain *_o_sharedMainInstance = nil;
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]];
......
modules/gui/macosx/misc.m
View file @ 3efeac83
......@@ -176,7 +176,7 @@ static NSMutableArray *blackoutWindows = NULL;
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;
}
......@@ -185,7 +185,7 @@ static NSMutableArray *blackoutWindows = NULL;
- (BOOL)hasMenuBar
{
return ([self displayID] == [[NSScreen screens][0] displayID]);
return ([self displayID] == [[[NSScreen screens] objectAtIndex:0] displayID]);
}
- (BOOL)hasDock
......@@ -221,7 +221,7 @@ static NSMutableArray *blackoutWindows = NULL;
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;
......@@ -255,7 +255,7 @@ static NSMutableArray *blackoutWindows = NULL;
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];
}
......
modules/gui/macosx/open.m
View file @ 3efeac83
This diff is collapsed.
modules/gui/macosx/output.m
View file @ 3efeac83
......@@ -378,10 +378,10 @@
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: @"\""];
}
......
modules/gui/macosx/playlist.m
View file @ 3efeac83
......@@ -470,12 +470,12 @@
[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];
......@@ -522,7 +522,7 @@
/* 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;
......@@ -599,7 +599,7 @@
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];
}
}
......@@ -671,8 +671,8 @@
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
......@@ -1009,7 +1009,7 @@
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 */
......@@ -1035,7 +1035,7 @@
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;
......@@ -1068,7 +1068,7 @@
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)
......@@ -1161,7 +1161,7 @@
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;
......@@ -1170,11 +1170,12 @@
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];
......@@ -1366,7 +1367,7 @@
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"];
......@@ -1400,7 +1401,7 @@
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)
......@@ -1451,7 +1452,7 @@
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;
}
}
......@@ -1505,7 +1506,7 @@
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;
}
......@@ -1520,7 +1521,7 @@
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]]];
......@@ -1546,7 +1547,7 @@
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;
......@@ -1556,7 +1557,7 @@
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;
......
modules/gui/macosx/playlistinfo.m
View file @ 3efeac83
......@@ -502,7 +502,7 @@ error:
}
- (VLCInfoTreeItem *)childAtIndex:(NSUInteger)i_index {
return [self children][i_index];
return [[self children] objectAtIndex:i_index];
}
- (int)numberOfChildren {
......
modules/gui/macosx/prefs.m
View file @ 3efeac83
......@@ -279,7 +279,7 @@ static VLCPrefs *_o_sharedMainInstance = nil;
{
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;
}
......@@ -404,7 +404,7 @@ static VLCPrefs *_o_sharedMainInstance = nil;
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;
}
......@@ -523,7 +523,7 @@ static VLCPrefs *_o_sharedMainInstance = nil;
- (VLCTreeItem *)childAtIndex:(NSInteger)i_index
{
return [self children][i_index];
return [[self children] objectAtIndex:i_index];
}
- (int)numberOfChildren
......@@ -551,7 +551,7 @@ static VLCPrefs *_o_sharedMainInstance = nil;
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];
......@@ -604,26 +604,26 @@ static VLCPrefs *_o_sharedMainInstance = nil;
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];
}
......
modules/gui/macosx/prefs_widgets.m
View file @ 3efeac83
......@@ -1150,7 +1150,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
[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];
}
}];
......@@ -2138,9 +2138,10 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
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:@":"];
}
......@@ -2224,7 +2225,8 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
// 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];
......@@ -2265,9 +2267,9 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
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;
}
......@@ -2275,7 +2277,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
- (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
......
modules/gui/macosx/simple_prefs.m
View file @ 3efeac83
......@@ -527,11 +527,11 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
[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];
......@@ -954,7 +954,7 @@ static inline void save_module_list(intf_thread_t * p_intf, id object, const cha
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;
}
......@@ -1209,11 +1209,11 @@ static inline void save_module_list(intf_thread_t * p_intf, id object, const cha
[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]; \
} \
} \
......@@ -1264,8 +1264,8 @@ static inline void save_module_list(intf_thread_t * p_intf, id object, const cha
{
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]];
......@@ -1325,9 +1325,9 @@ static inline void save_module_list(intf_thread_t * p_intf, id object, const cha
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;
......@@ -1352,11 +1352,11 @@ static inline void save_module_list(intf_thread_t * p_intf, id object, const cha
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: @""];
......
modules/gui/macosx/wizard.m
View file @ 3efeac83
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment