[vlc-commits] [Git][videolan/vlc][master] 6 commits: macosx: Fix warnings about unused parameters
Steve Lhomme (@robUx4)
gitlab at videolan.org
Thu Jul 30 18:38:42 UTC 2026
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
17a04ac1 by Claudio Cambra at 2026-07-30T18:26:03+00:00
macosx: Fix warnings about unused parameters
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
0d74a833 by Claudio Cambra at 2026-07-30T18:26:03+00:00
macosx: Remove #pragma public interface
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
d90c1fd9 by Claudio Cambra at 2026-07-30T18:26:03+00:00
macosx: Remove unused variables
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
23aa95e5 by Claudio Cambra at 2026-07-30T18:26:03+00:00
macosx: Fix additional type mismatch warnings
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
9f788fb5 by Claudio Cambra at 2026-07-30T18:26:03+00:00
macosx: Replace deprecated NSCompositeSourceIn with NSCompositingOperationSourceIn
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
3989afb5 by Claudio Cambra at 2026-07-30T18:26:03+00:00
macosx: Remove unnecessary semicolons
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
23 changed files:
- modules/gui/macosx/extensions/NSArray+VLCAdditions.m
- modules/gui/macosx/extensions/NSImage+VLCAdditions.m
- modules/gui/macosx/imported/AppleRemote/AppleRemote.m
- modules/gui/macosx/library/VLCInputItem.m
- modules/gui/macosx/library/VLCLibraryDataTypes.m
- modules/gui/macosx/library/VLCLibraryWindow.m
- modules/gui/macosx/library/audio-library/VLCLibraryAllAudioGroupsMediaLibraryItem.m
- modules/gui/macosx/library/media-source/VLCLibraryMediaSourceViewController.m
- modules/gui/macosx/library/playlist-library/VLCLibraryPlaylistDataSource.m
- modules/gui/macosx/main/VLCMain+OldPrefs.m
- modules/gui/macosx/panels/VLCAudioEffectsWindowController.m
- modules/gui/macosx/panels/VLCVideoEffectsWindowController.m
- modules/gui/macosx/panels/dialogs/VLCCoreDialogProvider.m
- modules/gui/macosx/preferences/VLCSimplePrefsController.m
- modules/gui/macosx/preferences/prefs.m
- modules/gui/macosx/preferences/prefs_widgets.m
- modules/gui/macosx/views/VLCPlaybackProgressSliderCell.m
- modules/gui/macosx/views/VLCStatusNotifierView.m
- modules/gui/macosx/windows/addons/VLCAddonsWindowController.m
- modules/gui/macosx/windows/convertandsave/VLCOutput.m
- modules/gui/macosx/windows/video/VLCFullVideoViewWindow.m
- modules/gui/macosx/windows/video/VLCMainVideoViewController.m
- modules/gui/macosx/windows/video/VLCVideoWindowCommon.m
Changes:
=====================================
modules/gui/macosx/extensions/NSArray+VLCAdditions.m
=====================================
@@ -42,7 +42,7 @@
- (NSInteger)indexOfMediaLibraryItem:(id<VLCMediaLibraryItemProtocol>)mediaLibraryItem
{
- return [self indexOfObjectPassingTest:^BOOL(const id<VLCMediaLibraryItemProtocol> item, const NSUInteger idx, BOOL * const stop) {
+ return [self indexOfObjectPassingTest:^BOOL(const id<VLCMediaLibraryItemProtocol> item, const NSUInteger __unused idx, BOOL * const __unused stop) {
NSParameterAssert([item conformsToProtocol:@protocol(VLCMediaLibraryItemProtocol)]);
return item.libraryID == mediaLibraryItem.libraryID;
}];
=====================================
modules/gui/macosx/extensions/NSImage+VLCAdditions.m
=====================================
@@ -280,7 +280,7 @@
{
return [NSImage imageWithSize:size
flipped:NO
- drawingHandler:^BOOL(const NSRect dstRect) {
+ drawingHandler:^BOOL(const NSRect __unused dstRect) {
NSUInteger counter = 0;
for (NSValue * const rectValue in frames) {
@@ -310,7 +310,7 @@
[image lockFocus];
[color set];
const NSRect imageRect = {NSZeroPoint, image.size};
- NSRectFillUsingOperation(imageRect, NSCompositeSourceIn);
+ NSRectFillUsingOperation(imageRect, NSCompositingOperationSourceIn);
[image unlockFocus];
}
=====================================
modules/gui/macosx/imported/AppleRemote/AppleRemote.m
=====================================
@@ -63,8 +63,6 @@ const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL=0.4;
@implementation AppleRemote
-#pragma public interface
-
- (id)init
{
self = [super init];
@@ -432,7 +430,7 @@ static AppleRemote* sharedInstance=nil;
/* Callback method for the device queue
Will be called for any event of any type (cookie) to which we subscribe
*/
-static void QueueCallbackFunction(void* target, IOReturn result, void* refcon, void* sender) {
+static void QueueCallbackFunction(void* target, IOReturn result, void* __unused refcon, void* __unused sender) {
AppleRemote* remote = (__bridge AppleRemote*)target;
IOHIDEventStruct event;
@@ -524,8 +522,6 @@ static void QueueCallbackFunction(void* target, IOReturn result, void* refcon,
- (BOOL) initializeCookies {
IOHIDDeviceInterface122** handle = (IOHIDDeviceInterface122**)hidDeviceInterface;
IOHIDElementCookie cookie;
- long usage;
- long usagePage;
id object;
NSDictionary* element;
CFArrayRef elementsRef;
@@ -557,16 +553,6 @@ static void QueueCallbackFunction(void* target, IOReturn result, void* refcon,
if (object == 0 || CFGetTypeID((__bridge CFTypeRef)(object)) != CFNumberGetTypeID()) continue;
cookie = (IOHIDElementCookie) [object longValue];
- //Get usage
- object = [element valueForKey: (NSString*)CFSTR(kIOHIDElementUsageKey) ];
- if (object == nil || ![object isKindOfClass:[NSNumber class]]) continue;
- usage = [object longValue];
-
- //Get usage page
- object = [element valueForKey: (NSString*)CFSTR(kIOHIDElementUsagePageKey) ];
- if (object == nil || ![object isKindOfClass:[NSNumber class]]) continue;
- usagePage = [object longValue];
-
[mutableAllCookies addObject: [NSNumber numberWithInt:(int)cookie]];
}
_allCookies = [[NSArray alloc] initWithArray: mutableAllCookies];
@@ -582,7 +568,6 @@ static void QueueCallbackFunction(void* target, IOReturn result, void* refcon,
}
- (BOOL) openDevice {
- HRESULT result;
IOHIDOptionsType openMode = kIOHIDOptionsTypeNone;
if ([self openInExclusiveMode]) openMode = kIOHIDOptionsTypeSeizeDevice;
@@ -591,7 +576,7 @@ static void QueueCallbackFunction(void* target, IOReturn result, void* refcon,
if (ioReturnValue == KERN_SUCCESS) {
queue = (*hidDeviceInterface)->allocQueue(hidDeviceInterface);
if (queue) {
- result = (*queue)->create(queue, 0, 12); //depth: maximum number of elements in queue before oldest elements in queue begin to be lost.
+ (*queue)->create(queue, 0, 12); //depth: maximum number of elements in queue before oldest elements in queue begin to be lost.
NSUInteger cookieCount = [_allCookies count];
for(NSUInteger i=0; i<cookieCount; i++) {
=====================================
modules/gui/macosx/library/VLCInputItem.m
=====================================
@@ -565,7 +565,7 @@ static const struct input_item_parser_cbs_t parserCallbacks =
{
const int i_options = _vlcInputItem->i_options;
NSMutableArray * const options = [NSMutableArray arrayWithCapacity:i_options];
- for (NSUInteger i = 0; i < i_options; ++i) {
+ for (int i = 0; i < i_options; ++i) {
const char * const psz_option = _vlcInputItem->ppsz_options[i];
NSString * const option = NSTR(psz_option);
[options addObject:option];
=====================================
modules/gui/macosx/library/VLCLibraryDataTypes.m
=====================================
@@ -379,7 +379,7 @@ static NSString *genreArrayDisplayString(NSArray<VLCMediaLibraryGenre *> * const
- (void)iterateMediaItemsWithBlock:(nonnull void (^)(VLCMediaLibraryMediaItem * _Nonnull))mediaItemBlock
{
- [self enumerateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem * const item, BOOL * const stop) {
+ [self enumerateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem * const item, BOOL * const __unused stop) {
mediaItemBlock(item);
}];
}
@@ -595,7 +595,7 @@ static NSString *genreArrayDisplayString(NSArray<VLCMediaLibraryGenre *> * const
- (void)iterateMediaItemsWithBlock:(void (^)(VLCMediaLibraryMediaItem*))mediaItemBlock
{
- [self enumerateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem * const item, BOOL * const stop) {
+ [self enumerateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem * const item, BOOL * const __unused stop) {
mediaItemBlock(item);
}];
}
@@ -831,7 +831,7 @@ static NSString *genreArrayDisplayString(NSArray<VLCMediaLibraryGenre *> * const
- (void)iterateMediaItemsWithBlock:(void (^)(VLCMediaLibraryMediaItem*))mediaItemBlock
{
// By default iterate album-by-album
- [self enumerateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem * const item, BOOL * const stop) {
+ [self enumerateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem * const item, BOOL * const __unused stop) {
mediaItemBlock(item);
} orderedBy:VLC_ML_PARENT_ALBUM];
}
@@ -843,7 +843,7 @@ static NSString *genreArrayDisplayString(NSArray<VLCMediaLibraryGenre *> * const
- (void)iterateMediaItemsWithBlock:(void (^)(VLCMediaLibraryMediaItem*))mediaItemBlock orderedBy:(int)mediaItemParentType
{
- [self enumerateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem * const item, BOOL * const stop) {
+ [self enumerateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem * const item, BOOL * const __unused stop) {
mediaItemBlock(item);
} orderedBy:mediaItemParentType];
}
@@ -1612,7 +1612,7 @@ static NSString *genreArrayDisplayString(NSArray<VLCMediaLibraryGenre *> * const
- (void)iterateMediaItemsWithBlock:(void (^)(VLCMediaLibraryMediaItem*))mediaItemBlock
{
- [self enumerateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem * const item, BOOL * const stop) {
+ [self enumerateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem * const item, BOOL * const __unused stop) {
mediaItemBlock(item);
}];
}
@@ -2071,7 +2071,7 @@ static NSString *genreArrayDisplayString(NSArray<VLCMediaLibraryGenre *> * const
- (void)iterateMediaItemsWithBlock:(nonnull void (^)(VLCMediaLibraryMediaItem * _Nonnull))mediaItemBlock
{
- [self enumerateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem * const item, BOOL * const stop) {
+ [self enumerateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem * const item, BOOL * const __unused stop) {
mediaItemBlock(item);
}];
}
=====================================
modules/gui/macosx/library/VLCLibraryWindow.m
=====================================
@@ -571,7 +571,7 @@ static int ShowController(vlc_object_t * __unused p_this,
self.controlsBar.bottomBarView.hidden = NO;
[NSAnimationContext runAnimationRespectingPreferencesWithDuration:VLCUIUnits.controlsFadeAnimationDuration
- changes:^(NSAnimationContext * const context) {
+ changes:^(NSAnimationContext * const __unused context) {
context.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn];
self.controlsBar.bottomBarView.animator.alphaValue = 1;
} completionHandler:nil];
@@ -712,7 +712,7 @@ static int ShowController(vlc_object_t * __unused p_this,
[self.loadingOverlayView applyConstraintsToFillSuperview];
[NSAnimationContext runAnimationRespectingPreferencesWithDuration:0.5
- changes:^(NSAnimationContext * const context) {
+ changes:^(NSAnimationContext * const __unused context) {
self.loadingOverlayView.animator.alphaValue = 1.0;
} completionHandler:nil];
@@ -732,7 +732,7 @@ static int ShowController(vlc_object_t * __unused p_this,
self.loadingOverlayView.alphaValue = 1.0;
[NSAnimationContext runAnimationRespectingPreferencesWithDuration:1.0
- changes:^(NSAnimationContext * const context) {
+ changes:^(NSAnimationContext * const __unused context) {
self.loadingOverlayView.animator.alphaValue = 0.0;
} completionHandler:^{
NSMutableArray * const mutableSubviews = self.libraryTargetView.subviews.mutableCopy;
=====================================
modules/gui/macosx/library/audio-library/VLCLibraryAllAudioGroupsMediaLibraryItem.m
=====================================
@@ -66,7 +66,7 @@
- (void)iterateMediaItemsWithBlock:(nonnull void (^)(VLCMediaLibraryMediaItem * _Nonnull))mediaItemBlock
{
- [self enumerateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem * const item, BOOL * const stop) {
+ [self enumerateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem * const item, BOOL * const __unused stop) {
mediaItemBlock(item);
}];
}
=====================================
modules/gui/macosx/library/media-source/VLCLibraryMediaSourceViewController.m
=====================================
@@ -278,7 +278,7 @@
return;
_loadingOverlayView.alphaValue = 1.0;
- [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context) {
+ [NSAnimationContext runAnimationGroup:^(NSAnimationContext * __unused context) {
_loadingOverlayView.animator.alphaValue = 0.0;
} completionHandler:^{
[_loadingOverlayView removeFromSuperview];
=====================================
modules/gui/macosx/library/playlist-library/VLCLibraryPlaylistDataSource.m
=====================================
@@ -411,7 +411,7 @@ viewForSupplementaryElementOfKind:(NSCollectionViewSupplementaryElementKind)kind
}
const NSInteger selectedRow = self.masterTableView.selectedRow;
- if (selectedRow < 0 || selectedRow >= self.playlists.count) {
+ if (selectedRow < 0 || (NSUInteger)selectedRow >= self.playlists.count) {
return nil;
}
@@ -440,7 +440,7 @@ viewForSupplementaryElementOfKind:(NSCollectionViewSupplementaryElementKind)kind
}
const NSInteger selectedRow = masterTableView.selectedRow;
- if (selectedRow < 0 || selectedRow >= self.playlists.count) {
+ if (selectedRow < 0 || (NSUInteger)selectedRow >= self.playlists.count) {
[self.headerDelegate updateHeaderForTableView:detailTableView
withRepresentedItem:nil
fallbackTitle:_NS("Playlists")
=====================================
modules/gui/macosx/main/VLCMain+OldPrefs.m
=====================================
@@ -126,7 +126,7 @@ static const int kCurrentPreferencesVersion = 4;
NSArray *ourPreferences = @[[[NSURL alloc] initFileURLWithPath:[preferences stringByAppendingPathComponent:@"org.videolan.vlc"]],
[[NSURL alloc] initFileURLWithPath:[preferences stringByAppendingPathComponent:@"VLC"]]];
- [NSWorkspace.sharedWorkspace recycleURLs:ourPreferences completionHandler:^(NSDictionary *newURLs, NSError *error){
+ [NSWorkspace.sharedWorkspace recycleURLs:ourPreferences completionHandler:^(NSDictionary * __unused newURLs, NSError * __unused error){
[self resetAndReinitializeUserDefaults];
[VLCMain relaunchApplication];
}];
=====================================
modules/gui/macosx/panels/VLCAudioEffectsWindowController.m
=====================================
@@ -429,7 +429,7 @@ static inline void enableTextField(NSTextField *const __unsafe_unretained textFi
NSString *newProfile = [self generateProfileString];
NSMutableArray *workArray = [[NSMutableArray alloc] initWithArray:[defaults objectForKey:VLCAudioEffectsProfilesKey]];
- if (currentProfileIndex >= [workArray count])
+ if (currentProfileIndex < 0 || (NSUInteger)currentProfileIndex >= workArray.count)
return;
[workArray replaceObjectAtIndex:currentProfileIndex withObject:newProfile];
@@ -641,7 +641,7 @@ static inline void enableTextField(NSTextField *const __unsafe_unretained textFi
#pragma mark -
#pragma mark Equalizer
-static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
+static bool GetEqualizerStatus(intf_thread_t *__unused p_custom_intf,
VLCPlayerController *playerController,
char *psz_name)
{
@@ -785,7 +785,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
NSString *preset = [[[NSUserDefaults standardUserDefaults] objectForKey:VLCAudioEffectsEqualizerValuesKey] objectAtIndex:presetID];
NSArray *values = [preset componentsSeparatedByString:@" "];
NSUInteger count = [values count];
- for (int x = 0; x < count; x++)
+ for (NSUInteger x = 0; x < count; x++)
[self setValue:[[values objectAtIndex:x] floatValue] forSlider:x];
}
=====================================
modules/gui/macosx/panels/VLCVideoEffectsWindowController.m
=====================================
@@ -803,7 +803,7 @@ static NSString * const VLCVideoEffectsDefaultProfileString = @";;;0;1.000000;1.
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSMutableArray *workArray = [[NSMutableArray alloc] initWithArray:[defaults objectForKey:VLCVideoEffectsProfilesKey]];
- if (currentProfileIndex >= [workArray count])
+ if (currentProfileIndex < 0 || (NSUInteger)currentProfileIndex >= workArray.count)
return;
[workArray replaceObjectAtIndex:currentProfileIndex withObject:newProfile];
=====================================
modules/gui/macosx/panels/dialogs/VLCCoreDialogProvider.m
=====================================
@@ -150,8 +150,8 @@ static void displayProgressCallback(void *p_data,
}
}
-static void cancelCallback(void *p_data,
- vlc_dialog_id *p_id)
+static void cancelCallback(void * __unused p_data,
+ vlc_dialog_id * __unused p_id)
{
@autoreleasepool {
dispatch_async(dispatch_get_main_queue(), ^{
@@ -279,7 +279,7 @@ static void updateProgressCallback(void *p_data,
type:(vlc_dialog_question_type)questionType
cancelText:(NSString *)cancelText
action1Text:(NSString *)action1Text
- action2Text:(NSString *)action2Text;
+ action2Text:(NSString *)action2Text
{
NSAlert *alert = [[NSAlert alloc] init];
[alert setMessageText:title];
=====================================
modules/gui/macosx/preferences/VLCSimplePrefsController.m
=====================================
@@ -622,7 +622,7 @@ create_toolbar_item(NSString *itemIdent, NSString *name, NSString *desc, NSStrin
const char *pref = NULL;
NSUserDefaults * const defaults = NSUserDefaults.standardUserDefaults;
pref = [[defaults objectForKey:@"language"] UTF8String];
- for (int x = 0; x < ARRAY_SIZE(language_map); x++) {
+ for (size_t x = 0; x < ARRAY_SIZE(language_map); x++) {
[_intf_languagePopup addItemWithTitle:toNSStr(language_map[x].name)];
if (pref) {
if (!strcmp(language_map[x].iso, pref))
@@ -915,7 +915,7 @@ create_toolbar_item(NSString *itemIdent, NSString *name, NSString *desc, NSStrin
}];
}
-static inline void save_int_list(intf_thread_t * p_intf, id object, const char * name)
+static inline void save_int_list(intf_thread_t * __unused p_intf, id object, const char * name)
{
NSNumber *p_valueobject = (NSNumber *)[[object selectedItem] representedObject];
if (p_valueobject) {
@@ -924,7 +924,7 @@ static inline void save_int_list(intf_thread_t * p_intf, id object, const char *
}
}
-static inline void save_string_list(intf_thread_t * p_intf, id object, const char * name)
+static inline void save_string_list(intf_thread_t * __unused p_intf, id object, const char * name)
{
NSString *p_stringobject = (NSString *)[[object selectedItem] representedObject];
if (p_stringobject) {
@@ -943,7 +943,7 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
[defaults removeObjectForKey:@"NSForceRightToLeftWritingDirection"];
[defaults removeObjectForKey:@"AppleTextDirection"];
} else {
- for(int i = 0; i < ARRAY_SIZE(language_map); i++) {
+ for(size_t i = 0; i < ARRAY_SIZE(language_map); i++) {
if (!strcmp(language_map[i].iso, [isoCode UTF8String])) {
[defaults setBool:language_map[i].isRightToLeft forKey:@"NSForceRightToLeftWritingDirection"];
[defaults setBool:language_map[i].isRightToLeft forKey:@"AppleTextDirection"];
=====================================
modules/gui/macosx/preferences/prefs.m
=====================================
@@ -450,7 +450,7 @@ enum VLCTreeBranchType {
- (VLCTreeBranchItem *)childRepresentingCategory:(enum vlc_config_cat)category
{
NSUInteger childrenCount = [[self children] count];
- for (int i = 0; i < childrenCount; i++) {
+ for (NSUInteger i = 0; i < childrenCount; i++) {
VLCTreeBranchItem * item = [[self children] objectAtIndex:i];
if ([item branchType] == CategoryBranch && [item category] == category)
return item;
=====================================
modules/gui/macosx/preferences/prefs_widgets.m
=====================================
@@ -1722,7 +1722,7 @@ my_width, tooltip, init_value) \
size_t count;
p_list = module_list_get(&count);
for (i_module_index = 0; i_module_index < count; i_module_index++) {
- int i;
+ unsigned int i;
p_parser = p_list[i_module_index];
if (module_is_main(p_parser))
@@ -1941,7 +1941,7 @@ o_moduleenabled = [NSNumber numberWithBool:NO];\
}
- (BOOL)tableView:(NSTableView*)table acceptDrop:(id <NSDraggingInfo>)info
- row:(NSInteger)dropRow dropOperation:(NSTableViewDropOperation)op;
+ row:(NSInteger)dropRow dropOperation:(NSTableViewDropOperation)op
{
NSPasteboard *pb = [info draggingPasteboard];
BOOL accepted = NO;
=====================================
modules/gui/macosx/views/VLCPlaybackProgressSliderCell.m
=====================================
@@ -55,9 +55,9 @@
static CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink,
const CVTimeStamp *inNow,
- const CVTimeStamp *inOutputTime,
- CVOptionFlags flagsIn,
- CVOptionFlags *flagsOut,
+ const CVTimeStamp *__unused inOutputTime,
+ CVOptionFlags __unused flagsIn,
+ CVOptionFlags *__unused flagsOut,
void *displayLinkContext)
{
const CVTimeStamp inNowCopy = *inNow;
=====================================
modules/gui/macosx/views/VLCStatusNotifierView.m
=====================================
@@ -98,7 +98,7 @@ NSString * const VLCMessageTimeoutTimerUserInfoMessageKey = @"VLCMessageTimeoutT
[NSNotificationCenter.defaultCenter postNotificationName:VLCStatusNotifierViewActivated object:self];
}
NSString *finalMessage = message;
- const NSInteger matchingIndex = [self.messages indexOfObjectPassingTest:^BOOL(NSString * const string, NSUInteger, BOOL *){
+ const NSInteger matchingIndex = [self.messages indexOfObjectPassingTest:^BOOL(NSString * const string, NSUInteger __unused idx, BOOL * __unused stop){
return [string hasPrefix:message];
}];
if (matchingIndex != NSNotFound) {
@@ -115,7 +115,7 @@ NSString * const VLCMessageTimeoutTimerUserInfoMessageKey = @"VLCMessageTimeoutT
return;
}
- const NSInteger matchingIndex = [self.messages indexOfObjectPassingTest:^BOOL(NSString * const string, NSUInteger, BOOL *){
+ const NSInteger matchingIndex = [self.messages indexOfObjectPassingTest:^BOOL(NSString * const string, NSUInteger __unused idx, BOOL * __unused stop){
return [string hasPrefix:message];
}];
if (matchingIndex != NSNotFound) {
=====================================
modules/gui/macosx/windows/addons/VLCAddonsWindowController.m
=====================================
@@ -167,7 +167,7 @@ static void addonChangedCallback( addons_manager_t *manager,
- (IBAction)installSelection:(id)sender
{
NSInteger selectedRow = [_addonsTable selectedRow];
- if (selectedRow > _displayedAddons.count - 1 || selectedRow < 0)
+ if (selectedRow < 0 || (NSUInteger)selectedRow >= _displayedAddons.count)
return;
VLCAddonListItem *currentAddon = [_displayedAddons objectAtIndex:selectedRow];
@@ -179,7 +179,7 @@ static void addonChangedCallback( addons_manager_t *manager,
- (IBAction)uninstallSelection:(id)sender
{
NSInteger selectedRow = [_addonsTable selectedRow];
- if (selectedRow > _displayedAddons.count - 1 || selectedRow < 0)
+ if (selectedRow < 0 || (NSUInteger)selectedRow >= _displayedAddons.count)
return;
VLCAddonListItem *currentAddon = [_displayedAddons objectAtIndex:selectedRow];
@@ -210,7 +210,7 @@ static void addonChangedCallback( addons_manager_t *manager,
- (void)tableViewSelectionDidChange:(NSNotification *)aNotification
{
NSInteger selectedRow = [_addonsTable selectedRow];
- if (selectedRow > _displayedAddons.count - 1 || selectedRow < 0) {
+ if (selectedRow < 0 || (NSUInteger)selectedRow >= _displayedAddons.count) {
[_name setStringValue:@""];
[_author setStringValue:@""];
[_version setStringValue:@""];
@@ -276,7 +276,7 @@ static void addonChangedCallback( addons_manager_t *manager,
NSMutableArray *filteredItems = [[NSMutableArray alloc] initWithCapacity:_addons.count];
for (VLCAddonListItem *currentItem in _addons) {
if (type != -1) {
- if ([currentItem type] == type) {
+ if ((int)[currentItem type] == type) {
if (installedOnly) {
if ([currentItem isInstalled])
[filteredItems addObject:currentItem];
=====================================
modules/gui/macosx/windows/convertandsave/VLCOutput.m
=====================================
@@ -341,7 +341,6 @@
[finalStreamAddress appendFormat: @"\"%@:%@\"", [self.streamAddressTextField stringValue],[self.streamPortTextField stringValue]];
else {
[finalStreamAddress appendFormat: @"\"%@:%@", [urlItems firstObject], [self.streamPortTextField stringValue]];
- NSUInteger itemCount = [urlItems count];
for (NSString *item in urlItems)
[finalStreamAddress appendFormat: @"/%@", item];
[finalStreamAddress appendString: @"\""];
=====================================
modules/gui/macosx/windows/video/VLCFullVideoViewWindow.m
=====================================
@@ -94,7 +94,7 @@
}
[NSAnimationContext runAnimationRespectingPreferencesWithDuration:VLCUIUnits.controlsFadeAnimationDuration
- changes:^(NSAnimationContext * const _Nonnull context){
+ changes:^(NSAnimationContext * const _Nonnull __unused context){
self->_isFadingIn = YES;
[titlebarView.animator setAlphaValue:1.0f];
} completionHandler:^{
@@ -120,7 +120,7 @@
NSView *titlebarView = [self standardWindowButton:NSWindowCloseButton].superview;
[NSAnimationContext runAnimationRespectingPreferencesWithDuration:VLCUIUnits.controlsFadeAnimationDuration
- changes:^(NSAnimationContext * const _Nonnull context) {
+ changes:^(NSAnimationContext * const _Nonnull __unused context) {
[titlebarView.animator setAlphaValue:0.0f];
} completionHandler:nil];
}
=====================================
modules/gui/macosx/windows/video/VLCMainVideoViewController.m
=====================================
@@ -463,7 +463,7 @@ NSString * const VLCUseClassicVideoPlayerLayoutKey = @"VLCUseClassicVideoPlayerL
}
[NSAnimationContext runAnimationRespectingPreferencesWithDuration:VLCUIUnits.controlsFadeAnimationDuration
- changes:^(NSAnimationContext * const _Nonnull context) {
+ changes:^(NSAnimationContext * const _Nonnull __unused context) {
[self->_mainControlsView.animator setAlphaValue:0.0f];
[self->_floatOnTopIndicatorImageView.animator setAlphaValue:0.0f];
} completionHandler:nil];
@@ -511,7 +511,7 @@ NSString * const VLCUseClassicVideoPlayerLayoutKey = @"VLCUseClassicVideoPlayerL
[NSAnimationContext runAnimationRespectingPreferencesWithDuration:VLCUIUnits.controlsFadeAnimationDuration
- changes:^(NSAnimationContext * const _Nonnull context) {
+ changes:^(NSAnimationContext * const _Nonnull __unused context) {
self->_isFadingIn = YES;
[self->_mainControlsView.animator setAlphaValue:1.0f];
[self->_floatOnTopIndicatorImageView.animator setAlphaValue:1.0f];
=====================================
modules/gui/macosx/windows/video/VLCVideoWindowCommon.m
=====================================
@@ -235,7 +235,7 @@ NSString *VLCWindowShouldShowController = @"VLCWindowShouldShowController";
NSRect screenFrame = [screen frame];
[NSAnimationContext runAnimationRespectingPreferencesWithDuration:0.5 * duration
- changes:^(NSAnimationContext *context) {
+ changes:^(NSAnimationContext *__unused context) {
[[window animator] setFrame:screenFrame display:YES];
} completionHandler:nil];
}
@@ -246,7 +246,7 @@ NSString *VLCWindowShouldShowController = @"VLCWindowShouldShowController";
[[window animator] setFrame:_frameBeforeLionFullscreen display:YES animate:YES];
[NSAnimationContext runAnimationRespectingPreferencesWithDuration:0.5 * duration
- changes:^(NSAnimationContext *context) {
+ changes:^(NSAnimationContext *__unused context) {
[[window animator] setFrame:self->_frameBeforeLionFullscreen display:YES animate:YES];
} completionHandler:nil];
}
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8218a43afda7cd68f2e8821843a6d91f1eb752a8...3989afb520ee52f30d9d93ba24ee7d99852eac6f
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8218a43afda7cd68f2e8821843a6d91f1eb752a8...3989afb520ee52f30d9d93ba24ee7d99852eac6f
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help
More information about the vlc-commits
mailing list