Switch to the new taglib-sharp version. Add support for opus.

gchudov · Mar 12, 2018 · 807063f · 807063f
1 parent 284da94
commit 807063f
Show file tree

Hide file tree

Showing 284 changed files with 50 additions and 92,502 deletions.
diff --git a/CUERipper/CUERipper.csproj b/CUERipper/CUERipper.csproj
@@ -181,8 +181,8 @@
       <Project>{8DD1E84B-0B03-4C0B-9B42-1E49F75E7CB1}</Project>
       <Name>ProgressODoom</Name>
     </ProjectReference>
-    <ProjectReference Include="..\taglib-sharp\src\taglib-sharp.csproj">
-      <Project>{6B143A39-C7B2-4743-9917-92262C60E9A6}</Project>
+    <ProjectReference Include="..\ThirdParty\taglib-sharp\src\taglib-sharp.csproj">
+      <Project>{1219a514-d3fa-40db-bbb2-92ce05e35839}</Project>
       <Name>taglib-sharp</Name>
     </ProjectReference>
   </ItemGroup>

diff --git a/CUETools.Codecs/CUEToolsCodecsConfig.cs b/CUETools.Codecs/CUEToolsCodecsConfig.cs
@@ -56,6 +56,7 @@ public CUEToolsCodecsConfig(List<Type> encs, List<Type> decs)
                 encoders.Add(new CUEToolsUDC("VBR (lame.exe)", "mp3", false, "V9 V8 V7 V6 V5 V4 V3 V2 V1 V0", "V2", "lame.exe", "--vbr-new -%M - %O"));
 				encoders.Add(new CUEToolsUDC("CBR (lame.exe)", "mp3", false, "96 128 192 256 320", "256", "lame.exe", "-m s -q 0 -b %M --noreplaygain - %O"));
                 encoders.Add(new CUEToolsUDC("oggenc", "ogg", false, "-1 -0.5 0 0.5 1 1.5 2 2.5 3 3.5 4 4.5 5 5.5 6 6.5 7 7.5 8", "3", "oggenc.exe", "-q %M - -o %O"));
+                encoders.Add(new CUEToolsUDC("opusenc", "opus", false, "6 16 32 48 64 96 128 192 256", "128", "opusenc.exe", "--bitrate %M - %O"));
                 encoders.Add(new CUEToolsUDC("nero aac", "m4a", false, "0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9", "0.4", "neroAacEnc.exe", "-q %M -if - -of %O"));
                 encoders.Add(new CUEToolsUDC("qaac tvbr", "m4a", false, "10 20 30 40 50 60 70 80 90 100 110 127", "80", "qaac.exe", "-s -V %M -q 2 - -o %O"));
 
@@ -80,6 +81,7 @@ public CUEToolsCodecsConfig(List<Type> encs, List<Type> decs)
             formats.Add("wma", new CUEToolsFormat("wma", CUEToolsTagger.TagLibSharp, true, true, false, true, encoders.GetDefault("wma", true), encoders.GetDefault("wma", false), decoders.GetDefault("wma", true)));
             formats.Add("mp3", new CUEToolsFormat("mp3", CUEToolsTagger.TagLibSharp, false, true, false, true, null, encoders.GetDefault("mp3", false), null));
             formats.Add("ogg", new CUEToolsFormat("ogg", CUEToolsTagger.TagLibSharp, false, true, false, true, null, encoders.GetDefault("ogg", false), null));
+            formats.Add("opus", new CUEToolsFormat("opus", CUEToolsTagger.TagLibSharp, false, true, false, true, null, encoders.GetDefault("opus", false), null));
         }
     }
 }
diff --git a/CUETools.Converter/CUETools.Converter.csproj b/CUETools.Converter/CUETools.Converter.csproj
@@ -25,7 +25,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj" />
-    <ProjectReference Include="..\taglib-sharp\src\taglib-sharp.csproj" />
     <ProjectReference Include="..\CUETools.Processor\CUETools.Processor.csproj" />
   </ItemGroup>
 

