Browse Source

Replaced DUMB and company with libopenmpt.

master
Christopher Snowhill 2 years ago
parent
commit
66e9a1fa14
14 changed files with 2422 additions and 154 deletions
  1. +3
    -0
      .gitmodules
  2. +38
    -154
      Cog.xcodeproj/project.pbxproj
  3. +26
    -0
      Frameworks/OpenMPT/Info.plist
  4. +1
    -0
      Frameworks/OpenMPT/OpenMPT
  5. +1496
    -0
      Frameworks/OpenMPT/OpenMPT.xcodeproj/project.pbxproj
  6. +17
    -0
      Frameworks/OpenMPT/config.h
  7. +375
    -0
      Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj
  8. +26
    -0
      Plugins/OpenMPT/OpenMPT/Info.plist
  9. +17
    -0
      Plugins/OpenMPT/OpenMPT/OMPTContainer.h
  10. +79
    -0
      Plugins/OpenMPT/OpenMPT/OMPTContainer.mm
  11. +29
    -0
      Plugins/OpenMPT/OpenMPT/OMPTDecoder.h
  12. +201
    -0
      Plugins/OpenMPT/OpenMPT/OMPTDecoder.mm
  13. +17
    -0
      Plugins/OpenMPT/OpenMPT/OMPTMetadataReader.h
  14. +97
    -0
      Plugins/OpenMPT/OpenMPT/OMPTMetadataReader.mm

+ 3
- 0
.gitmodules View File

@@ -4,3 +4,6 @@
[submodule "Frameworks/mGBA/mGBA/mgba"]
path = Frameworks/mGBA/mGBA/mgba
url = https://github.com/kode54/mgba.git
[submodule "Frameworks/OpenMPT/OpenMPT"]
path = Frameworks/OpenMPT/OpenMPT
url = https://gitlab.kode54.net/kode54/OpenMPT.git

+ 38
- 154
Cog.xcodeproj/project.pbxproj View File

