Readded bass nodes and fixed minor build issue in flash node.

vvvv · Nov 14, 2012 · 2e7fc83 · 2e7fc83
1 parent 5acd376
commit 2e7fc83
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 113 deletions.
diff --git a/vvvv45/addonpack/src/Addonpack.sln b/vvvv45/addonpack/src/Addonpack.sln
@@ -317,6 +317,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLLiteNodes", "nodes\plugi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLServerNodes", "nodes\plugins\Network\Databases\SQLServerNode\SQLServerNodes.csproj", "{B11EB55C-253A-48C4-B679-72B1D9539141}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bass", "Bass", "{398BAB6C-E277-4913-8347-CB2C9FE33AC3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BassSound", "nodes\plugins\Bass\BassSound\BassSound.csproj", "{8CC39D35-7F34-4B53-99CC-35BB088182AB}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Addonpack", "Addonpack.csproj", "{AA8072CA-3343-4199-AC22-62B9E352BAE9}"
 EndProject
 Global
@@ -1247,14 +1251,6 @@ Global
 		{4025CBC3-C978-4FC7-A9F0-69F7F5E10811}.Release|x64.ActiveCfg = Release|x64
 		{4025CBC3-C978-4FC7-A9F0-69F7F5E10811}.Release|x86.ActiveCfg = Release|x86
 		{4025CBC3-C978-4FC7-A9F0-69F7F5E10811}.Release|x86.Build.0 = Release|x86
-		{AA8072CA-3343-4199-AC22-62B9E352BAE9}.Debug|x64.ActiveCfg = Debug|x64
-		{AA8072CA-3343-4199-AC22-62B9E352BAE9}.Debug|x64.Build.0 = Debug|x64
-		{AA8072CA-3343-4199-AC22-62B9E352BAE9}.Debug|x86.ActiveCfg = Debug|x86
-		{AA8072CA-3343-4199-AC22-62B9E352BAE9}.Debug|x86.Build.0 = Debug|x86
-		{AA8072CA-3343-4199-AC22-62B9E352BAE9}.Release|x64.ActiveCfg = Release|x64
-		{AA8072CA-3343-4199-AC22-62B9E352BAE9}.Release|x64.Build.0 = Release|x64
-		{AA8072CA-3343-4199-AC22-62B9E352BAE9}.Release|x86.ActiveCfg = Release|x86
-		{AA8072CA-3343-4199-AC22-62B9E352BAE9}.Release|x86.Build.0 = Release|x86
 		{7ACEF15A-C8F4-42F9-A6B4-2DB16CDE5EE3}.Debug|x64.ActiveCfg = Debug|x64
 		{7ACEF15A-C8F4-42F9-A6B4-2DB16CDE5EE3}.Debug|x86.ActiveCfg = Debug|x86
 		{7ACEF15A-C8F4-42F9-A6B4-2DB16CDE5EE3}.Debug|x86.Build.0 = Debug|x86
@@ -1315,6 +1311,20 @@ Global
 		{B11EB55C-253A-48C4-B679-72B1D9539141}.Release|x64.Build.0 = Release|x64
 		{B11EB55C-253A-48C4-B679-72B1D9539141}.Release|x86.ActiveCfg = Release|x86
 		{B11EB55C-253A-48C4-B679-72B1D9539141}.Release|x86.Build.0 = Release|x86
+		{AA8072CA-3343-4199-AC22-62B9E352BAE9}.Debug|x64.ActiveCfg = Debug|x64
+		{AA8072CA-3343-4199-AC22-62B9E352BAE9}.Debug|x64.Build.0 = Debug|x64
+		{AA8072CA-3343-4199-AC22-62B9E352BAE9}.Debug|x86.ActiveCfg = Debug|x86
+		{AA8072CA-3343-4199-AC22-62B9E352BAE9}.Debug|x86.Build.0 = Debug|x86
+		{AA8072CA-3343-4199-AC22-62B9E352BAE9}.Release|x64.ActiveCfg = Release|x64
+		{AA8072CA-3343-4199-AC22-62B9E352BAE9}.Release|x64.Build.0 = Release|x64
+		{AA8072CA-3343-4199-AC22-62B9E352BAE9}.Release|x86.ActiveCfg = Release|x86
+		{AA8072CA-3343-4199-AC22-62B9E352BAE9}.Release|x86.Build.0 = Release|x86
+		{8CC39D35-7F34-4B53-99CC-35BB088182AB}.Debug|x64.ActiveCfg = Debug|x64
+		{8CC39D35-7F34-4B53-99CC-35BB088182AB}.Debug|x86.ActiveCfg = Debug|x86
+		{8CC39D35-7F34-4B53-99CC-35BB088182AB}.Debug|x86.Build.0 = Debug|x86
+		{8CC39D35-7F34-4B53-99CC-35BB088182AB}.Release|x64.ActiveCfg = Release|x64
+		{8CC39D35-7F34-4B53-99CC-35BB088182AB}.Release|x86.ActiveCfg = Release|x86
+		{8CC39D35-7F34-4B53-99CC-35BB088182AB}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1348,6 +1358,7 @@ Global
 		{69AB15E3-B578-45C3-835E-9322094E2265} = {95C0B922-0555-4DDC-B452-6FADAAB6B024}
 		{8AF90C4C-1205-4ABA-A44B-3B6F6BD18903} = {95C0B922-0555-4DDC-B452-6FADAAB6B024}
 		{5DF63D5D-B49C-4995-816C-EFA684E8DC89} = {95C0B922-0555-4DDC-B452-6FADAAB6B024}
+		{398BAB6C-E277-4913-8347-CB2C9FE33AC3} = {95C0B922-0555-4DDC-B452-6FADAAB6B024}
 		{BE8F0188-A22A-4ED6-B94D-963F37F114AD} = {37C2F352-650D-4AE4-A0EC-1A2E78367F9A}
 		{F45B342A-CE39-4A64-B362-979F5C27769F} = {37C2F352-650D-4AE4-A0EC-1A2E78367F9A}
 		{E33B2854-DA30-4E94-AE54-51D53BE603B8} = {37C2F352-650D-4AE4-A0EC-1A2E78367F9A}
@@ -1473,5 +1484,6 @@ Global
 		{9AFFA86D-3DB2-4039-950B-19A6F4285955} = {42C89BB7-54C6-4CFD-BB3A-662A15B8542F}
 		{ACB8D084-7F60-414B-A8AF-ED2C86BD1B4D} = {42C89BB7-54C6-4CFD-BB3A-662A15B8542F}
 		{B11EB55C-253A-48C4-B679-72B1D9539141} = {42C89BB7-54C6-4CFD-BB3A-662A15B8542F}
+		{8CC39D35-7F34-4B53-99CC-35BB088182AB} = {398BAB6C-E277-4913-8347-CB2C9FE33AC3}
 	EndGlobalSection
 EndGlobal
diff --git a/vvvv45/addonpack/src/nodes/plugins/Bass/BassSound/BassSound.csproj b/vvvv45/addonpack/src/nodes/plugins/Bass/BassSound/BassSound.csproj
@@ -1,79 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="..\..\Default.Plugin.Project.settings" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8CC39D35-7F34-4B53-99CC-35BB088182AB}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BassSound</RootNamespace>
     <AssemblyName>BassSound</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkProfile />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\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)' == 'vvvv_debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Release</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Bass.Net, Version=2.4.1.1, Culture=neutral, PublicKeyToken=b7566c273e6ef480, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Dependencies\Bass.Net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\vvvv\beta25\bin\managed\System.ComponentModel.Composition.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    <Reference Include="System.ComponentModel.Composition">
