* Reorganize a bit

renaudbedard · Oct 10, 2012 · ac056f4 · ac056f4
1 parent a3b08ec
commit ac056f4
Show file tree

Hide file tree

Showing 28 changed files with 12 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -97,6 +97,8 @@ ClientBin
 
 *.[Pp]ublish.xml
 
+*.bak
+
 Generated_Code #added for RIA/Silverlight projects
 
 # Backup & report files from converting an old project file to a newer
@@ -107,6 +109,7 @@ UpgradeLog*.XML
 
 # NuGet
 packages/
+*.nupkg
 
 # Windows image file caches
 Thumbs.db

diff --git a/References/NAudio license.txt → Lib/NAudio license.txt b/References/NAudio license.txt → Lib/NAudio license.txt
diff --git a/References/NAudio.dll → Lib/NAudio.dll b/References/NAudio.dll → Lib/NAudio.dll
diff --git a/NAudioSupport/NAudioSupport.csproj b/NAudioSupport/NAudioSupport.csproj
@@ -29,24 +29,20 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\bin\NVorbis.NAudioSupport.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="NAudio">
-      <HintPath>..\References\NAudio.dll</HintPath>
+      <HintPath>..\Lib\NAudio.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="VorbisWaveReader.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Lib\NVorbis.csproj">
+    <ProjectReference Include="..\NVorbis\NVorbis.csproj">
       <Project>{A372E591-DFEF-49C4-9C82-98C4361EFCCD}</Project>
       <Name>NVorbis</Name>
     </ProjectReference>

diff --git a/NVorbis.sln b/NVorbis.sln
@@ -1,11 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NVorbis", "Lib\NVorbis.csproj", "{A372E591-DFEF-49C4-9C82-98C4361EFCCD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NVorbis", "NVorbis\NVorbis.csproj", "{A372E591-DFEF-49C4-9C82-98C4361EFCCD}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2FC272F6-7727-4000-9110-A03F8936BA8E}"
 	ProjectSection(SolutionItems) = preProject
 		COPYING = COPYING
+		NVorbis.NAudioSupport.nuspec = NVorbis.NAudioSupport.nuspec
+		NVorbis.nuspec = NVorbis.nuspec
 		README = README
 		TODO = TODO
 	EndProjectSection
