rereorganizing

ArCueDotNet/ArCueDotNet.csproj

@@ -81,7 +81,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CUEToolsLib\CUETools.Processor.csproj">
+    <ProjectReference Include="..\CUETools.Processor\CUETools.Processor.csproj">
       <Project>{4911BD82-49EF-4858-8B51-5394F86739A4}</Project>
       <Name>CUETools.Processor</Name>
     </ProjectReference>

CUETools.AccurateRip/CUETools.AccurateRip.csproj

@@ -87,7 +87,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\AudioCodecsDotNet\CUETools.Codecs.csproj">
+    <ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj">
       <Project>{6458A13A-30EF-45A9-9D58-E5031B17BEE2}</Project>
       <Name>CUETools.Codecs</Name>
     </ProjectReference>

CUETools.Codec.FLAC/CUETools.Codecs.FLAC.cpp

@@ -181,7 +181,7 @@ namespace FLACDotNet {
 			}
 		}
 
-		virtual bool UpdateTags (bool preserveTime)
+		bool UpdateTags (bool preserveTime)
 		{
 		    Close ();
 		    

CUETools.Codec.FLAC/CUETools.Codecs.FLAC.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="FLACDotNet"
+	Name="CUETools.Codecs.FLAC"
 	ProjectGUID="{E70FA90A-7012-4A52-86B5-362B699D1540}"
-	RootNamespace="FLACDotNet"
+	RootNamespace="CUETools.Codecs.FLAC"
 	Keyword="ManagedCProj"
 	>
 	<Platforms>
@@ -344,7 +344,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\FLACDotNet.cpp"
+				RelativePath=".\CUETools.Codecs.FLAC.cpp"
 				>
 			</File>
 		</Filter>

CUETools.Codecs.ALAC/CUETools.Codecs.ALAC.csproj

@@ -87,7 +87,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\AudioCodecsDotNet\CUETools.Codecs.csproj">
+    <ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj">
       <Project>{6458A13A-30EF-45A9-9D58-E5031B17BEE2}</Project>
       <Name>CUETools.Codecs</Name>
     </ProjectReference>

CUETools.Codecs.APE/CUETools.Codecs.APE.cpp

@@ -229,16 +229,6 @@ namespace APEDotNet {
 			}
 		}
 
-		virtual bool UpdateTags(bool preserveTime)
-		{
-			Close ();
-			APETagDotNet^ apeTag = gcnew APETagDotNet (_path, true, false);
-			apeTag->SetStringTags (_tags, true);
-			apeTag->Save();
-			apeTag->Close();
-			return true;
-		}
-
 		virtual UInt32 Read([Out] array<Int32, 2>^ buff, UInt32 sampleCount)
 		{
 			UInt32 buffOffset = 0;

CUETools.Codecs.APE/CUETools.Codecs.APE.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="APEDotNet"
+	Name="CUETools.Codecs.APE"
 	ProjectGUID="{9AE965C4-301E-4C01-B90F-297AF341ACC6}"
-	RootNamespace="APEDotNet"
+	RootNamespace="CUETools.Codecs.APE"
 	Keyword="ManagedCProj"
 	>
 	<Platforms>
@@ -349,7 +349,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\APEDotNet.cpp"
+				RelativePath=".\CUETools.Codecs.APE.cpp"
 				>
 			</File>
 			<File
@@ -399,7 +399,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\APEDotNet.h"
+				RelativePath=".\CUETools.Codecs.APE.h"
 				>
 			</File>
 			<File

CUETools.Codecs.LossyWAV/CUETools.Codecs.LossyWAV.csproj

@@ -85,7 +85,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\AudioCodecsDotNet\CUETools.Codecs.csproj">
+    <ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj">
       <Project>{6458A13A-30EF-45A9-9D58-E5031B17BEE2}</Project>
       <Name>CUETools.Codecs</Name>
     </ProjectReference>

CUETools.Codecs.WavPack/CUETools.Codecs.WavPack.cpp

@@ -172,20 +172,9 @@ namespace WavPackDotNet {
 			}
 		}
 