diff --git a/CUETools.Processor/CUETools.Processor.csproj b/CUETools.Processor/CUETools.Processor.csproj
@@ -30,7 +30,9 @@
     <ProjectReference Include="..\CUETools.CTDB\CUETools.CTDB.csproj" />
     <ProjectReference Include="..\CUETools.Ripper\CUETools.Ripper.csproj" />
     <ProjectReference Include="..\Freedb\Freedb.csproj" />
-    <ProjectReference Include="..\taglib-sharp\src\taglib-sharp.csproj" />
+    <ProjectReference Include="..\ThirdParty\taglib-sharp\src\taglib-sharp.csproj">
+      <Private>true</Private>
+    </ProjectReference>
   </ItemGroup>
 
 </Project>
diff --git a/CUETools.eac3to/CUETools.eac3to.csproj b/CUETools.eac3to/CUETools.eac3to.csproj
@@ -25,7 +25,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj" />
-    <ProjectReference Include="..\taglib-sharp\src\taglib-sharp.csproj" />
     <ProjectReference Include="..\CUETools.Processor\CUETools.Processor.csproj" />
     <ProjectReference Include="..\CUETools.CTDB\CUETools.CTDB.csproj" />
     <ProjectReference Include="..\CUETools.Codecs.BDLPCM\CUETools.Codecs.BDLPCM.csproj" />

diff --git a/CUETools/CUETools.csproj b/CUETools/CUETools.csproj
@@ -276,8 +276,8 @@
       <Project>{5ADCFD6D-BFEA-4B10-BB45-9083BBB56AF4}</Project>
       <Name>Freedb</Name>
     </ProjectReference>
-    <ProjectReference Include="..\taglib-sharp\src\taglib-sharp.csproj">
-      <Project>{6b143a39-c7b2-4743-9917-92262c60e9a6}</Project>
+    <ProjectReference Include="..\ThirdParty\taglib-sharp\src\taglib-sharp.csproj">
+      <Project>{1219a514-d3fa-40db-bbb2-92ce05e35839}</Project>
       <Name>taglib-sharp</Name>
     </ProjectReference>
   </ItemGroup>
@@ -319,6 +319,7 @@
     <None Include="Resources\picture.ico" />
     <None Include="Resources\wma.ico" />
     <None Include="Resources\more\card--pencil.png" />
+    <Content Include="Resources\opus.ico" />
     <Content Include="unrar.dll">
     </Content>
     <Content Include="Resources\accuraterip_16.bmp" />

diff --git a/CUETools/CUETools.sln b/CUETools/CUETools.sln
@@ -107,9 +107,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CUETools.Codecs.TTA", "..\CUETools.Codecs.TTA\CUETools.Codecs.TTA.vcxproj", "{1D1E99BC-6D22-41C0-BD94-FF4DD5EC725B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUETools.Converter", "..\CUETools.Converter\CUETools.Converter.csproj", "{115CC5B0-0385-41CD-8A23-6A7EA4C51926}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6B143A39-C7B2-4743-9917-92262C60E9A6} = {6B143A39-C7B2-4743-9917-92262C60E9A6}
-	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUEControls", "..\CUEControls\CUEControls.csproj", "{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}"
 EndProject
