kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove a saucy option 

Nobody was likely to be using it, much less even know what it was.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
main
Christopher Snowhill 2023-06-13 22:42:13 -07:00
parent 3c91aab9d8
commit a366cbadee
No known key found for this signature in database
6 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cog.xcodeproj/project.pbxproj
View File

@ -175,8 +175,6 @@
83BC5AC420E4CE9000631CD4 /* Feedback.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B1DA0F6330D400694C57 /* Feedback.xib */; };
83BCB8DE17FC971300760340 /* FFMPEG.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = B09E94350D747F7B0064F138 /* FFMPEG.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
83D0380F24A40DFB004CF90F /* CogAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 83D0380E24A40DF2004CF90F /* CogAssets.xcassets */; };
83F7AADA290B682400951B61 /* scpipe in Resources */ = {isa = PBXBuildFile; fileRef = 83F7AAD8290B682400951B61 /* scpipe */; };
83F7AADE290B8DDF00951B61 /* IIAM.bin in Resources */ = {isa = PBXBuildFile; fileRef = 83F7AAD7290B682400951B61 /* IIAM.bin */; };
83F9D8071A884C54007ABEC2 /* SilenceDecoder.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83F9D7F61A884B46007ABEC2 /* SilenceDecoder.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
@ -1067,8 +1065,6 @@
83F0E8AD287CD48800D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
83F0E8B1287CD50700D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = "<group>"; };
83F0E8B2287CD52500D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = pl; path = pl.lproj/Credits.html; sourceTree = "<group>"; };
83F7AAD7290B682400951B61 /* IIAM.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = IIAM.bin; sourceTree = "<group>"; };
83F7AAD8290B682400951B61 /* scpipe */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = scpipe; sourceTree = "<group>"; };
83F9D7F11A884B44007ABEC2 /* SilenceDecoder.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SilenceDecoder.xcodeproj; path = Plugins/SilenceDecoder/SilenceDecoder.xcodeproj; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
8E07AB760AAC930B00A4B32F /* PreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PreferencesController.h; path = Preferences/PreferencesController.h; sourceTree = "<group>"; };
@ -1508,8 +1504,6 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
83F7AAD7290B682400951B61 /* IIAM.bin */,
83F7AAD8290B682400951B61 /* scpipe */,
839E56F12879625100DFB5F4 /* SADIE_D02-96000.mhr */,
837DC92F285B3F790005C58A /* DataModel.xcdatamodeld */,
8E07AD280AAC9BE600A4B32F /* Preference Panes */,
@ -2495,8 +2489,6 @@
17D1B27F0CF8B2830028F5B5 /* pls.icns in Resources */,
17D1B2800CF8B2830028F5B5 /* s3m.icns in Resources */,
17D1B2810CF8B2830028F5B5 /* song.icns in Resources */,
83F7AADA290B682400951B61 /* scpipe in Resources */,
83F7AADE290B8DDF00951B61 /* IIAM.bin in Resources */,
831B99BF27C23E88005A969B /* Cog.sdef in Resources */,
832923AF279FAC400048201E /* Cog.q1.json in Resources */,
17D1B2820CF8B2830028F5B5 /* vg.icns in Resources */,

BIN
IIAM.bin
View File

Binary file not shown.

6
Plugins/MIDI/MIDI.xcodeproj/project.pbxproj
View File