@@ -98,7 +98,6 @@
17C8099A0C3BD233005707C4 /* FileSource.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808790C3BD167005707C4 /* FileSource.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
17C809E60C3BD487005707C4 /* CoreAudio.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C809E30C3BD46D005707C4 /* CoreAudio.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
17C8F3CF0CBED66C008D969D /* GME.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C8F3CD0CBED663008D969D /* GME.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
17C8F7D80CBEF3EF008D969D /* Dumb.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C8F7D70CBEF3E8008D969D /* Dumb.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
17D1B0D20F6320EA00694C57 /* InfoInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B0D00F6320EA00694C57 /* InfoInspector.xib */; };
17D1B1010F63255200694C57 /* InfoWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17D1B1000F63255200694C57 /* InfoWindowController.m */; };
17D1B1680F632ABB00694C57 /* BlankZeroFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 17D1B1630F632ABB00694C57 /* BlankZeroFormatter.m */; };
@@ -139,7 +138,6 @@
8355D6B6180612F300D05687 /* NSData+MD5.m in Sources */ = {isa = PBXBuildFile; fileRef = 8355D6B5180612F300D05687 /* NSData+MD5.m */; };
8355D6B8180613FB00D05687 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8355D6B7180613FB00D05687 /* Security.framework */; };
8359009D17FF06570060F3ED /* ArchiveSource.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8359FF3117FEF35D0060F3ED /* ArchiveSource.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
835CBC8118DA7A520087A03E /* modplay.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 835CBC7618DA79F80087A03E /* modplay.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
8360EF6D17F92E56005208A4 /* HighlyComplete.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8360EF0517F92B24005208A4 /* HighlyComplete.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
836D28A818086386005B7299 /* MiniModeMenuTitleTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 836D28A718086386005B7299 /* MiniModeMenuTitleTransformer.m */; };
836F5BF91A357A01002730CC /* sidplay.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8314D6411A354DFF00EEE8E6 /* sidplay.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -183,12 +181,11 @@
838491871808591F00E7332D /* NDHotKey.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8384917E1808585D00E7332D /* NDHotKey.framework */; };
838491881808593200E7332D /* NDHotKey.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8384917E1808585D00E7332D /* NDHotKey.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
8399D4E21805A55000B503B1 /* XmlContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 8399D4E01805A55000B503B1 /* XmlContainer.m */; };
839BD010196521E600947767 /* BASSMODS.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 839BCFEC1965133F00947767 /* BASSMODS.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
83A0F4E31816DBF900119DB4 /* playptmod.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83A0F4891816CE5E00119DB4 /* playptmod.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
83B06704180D579E008E3612 /* MIDI.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83B066A1180D5669008E3612 /* MIDI.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
83BCB8DE17FC971300760340 /* FFMPEG.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = B09E94350D747F7B0064F138 /* FFMPEG.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
83E5E54C18087CA5001F3284 /* miniModeOffTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 83E5E54A18087CA5001F3284 /* miniModeOffTemplate.pdf */; };
83E5E54D18087CA5001F3284 /* miniModeOnTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 83E5E54B18087CA5001F3284 /* miniModeOnTemplate.pdf */; };
83E5FE771FFF0C9D00659F0F /* OpenMPT.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83E5EFB11FFEF78300659F0F /* OpenMPT.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
83E6B7621816136F00D4576D /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83E6B759181612FD00D4576D /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
83E6B7651816178200D4576D /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83E6B759181612FD00D4576D /* Sparkle.framework */; };
83EEAB241C965C56002761C5 /* Syntrax.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83EEAAFA1C9651D8002761C5 /* Syntrax.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -363,20 +360,6 @@
remoteGlobalIDString = 8D5B49AC048680CD000E48DA;
remoteInfo = "GME Plugin";
};
17C8F7D60CBEF3E8008D969D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 17C8F7D20CBEF3E8008D969D /* Dumb.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 8D5B49B6048680CD000E48DA;
remoteInfo = Dumb;
};
17C8F7D90CBEF3F9008D969D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 17C8F7D20CBEF3E8008D969D /* Dumb.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 8D5B49AC048680CD000E48DA;
remoteInfo = Dumb;
};
17F3BB870CBC565100864489 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 17F3BB830CBC565100864489 /* CueSheet.xcodeproj */;
@@ -461,13 +444,6 @@
remoteGlobalIDString = 8359FF1717FEF35C0060F3ED;
remoteInfo = ArchiveSource;
};
835CBC7518DA79F80087A03E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 835CBC7118DA79F80087A03E /* modplay.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 83F4D51518D8206A009B2DE6;
remoteInfo = modplay;
};
8360EF0417F92B24005208A4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 8360EF0017F92B23005208A4 /* HighlyComplete.xcodeproj */;
@@ -538,34 +514,6 @@
remoteGlobalIDString = 32F1615514E6BB3B00D6AB2F;
remoteInfo = NDHotKey;
};
839BCFEB1965133F00947767 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 839BCFE71965133E00947767 /* BASSMODS.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 839BCFD21965133E00947767;
remoteInfo = BASSMODS;
};
839BD011196521FD00947767 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 839BCFE71965133E00947767 /* BASSMODS.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 839BCFD11965133E00947767;
remoteInfo = BASSMODS;
};
83A0F4881816CE5E00119DB4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83A0F4841816CE5E00119DB4 /* playptmod.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 83A0F46F1816CE5E00119DB4;
remoteInfo = playptmod;
};
83A0F4E11816DBE800119DB4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83A0F4841816CE5E00119DB4 /* playptmod.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 83A0F46E1816CE5E00119DB4;
remoteInfo = playptmod;
};
83B066A0180D5669008E3612 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83B0669C180D5668008E3612 /* MIDI.xcodeproj */;
@@ -594,6 +542,20 @@
remoteGlobalIDString = 8D5B49AC048680CD000E48DA;
remoteInfo = "FFMPEG Plugin";
};
83E5EFB01FFEF78300659F0F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83E5EFAC1FFEF78100659F0F /* OpenMPT.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 83E5EFA31FFEF78100659F0F;
remoteInfo = OpenMPT;
};
83E5FE781FFF0CAC00659F0F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83E5EFAC1FFEF78100659F0F /* OpenMPT.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 83E5EFA21FFEF78100659F0F;
remoteInfo = OpenMPT;
};
83E6B758181612FD00D4576D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83E6B750181612FD00D4576D /* Sparkle.xcodeproj */;
@@ -717,21 +679,18 @@
dstPath = "";
dstSubfolderSpec = 13;
files = (
83E5FE771FFF0C9D00659F0F /* OpenMPT.bundle in CopyFiles */,
83EEAB241C965C56002761C5 /* Syntrax.bundle in CopyFiles */,
83F9D8071A884C54007ABEC2 /* SilenceDecoder.bundle in CopyFiles */,
836F5BF91A357A01002730CC /* sidplay.bundle in CopyFiles */,
839BD010196521E600947767 /* BASSMODS.bundle in CopyFiles */,
835CBC8118DA7A520087A03E /* modplay.bundle in CopyFiles */,
836F706218BDD1230095E648 /* vgmstream.bundle in CopyFiles */,
836FB5A718206F2500B3AD2D /* Hively.bundle in CopyFiles */,
83A0F4E31816DBF900119DB4 /* playptmod.bundle in CopyFiles */,
83B06704180D579E008E3612 /* MIDI.bundle in CopyFiles */,
8375B36517FFEF130092A79F /* Opus.bundle in CopyFiles */,
8359009D17FF06570060F3ED /* ArchiveSource.bundle in CopyFiles */,
83BCB8DE17FC971300760340 /* FFMPEG.bundle in CopyFiles */,
8360EF6D17F92E56005208A4 /* HighlyComplete.bundle in CopyFiles */,
99EAACA80DD1BB7A00423C38 /* APL.bundle in CopyFiles */,
17C8F7D80CBEF3EF008D969D /* Dumb.bundle in CopyFiles */,
17C8F3CF0CBED66C008D969D /* GME.bundle in CopyFiles */,
17F3BB890CBC565900864489 /* CueSheet.bundle in CopyFiles */,
8E8D41C80CBB0DA900135C1B /* Pls.bundle in CopyFiles */,
@@ -896,7 +855,6 @@
17C808B70C3BD1D2005707C4 /* Vorbis.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Vorbis.xcodeproj; path = Plugins/Vorbis/Vorbis.xcodeproj; sourceTree = "<group>"; };
17C808C00C3BD1DD005707C4 /* WavPack.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WavPack.xcodeproj; path = Plugins/WavPack/WavPack.xcodeproj; sourceTree = "<group>"; };
17C8F3C80CBED663008D969D /* GME.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GME.xcodeproj; path = Plugins/GME/GME.xcodeproj; sourceTree = "<group>"; };
17C8F7D20CBEF3E8008D969D /* Dumb.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Dumb.xcodeproj; path = Plugins/Dumb/Dumb.xcodeproj; sourceTree = "<group>"; };
17D1B0D10F6320EA00694C57 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/InfoInspector.xib; sourceTree = "<group>"; };
17D1B0FF0F63255200694C57 /* InfoWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InfoWindowController.h; path = InfoInspector/InfoWindowController.h; sourceTree = "<group>"; };
17D1B1000F63255200694C57 /* InfoWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = InfoWindowController.m; path = InfoInspector/InfoWindowController.m; sourceTree = "<group>"; };
@@ -975,7 +933,6 @@
8355D6B5180612F300D05687 /* NSData+MD5.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+MD5.m"; sourceTree = "<group>"; };
8355D6B7180613FB00D05687 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
8359FF2C17FEF35C0060F3ED /* ArchiveSource.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ArchiveSource.xcodeproj; path = Plugins/ArchiveSource/ArchiveSource.xcodeproj; sourceTree = "<group>"; };
835CBC7118DA79F80087A03E /* modplay.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = modplay.xcodeproj; path = Plugins/modplay/modplay.xcodeproj; sourceTree = "<group>"; };
8360EF0017F92B23005208A4 /* HighlyComplete.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = HighlyComplete.xcodeproj; path = Plugins/HighlyComplete/HighlyComplete.xcodeproj; sourceTree = "<group>"; };
836D28A618086386005B7299 /* MiniModeMenuTitleTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MiniModeMenuTitleTransformer.h; path = Window/MiniModeMenuTitleTransformer.h; sourceTree = "<group>"; };
836D28A718086386005B7299 /* MiniModeMenuTitleTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MiniModeMenuTitleTransformer.m; path = Window/MiniModeMenuTitleTransformer.m; sourceTree = "<group>"; };
@@ -1024,11 +981,10 @@
838491791808585C00E7332D /* NDHotKey.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = NDHotKey.xcodeproj; path = Frameworks/NDHotKey/NDHotKey.xcodeproj; sourceTree = "<group>"; };
8399D4E01805A55000B503B1 /* XmlContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XmlContainer.m; sourceTree = "<group>"; };
8399D4E11805A55000B503B1 /* XmlContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XmlContainer.h; sourceTree = "<group>"; };
839BCFE71965133E00947767 /* BASSMODS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = BASSMODS.xcodeproj; path = Plugins/BASSMODS/BASSMODS.xcodeproj; sourceTree = "<group>"; };
83A0F4841816CE5E00119DB4 /* playptmod.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = playptmod.xcodeproj; path = Plugins/playptmod/playptmod.xcodeproj; sourceTree = "<group>"; };
83B0669C180D5668008E3612 /* MIDI.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MIDI.xcodeproj; path = Plugins/MIDI/MIDI.xcodeproj; sourceTree = "<group>"; };
83E5E54A18087CA5001F3284 /* miniModeOffTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = miniModeOffTemplate.pdf; path = Images/miniModeOffTemplate.pdf; sourceTree = "<group>"; };
83E5E54B18087CA5001F3284 /* miniModeOnTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = miniModeOnTemplate.pdf; path = Images/miniModeOnTemplate.pdf; sourceTree = "<group>"; };
83E5EFAC1FFEF78100659F0F /* OpenMPT.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OpenMPT.xcodeproj; path = Plugins/OpenMPT/OpenMPT.xcodeproj; sourceTree = "<group>"; };
83E6B750181612FD00D4576D /* Sparkle.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Sparkle.xcodeproj; path = Frameworks/Sparkle/Sparkle.xcodeproj; sourceTree = "<group>"; };
83EEAAF51C9651D8002761C5 /* Syntrax.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Syntrax.xcodeproj; path = Plugins/Syntrax/Syntrax.xcodeproj; sourceTree = "<group>"; };
83F9D7F11A884B44007ABEC2 /* SilenceDecoder.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SilenceDecoder.xcodeproj; path = Plugins/SilenceDecoder/SilenceDecoder.xcodeproj; sourceTree = "<group>"; };
@@ -1306,12 +1262,11 @@
17B619FF0B909ED400BC003F /* PlugIns */ = {
isa = PBXGroup;
children = (
83E5EFAC1FFEF78100659F0F /* OpenMPT.xcodeproj */,
83EEAAF51C9651D8002761C5 /* Syntrax.xcodeproj */,
835CBC7118DA79F80087A03E /* modplay.xcodeproj */,
8360EF0017F92B23005208A4 /* HighlyComplete.xcodeproj */,
B09E94300D747F7B0064F138 /* FFMPEG.xcodeproj */,
566D32160D538550004466A5 /* APL.xcodeproj */,
17C8F7D20CBEF3E8008D969D /* Dumb.xcodeproj */,
17C8F3C80CBED663008D969D /* GME.xcodeproj */,
17F3BB830CBC565100864489 /* CueSheet.xcodeproj */,
8E8D41C20CBB0DA000135C1B /* Pls.xcodeproj */,
@@ -1328,10 +1283,8 @@
8359FF2C17FEF35C0060F3ED /* ArchiveSource.xcodeproj */,
8375B05117FFEA400092A79F /* Opus.xcodeproj */,
83B0669C180D5668008E3612 /* MIDI.xcodeproj */,
83A0F4841816CE5E00119DB4 /* playptmod.xcodeproj */,
836FB5421820538700B3AD2D /* Hively.xcodeproj */,
836F6B2518BDB80D0095E648 /* vgmstream.xcodeproj */,
839BCFE71965133E00947767 /* BASSMODS.xcodeproj */,
8314D63B1A354DFE00EEE8E6 /* sidplay.xcodeproj */,
83F9D7F11A884B44007ABEC2 /* SilenceDecoder.xcodeproj */,
);
@@ -1418,14 +1371,6 @@
name = Products;
sourceTree = "<group>";
};
17C8F7D30CBEF3E8008D969D /* Products */ = {
isa = PBXGroup;
children = (
17C8F7D70CBEF3E8008D969D /* Dumb.bundle */,
);
name = Products;
sourceTree = "<group>";
};
17D1B0FE0F63252900694C57 /* InfoInspector */ = {
isa = PBXGroup;
children = (
@@ -1665,14 +1610,6 @@
name = Products;
sourceTree = "<group>";
};
835CBC7218DA79F80087A03E /* Products */ = {
isa = PBXGroup;
children = (
835CBC7618DA79F80087A03E /* modplay.bundle */,
);
name = Products;
sourceTree = "<group>";
};
8360EF0117F92B23005208A4 /* Products */ = {
isa = PBXGroup;
children = (
@@ -1732,26 +1669,18 @@
name = Products;
sourceTree = "<group>";
};
839BCFE81965133E00947767 /* Products */ = {
isa = PBXGroup;
children = (
839BCFEC1965133F00947767 /* BASSMODS.bundle */,
);
name = Products;
sourceTree = "<group>";
};
83A0F4851816CE5E00119DB4 /* Products */ = {
83B0669D180D5668008E3612 /* Products */ = {
isa = PBXGroup;
children = (
83A0F4891816CE5E00119DB4 /* playptmod.bundle */,
83B066A1180D5669008E3612 /* MIDI.bundle */,
);
name = Products;
sourceTree = "<group>";
};
83B0669D180D5668008E3612 /* Products */ = {
83E5EFAD1FFEF78100659F0F /* Products */ = {
isa = PBXGroup;
children = (
83B066A1180D5669008E3612 /* MIDI.bundle */,
83E5EFB11FFEF78300659F0F /* OpenMPT.bundle */,
);
name = Products;
sourceTree = "<group>";
@@ -1919,12 +1848,11 @@
buildRules = (
);
dependencies = (
83E5FE791FFF0CAC00659F0F /* PBXTargetDependency */,
83EEAB261C965C61002761C5 /* PBXTargetDependency */,
83F9D8061A884C33007ABEC2 /* PBXTargetDependency */,
836F5BEE1A3579F5002730CC /* PBXTargetDependency */,
839BD012196521FD00947767 /* PBXTargetDependency */,
836FB5A618206F1500B3AD2D /* PBXTargetDependency */,
83A0F4E21816DBE800119DB4 /* PBXTargetDependency */,
83E6B7641816138800D4576D /* PBXTargetDependency */,
83B06703180D5776008E3612 /* PBXTargetDependency */,
838491861808591400E7332D /* PBXTargetDependency */,
@@ -1947,7 +1875,6 @@
8E8D41CC0CBB0DD200135C1B /* PBXTargetDependency */,
17F3BB8B0CBC566200864489 /* PBXTargetDependency */,
17C8F44C0CBEDD37008D969D /* PBXTargetDependency */,
17C8F7DA0CBEF3F9008D969D /* PBXTargetDependency */,
17643CBC0D5BD44900F0A9FE /* PBXTargetDependency */,
);
name = Cog;
@@ -1996,10 +1923,6 @@
ProductGroup = 8359FF2D17FEF35C0060F3ED /* Products */;
ProjectRef = 8359FF2C17FEF35C0060F3ED /* ArchiveSource.xcodeproj */;
},
{
ProductGroup = 839BCFE81965133E00947767 /* Products */;
ProjectRef = 839BCFE71965133E00947767 /* BASSMODS.xcodeproj */;
},
{
ProductGroup = 17F5612B0C3BD4DC0019975C /* Products */;
ProjectRef = 17F5612A0C3BD4DC0019975C /* CogAudio.xcodeproj */;
@@ -2012,10 +1935,6 @@
ProductGroup = 17F3BB840CBC565100864489 /* Products */;
ProjectRef = 17F3BB830CBC565100864489 /* CueSheet.xcodeproj */;
},
{
ProductGroup = 17C8F7D30CBEF3E8008D969D /* Products */;
ProjectRef = 17C8F7D20CBEF3E8008D969D /* Dumb.xcodeproj */;
},
{
ProductGroup = B09E94310D747F7B0064F138 /* Products */;
ProjectRef = B09E94300D747F7B0064F138 /* FFMPEG.xcodeproj */;
@@ -2056,10 +1975,6 @@
ProductGroup = 83B0669D180D5668008E3612 /* Products */;
ProjectRef = 83B0669C180D5668008E3612 /* MIDI.xcodeproj */;
},
{
ProductGroup = 835CBC7218DA79F80087A03E /* Products */;
ProjectRef = 835CBC7118DA79F80087A03E /* modplay.xcodeproj */;
},
{
ProductGroup = 17C8089F0C3BD1AB005707C4 /* Products */;
ProjectRef = 17C8089E0C3BD1AB005707C4 /* Musepack.xcodeproj */;
@@ -2069,12 +1984,12 @@
ProjectRef = 838491791808585C00E7332D /* NDHotKey.xcodeproj */;
},
{
ProductGroup = 8375B05217FFEA400092A79F /* Products */;
ProjectRef = 8375B05117FFEA400092A79F /* Opus.xcodeproj */;
ProductGroup = 83E5EFAD1FFEF78100659F0F /* Products */;
ProjectRef = 83E5EFAC1FFEF78100659F0F /* OpenMPT.xcodeproj */;
},
{
ProductGroup = 83A0F4851816CE5E00119DB4 /* Products */;
ProjectRef = 83A0F4841816CE5E00119DB4 /* playptmod.xcodeproj */;
ProductGroup = 8375B05217FFEA400092A79F /* Products */;
ProjectRef = 8375B05117FFEA400092A79F /* Opus.xcodeproj */;
},
{
ProductGroup = 8E8D41C30CBB0DA000135C1B /* Products */;
@@ -2195,13 +2110,6 @@
remoteRef = 17C8F3CC0CBED663008D969D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
17C8F7D70CBEF3E8008D969D /* Dumb.bundle */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = Dumb.bundle;
remoteRef = 17C8F7D60CBEF3E8008D969D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
17F3BB880CBC565100864489 /* CueSheet.bundle */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
@@ -2265,13 +2173,6 @@
remoteRef = 8359FF3017FEF35D0060F3ED /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
835CBC7618DA79F80087A03E /* modplay.bundle */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = modplay.bundle;
remoteRef = 835CBC7518DA79F80087A03E /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
8360EF0517F92B24005208A4 /* HighlyComplete.bundle */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
@@ -2307,25 +2208,18 @@
remoteRef = 8384917D1808585D00E7332D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
839BCFEC1965133F00947767 /* BASSMODS.bundle */ = {
83B066A1180D5669008E3612 /* MIDI.bundle */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = BASSMODS.bundle;
remoteRef = 839BCFEB1965133F00947767 /* PBXContainerItemProxy */;
path = MIDI.bundle;
remoteRef = 83B066A0180D5669008E3612 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
83A0F4891816CE5E00119DB4 /* playptmod.bundle */ = {
83E5EFB11FFEF78300659F0F /* OpenMPT.bundle */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = playptmod.bundle;
remoteRef = 83A0F4881816CE5E00119DB4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
83B066A1180D5669008E3612 /* MIDI.bundle */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = MIDI.bundle;
remoteRef = 83B066A0180D5669008E3612 /* PBXContainerItemProxy */;
path = OpenMPT.bundle;
remoteRef = 83E5EFB01FFEF78300659F0F /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
83E6B759181612FD00D4576D /* Sparkle.framework */ = {
@@ -2655,11 +2549,6 @@
name = "GME Plugin";
targetProxy = 17C8F44B0CBEDD37008D969D /* PBXContainerItemProxy */;
};
17C8F7DA0CBEF3F9008D969D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = Dumb;
targetProxy = 17C8F7D90CBEF3F9008D969D /* PBXContainerItemProxy */;
};
17F3BB8B0CBC566200864489 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = CueSheet;
@@ -2700,16 +2589,6 @@
name = NDHotKey;
targetProxy = 838491851808591400E7332D /* PBXContainerItemProxy */;
};
839BD012196521FD00947767 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = BASSMODS;
targetProxy = 839BD011196521FD00947767 /* PBXContainerItemProxy */;
};
83A0F4E21816DBE800119DB4 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = playptmod;
targetProxy = 83A0F4E11816DBE800119DB4 /* PBXContainerItemProxy */;
};
83B06703180D5776008E3612 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = MIDI;
@@ -2725,6 +2604,11 @@
name = "FFMPEG Plugin";
targetProxy = 83BCB8DC17FC96FC00760340 /* PBXContainerItemProxy */;
};
83E5FE791FFF0CAC00659F0F /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = OpenMPT;
targetProxy = 83E5FE781FFF0CAC00659F0F /* PBXContainerItemProxy */;
};
83E6B7641816138800D4576D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = Sparkle;


+ 26
- 0
Frameworks/OpenMPT/Info.plist View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2016 Christopher Snowhill. All rights reserved.</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>

+ 1
- 0
Frameworks/OpenMPT/OpenMPT

@@ -0,0 +1 @@
Subproject commit bf3d5ea380157da7aa0b7bc58c3d889ac7e31b37

+ 1496
- 0
Frameworks/OpenMPT/OpenMPT.xcodeproj/project.pbxproj
File diff suppressed because it is too large
View File


+ 17
- 0
Frameworks/OpenMPT/config.h View File

@@ -0,0 +1,17 @@
#ifndef _LIBOPENMPT_CONFIG_H_
#define _LIBOPENMPT_CONFIG_H_

#if 0
#define MPT_WITH_MPG123 1
#define MPT_WITH_OGG 1
#define MPT_WITH_VORBIS 1
#define MPT_WITH_VORBISFILE 1
#else
#define MPT_WITH_MINIMP3 1
#define MPT_WITH_STBVORBIS 1
#endif

#define MPT_WITH_ZLIB 1

#endif


+ 375
- 0
Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj View File

@@ -0,0 +1,375 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 48;
objects = {

/* Begin PBXBuildFile section */
83E5FE671FFF001100659F0F /* OpenMPT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83E5EFCD1FFEF7CE00659F0F /* OpenMPT.framework */; };
83E5FE691FFF002000659F0F /* OpenMPT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83E5EFCD1FFEF7CE00659F0F /* OpenMPT.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
83E5FE731FFF010C00659F0F /* OMPTDecoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83E5FE6D1FFF010B00659F0F /* OMPTDecoder.mm */; };
83E5FE741FFF010C00659F0F /* OMPTContainer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83E5FE6F1FFF010B00659F0F /* OMPTContainer.mm */; };
83E5FE751FFF010C00659F0F /* OMPTMetadataReader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83E5FE701FFF010C00659F0F /* OMPTMetadataReader.mm */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
83E5EFCC1FFEF7CE00659F0F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83E5EFC81FFEF7CC00659F0F /* OpenMPT.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 83E5EFBD1FFEF7CC00659F0F;
remoteInfo = OpenMPT;
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
83E5FE681FFF001800659F0F /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
83E5FE691FFF002000659F0F /* OpenMPT.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
83E5EFA31FFEF78100659F0F /* OpenMPT.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OpenMPT.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
83E5EFA61FFEF78100659F0F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
83E5EFC81FFEF7CC00659F0F /* OpenMPT.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OpenMPT.xcodeproj; path = ../../Frameworks/OpenMPT/OpenMPT.xcodeproj; sourceTree = "<group>"; };
83E5FE6B1FFF004D00659F0F /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../Utils/Logging.h; sourceTree = "<group>"; };
83E5FE6C1FFF006400659F0F /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = "<group>"; };
83E5FE6D1FFF010B00659F0F /* OMPTDecoder.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OMPTDecoder.mm; path = OpenMPT/OMPTDecoder.mm; sourceTree = "<group>"; };
83E5FE6E1FFF010B00659F0F /* OMPTContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OMPTContainer.h; path = OpenMPT/OMPTContainer.h; sourceTree = "<group>"; };
83E5FE6F1FFF010B00659F0F /* OMPTContainer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OMPTContainer.mm; path = OpenMPT/OMPTContainer.mm; sourceTree = "<group>"; };
83E5FE701FFF010C00659F0F /* OMPTMetadataReader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OMPTMetadataReader.mm; path = OpenMPT/OMPTMetadataReader.mm; sourceTree = "<group>"; };
83E5FE711FFF010C00659F0F /* OMPTDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OMPTDecoder.h; path = OpenMPT/OMPTDecoder.h; sourceTree = "<group>"; };
83E5FE721FFF010C00659F0F /* OMPTMetadataReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OMPTMetadataReader.h; path = OpenMPT/OMPTMetadataReader.h; sourceTree = "<group>"; };
83E5FE761FFF076F00659F0F /* PlaylistController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlaylistController.h; path = ../../Playlist/PlaylistController.h; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
83E5EFA01FFEF78100659F0F /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
83E5FE671FFF001100659F0F /* OpenMPT.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
83E5EF9A1FFEF78100659F0F = {
isa = PBXGroup;
children = (
83E5FE6A1FFF003900659F0F /* Classes */,
83E5EFB21FFEF79000659F0F /* Frameworks */,
83E5EFA51FFEF78100659F0F /* OpenMPT */,
83E5EFA41FFEF78100659F0F /* Products */,
);
sourceTree = "<group>";
};
83E5EFA41FFEF78100659F0F /* Products */ = {
isa = PBXGroup;
children = (
83E5EFA31FFEF78100659F0F /* OpenMPT.bundle */,
);
name = Products;
sourceTree = "<group>";
};
83E5EFA51FFEF78100659F0F /* OpenMPT */ = {
isa = PBXGroup;
children = (
83E5EFA61FFEF78100659F0F /* Info.plist */,
);
path = OpenMPT;
sourceTree = "<group>";
};
83E5EFB21FFEF79000659F0F /* Frameworks */ = {
isa = PBXGroup;
children = (
83E5EFC81FFEF7CC00659F0F /* OpenMPT.xcodeproj */,
);
name = Frameworks;
sourceTree = "<group>";
};
83E5EFC91FFEF7CC00659F0F /* Products */ = {
isa = PBXGroup;
children = (
83E5EFCD1FFEF7CE00659F0F /* OpenMPT.framework */,
);
name = Products;
sourceTree = "<group>";
};
83E5FE6A1FFF003900659F0F /* Classes */ = {
isa = PBXGroup;
children = (
83E5FE6B1FFF004D00659F0F /* Logging.h */,
83E5FE761FFF076F00659F0F /* PlaylistController.h */,
83E5FE6C1FFF006400659F0F /* Plugin.h */,
83E5FE6E1FFF010B00659F0F /* OMPTContainer.h */,
83E5FE6F1FFF010B00659F0F /* OMPTContainer.mm */,
83E5FE711FFF010C00659F0F /* OMPTDecoder.h */,
83E5FE6D1FFF010B00659F0F /* OMPTDecoder.mm */,
83E5FE721FFF010C00659F0F /* OMPTMetadataReader.h */,
83E5FE701FFF010C00659F0F /* OMPTMetadataReader.mm */,
);
name = Classes;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
83E5EFA21FFEF78100659F0F /* OpenMPT */ = {
isa = PBXNativeTarget;
buildConfigurationList = 83E5EFA91FFEF78100659F0F /* Build configuration list for PBXNativeTarget "OpenMPT" */;
buildPhases = (
83E5EF9F1FFEF78100659F0F /* Sources */,
83E5EFA01FFEF78100659F0F /* Frameworks */,
83E5EFA11FFEF78100659F0F /* Resources */,
83E5FE681FFF001800659F0F /* CopyFiles */,
);
buildRules = (
);
dependencies = (
);
name = OpenMPT;
productName = OpenMPT;
productReference = 83E5EFA31FFEF78100659F0F /* OpenMPT.bundle */;
productType = "com.apple.product-type.bundle";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
83E5EF9B1FFEF78100659F0F /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0920;
ORGANIZATIONNAME = "Christopher Snowhill";
TargetAttributes = {
83E5EFA21FFEF78100659F0F = {
CreatedOnToolsVersion = 9.2;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = 83E5EF9E1FFEF78100659F0F /* Build configuration list for PBXProject "OpenMPT" */;
compatibilityVersion = "Xcode 8.0";
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
);
mainGroup = 83E5EF9A1FFEF78100659F0F;
productRefGroup = 83E5EFA41FFEF78100659F0F /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 83E5EFC91FFEF7CC00659F0F /* Products */;
ProjectRef = 83E5EFC81FFEF7CC00659F0F /* OpenMPT.xcodeproj */;
},
);
projectRoot = "";
targets = (
83E5EFA21FFEF78100659F0F /* OpenMPT */,
);
};
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
83E5EFCD1FFEF7CE00659F0F /* OpenMPT.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = OpenMPT.framework;
remoteRef = 83E5EFCC1FFEF7CE00659F0F /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */

