Changed output dir for gstreamer helper

.gitignore

@@ -20,6 +20,7 @@ Output/Songs
 *.log
 /Output/Playlists/*.xml
 /Output/x64/gstreamer/GstreamerHelper.dll
+/Output/x86/gstreamer/GstreamerHelper.dll
 *.tlog
 *.suo
 *.obj
@@ -35,6 +36,5 @@ Output/Songs
 *.nativecodeanalysis*
 *.lastcodeanalysissucceeded
 /PartyModes/*/*/*.dll
-
 *.Cache
-/Output/x86/gstreamer/GstreamerHelper.dll
+/GstreamerHelper/bin/*

GstreamerHelper/GstreamerHelper.vcxproj

@@ -68,26 +68,29 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWin|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\Output\x86\gstreamer\</OutDir>
+    <OutDir>bin\$(Configuration)\$(Platform)</OutDir>
     <IncludePath>$(MSBuildProjectDirectory)\x86\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x86\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x86\include\glib-2.0;$(MSBuildProjectDirectory)\x86\include;$(IncludePath)</IncludePath>
     <LibraryPath>$(MSBuildProjectDirectory)\x86\lib;$(LibraryPath)</LibraryPath>
+    <GenerateManifest>false</GenerateManifest>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWin|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\Output\x64\gstreamer\</OutDir>
+    <OutDir>bin\$(Configuration)\$(Platform)</OutDir>
     <IncludePath>$(MSBuildProjectDirectory)\x64\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x64\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x64\include\glib-2.0;$(MSBuildProjectDirectory)\x64\include;$(IncludePath)</IncludePath>
     <LibraryPath>$(MSBuildProjectDirectory)\x64\lib;$(LibraryPath)</LibraryPath>
     <CodeAnalysisRuleSet>..\CheckingRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\Output\x86\gstreamer\</OutDir>
+    <OutDir>bin\$(Configuration)\$(Platform)</OutDir>
     <IncludePath>$(MSBuildProjectDirectory)\x86\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x86\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x86\include\glib-2.0;$(MSBuildProjectDirectory)\x86\include;$(IncludePath)</IncludePath>
     <LibraryPath>$(MSBuildProjectDirectory)\x86\lib;$(LibraryPath)</LibraryPath>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\Output\x64\gstreamer\</OutDir>
+    <OutDir>bin\$(Configuration)\$(Platform)</OutDir>
     <IncludePath>$(MSBuildProjectDirectory)\x64\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x64\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x64\include\glib-2.0;$(MSBuildProjectDirectory)\x64\include;$(IncludePath)</IncludePath>
     <LibraryPath>$(MSBuildProjectDirectory)\x64\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
@@ -111,6 +114,12 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <PostBuildEvent>
+      <Command>xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x86\gstreamer\" /I /Y</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>Copying binary</Message>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugWin|x64'">
     <ClCompile>
@@ -125,6 +134,9 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <PostBuildEvent>
+      <Command>xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x64\gstreamer\" /I /Y</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|Win32'">
     <ClCompile>
@@ -144,6 +156,12 @@
       <AdditionalDependencies>gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
+    <PostBuildEvent>
+      <Command>xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x86\gstreamer\" /I /Y</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>Copying binary</Message>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|x64'">
     <ClCompile>
@@ -164,6 +182,9 @@
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <PostBuildEvent>
+      <Command>xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x64\gstreamer\" /I /Y</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="GstreamerAudio.h" />

Vocaluxe/Lib/Sound/Gstreamer/CGstreamerAudioWrapper.cs

@@ -26,13 +26,13 @@ namespace Vocaluxe.Lib.Sound.Gstreamer
         #region arch
 #if ARCH_X86
 #if WIN
-        private const string _Dll = "x86\\gstreamer\\gstreamerhelper.dll";
+        private const string _Dll = "x86\\gstreamer\\GstreamerHelper.dll";
 #endif
 #endif
 
 #if ARCH_X64
 #if WIN
-        private const string _Dll = "x64\\gstreamer\\gstreamerhelper.dll";
+        private const string _Dll = "x64\\gstreamer\\GstreamerHelper.dll";
 #endif
 #endif
         #endregion arch