@@ -173,8 +170,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CUETools.AVX", "..\CUETools
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Third Party Libraries", "Third Party Libraries", "{7E402406-7E51-4F0D-8209-60824C1CD6E8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "taglib-sharp", "..\taglib-sharp\src\taglib-sharp.csproj", "{6B143A39-C7B2-4743-9917-92262C60E9A6}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsMediaLib", "..\WindowsMediaLib\WindowsMediaLib.csproj", "{7EA4160F-3BBD-47C9-A38C-4053B64B24A8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUETools.Codecs.WMA", "..\CUETools.Codecs.WMA\CUETools.Codecs.WMA.csproj", "{082D6B9E-326E-4D15-9798-DE70A6EDAE9E}"
@@ -193,6 +188,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUETools.CTDB.Types", "..\C
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUETools.Codecs.libFLAC", "..\CUETools.Codecs.libFLAC\CUETools.Codecs.libFLAC.csproj", "{F10AB92C-9AFB-4FC0-94E0-06FCD3CA8155}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "taglib-sharp", "..\ThirdParty\taglib-sharp\src\taglib-sharp.csproj", "{1219A514-D3FA-40DB-BBB2-92CE05E35839}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -983,20 +980,6 @@ Global
 		{CC022842-F2E9-4016-82B8-65A264B642D5}.Release|Win32.ActiveCfg = Release|Win32
 		{CC022842-F2E9-4016-82B8-65A264B642D5}.Release|x64.ActiveCfg = Release|x64
 		{CC022842-F2E9-4016-82B8-65A264B642D5}.Release|x86.ActiveCfg = Release|Win32
-		{6B143A39-C7B2-4743-9917-92262C60E9A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B143A39-C7B2-4743-9917-92262C60E9A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B143A39-C7B2-4743-9917-92262C60E9A6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6B143A39-C7B2-4743-9917-92262C60E9A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6B143A39-C7B2-4743-9917-92262C60E9A6}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{6B143A39-C7B2-4743-9917-92262C60E9A6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6B143A39-C7B2-4743-9917-92262C60E9A6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6B143A39-C7B2-4743-9917-92262C60E9A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B143A39-C7B2-4743-9917-92262C60E9A6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B143A39-C7B2-4743-9917-92262C60E9A6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6B143A39-C7B2-4743-9917-92262C60E9A6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6B143A39-C7B2-4743-9917-92262C60E9A6}.Release|Win32.ActiveCfg = Release|Any CPU
-		{6B143A39-C7B2-4743-9917-92262C60E9A6}.Release|x64.ActiveCfg = Release|Any CPU
-		{6B143A39-C7B2-4743-9917-92262C60E9A6}.Release|x86.ActiveCfg = Release|Any CPU
 		{7EA4160F-3BBD-47C9-A38C-4053B64B24A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7EA4160F-3BBD-47C9-A38C-4053B64B24A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7EA4160F-3BBD-47C9-A38C-4053B64B24A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1117,6 +1100,26 @@ Global
 		{F10AB92C-9AFB-4FC0-94E0-06FCD3CA8155}.Release|x64.ActiveCfg = Release|Any CPU
 		{F10AB92C-9AFB-4FC0-94E0-06FCD3CA8155}.Release|x86.ActiveCfg = Release|Any CPU
 		{F10AB92C-9AFB-4FC0-94E0-06FCD3CA8155}.Release|x86.Build.0 = Release|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|Win32.Build.0 = Debug|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|x64.Build.0 = Debug|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|x86.Build.0 = Debug|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|Win32.ActiveCfg = Release|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|Win32.Build.0 = Release|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|x64.ActiveCfg = Release|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|x64.Build.0 = Release|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|x86.ActiveCfg = Release|Any CPU
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1166,14 +1169,14 @@ Global
 		{84EBB7CB-02C9-40A9-9D32-C641B822DAA2} = {D9D97BB6-002F-4858-8EF2-49B4C4C4DDB4}
 		{0AC7691C-562A-4879-8A11-6C7890BF659B} = {86BBE3FC-E4E5-4190-B675-C6745EAF4E64}
 		{F8C29953-A697-4462-82DC-DA7146654A64} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D}
-		{6B143A39-C7B2-4743-9917-92262C60E9A6} = {7E402406-7E51-4F0D-8209-60824C1CD6E8}
 		{7EA4160F-3BBD-47C9-A38C-4053B64B24A8} = {7E402406-7E51-4F0D-8209-60824C1CD6E8}
 		{082D6B9E-326E-4D15-9798-DE70A6EDAE9E} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D}
 		{E75F7CCD-4266-42E1-A039-DC7EB5EDD8F6} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D}
 		{E3FF7539-6B22-4922-8FEF-6D26F2C2E3CE} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D}
 		{678875A6-6B3A-4AAC-83B6-D9A72D9016CF} = {BC0C1801-0212-4ECC-92D5-8F2D6F69E888}
 		{2D8D7A03-DFFA-44EF-9299-8BB56D122245} = {BC0C1801-0212-4ECC-92D5-8F2D6F69E888}
 		{F10AB92C-9AFB-4FC0-94E0-06FCD3CA8155} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D}
