Felix Paul Kühne pushed to branch master at VideoLAN / VLC
Commits:
d806e931 by Marvin Scholz at 2026-02-19T11:11:40+01:00
macosx: remove extraneous semicolon
- - - - -
fa475a15 by Marvin Scholz at 2026-02-19T11:11:40+01:00
macosx: fix sign comparison warnings
Use the proper type for comparisons where possible or explicitly
handle the other cases before casting.
- - - - -
654bbd7b by Marvin Scholz at 2026-02-19T11:11:40+01:00
macosx: use NSModalResponseOK instead of old name
Use NSModalResponseOK instead of NSFileHandlingPanelOKButton, the latter
being the old name, deprecated since macOS 10.13.
- - - - -
1 changed file:
- modules/gui/macosx/windows/VLCOpenWindowController.m
Changes:
=====================================
modules/gui/macosx/windows/VLCOpenWindowController.m
=====================================
@@ -538,7 +538,7 @@ NSString *const VLCOpenTextFieldWasClicked =
@"VLCOpenTextFieldWasClicked";
[self openTarget: VLCOpenCaptureTabViewId];
}
-- (void)openFileWithAction:(void (^)(NSArray *files))action;
+- (void)openFileWithAction:(void (^)(NSArray *files))action
{
NSOpenPanel *openPanel = [NSOpenPanel openPanel];
[openPanel setAllowsMultipleSelection: YES];
@@ -628,7 +628,7 @@ NSString *const VLCOpenTextFieldWasClicked =
@"VLCOpenTextFieldWasClicked";
[openPanel setTitle: _NS("Open File")];
[openPanel setPrompt: _NS("Open")];
[openPanel beginSheetModalForWindow:[sender window]
completionHandler:^(NSInteger returnCode) {
- if (returnCode == NSFileHandlingPanelOKButton) {
+ if (returnCode == NSModalResponseOK) {
self->_filePath = [[[openPanel URLs] firstObject] path];
[self openFilePathChanged: nil];
}
@@ -1145,7 +1145,7 @@ NSString *const VLCOpenTextFieldWasClicked =
@"VLCOpenTextFieldWasClicked";
- (IBAction)screenChanged:(id)sender
{
NSInteger selected_index = [_screenPopup indexOfSelectedItem];
- if (selected_index >= [_displayInfos count])
+ if (selected_index < 0 || (unsigned)selected_index >= [_displayInfos
count])
return;
VLCOpenDisplayInformation *displayInformation = [_displayInfos
objectAtIndex:selected_index];
@@ -1179,7 +1179,7 @@ NSString *const VLCOpenTextFieldWasClicked =
@"VLCOpenTextFieldWasClicked";
- (IBAction)qtkChanged:(id)sender
{
NSInteger selectedDevice = [_qtkVideoDevicePopup indexOfSelectedItem];
- if (selectedDevice >= _avvideoDevices.count)
+ if (selectedDevice < 0 || (unsigned)selectedDevice >=
_avvideoDevices.count)
return;
_avCurrentDeviceUID = [[(AVCaptureDevice *)[_avvideoDevices
objectAtIndex:selectedDevice] uniqueID]
stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
@@ -1189,7 +1189,7 @@ NSString *const VLCOpenTextFieldWasClicked =
@"VLCOpenTextFieldWasClicked";
- (IBAction)qtkAudioChanged:(id)sender
{
NSInteger selectedDevice = [_qtkAudioDevicePopup indexOfSelectedItem];
- if (selectedDevice >= _avaudioDevices.count)
+ if (selectedDevice < 0 || (unsigned)selectedDevice >=
_avaudioDevices.count)
return;
_avCurrentAudioDeviceUID = [[(AVCaptureDevice *)[_avaudioDevices
objectAtIndex:selectedDevice] uniqueID]
stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
@@ -1299,7 +1299,7 @@ NSString *const VLCOpenTextFieldWasClicked =
@"VLCOpenTextFieldWasClicked";
stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
NSUInteger deviceCount = _avvideoDevices.count;
- for (int ivideo = 0; ivideo < deviceCount; ivideo++) {
+ for (NSUInteger ivideo = 0; ivideo < deviceCount; ivideo++) {
AVCaptureDevice *avDevice = [_avvideoDevices objectAtIndex:ivideo];
// allow same name for multiple times
[[_qtkVideoDevicePopup menu] addItemWithTitle:[avDevice
localizedName] action:nil keyEquivalent:@""];
@@ -1327,7 +1327,7 @@ NSString *const VLCOpenTextFieldWasClicked =
@"VLCOpenTextFieldWasClicked";
stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
NSUInteger deviceCount = _avaudioDevices.count;
- for (int iaudio = 0; iaudio < deviceCount; iaudio++) {
+ for (NSUInteger iaudio = 0; iaudio < deviceCount; iaudio++) {
AVCaptureDevice *avAudioDevice = [_avaudioDevices
objectAtIndex:iaudio];
// allow same name for multiple times
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/375e8cdcf434e95184fdb329013b074adfe10d03...654bbd7ba7caf01ead90e4e398a0e6159a930bd7
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/375e8cdcf434e95184fdb329013b074adfe10d03...654bbd7ba7caf01ead90e4e398a0e6159a930bd7
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