-		virtual bool UpdateTags(bool preserveTime)
-		{
-			Close ();
-			APETagDotNet^ apeTag = gcnew APETagDotNet (_path, true, false);
-			apeTag->SetStringTags (_tags, true);
-			apeTag->Save();
-			apeTag->Close();
-			return true;
-		}
-
 		virtual void Close() 
 		{
-			if (_wpc != NULL)
+			_wpc = WavpackCloseFile(_wpc);
-				_wpc = WavpackCloseFile(_wpc);
 			if (_IO != nullptr) 
 			{
 				_IO->Close ();

CUETools.Codecs.WavPack/CUETools.Codecs.WavPack.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="WavPackDotNet"
+	Name="CUETools.Codecs.WavPack"
 	ProjectGUID="{CC2E74B6-534A-43D8-9F16-AC03FE955000}"
-	RootNamespace="WavPackDotNet"
+	RootNamespace="CUETools.Codecs.WavPack"
 	Keyword="ManagedCProj"
 	>
 	<Platforms>
@@ -352,7 +352,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\WavPackDotNet.cpp"
+				RelativePath=".\CUETools.Codecs.WavPack.cpp"
 				>
 			</File>
 		</Filter>

CUETools.Ripper.Console/CUERipper.csproj

@@ -81,7 +81,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\AudioCodecsDotNet\CUETools.Codecs.csproj">
+    <ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj">
       <Project>{6458A13A-30EF-45A9-9D58-E5031B17BEE2}</Project>
       <Name>CUETools.Codecs</Name>
     </ProjectReference>
@@ -97,7 +97,7 @@
       <Project>{8CF07381-BEA2-4AFC-B3DD-9B2F21C65A3A}</Project>
       <Name>CUETools.Ripper.SCSI</Name>
     </ProjectReference>
-    <ProjectReference Include="..\FLACDotNet\FLACDotNet.vcproj">
+    <ProjectReference Include="..\CUETools.Codec.FLAC\CUETools.Codecs.FLAC.vcproj">
       <Project>{E70FA90A-7012-4A52-86B5-362B699D1540}</Project>
       <Name>FLACDotNet</Name>
     </ProjectReference>

CUETools.Ripper.SCSI/CUETools.Ripper.SCSI.csproj

@@ -89,7 +89,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\AudioCodecsDotNet\CUETools.Codecs.csproj">
+    <ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj">
       <Project>{6458A13A-30EF-45A9-9D58-E5031B17BEE2}</Project>
       <Name>CUETools.Codecs</Name>
     </ProjectReference>

CUETools/CUETools.csproj

@@ -185,7 +185,7 @@
     <Compile Include="Settings.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CUEToolsLib\CUETools.Processor.csproj">
+    <ProjectReference Include="..\CUETools.Processor\CUETools.Processor.csproj">
       <Project>{4911BD82-49EF-4858-8B51-5394F86739A4}</Project>
       <Name>CUETools.Processor</Name>
     </ProjectReference>

CUETools/CUETools.sln

@@ -3,12 +3,12 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools", "CUETools.csproj", "{EF351583-A9CD-4530-92C3-20AC02136BC2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FLACDotNet", "..\FLACDotNet\FLACDotNet.vcproj", "{E70FA90A-7012-4A52-86B5-362B699D1540}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CUETools.Codecs.FLAC", "..\CUETools.Codec.FLAC\CUETools.Codecs.FLAC.vcproj", "{E70FA90A-7012-4A52-86B5-362B699D1540}"
 	ProjectSection(ProjectDependencies) = postProject
 		{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APEDotNet", "..\APEDotNet\APEDotNet.vcproj", "{9AE965C4-301E-4C01-B90F-297AF341ACC6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CUETools.Codecs.APE", "..\CUETools.Codecs.APE\CUETools.Codecs.APE.vcproj", "{9AE965C4-301E-4C01-B90F-297AF341ACC6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0B9C97D4-61B8-4294-A1DF-BA90752A1779} = {0B9C97D4-61B8-4294-A1DF-BA90752A1779}
 		{CA200BCB-DFC6-4153-9BD4-785BC768B26B} = {CA200BCB-DFC6-4153-9BD4-785BC768B26B}
@@ -16,7 +16,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APEDotNet", "..\APEDotNet\A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodecLibs", "CodecLibs", "{8B179853-B7D6-479C-B8B2-6CBCE835D040}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WavPackDotNet", "..\WavPackDotNet\WavPackDotNet.vcproj", "{CC2E74B6-534A-43D8-9F16-AC03FE955000}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CUETools.Codecs.WavPack", "..\CUETools.Codecs.WavPack\CUETools.Codecs.WavPack.vcproj", "{CC2E74B6-534A-43D8-9F16-AC03FE955000}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA200BCB-DFC6-4153-9BD4-785BC768B26B} = {CA200BCB-DFC6-4153-9BD4-785BC768B26B}
 		{5CCCB9CF-0384-458F-BA08-72B73866840F} = {5CCCB9CF-0384-458F-BA08-72B73866840F}
@@ -34,7 +34,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwavpack", "..\wavpack-4.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArCueDotNet", "..\ArCueDotNet\ArCueDotNet.csproj", "{A5A8D8FA-9E32-4010-8AAF-AE580C5AF728}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Processor", "..\CUEToolsLib\CUETools.Processor.csproj", "{4911BD82-49EF-4858-8B51-5394F86739A4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Processor", "..\CUETools.Processor\CUETools.Processor.csproj", "{4911BD82-49EF-4858-8B51-5394F86739A4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9AE965C4-301E-4C01-B90F-297AF341ACC6} = {9AE965C4-301E-4C01-B90F-297AF341ACC6}
 		{CC2E74B6-534A-43D8-9F16-AC03FE955000} = {CC2E74B6-534A-43D8-9F16-AC03FE955000}
@@ -43,13 +43,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Processor", "..\CU
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HDCDDotNet", "..\HDCDDotNet\HDCDDotNet.csproj", "{32338A04-5B6B-4C63-8EE7-C6400F73B5D7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Codecs", "..\AudioCodecsDotNet\CUETools.Codecs.csproj", "{6458A13A-30EF-45A9-9D58-E5031B17BEE2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Codecs", "..\CUETools.Codecs\CUETools.Codecs.csproj", "{6458A13A-30EF-45A9-9D58-E5031B17BEE2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Codecs.ALAC", "..\ALACDotNet\CUETools.Codecs.ALAC.csproj", "{F2EC7193-D5E5-4252-9803-5CEB407E910F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Codecs.ALAC", "..\CUETools.Codecs.ALAC\CUETools.Codecs.ALAC.csproj", "{F2EC7193-D5E5-4252-9803-5CEB407E910F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnRarDotNet", "..\UnRarDotNet\UnRarDotNet.csproj", "{8427CAA5-80B8-4952-9A68-5F3DFCFBDF40}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Codecs.LossyWAV", "..\LossyWAVDotNet\CUETools.Codecs.LossyWAV.csproj", "{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Codecs.LossyWAV", "..\CUETools.Codecs.LossyWAV\CUETools.Codecs.LossyWAV.csproj", "{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LossyWAVSharp", "..\LossyWAVSharp\LossyWAVSharp.csproj", "{A574F3B1-E38B-4EE4-9394-49D6E2DF52EA}"
 EndProject

CUEToolsLib/AudioReadWrite.cs

@@ -1,102 +0,0 @@
-using System;
-using System.IO;
-using FLACDotNet;
-using WavPackDotNet;
-using APEDotNet;
-using CUETools.Codecs;
-using CUETools.Codecs.ALAC;
-using CUETools.Codecs.LossyWAV;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-
-namespace CUETools.Processor
-{
-	public static class AudioReadWrite {
-		public static IAudioSource GetAudioSource(string path, Stream IO, string extension)
-		{
-			switch (extension)
-			{
-				case ".wav":
-					return new WAVReader(path, IO);
-				case ".m4a":
-					return new ALACReader(path, IO);
-#if !MONO
-				case ".flac":
-					return new FLACReader(path, IO);
-				case ".wv":
-					return new WavPackReader(path, IO, null);
-				case ".ape":
-					return new APEReader(path, IO);
-#endif
-				default:
-					throw new Exception("Unsupported audio type.");
-			}
-		}
-
-		public static IAudioSource GetAudioSource(string path, Stream IO)
-		{
-			string extension = Path.GetExtension(path).ToLower();
-			string filename = Path.GetFileNameWithoutExtension(path);
-			string secondExtension = Path.GetExtension(filename).ToLower();
-			if (secondExtension != ".lossy" && secondExtension != ".lwcdf")
-				return GetAudioSource(path, IO, extension);
-
-			string lossyPath = Path.Combine(Path.GetDirectoryName(path), Path.GetFileNameWithoutExtension(filename) + ".lossy" + extension);
-			string lwcdfPath = Path.Combine(Path.GetDirectoryName(path), Path.GetFileNameWithoutExtension(filename) + ".lwcdf" + extension);
-			IAudioSource lossySource = GetAudioSource(lossyPath, null, extension);
-			IAudioSource lwcdfSource = GetAudioSource(lwcdfPath, null, extension);
-			return new LossyWAVReader(lossySource, lwcdfSource);
-		}
-
-		public static IAudioDest GetAudioDest(string path, int bitsPerSample, int channelCount, int sampleRate, long finalSampleCount, string extension, CUEConfig config) {
-			IAudioDest dest;
-			switch (extension) {
-				case ".wav":
-					dest = new WAVWriter(path, bitsPerSample, channelCount, sampleRate, null);
-					break;
-#if !MONO
-				case ".flac":
-					dest = new FLACWriter(path, bitsPerSample, channelCount, sampleRate);
-					((FLACWriter)dest).CompressionLevel = (int)config.flacCompressionLevel;
-					((FLACWriter)dest).Verify = config.flacVerify;
-					break;
-				case ".wv":
-					dest = new WavPackWriter(path, bitsPerSample, channelCount, sampleRate);
-					((WavPackWriter)dest).CompressionMode = config.wvCompressionMode;
-					((WavPackWriter)dest).ExtraMode = config.wvExtraMode;
-					((WavPackWriter)dest).MD5Sum = config.wvStoreMD5;
-					break;
-				case ".ape":
-					dest = new APEWriter(path, bitsPerSample, channelCount, sampleRate);
-					((APEWriter)dest).CompressionLevel = (int)config.apeCompressionLevel;
-					break;
-				case ".dummy":
-					dest = new DummyWriter(path, bitsPerSample, channelCount, sampleRate); 
-					break;
-#endif
-				default:
-					throw new Exception("Unsupported audio type.");
-			}
-			dest.FinalSampleCount = finalSampleCount;
-			return dest;
-		}
-
-		public static IAudioDest GetAudioDest(string path, long finalSampleCount, CUEConfig config)
-		{
-			string extension = Path.GetExtension(path).ToLower();
-			string filename = Path.GetFileNameWithoutExtension(path);
-			if (Path.GetExtension(filename).ToLower() != ".lossy")
-			{
-				int bitsPerSample = (config.detectHDCD && config.decodeHDCD) ? (config.decodeHDCDto24bit ? 24 : 20) : 16;
-				return GetAudioDest(path, bitsPerSample, 2, 44100, finalSampleCount, extension, config);
-			}
-
-			string lwcdfPath = Path.Combine(Path.GetDirectoryName(path), Path.GetFileNameWithoutExtension(filename) + ".lwcdf" + extension);
-			int destBitsPerSample = (config.detectHDCD && config.decodeHDCD) ? ((!config.decodeHDCDtoLW16 && config.decodeHDCDto24bit) ? 24 : 20) : 16;
-			int lossyBitsPerSample = (config.detectHDCD && config.decodeHDCD && !config.decodeHDCDtoLW16) ? 24 : 16;
-			IAudioDest lossyDest = GetAudioDest(path, lossyBitsPerSample, 2, 44100, finalSampleCount, extension, config);
-			IAudioDest lwcdfDest = GetAudioDest(lwcdfPath, destBitsPerSample, 2, 44100, finalSampleCount, extension, config);
-			return new LossyWAVWriter(lossyDest, lwcdfDest, destBitsPerSample, 2, 44100, config.lossyWAVQuality);
-		}
-	}
-}

CUEToolsLib/CUETools.Processor.csproj

@@ -1,149 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4911BD82-49EF-4858-8B51-5394F86739A4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CUETools.Processor</RootNamespace>
-    <AssemblyName>CUETools.Processor</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\bin\win32\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\bin\win32\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisRuleAssemblies>C:\Program Files (x86)\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules</CodeAnalysisRuleAssemblies>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>..\bin\win32\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisRuleAssemblies>C:\Program Files (x86)\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules</CodeAnalysisRuleAssemblies>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisRuleAssemblies>C:\Program Files (x86)\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules</CodeAnalysisRuleAssemblies>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>..\bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisRuleAssemblies>C:\Program Files (x86)\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules</CodeAnalysisRuleAssemblies>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AudioReadWrite.cs" />
-    <Compile Include="Main.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Settings.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ALACDotNet\CUETools.Codecs.ALAC.csproj">
-      <Project>{F2EC7193-D5E5-4252-9803-5CEB407E910F}</Project>
-      <Name>CUETools.Codecs.ALAC</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\APEDotNet\APEDotNet.vcproj">
-      <Project>{9AE965C4-301E-4C01-B90F-297AF341ACC6}</Project>
-      <Name>APEDotNet</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\AudioCodecsDotNet\CUETools.Codecs.csproj">
-      <Project>{6458A13A-30EF-45A9-9D58-E5031B17BEE2}</Project>
-      <Name>CUETools.Codecs</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\CUETools.AccurateRip\CUETools.AccurateRip.csproj">
-      <Project>{5802C7E9-157E-4124-946D-70B5AE48A5A1}</Project>
-      <Name>CUETools.AccurateRip</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\CUETools.CDImage\CUETools.CDImage.csproj">
-      <Project>{1DD41038-D885-46C5-8DDE-E0B82F066584}</Project>
-      <Name>CUETools.CDImage</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\CUETools.Ripper.SCSI\CUETools.Ripper.SCSI.csproj">
-      <Project>{8CF07381-BEA2-4AFC-B3DD-9B2F21C65A3A}</Project>
-      <Name>CUETools.Ripper.SCSI</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\FLACDotNet\FLACDotNet.vcproj">
-      <Project>{E70FA90A-7012-4A52-86B5-362B699D1540}</Project>
-      <Name>FLACDotNet</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\HDCDDotNet\HDCDDotNet.csproj">
-      <Project>{32338A04-5B6B-4C63-8EE7-C6400F73B5D7}</Project>
-      <Name>HDCDDotNet</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\LossyWAVDotNet\CUETools.Codecs.LossyWAV.csproj">
-      <Project>{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}</Project>
-      <Name>CUETools.Codecs.LossyWAV</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\MusicBrainz\MusicBrainz.csproj">
-      <Project>{74C2036B-2C9B-4FC8-B7BD-AE81A8DCE533}</Project>
-      <Name>MusicBrainz</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\UnRarDotNet\UnRarDotNet.csproj">
-      <Project>{8427CAA5-80B8-4952-9A68-5F3DFCFBDF40}</Project>
-      <Name>UnRarDotNet</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\WavPackDotNet\WavPackDotNet.vcproj">
-      <Project>{CC2E74B6-534A-43D8-9F16-AC03FE955000}</Project>
-      <Name>WavPackDotNet</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

CUEToolsLib/Properties/AssemblyInfo.cs

@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CUEToolsLib")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CUEToolsLib")]
-[assembly: AssemblyCopyright("Copyright © 2006-2008 Moitah, Gregory S. Chudov")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("d3afb938-f35e-4e5a-b650-7d7a4e885aff")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.4.0")]
-[assembly: AssemblyFileVersion("1.9.4.0")]

CUEToolsLib/Settings.cs

@@ -1,129 +0,0 @@
-// ****************************************************************************
-// 
-// CUE Tools
-// Copyright (C) 2006-2007  Moitah (moitah@yahoo.com)
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-// 
-// ****************************************************************************
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-
-namespace CUETools.Processor
-{
-	static class SettingsShared 
-	{
-		public static string GetMyAppDataDir(string appName) {
-			string appDataDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
-			string myAppDataDir = Path.Combine(appDataDir, appName);
-
-			if (Directory.Exists(myAppDataDir) == false) {
-				Directory.CreateDirectory(myAppDataDir);
-			}
-
-			return myAppDataDir;
-		}
-	}
-
-	public class SettingsReader {
-		Dictionary<string, string> _settings;
-
-		public SettingsReader(string appName, string fileName) {
-			_settings = new Dictionary<string, string>();
-
-			string path = Path.Combine(SettingsShared.GetMyAppDataDir(appName), fileName);
-			if (!File.Exists(path)) {
-				return;
-			}
-
-			using (StreamReader sr = new StreamReader(path, Encoding.UTF8)) {
-				string line, name, val;
-				int pos;
-
-				while ((line = sr.ReadLine()) != null) {
-					pos = line.IndexOf('=');
-					if (pos != -1) {
-						name = line.Substring(0, pos);
-						val = line.Substring(pos + 1);
-
-						if (!_settings.ContainsKey(name)) {
-							_settings.Add(name, val);
-						}
-					}
-				}
-			}
-		}
-
-		public string Load(string name) {
-			return _settings.ContainsKey(name) ? _settings[name] : null;
-		}
-
-		public bool? LoadBoolean(string name) {
-			string val = Load(name);
-			if (val == "0") return false;
-			if (val == "1") return true;
-			return null;
-		}
-
-		public int? LoadInt32(string name, int? min, int? max) {
-			int val;
-			if (!Int32.TryParse(Load(name), out val)) return null;
-			if (min.HasValue && (val < min.Value)) return null;
-			if (max.HasValue && (val > max.Value)) return null;
-			return val;
-		}
-
-		public uint? LoadUInt32(string name, uint? min, uint? max) {
-			uint val;
-			if (!UInt32.TryParse(Load(name), out val)) return null;
-			if (min.HasValue && (val < min.Value)) return null;
-			if (max.HasValue && (val > max.Value)) return null;
-			return val;
-		}
-	}
-
-	public class SettingsWriter {
-		StreamWriter _sw;
-
-		public SettingsWriter(string appName, string fileName) {
-			string path = Path.Combine(SettingsShared.GetMyAppDataDir(appName), fileName);
-
-			_sw = new StreamWriter(path, false, Encoding.UTF8);
-		}
-
-		public void Save(string name, string value) {
-			_sw.WriteLine(name + "=" + value);
-		}
-
-		public void Save(string name, bool value) {
-			Save(name, value ? "1" : "0");
-		}
-
-		public void Save(string name, int value) {
-			Save(name, value.ToString());
-		}
-
-		public void Save(string name, uint value) {
-			Save(name, value.ToString());
-		}
-
-		public void Close() {
-			_sw.Close();
-		}
-	}
-}

FLACDotNet/FLACDotNet.sln

@@ -1,36 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FLACDotNet", "FLACDotNet.vcproj", "{E70FA90A-7012-4A52-86B5-362B699D1540}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APEDotNet", "..\APEDotNet\APEDotNet.vcproj", "{9AE965C4-301E-4C01-B90F-297AF341ACC6}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E70FA90A-7012-4A52-86B5-362B699D1540}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E70FA90A-7012-4A52-86B5-362B699D1540}.Debug|Win32.Build.0 = Debug|Win32
-		{E70FA90A-7012-4A52-86B5-362B699D1540}.Debug|x64.ActiveCfg = Debug|x64
-		{E70FA90A-7012-4A52-86B5-362B699D1540}.Debug|x64.Build.0 = Debug|x64
-		{E70FA90A-7012-4A52-86B5-362B699D1540}.Release|Win32.ActiveCfg = Release|Win32
-		{E70FA90A-7012-4A52-86B5-362B699D1540}.Release|Win32.Build.0 = Release|Win32
-		{E70FA90A-7012-4A52-86B5-362B699D1540}.Release|x64.ActiveCfg = Release|x64
-		{E70FA90A-7012-4A52-86B5-362B699D1540}.Release|x64.Build.0 = Release|x64
-		{9AE965C4-301E-4C01-B90F-297AF341ACC6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9AE965C4-301E-4C01-B90F-297AF341ACC6}.Debug|Win32.Build.0 = Debug|Win32
-		{9AE965C4-301E-4C01-B90F-297AF341ACC6}.Debug|x64.ActiveCfg = Debug|x64
-		{9AE965C4-301E-4C01-B90F-297AF341ACC6}.Debug|x64.Build.0 = Debug|x64
-		{9AE965C4-301E-4C01-B90F-297AF341ACC6}.Release|Win32.ActiveCfg = Release|Win32
-		{9AE965C4-301E-4C01-B90F-297AF341ACC6}.Release|Win32.Build.0 = Release|Win32
-		{9AE965C4-301E-4C01-B90F-297AF341ACC6}.Release|x64.ActiveCfg = Release|x64
-		{9AE965C4-301E-4C01-B90F-297AF341ACC6}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

HDCDDotNet/HDCDDotNet.csproj

@@ -85,7 +85,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\AudioCodecsDotNet\CUETools.Codecs.csproj">
+    <ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj">
       <Project>{6458A13A-30EF-45A9-9D58-E5031B17BEE2}</Project>
       <Name>CUETools.Codecs</Name>
     </ProjectReference>

LossyWAVSharp/LossyWAVSharp.csproj

@@ -81,11 +81,11 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\AudioCodecsDotNet\CUETools.Codecs.csproj">
+    <ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj">
       <Project>{6458A13A-30EF-45A9-9D58-E5031B17BEE2}</Project>
       <Name>AudioCodecsDotNet</Name>
     </ProjectReference>
-    <ProjectReference Include="..\LossyWAVDotNet\CUETools.Codecs.LossyWAV.csproj">
+    <ProjectReference Include="..\CUETools.Codecs.LossyWAV\CUETools.Codecs.LossyWAV.csproj">
       <Project>{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}</Project>
       <Name>LossyWAVDotNet</Name>
     </ProjectReference>

WavPackDotNet/WavPackDotNet.sln

@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WavPackDotNet", "WavPackDotNet.vcproj", "{CC2E74B6-534A-43D8-9F16-AC03FE955000}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CC2E74B6-534A-43D8-9F16-AC03FE955000}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CC2E74B6-534A-43D8-9F16-AC03FE955000}.Debug|Win32.Build.0 = Debug|Win32
-		{CC2E74B6-534A-43D8-9F16-AC03FE955000}.Release|Win32.ActiveCfg = Release|Win32
-		{CC2E74B6-534A-43D8-9F16-AC03FE955000}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal