From d4990de7f3780905bd8a2186f8c639937080cca5 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Tue, 1 Feb 2022 18:55:39 -0800 Subject: [PATCH] Adopt the sox resampler instead of RetroArch Removing RetroArch code from my project. Signed-off-by: Christopher Snowhill --- Application/AppController.m | 2 - Audio/Chain/ConverterNode.h | 7 +- Audio/Chain/ConverterNode.m | 144 +- Audio/Chain/HeadphoneFilter.m | 149 +- Audio/CogAudio.xcodeproj/project.pbxproj | 450 +- Audio/ThirdParty/RetroArch/config.h | 22 - .../audio/conversion/s16_to_float.c | 110 - .../audio/conversion/s32_to_float.c | 107 - .../audio/resampler/audio_resampler.c | 260 -- .../audio/resampler/drivers/sinc_resampler.c | 1288 ------ .../libretro-common/encodings/encoding_utf.c | 512 --- .../libretro-common/features/features_cpu.c | 877 ---- .../libretro-common/file/config_file.c | 1505 ------- .../file/config_file_userdata.c | 171 - .../libretro-common/file/file_path.c | 1391 ------ .../libretro-common/file/file_path_io.c | 151 - .../libretro-common/include/array/rhmap.h | 284 -- .../include/audio/audio_resampler.h | 208 - .../include/audio/conversion/s16_to_float.h | 55 - .../include/audio/conversion/s32_to_float.h | 55 - .../libretro-common/include/boolean.h | 39 - .../include/compat/fopen_utf8.h | 34 - .../libretro-common/include/compat/msvc.h | 126 - .../include/compat/posix_string.h | 60 - .../include/compat/strcasestr.h | 48 - .../libretro-common/include/compat/strl.h | 59 - .../libretro-common/include/encodings/utf.h | 67 - .../include/features/features_cpu.h | 75 - .../include/file/config_file.h | 225 - .../include/file/config_file_userdata.h | 64 - .../libretro-common/include/file/file_path.h | 538 --- .../libretro-common/include/filters.h | 93 - .../libretro-common/include/libretro.h | 3894 ----------------- .../include/lists/string_list.h | 186 - .../libretro-common/include/memalign.h | 42 - .../libretro-common/include/retro_assert.h | 35 - .../include/retro_common_api.h | 119 - .../include/retro_environment.h | 114 - .../libretro-common/include/retro_inline.h | 39 - .../libretro-common/include/retro_math.h | 190 - .../include/retro_miscellaneous.h | 207 - .../libretro-common/include/retro_timers.h | 112 - .../include/streams/file_stream.h | 117 - .../include/string/stdstring.h | 269 -- .../libretro-common/include/time/rtime.h | 48 - .../libretro-common/include/vfs/vfs.h | 111 - .../include/vfs/vfs_implementation.h | 82 - .../libretro-common/lists/string_list.c | 554 --- .../libretro-common/memmap/memalign.c | 80 - .../libretro-common/streams/file_stream.c | 682 --- .../libretro-common/string/stdstring.c | 536 --- .../RetroArch/libretro-common/time/rtime.c | 81 - .../libretro-common/vfs/vfs_implementation.c | 1335 ------ Audio/ThirdParty/libsoxr/README.md | 12 + Audio/ThirdParty/libsoxr/include/soxr.h | 344 ++ Audio/ThirdParty/libsoxr/lib/libsoxr.0.dylib | Bin 0 -> 419296 bytes Cog.xcodeproj/project.pbxproj | 4 - .../Preferences/Base.lproj/Preferences.xib | 62 +- .../OutputResamplerBehaviorArrayController.h | 13 - .../OutputResamplerBehaviorArrayController.m | 42 - .../Preferences.xcodeproj/project.pbxproj | 6 - README.md | 12 +- 62 files changed, 544 insertions(+), 17960 deletions(-) delete mode 100644 Audio/ThirdParty/RetroArch/config.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/audio/conversion/s16_to_float.c delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/audio/conversion/s32_to_float.c delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/audio/resampler/audio_resampler.c delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/audio/resampler/drivers/sinc_resampler.c delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/encodings/encoding_utf.c delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/features/features_cpu.c delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/file/config_file.c delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/file/config_file_userdata.c delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/file/file_path.c delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/file/file_path_io.c delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/array/rhmap.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/audio/audio_resampler.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/audio/conversion/s16_to_float.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/audio/conversion/s32_to_float.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/boolean.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/compat/fopen_utf8.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/compat/msvc.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/compat/posix_string.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/compat/strcasestr.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/compat/strl.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/encodings/utf.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/features/features_cpu.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/file/config_file.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/file/config_file_userdata.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/file/file_path.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/filters.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/libretro.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/lists/string_list.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/memalign.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/retro_assert.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/retro_common_api.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/retro_environment.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/retro_inline.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/retro_math.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/retro_miscellaneous.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/retro_timers.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/streams/file_stream.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/string/stdstring.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/time/rtime.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/vfs/vfs.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/include/vfs/vfs_implementation.h delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/lists/string_list.c delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/memmap/memalign.c delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/streams/file_stream.c delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/string/stdstring.c delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/time/rtime.c delete mode 100644 Audio/ThirdParty/RetroArch/libretro-common/vfs/vfs_implementation.c create mode 100644 Audio/ThirdParty/libsoxr/README.md create mode 100644 Audio/ThirdParty/libsoxr/include/soxr.h create mode 100755 Audio/ThirdParty/libsoxr/lib/libsoxr.0.dylib delete mode 100644 Preferences/Preferences/OutputResamplerBehaviorArrayController.h delete mode 100644 Preferences/Preferences/OutputResamplerBehaviorArrayController.m diff --git a/Application/AppController.m b/Application/AppController.m index 140bb3512..34d49ab65 100644 --- a/Application/AppController.m +++ b/Application/AppController.m @@ -487,8 +487,6 @@ void* kAppControllerContext = &kAppControllerContext; [userDefaultsValuesDict setObject:@"cubic" forKey:@"resampling"]; - [userDefaultsValuesDict setObject:@"normal" forKey:@"outputResampling"]; - [userDefaultsValuesDict setObject:[NSNumber numberWithInteger:CogStatusStopped] forKey:@"lastPlaybackStatus"]; [userDefaultsValuesDict setObject:[NSNumber numberWithInteger:-1] forKey:@"lastTrackPlaying"]; [userDefaultsValuesDict setObject:[NSNumber numberWithDouble:0] forKey:@"lastTrackPosition"]; diff --git a/Audio/Chain/ConverterNode.h b/Audio/Chain/ConverterNode.h index 8fb81eb8d..514524436 100644 --- a/Audio/Chain/ConverterNode.h +++ b/Audio/Chain/ConverterNode.h @@ -12,7 +12,7 @@ #import #import -#import