+		{1219A514-D3FA-40DB-BBB2-92CE05E35839} = {7E402406-7E51-4F0D-8209-60824C1CD6E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C634D169-5814-4203-94B6-6A11371DDA95}

diff --git a/CUETools/Properties/Resources.Designer.cs b/CUETools/Properties/Resources.Designer.cs
diff --git a/CUETools/Properties/Resources.resx b/CUETools/Properties/Resources.resx
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="basket" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -277,8 +277,10 @@
   <data name="alarm-clock--minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\alarm-clock--minus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="card--pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\more\card--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="opus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\opus.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/CUETools/Resources/opus.ico b/CUETools/Resources/opus.ico
diff --git a/CUETools/frmCUETools.cs b/CUETools/frmCUETools.cs
@@ -64,6 +64,7 @@ public frmCUETools()
             m_icon_mgr.SetExtensionIcon(".m4a", global::JDP.Properties.Resources.ipod_sound);
             m_icon_mgr.SetExtensionIcon(".wma", global::JDP.Properties.Resources.wma);
             m_icon_mgr.SetExtensionIcon(".ogg", global::JDP.Properties.Resources.ogg);
+            m_icon_mgr.SetExtensionIcon(".opus", global::JDP.Properties.Resources.opus);
             m_icon_mgr.SetExtensionIcon(".cue", global::JDP.Properties.Resources.cue3);
             m_icon_mgr.SetExtensionIcon(".#puzzle", global::JDP.Properties.Resources.puzzle);
             m_icon_mgr.SetExtensionIcon(".#users", global::JDP.Properties.Resources.users);

diff --git a/ThirdParty/taglib-sharp b/ThirdParty/taglib-sharp
diff --git a/taglib-sharp/.gitignore b/taglib-sharp/.gitignore
diff --git a/taglib-sharp/.gitmodules b/taglib-sharp/.gitmodules
diff --git a/taglib-sharp/AUTHORS b/taglib-sharp/AUTHORS
+16 −0		src/TagLib/Aac/AudioHeader.cs
+17 −1		src/TagLib/Aiff/StreamHeader.cs
+18 −2		src/TagLib/Ape/StreamHeader.cs
+69 −0		src/TagLib/Ape/Tag.cs
+8 −0		src/TagLib/Asf/FilePropertiesObject.cs
+35 −0		src/TagLib/Asf/Tag.cs
+157 −0		src/TagLib/CombinedTag.cs
+13 −1		src/TagLib/Dsf/StreamHeader.cs
+18 −2		src/TagLib/Flac/StreamHeader.cs
+12 −2		src/TagLib/ICodec.cs
+3 −0		src/TagLib/Id3v2/FrameTypes.cs
+72 −0		src/TagLib/Id3v2/Tag.cs
+17 −2		src/TagLib/Matroska/AudioTrack.cs
+30 −0		src/TagLib/Matroska/Tag.cs
+12 −0		src/TagLib/Mpc/StreamHeader.cs
+18 −2		src/TagLib/Mpeg/AudioHeader.cs
+84 −7		src/TagLib/Mpeg4/AppleTag.cs
+1 −1		src/TagLib/Mpeg4/BoxFactory.cs
+18 −2		src/TagLib/Mpeg4/Boxes/IsoAudioSampleEntry.cs
+12 −0		src/TagLib/Ogg/Codecs/Opus.cs
+22 −2		src/TagLib/Ogg/Codecs/Vorbis.cs
+133 −0		src/TagLib/Ogg/GroupedComment.cs
+78 −0		src/TagLib/Ogg/XiphComment.cs
+30 −2		src/TagLib/Properties.cs
+18 −2		src/TagLib/Riff/WaveFormatEx.cs
+78 −0		src/TagLib/Tag.cs
+23 −3		src/TagLib/WavPack/File.cs
+24 −2		src/TagLib/WavPack/StreamHeader.cs