+      <HintPath>..\..\..\..\thirdparty\System.ComponentModel.Composition.dll</HintPath>
     </Reference>
+    <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
@@ -136,33 +80,6 @@
   <ItemGroup>
     <Folder Include="Internals\Effects\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\..\src\core\Hosting\Hosting.csproj">
       <Project>{F9A754A6-EEA5-4761-9446-C2AAF9CF8B31}</Project>
@@ -184,51 +101,44 @@
   <ItemGroup>
     <None Include="..\Dependencies\bass.dll">
       <Link>bass.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\Dependencies\bassasio.dll">
       <Link>bassasio.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\Dependencies\bassenc.dll">
       <Link>bassenc.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\Dependencies\bassflac.dll">
       <Link>bassflac.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\Dependencies\bassmix.dll">
       <Link>bassmix.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\Dependencies\basswma.dll">
       <Link>basswma.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\Dependencies\bass_fx.dll">
       <Link>bass_fx.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\Dependencies\bass_vst.dll">
       <Link>bass_vst.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\Dependencies\bass_wadsp.dll">
       <Link>bass_wadsp.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\Dependencies\oggenc2.exe">
       <Link>oggenc2.exe</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </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>
diff --git a/vvvv45/addonpack/src/nodes/plugins/Layer/DrawFlash/DrawFlash.csproj b/vvvv45/addonpack/src/nodes/plugins/Layer/DrawFlash/DrawFlash.csproj
@@ -14,7 +14,7 @@
       <HintPath>Dependencies\FantastiqUInet.dll</HintPath>
     </Reference>
     <Reference Include="SlimDX">
-      <HintPath>..\..\..\..\thirdparty\SlimDX.dll</HintPath>
+      <HintPath>..\..\..\..\thirdparty\$(Platform)\SlimDX.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition.Codeplex">