diff --git a/.gitignore b/.gitignore index b02f4019..cd58e0f8 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ Output/Songs /PartyModes/*/*/*.dll *.Cache +/Output/x86/gstreamer/GstreamerHelper.dll diff --git a/GstreamerHelper/GstreamerHelper.vcxproj b/GstreamerHelper/GstreamerHelper.vcxproj index 8e692fe5..42933149 100644 --- a/GstreamerHelper/GstreamerHelper.vcxproj +++ b/GstreamerHelper/GstreamerHelper.vcxproj @@ -27,13 +27,13 @@ DynamicLibrary true - v110 + v110_xp Unicode DynamicLibrary true - v110 + v110_xp Unicode @@ -149,11 +149,13 @@ Level3 Use - MaxSpeed + Full true true WIN32;NDEBUG;_WINDOWS;_USRDLL;GSTREAMERHELPER_EXPORTS;%(PreprocessorDefinitions) true + true + Speed Windows diff --git a/Vocaluxe/Lib/Input/CHIDAPI.cs b/Vocaluxe/Lib/Input/CHIDAPI.cs index 4f7b39c4..12caadf1 100644 --- a/Vocaluxe/Lib/Input/CHIDAPI.cs +++ b/Vocaluxe/Lib/Input/CHIDAPI.cs @@ -24,11 +24,11 @@ namespace Vocaluxe.Lib.Input { #if ARCH_X86 #if WIN - private const string HIDapiDll = "x86\\hidapi.dll"; + private const string _HIDApiDll = "x86\\hidapi.dll"; #endif #if LINUX - private const string HIDapiDll = "libhidapi.so"; + private const string _HIDApiDll = "libhidapi.so"; #endif #endif @@ -38,7 +38,7 @@ namespace Vocaluxe.Lib.Input #endif #if LINUX - private const string HIDaApiDll = "libhidapi.so"; + private const string _HIDApiDll = "libhidapi.so"; #endif #endif diff --git a/Vocaluxe/Lib/Sound/Gstreamer/CGstreamerAudioWrapper.cs b/Vocaluxe/Lib/Sound/Gstreamer/CGstreamerAudioWrapper.cs index d8e77638..fc4e80f9 100644 --- a/Vocaluxe/Lib/Sound/Gstreamer/CGstreamerAudioWrapper.cs +++ b/Vocaluxe/Lib/Sound/Gstreamer/CGstreamerAudioWrapper.cs @@ -7,7 +7,7 @@ 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 diff --git a/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs b/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs index 90072073..fc7966b8 100644 --- a/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs +++ b/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs @@ -273,11 +273,11 @@ namespace PortAudioSharp #region **** PORTAUDIO FUNCTIONS **** #if ARCH_X86 #if WIN - private const string PaDll = "x86\\portaudio_x86.dll"; + private const string _PaDll = "x86\\portaudio_x86.dll"; #endif #if LINUX - private const string PaDll = "libportaudio.so.2.0.0"; + private const string _PaDll = "libportaudio.so.2.0.0"; #endif #endif @@ -287,7 +287,7 @@ namespace PortAudioSharp #endif #if LINUX - private const string PaDll = "libportaudio.so.2.0.0"; + private const string _PaDll = "libportaudio.so.2.0.0"; #endif #endif diff --git a/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs b/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs index ebff6299..0ad3e00b 100644 --- a/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs +++ b/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs @@ -153,11 +153,11 @@ namespace Vocaluxe.Lib.Video.Acinerella { #if ARCH_X86 #if WIN - private const string AcDll = "x86\\acinerella.dll"; + private const string _AcDll = "x86\\acinerella.dll"; #endif #if LINUX - private const string AcDll = "x86/libacinerella.so"; + private const string _AcDll = "x86/libacinerella.so"; #endif #endif @@ -167,7 +167,7 @@ namespace Vocaluxe.Lib.Video.Acinerella #endif #if LINUX - private const string AcDll = "x64/libacinerella.so"; + private const string _AcDll = "x64/libacinerella.so"; #endif #endif diff --git a/Vocaluxe/Lib/Video/Gstreamer/CGstreamerVideoWrapper.cs b/Vocaluxe/Lib/Video/Gstreamer/CGstreamerVideoWrapper.cs index 02924974..d58f4fa6 100644 --- a/Vocaluxe/Lib/Video/Gstreamer/CGstreamerVideoWrapper.cs +++ b/Vocaluxe/Lib/Video/Gstreamer/CGstreamerVideoWrapper.cs @@ -26,7 +26,7 @@ namespace Vocaluxe.Lib.Video.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 diff --git a/Vocaluxe/Properties/AssemblyInfo.cs b/Vocaluxe/Properties/AssemblyInfo.cs index 5aa6b1d3..8b5da9e1 100644 --- a/Vocaluxe/Properties/AssemblyInfo.cs +++ b/Vocaluxe/Properties/AssemblyInfo.cs @@ -4,7 +4,7 @@ using System.Runtime.InteropServices; // Allgemeine Informationen über eine Assembly werden über die folgenden // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // die mit einer Assembly verknüpft sind. -[assembly: AssemblyTitle("Vocaluxe.Properties")] +[assembly: AssemblyTitle("Vocaluxe")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")]