/* Begin PBXResourcesBuildPhase section */
83E5EFA11FFEF78100659F0F /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
83E5EF9F1FFEF78100659F0F /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
83E5FE751FFF010C00659F0F /* OMPTMetadataReader.mm in Sources */,
83E5FE731FFF010C00659F0F /* OMPTDecoder.mm in Sources */,
83E5FE741FFF010C00659F0F /* OMPTContainer.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin XCBuildConfiguration section */
83E5EFA71FFEF78100659F0F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
name = Debug;
};
83E5EFA81FFEF78100659F0F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
};
name = Release;
};
83E5EFAA1FFEF78100659F0F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = N6E749HJ2X;
INFOPLIST_FILE = OpenMPT/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.OpenMPT;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};
name = Debug;
};
83E5EFAB1FFEF78100659F0F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = N6E749HJ2X;
INFOPLIST_FILE = OpenMPT/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_BUNDLE_IDENTIFIER = net.kode54.OpenMPT;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = bundle;
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
83E5EF9E1FFEF78100659F0F /* Build configuration list for PBXProject "OpenMPT" */ = {
isa = XCConfigurationList;
buildConfigurations = (
83E5EFA71FFEF78100659F0F /* Debug */,
83E5EFA81FFEF78100659F0F /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
83E5EFA91FFEF78100659F0F /* Build configuration list for PBXNativeTarget "OpenMPT" */ = {
isa = XCConfigurationList;
buildConfigurations = (
83E5EFAA1FFEF78100659F0F /* Debug */,
83E5EFAB1FFEF78100659F0F /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 83E5EF9B1FFEF78100659F0F /* Project object */;
}

+ 26
- 0
Plugins/OpenMPT/OpenMPT/Info.plist View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2018 Christopher Snowhill. All rights reserved.</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>

+ 17
- 0
Plugins/OpenMPT/OpenMPT/OMPTContainer.h View File

@@ -0,0 +1,17 @@
//
// OMPTContainer.h
// OpenMPT
//
// Created by Christopher Snowhill on 1/4/18.
// Copyright 2018 __LoSnoCo__. All rights reserved.
//

#import <Cocoa/Cocoa.h>

#import "Plugin.h"

@interface OMPTContainer : NSObject <CogContainer> {

}

@end

+ 79
- 0
Plugins/OpenMPT/OpenMPT/OMPTContainer.mm View File

@@ -0,0 +1,79 @@
//
// OMPTContainer.m
// OpenMPT
//
// Created by Christopher Snowhill on 1/4/18.
// Copyright 2018 __LoSnoCo__. All rights reserved.
//

#import <OpenMPT/libopenmpt.hpp>

#import "OMPTContainer.h"
#import "OMPTDecoder.h"

#import "Logging.h"

@implementation OMPTContainer

+ (NSArray *)fileTypes
{
return [OMPTDecoder fileTypes];
}

+ (NSArray *)mimeTypes
{
return nil;
}

+ (float)priority
{
return 1.0f;
}

+ (NSArray *)urlsForContainerURL:(NSURL *)url
{
if ([url fragment]) {
// input url already has fragment defined - no need to expand further
return [NSMutableArray arrayWithObject:url];
}
id audioSourceClass = NSClassFromString(@"AudioSource");
id<CogSource> source = [audioSourceClass audioSourceForURL:url];
if (![source open:url])
return 0;
if (![source seekable])
return 0;
[source seek:0 whence:SEEK_END];
long size = [source tell];
[source seek:0 whence:SEEK_SET];
std::vector<char> data( static_cast<std::size_t>( size ) );
[source read:data.data() amount:size];
try {
std::map< std::string, std::string > ctls;
openmpt::module * mod = new openmpt::module( data, std::clog, ctls );
NSMutableArray *tracks = [NSMutableArray array];
int i;
int subsongs = mod->get_num_subsongs();
delete mod;
for (i = 0; i < subsongs; ++i) {
[tracks addObject:[NSURL URLWithString:[[url absoluteString] stringByAppendingFormat:@"#%i", i]]];
}
return tracks;
} catch ( std::exception & /*e*/ ) {
return 0;
}
}


@end

+ 29
- 0
Plugins/OpenMPT/OpenMPT/OMPTDecoder.h View File

@@ -0,0 +1,29 @@
//
// OMPTDecoder.h
// OpenMPT
//
// Created by Christopher Snowhill on 1/4/18.
// Copyright 2018 __LoSnoCo__. All rights reserved.
//

#import <Cocoa/Cocoa.h>

#import <OpenMPT/libopenmpt.hpp>

#include <vector>

#import "Plugin.h"

@interface OMPTDecoder : NSObject <CogDecoder> {
openmpt::module *mod;
std::vector<float> left;
std::vector<float> right;
id<CogSource> source;
long length;
}

- (void)setSource:(id<CogSource>)s;
- (id<CogSource>)source;
- (void)cleanUp;
@end

+ 201
- 0
Plugins/OpenMPT/OpenMPT/OMPTDecoder.mm View File

@@ -0,0 +1,201 @@
//
// OMPTDecoder.m
// OpenMPT
//
// Created by Christopher Snowhill on 1/4/18.
// Copyright 2018 __LoSnoCo__. All rights reserved.
//

#import "OMPTDecoder.h"

#import "Logging.h"

#import "PlaylistController.h"

static void g_push_archive_extensions(std::vector<std::string> & list)
{
static std::string archive_extensions[] = {
"mdz", "mdr", "s3z", "xmz", "itz", "mptmz"
};
for (unsigned i = 0, j = 6; i < j; ++i) {
if (list.empty() || std::find(list.begin(), list.end(), archive_extensions[i]) == list.end())
list.push_back(archive_extensions[i]);
}
}

@implementation OMPTDecoder

- (id)init
{
self = [super init];
if (self) {
mod = NULL;
}
return self;
}

- (BOOL)open:(id<CogSource>)s
{
[self setSource:s];
[source seek:0 whence:SEEK_END];
long size = [source tell];
[source seek:0 whence:SEEK_SET];
std::vector<char> data( static_cast<std::size_t>( size ) );

[source read:data.data() amount:size];

int track_num;
if ([[source.url fragment] length] == 0)
track_num = 0;
else
track_num = [[source.url fragment] intValue];

int interp = 8;
NSString * resampling = [[NSUserDefaults standardUserDefaults] stringForKey:@"resampling"];
if ([resampling isEqualToString:@"zoh"])
interp = 1;
else if ([resampling isEqualToString:@"blep"])
interp = 1;
else if ([resampling isEqualToString:@"linear"])
interp = 2;
else if ([resampling isEqualToString:@"blam"])
interp = 2;
else if ([resampling isEqualToString:@"cubic"])
interp = 4;
else if ([resampling isEqualToString:@"sinc"])
interp = 8;

try {
std::map< std::string, std::string > ctls;
ctls["seek.sync_samples"] = "1";
mod = new openmpt::module( data, std::clog, ctls );
mod->select_subsong(track_num);
length = mod->get_duration_seconds() * 44100.0;
mod->set_repeat_count( IsRepeatOneSet() ? -1 : 0 );
mod->set_render_param( openmpt::module::RENDER_MASTERGAIN_MILLIBEL, 0 );
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" );
left.resize( 1024 );
right.resize( 1024 );
} catch (std::exception & /*e*/) {
return NO;
}

[self willChangeValueForKey:@"properties"];
[self didChangeValueForKey:@"properties"];

return YES;
}

- (NSDictionary *)properties
{
return [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInt:0], @"bitrate",
[NSNumber numberWithFloat:44100], @"sampleRate",
[NSNumber numberWithDouble:length], @"totalFrames",
[NSNumber numberWithInt:32], @"bitsPerSample", //Samples are short
[NSNumber numberWithBool:YES], @"floatingPoint",
[NSNumber numberWithInt:2], @"channels", //output from gme_play is in stereo
[NSNumber numberWithBool:YES], @"seekable",
@"host", @"endian",
nil];
}

- (int)readAudio:(void *)buf frames:(UInt32)frames
{
mod->set_repeat_count( IsRepeatOneSet() ? -1 : 0 );

int total = 0;
while ( total < frames ) {
int framesToRender = 1024;
if ( framesToRender > frames )
framesToRender = frames;
std::size_t count = mod->read(44100, framesToRender, left.data(), right.data());
if ( count == 0 )
break;
for ( std::size_t frame = 0; frame < count; frame++ ) {
((float *)buf)[(total + frame) * 2 + 0] = left[frame];
((float *)buf)[(total + frame) * 2 + 1] = right[frame];
}
total += count;
if ( count < framesToRender )
break;
}
return total;
}

- (long)seek:(long)frame
{
mod->set_position_seconds( frame * (1.0 / 44100.0) );
return frame;
}

- (void)cleanUp
{
delete mod;
mod = NULL;
}

- (void)close
{
[self cleanUp];
if (source) {
[source close];
[self setSource:nil];
}
}

- (void)dealloc
{
[self close];
}

- (void)setSource:(id<CogSource>)s
{
source = s;
}

- (id<CogSource>)source
{
return source;
}

+ (NSArray *)fileTypes
{
std::vector<std::string> extensions = openmpt::get_supported_extensions();
g_push_archive_extensions(extensions);
NSMutableArray * array = [NSMutableArray array];
for (std::vector<std::string>::iterator ext = extensions.begin(); ext != extensions.end(); ++ext) {
[array addObject:[NSString stringWithUTF8String:ext->c_str()]];
}
return array;
}

+ (NSArray *)mimeTypes
{
return [NSArray arrayWithObjects:@"audio/x-it", @"audio/x-xm", @"audio/x-s3m", @"audio/x-mod", nil];
}

+ (float)priority
{
return 1.0;
}

@end

+ 17
- 0
Plugins/OpenMPT/OpenMPT/OMPTMetadataReader.h View File

@@ -0,0 +1,17 @@
//
// OMPTMetadataReader.h
// OpenMPT
//
// Created by Christopher Snowhill on 1/4/18.
// Copyright 2018 __LoSnoCo__. All rights reserved.
//

#import <Cocoa/Cocoa.h>

#import "Plugin.h"

@interface OMPTMetadataReader : NSObject <CogMetadataReader> {

}

@end

+ 97
- 0
Plugins/OpenMPT/OpenMPT/OMPTMetadataReader.mm View File

@@ -0,0 +1,97 @@
//
// OMPTMetadataReader.m
// OpenMPT
//
// Created by Christopher Snowhill on 1/4/18.
// Copyright 2018 __LoSnoCo__. All rights reserved.
//

#import "OMPTMetadataReader.h"
#import "OMPTDecoder.h"

#import <OpenMPT/libopenmpt.hpp>

#import "Logging.H"

@implementation OMPTMetadataReader

+ (NSArray *)fileTypes
{
return [OMPTDecoder fileTypes];
}

+ (NSArray *)mimeTypes
{
return [OMPTDecoder mimeTypes];
}

+ (float)priority
{
return 1.0f;
}

+ (NSDictionary *)metadataForURL:(NSURL *)url
{
id audioSourceClass = NSClassFromString(@"AudioSource");
id<CogSource> source = [audioSourceClass audioSourceForURL:url];
if (![source open:url])
return 0;
if (![source seekable])
return 0;

[source seek:0 whence:SEEK_END];
long size = [source tell];
[source seek:0 whence:SEEK_SET];
std::vector<char> data( static_cast<std::size_t>( size ) );

[source read:data.data() amount:size];

int track_num;
if ([[url fragment] length] == 0)
track_num = 0;
else
track_num = [[url fragment] intValue];

try {
std::map< std::string, std::string > ctls;
openmpt::module * mod = new openmpt::module( data, std::clog, ctls );
NSString * title = nil;
NSString * artist = nil;
//NSString * comment = nil;
NSString * date = nil;
std::vector<std::string> keys = mod->get_metadata_keys();
for ( std::vector<std::string>::iterator key = keys.begin(); key != keys.end(); ++key ) {
if ( *key == "title" )
title = [NSString stringWithUTF8String: mod->get_metadata( *key ).c_str()];
else if ( *key == "artist" )
artist = [NSString stringWithUTF8String: mod->get_metadata( *key ).c_str()];
/*else if ( *key == "message" )
comment = [NSString stringWithUTF8String: mod->get_metadata( *key ).c_str()];*/
else if ( *key == "date" )
date = [NSString stringWithUTF8String: mod->get_metadata( *key ).c_str()];
}
delete mod;
if (title == nil)
title = @"";
if (artist == nil)
artist = @"";
/*if (comment == nil)
comment = @"";*/
if (date == nil)
date = @"";
return [NSDictionary dictionaryWithObjectsAndKeys:title, @"title", artist, @"artist", /*comment, @"comment",*/ date, @"year", nil];
} catch (std::exception & /*e*/) {
return 0;
}
}

@end

Loading…
Cancel
Save