@ -40,7 +40,6 @@
83C35702180EDB74007E9DF0 /* MIDIContainer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83C35700180EDB74007E9DF0 /* MIDIContainer.mm */; };
83C35705180EDD1C007E9DF0 /* MIDIMetadataReader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83C35703180EDD1C007E9DF0 /* MIDIMetadataReader.mm */; };
83E973471C4378880007F413 /* AUPlayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83E973451C4378880007F413 /* AUPlayer.mm */; };
83F7AADD290B691900951B61 /* SCPlayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83F7AADB290B691900951B61 /* SCPlayer.mm */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -158,8 +157,6 @@
83E973451C4378880007F413 /* AUPlayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AUPlayer.mm; sourceTree = "<group>"; };
83E973461C4378880007F413 /* AUPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AUPlayer.h; sourceTree = "<group>"; };
83F0E6C4287CAB4300D84594 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
83F7AADB290B691900951B61 /* SCPlayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SCPlayer.mm; sourceTree = "<group>"; };
83F7AADC290B691900951B61 /* SCPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SCPlayer.h; sourceTree = "<group>"; };
83FAF8A618ADD60100057CAF /* PlaylistController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlaylistController.h; path = ../../../Playlist/PlaylistController.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
@ -312,8 +309,6 @@
83B06690180D5668008E3612 /* MIDI */ = {
isa = PBXGroup;
children = (
83F7AADC290B691900951B61 /* SCPlayer.h */,
83F7AADB290B691900951B61 /* SCPlayer.mm */,
834A42BC287AFC7F00EB9D9B /* AudioChunk.h */,
8307D31E28607377000FF8EB /* SandboxBroker.h */,
831E2A9127B4B2FA006F1C86 /* json */,
@ -473,7 +468,6 @@
83A09F651CFA83F2001E7D2D /* opl3class.cpp in Sources */,
83C35705180EDD1C007E9DF0 /* MIDIMetadataReader.mm in Sources */,
834BE91B1DE407CB00A07DCD /* resampler.c in Sources */,
83F7AADD290B691900951B61 /* SCPlayer.mm in Sources */,
83A09F641CFA83F2001E7D2D /* opl3.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;

11
Plugins/MIDI/MIDI/MIDIDecoder.mm
View File

@ -11,7 +11,6 @@
#import "AUPlayer.h"
#import "BMPlayer.h"
#import "MSPlayer.h"
#import "SCPlayer.h"
#import "Logging.h"
@ -199,8 +198,9 @@ static OSType getOSType(const char *in_) {
NSString *plugin = [[NSUserDefaults standardUserDefaults] stringForKey:@"midiPlugin"];
// Then detect if we should force the DLSMusicSynth, which has its own bank
if(!plugin || [plugin isEqualToString:@"BASSMIDI"]) {
if(!globalSoundFontPath || [globalSoundFontPath isEqualToString:@""]) {
BOOL sauce = plugin && [plugin isEqualToString:@"sauce"];
if(sauce || !plugin || [plugin isEqualToString:@"BASSMIDI"]) {
if(sauce || !globalSoundFontPath || [globalSoundFontPath isEqualToString:@""]) {
plugin = @"dls appl"; // Apple DLSMusicSynth if soundfont doesn't exist
[[NSUserDefaults standardUserDefaults] setValue:plugin forKey:@"midiPlugin"];
}
@ -221,11 +221,6 @@ static OSType getOSType(const char *in_) {
bmplayer->setFileSoundFont([soundFontPath UTF8String]);
player = bmplayer;
} else if([plugin isEqualToString:@"sauce"]) {
SCPlayer *scplayer = new SCPlayer;
player = scplayer;
scplayer->setSampleRate(sampleRate);
} else if([[plugin substringToIndex:4] isEqualToString:@"DOOM"]) {
MSPlayer *msplayer = new MSPlayer;
player = msplayer;

2
Preferences/Preferences/MIDIPluginBehaviorArrayController.m
View File

@ -68,8 +68,6 @@ static void enumCallback(void *context, OSType uSubType, OSType uManufacturer, c
[self addObject:@{@"name": @"BASSMIDI", @"preference": @"BASSMIDI"}];
[self addObject:@{ @"name": @"Secret Sauce", @"preference": @"sauce" }];
[self addObject:@{@"name": @"DMX Generic", @"preference": @"DOOM0000"}];
[self addObject:@{@"name": @"DMX Doom 1", @"preference": @"DOOM0001"}];
[self addObject:@{@"name": @"DMX Doom 2", @"preference": @"DOOM0002"}];

BIN
scpipe
View File

Binary file not shown.