From 70a22e9611053d98a94e8ee4058972c55fad0eb5 Mon Sep 17 00:00:00 2001 From: Dzmitry Neviadomski Date: Wed, 27 Jan 2021 05:12:07 +0300 Subject: [PATCH] Fix some more warnings. --- Audio/Chain/Node.m | 1 + Audio/CogAudio_Prefix.pch | 1 + Plugins/AdPlug/AdPlug/AdPlugContainer.mm | 2 +- Plugins/AdPlug/AdPlug/AdPlugDecoder.mm | 2 +- Plugins/AdPlug/AdPlug/AdPlugMetadataReader.mm | 2 +- Plugins/AdPlug/AdPlug/fileprovider.mm | 2 +- Plugins/ArchiveSource/ArchiveSource/ArchiveContainer.m | 2 +- Plugins/ArchiveSource/ArchiveSource/ArchiveSource.m | 2 +- Plugins/FFMPEG/FFMPEGDecoder.m | 4 ---- Plugins/MIDI/MIDI.xcodeproj/project.pbxproj | 2 ++ Plugins/MIDI/MIDI/AUPlayerView.mm | 6 +++++- Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj | 4 ++-- Plugins/OpenMPT/OpenMPT/OMPTDecoder.mm | 2 +- Plugins/TagLib/TagLibMetadataReader.m | 2 +- Plugins/TagLib/TagLibMetadataWriter.m | 4 ++-- Plugins/vgmstream/vgmstream.xcodeproj/project.pbxproj | 2 ++ Plugins/vgmstream/vgmstream/VGMContainer.m | 2 +- Plugins/vgmstream/vgmstream/VGMDecoder.m | 2 +- Plugins/vgmstream/vgmstream/VGMInterface.m | 4 ++-- Plugins/vgmstream/vgmstream/VGMMetadataReader.m | 2 +- Plugins/vgmstream/vgmstream/VGMPropertiesReader.m | 2 +- 21 files changed, 29 insertions(+), 23 deletions(-) diff --git a/Audio/Chain/Node.m b/Audio/Chain/Node.m index 6474b5fb8..8e9453678 100644 --- a/Audio/Chain/Node.m +++ b/Audio/Chain/Node.m @@ -9,6 +9,7 @@ #import "Node.h" #import "Logging.h" +#import "BufferChain.h" @implementation Node diff --git a/Audio/CogAudio_Prefix.pch b/Audio/CogAudio_Prefix.pch index 142f8365e..da450dcd0 100644 --- a/Audio/CogAudio_Prefix.pch +++ b/Audio/CogAudio_Prefix.pch @@ -3,5 +3,6 @@ // #ifdef __OBJC__ + #import #import #endif diff --git a/Plugins/AdPlug/AdPlug/AdPlugContainer.mm b/Plugins/AdPlug/AdPlug/AdPlugContainer.mm index b719a5943..4e936f19e 100755 --- a/Plugins/AdPlug/AdPlug/AdPlugContainer.mm +++ b/Plugins/AdPlug/AdPlug/AdPlugContainer.mm @@ -51,7 +51,7 @@ Copl * p_emu = new CSilentopl; - std::string path = [[[url absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] UTF8String]; + std::string path = [[[url absoluteString] stringByRemovingPercentEncoding] UTF8String]; CPlayer * p_player = CAdPlug::factory(path, p_emu, CAdPlug::players, CProvider_cog( path, source )); if ( !p_player ) diff --git a/Plugins/AdPlug/AdPlug/AdPlugDecoder.mm b/Plugins/AdPlug/AdPlug/AdPlugDecoder.mm index c610b2032..2e7996d47 100755 --- a/Plugins/AdPlug/AdPlug/AdPlugDecoder.mm +++ b/Plugins/AdPlug/AdPlug/AdPlugDecoder.mm @@ -40,7 +40,7 @@ path = [path substringToIndex:fragmentRange.location]; } - std::string _path = [[path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] UTF8String]; + std::string _path = [[path stringByRemovingPercentEncoding] UTF8String]; m_player = CAdPlug::factory(_path, m_emu, CAdPlug::players, CProvider_cog( _path, source )); if ( !m_player ) diff --git a/Plugins/AdPlug/AdPlug/AdPlugMetadataReader.mm b/Plugins/AdPlug/AdPlug/AdPlugMetadataReader.mm index 428ba6a16..5d06cd07d 100644 --- a/Plugins/AdPlug/AdPlug/AdPlugMetadataReader.mm +++ b/Plugins/AdPlug/AdPlug/AdPlugMetadataReader.mm @@ -52,7 +52,7 @@ path = [path substringToIndex:fragmentRange.location]; } - std::string _path = [[path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] UTF8String]; + std::string _path = [[path stringByRemovingPercentEncoding] UTF8String]; CPlayer * p_player = CAdPlug::factory(_path, p_emu, CAdPlug::players, CProvider_cog( _path, source )); if ( !p_player ) diff --git a/Plugins/AdPlug/AdPlug/fileprovider.mm b/Plugins/AdPlug/AdPlug/fileprovider.mm index bfdb6176e..201c2103b 100644 --- a/Plugins/AdPlug/AdPlug/fileprovider.mm +++ b/Plugins/AdPlug/AdPlug/fileprovider.mm @@ -100,7 +100,7 @@ binistream * CProvider_cog::open(std::string filename) const fragmentString = [urlString substringFromIndex:fragmentRange.location]; urlString = [urlString substringToIndex:fragmentRange.location]; } - NSURL * url = [NSURL URLWithString:[[urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] stringByAppendingString:fragmentString]]; + NSURL * url = [NSURL URLWithString:[[urlString stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLFragmentAllowedCharacterSet] stringByAppendingString:fragmentString]]; id audioSourceClass = NSClassFromString(@"AudioSource"); p_file = [audioSourceClass audioSourceForURL:url]; diff --git a/Plugins/ArchiveSource/ArchiveSource/ArchiveContainer.m b/Plugins/ArchiveSource/ArchiveSource/ArchiveContainer.m index 2aa5334f0..45226928f 100644 --- a/Plugins/ArchiveSource/ArchiveSource/ArchiveContainer.m +++ b/Plugins/ArchiveSource/ArchiveSource/ArchiveContainer.m @@ -62,7 +62,7 @@ static NSString * g_make_unpack_path(NSString * archive, NSString * file, NSStri while ( !fex_done(fex) ) { NSString *name = [NSString stringWithUTF8String:fex_name(fex)]; if ([[NSClassFromString(@"AudioPlayer") fileTypes] containsObject:[[name pathExtension] lowercaseString]]) - [files addObject:[NSURL URLWithString:[g_make_unpack_path([url path], name, @"fex") stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]]; + [files addObject:[NSURL URLWithString:[g_make_unpack_path([url path], name, @"fex") stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLPathAllowedCharacterSet]]]; fex_next(fex); } diff --git a/Plugins/ArchiveSource/ArchiveSource/ArchiveSource.m b/Plugins/ArchiveSource/ArchiveSource/ArchiveSource.m index 1d77b0558..87984b7ef 100644 --- a/Plugins/ArchiveSource/ArchiveSource/ArchiveSource.m +++ b/Plugins/ArchiveSource/ArchiveSource/ArchiveSource.m @@ -75,7 +75,7 @@ static BOOL g_parse_unpack_path(NSString * src, NSString ** archive, NSString ** { [self setURL:url]; - NSString * urlDecoded = [[url absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + NSString * urlDecoded = [[url absoluteString] stringByRemovingPercentEncoding]; NSString * type; NSString * archive; diff --git a/Plugins/FFMPEG/FFMPEGDecoder.m b/Plugins/FFMPEG/FFMPEGDecoder.m index de0ae4d0e..96f43d813 100644 --- a/Plugins/FFMPEG/FFMPEGDecoder.m +++ b/Plugins/FFMPEG/FFMPEGDecoder.m @@ -80,8 +80,6 @@ int lockmgr_callback(void ** mutex, enum AVLockOp op) { av_log_set_flags(AV_LOG_SKIP_REPEATED); av_log_set_level(AV_LOG_ERROR); - av_register_all(); - av_lockmgr_register(lockmgr_callback); } } @@ -190,8 +188,6 @@ int lockmgr_callback(void ** mutex, enum AVLockOp op) ALog(@"Can't copy codec parameters to context, errcode = %d, error = %s", errcode, errDescr); return NO; } - - av_codec_set_pkt_timebase(codecCtx, stream->time_base); AVCodec * codec = avcodec_find_decoder(codecCtx->codec_id); if (!codec) { diff --git a/Plugins/MIDI/MIDI.xcodeproj/project.pbxproj b/Plugins/MIDI/MIDI.xcodeproj/project.pbxproj index 7f47ea1f9..9a99515e9 100644 --- a/Plugins/MIDI/MIDI.xcodeproj/project.pbxproj +++ b/Plugins/MIDI/MIDI.xcodeproj/project.pbxproj @@ -508,6 +508,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_INHIBIT_ALL_WARNINGS = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; @@ -554,6 +555,7 @@ GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_INHIBIT_ALL_WARNINGS = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; diff --git a/Plugins/MIDI/MIDI/AUPlayerView.mm b/Plugins/MIDI/MIDI/AUPlayerView.mm index f0de19816..8f5ce2558 100644 --- a/Plugins/MIDI/MIDI/AUPlayerView.mm +++ b/Plugins/MIDI/MIDI/AUPlayerView.mm @@ -30,7 +30,11 @@ AUPluginUI::AUPluginUI (AudioUnit & _au) } if (au_view) { - cocoa_window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, req_width, req_height) styleMask:(NSTitledWindowMask | NSClosableWindowMask) backing:NSBackingStoreBuffered defer:NO]; + cocoa_window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, req_width, req_height) + styleMask:(NSWindowStyleMaskTitled | + NSWindowStyleMaskClosable) + backing:NSBackingStoreBuffered + defer:NO]; [cocoa_window setAutodisplay:YES]; [cocoa_window setTitle:@"AU Plug-in"]; diff --git a/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj b/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj index 7b6cddc82..b59bcd8a8 100644 --- a/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj +++ b/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj @@ -248,7 +248,7 @@ CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = NO; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; @@ -305,7 +305,7 @@ CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = NO; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; diff --git a/Plugins/OpenMPT/OpenMPT/OMPTDecoder.mm b/Plugins/OpenMPT/OpenMPT/OMPTDecoder.mm index 69fcfdfe7..5bb9ee1ae 100755 --- a/Plugins/OpenMPT/OpenMPT/OMPTDecoder.mm +++ b/Plugins/OpenMPT/OpenMPT/OMPTDecoder.mm @@ -81,7 +81,7 @@ static void g_push_archive_extensions(std::vector & list) mod->set_render_param( openmpt::module::RENDER_STEREOSEPARATION_PERCENT, 100 ); mod->set_render_param( openmpt::module::RENDER_INTERPOLATIONFILTER_LENGTH, interp ); mod->set_render_param( openmpt::module::RENDER_VOLUMERAMPING_STRENGTH, -1 ); - mod->ctl_set( "render.resampler.emulate_amiga", "1" ); + mod->ctl_set_boolean("render.resampler.emulate_amiga", true); left.resize( 1024 ); right.resize( 1024 ); diff --git a/Plugins/TagLib/TagLibMetadataReader.m b/Plugins/TagLib/TagLibMetadataReader.m index f87bedd20..bf2e00b30 100644 --- a/Plugins/TagLib/TagLibMetadataReader.m +++ b/Plugins/TagLib/TagLibMetadataReader.m @@ -148,7 +148,7 @@ // Gather list of candidate image files NSArray *fileNames = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:nil]; - NSArray *imageFileNames = [fileNames pathsMatchingExtensions:[NSImage imageFileTypes]]; + NSArray *imageFileNames = [fileNames pathsMatchingExtensions:[NSImage imageTypes]]; for (NSString *fileName in imageFileNames) { if ([TagLibMetadataReader isCoverFile:fileName]) { diff --git a/Plugins/TagLib/TagLibMetadataWriter.m b/Plugins/TagLib/TagLibMetadataWriter.m index 40c6efbf9..ca85ff885 100644 --- a/Plugins/TagLib/TagLibMetadataWriter.m +++ b/Plugins/TagLib/TagLibMetadataWriter.m @@ -8,8 +8,8 @@ #import "TagLibMetadataWriter.h" -#import -#import +#import +#import #import "Logging.h" diff --git a/Plugins/vgmstream/vgmstream.xcodeproj/project.pbxproj b/Plugins/vgmstream/vgmstream.xcodeproj/project.pbxproj index add52ddfa..976043e63 100644 --- a/Plugins/vgmstream/vgmstream.xcodeproj/project.pbxproj +++ b/Plugins/vgmstream/vgmstream.xcodeproj/project.pbxproj @@ -332,6 +332,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_INHIBIT_ALL_WARNINGS = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; @@ -393,6 +394,7 @@ ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_INHIBIT_ALL_WARNINGS = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; diff --git a/Plugins/vgmstream/vgmstream/VGMContainer.m b/Plugins/vgmstream/vgmstream/VGMContainer.m index c7241e773..6f5abe7a7 100755 --- a/Plugins/vgmstream/vgmstream/VGMContainer.m +++ b/Plugins/vgmstream/vgmstream/VGMContainer.m @@ -36,7 +36,7 @@ return [NSMutableArray arrayWithObject:url]; } - NSString * path = [[url absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + NSString * path = [[url absoluteString] stringByRemovingPercentEncoding]; VGMSTREAM * stream = init_vgmstream_from_cogfile([path UTF8String], 0); if (!stream) diff --git a/Plugins/vgmstream/vgmstream/VGMDecoder.m b/Plugins/vgmstream/vgmstream/VGMDecoder.m index 4e74530ef..4ee4972f7 100644 --- a/Plugins/vgmstream/vgmstream/VGMDecoder.m +++ b/Plugins/vgmstream/vgmstream/VGMDecoder.m @@ -194,7 +194,7 @@ NSLog(@"Opening %@ subsong %d", path, track_num); - stream = init_vgmstream_from_cogfile([[path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] UTF8String], track_num); + stream = init_vgmstream_from_cogfile([[path stringByRemovingPercentEncoding] UTF8String], track_num); if ( !stream ) return NO; diff --git a/Plugins/vgmstream/vgmstream/VGMInterface.m b/Plugins/vgmstream/vgmstream/VGMInterface.m index a0fb90256..62cd6dbd4 100644 --- a/Plugins/vgmstream/vgmstream/VGMInterface.m +++ b/Plugins/vgmstream/vgmstream/VGMInterface.m @@ -82,7 +82,7 @@ static STREAMFILE *cogsf_create(id file, const char *path) { STREAMFILE *cogsf_create_from_path(const char *path) { NSString * urlString = [NSString stringWithUTF8String:path]; - NSURL * url = [NSURL URLWithString:[urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]; + NSURL * url = [NSURL URLWithString:[urlString stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLPathAllowedCharacterSet]]; return cogsf_create_from_url(url); } @@ -98,7 +98,7 @@ STREAMFILE *cogsf_create_from_url(NSURL * url) { if (![source seekable]) return 0; - return cogsf_create(source, [[[url absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] UTF8String]); + return cogsf_create(source, [[[url absoluteString] stringByRemovingPercentEncoding] UTF8String]); } VGMSTREAM *init_vgmstream_from_cogfile(const char *path, int subsong) { diff --git a/Plugins/vgmstream/vgmstream/VGMMetadataReader.m b/Plugins/vgmstream/vgmstream/VGMMetadataReader.m index d607b0176..4027a218c 100644 --- a/Plugins/vgmstream/vgmstream/VGMMetadataReader.m +++ b/Plugins/vgmstream/vgmstream/VGMMetadataReader.m @@ -42,7 +42,7 @@ path = [path substringToIndex:fragmentRange.location]; } - VGMSTREAM * stream = init_vgmstream_from_cogfile([[path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] UTF8String], track_num); + VGMSTREAM * stream = init_vgmstream_from_cogfile([[path stringByRemovingPercentEncoding] UTF8String], track_num); if ( !stream ) return nil; diff --git a/Plugins/vgmstream/vgmstream/VGMPropertiesReader.m b/Plugins/vgmstream/vgmstream/VGMPropertiesReader.m index bf5fcb9f0..df91c84dc 100644 --- a/Plugins/vgmstream/vgmstream/VGMPropertiesReader.m +++ b/Plugins/vgmstream/vgmstream/VGMPropertiesReader.m @@ -44,7 +44,7 @@ path = [path substringToIndex:fragmentRange.location]; } - VGMSTREAM * stream = init_vgmstream_from_cogfile([[path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] UTF8String], track_num); + VGMSTREAM * stream = init_vgmstream_from_cogfile([[path stringByRemovingPercentEncoding] UTF8String], track_num); if ( !stream ) return nil;