@@ -37,7 +39,6 @@ Global
 		{902AD24A-6F7C-4F21-9E88-2B9151AEB563}.Release - Unsafe MDCT|Any CPU.ActiveCfg = Release|Any CPU
 		{902AD24A-6F7C-4F21-9E88-2B9151AEB563}.Release - Unsafe MDCT|Any CPU.Build.0 = Release|Any CPU
 		{902AD24A-6F7C-4F21-9E88-2B9151AEB563}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{902AD24A-6F7C-4F21-9E88-2B9151AEB563}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6FC9AAA7-E7FE-4BD4-B813-582D4B3BDA0C}.Debug - Unsafe MDCT|Any CPU.ActiveCfg = Debug|Any CPU
 		{6FC9AAA7-E7FE-4BD4-B813-582D4B3BDA0C}.Debug - Unsafe MDCT|Any CPU.Build.0 = Debug|Any CPU
 		{6FC9AAA7-E7FE-4BD4-B813-582D4B3BDA0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

diff --git a/Lib/ACache.cs → NVorbis/ACache.cs b/Lib/ACache.cs → NVorbis/ACache.cs
diff --git a/Lib/DataPacket.cs → NVorbis/DataPacket.cs b/Lib/DataPacket.cs → NVorbis/DataPacket.cs
diff --git a/Lib/Huffman.cs → NVorbis/Huffman.cs b/Lib/Huffman.cs → NVorbis/Huffman.cs
diff --git a/Lib/IPacketProvider.cs → NVorbis/IPacketProvider.cs b/Lib/IPacketProvider.cs → NVorbis/IPacketProvider.cs
diff --git a/Lib/IVorbisStreamStatus.cs → NVorbis/IVorbisStreamStatus.cs b/Lib/IVorbisStreamStatus.cs → NVorbis/IVorbisStreamStatus.cs
diff --git a/Lib/Mdct.cs → NVorbis/Mdct.cs b/Lib/Mdct.cs → NVorbis/Mdct.cs
diff --git a/Lib/NVorbis.csproj → NVorbis/NVorbis.csproj b/Lib/NVorbis.csproj → NVorbis/NVorbis.csproj
@@ -32,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\bin\NVorbis.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug - Unsafe MDCT|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -69,11 +70,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ACache.cs" />

diff --git a/Lib/Ogg/OggContainerReader.cs → NVorbis/Ogg/OggContainerReader.cs b/Lib/Ogg/OggContainerReader.cs → NVorbis/Ogg/OggContainerReader.cs
diff --git a/Lib/Ogg/OggPacket.cs → NVorbis/Ogg/OggPacket.cs b/Lib/Ogg/OggPacket.cs → NVorbis/Ogg/OggPacket.cs
diff --git a/Lib/Ogg/OggPacketReader.cs → NVorbis/Ogg/OggPacketReader.cs b/Lib/Ogg/OggPacketReader.cs → NVorbis/Ogg/OggPacketReader.cs
diff --git a/Lib/Ogg/OggPageFlags.cs → NVorbis/Ogg/OggPageFlags.cs b/Lib/Ogg/OggPageFlags.cs → NVorbis/Ogg/OggPageFlags.cs
diff --git a/Lib/Properties/AssemblyInfo.cs → NVorbis/Properties/AssemblyInfo.cs b/Lib/Properties/AssemblyInfo.cs → NVorbis/Properties/AssemblyInfo.cs
diff --git a/Lib/RingBuffer.cs → NVorbis/RingBuffer.cs b/Lib/RingBuffer.cs → NVorbis/RingBuffer.cs
diff --git a/Lib/Utils.cs → NVorbis/Utils.cs b/Lib/Utils.cs → NVorbis/Utils.cs
diff --git a/Lib/VorbisCodebook.cs → NVorbis/VorbisCodebook.cs b/Lib/VorbisCodebook.cs → NVorbis/VorbisCodebook.cs
diff --git a/Lib/VorbisFloor.cs → NVorbis/VorbisFloor.cs b/Lib/VorbisFloor.cs → NVorbis/VorbisFloor.cs
diff --git a/Lib/VorbisMapping.cs → NVorbis/VorbisMapping.cs b/Lib/VorbisMapping.cs → NVorbis/VorbisMapping.cs
diff --git a/Lib/VorbisMode.cs → NVorbis/VorbisMode.cs b/Lib/VorbisMode.cs → NVorbis/VorbisMode.cs
diff --git a/Lib/VorbisReader.cs → NVorbis/VorbisReader.cs b/Lib/VorbisReader.cs → NVorbis/VorbisReader.cs
diff --git a/Lib/VorbisResidue.cs → NVorbis/VorbisResidue.cs b/Lib/VorbisResidue.cs → NVorbis/VorbisResidue.cs
diff --git a/Lib/VorbisStreamDecoder.cs → NVorbis/VorbisStreamDecoder.cs b/Lib/VorbisStreamDecoder.cs → NVorbis/VorbisStreamDecoder.cs
diff --git a/Lib/VorbisTime.cs → NVorbis/VorbisTime.cs b/Lib/VorbisTime.cs → NVorbis/VorbisTime.cs
diff --git a/TestApp/TestApp.csproj b/TestApp/TestApp.csproj
@@ -50,7 +50,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="NAudio">
-      <HintPath>..\References\NAudio.dll</HintPath>
+      <HintPath>..\Lib\NAudio.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -66,7 +66,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Lib\NVorbis.csproj">
+    <ProjectReference Include="..\NVorbis\NVorbis.csproj">
       <Project>{A372E591-DFEF-49C4-9C82-98C4361EFCCD}</Project>
       <Name>NVorbis</Name>
     </ProjectReference>