diff --git a/Output/x64/SQLite.Interop.dll b/Output/x64/SQLite.Interop.dll new file mode 100644 index 00000000..0188070e Binary files /dev/null and b/Output/x64/SQLite.Interop.dll differ diff --git a/Output/x64/SlimDX.dll b/Output/x64/SlimDX.dll index 4132e870..ca05cbd7 100644 Binary files a/Output/x64/SlimDX.dll and b/Output/x64/SlimDX.dll differ diff --git a/Output/x64/System.Data.SQLite.dll b/Output/x64/System.Data.SQLite.dll index 6f07d5e7..1ee930f1 100644 Binary files a/Output/x64/System.Data.SQLite.dll and b/Output/x64/System.Data.SQLite.dll differ diff --git a/Output/x86/SQLite.Interop.dll b/Output/x86/SQLite.Interop.dll new file mode 100644 index 00000000..89523cfb Binary files /dev/null and b/Output/x86/SQLite.Interop.dll differ diff --git a/Output/x86/SlimDX.dll b/Output/x86/SlimDX.dll index 8715ac49..c02903f6 100644 Binary files a/Output/x86/SlimDX.dll and b/Output/x86/SlimDX.dll differ diff --git a/Output/x86/System.Data.SQLite.dll b/Output/x86/System.Data.SQLite.dll index aa398bbe..1ee930f1 100644 Binary files a/Output/x86/System.Data.SQLite.dll and b/Output/x86/System.Data.SQLite.dll differ diff --git a/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj index 61103a08..63677fe2 100644 --- a/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj +++ b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj @@ -10,7 +10,7 @@ Properties VocaluxeLib.PartyModes.Challenge Challenge - v2.0 + v4.0 512 diff --git a/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj index a09574e8..14027dd7 100644 --- a/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj +++ b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj @@ -10,7 +10,7 @@ Properties VocaluxeLib.PartyModes.ChallengeMedley ChallengeMedley - v2.0 + v4.0 512 diff --git a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj index 51727704..10f4703c 100644 --- a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj +++ b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj @@ -10,7 +10,7 @@ Properties VocaluxeLib.PartyModes.TicTacToe TicTacToe - v2.0 + v4.0 512 diff --git a/Vocaluxe.sln b/Vocaluxe.sln index c01db1ba..63b103dd 100644 --- a/Vocaluxe.sln +++ b/Vocaluxe.sln @@ -1,10 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio Express 2012 for Windows Desktop Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vocaluxe", "Vocaluxe\Vocaluxe.csproj", "{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}" ProjectSection(ProjectDependencies) = postProject + {6F3E1874-F28A-40E9-AFBD-31934D593678} = {6F3E1874-F28A-40E9-AFBD-31934D593678} + {6F3E1874-F28A-40E9-AFBD-31934D593679} = {6F3E1874-F28A-40E9-AFBD-31934D593679} {ED007796-367F-4142-AA55-5450C7645C2C} = {ED007796-367F-4142-AA55-5450C7645C2C} {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC} = {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC} + {5A4053F1-5AD5-441F-B254-D97A088127B6} = {5A4053F1-5AD5-441F-B254-D97A088127B6} EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VocaluxeLib", "VocaluxeLib\VocaluxeLib.csproj", "{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}" @@ -110,17 +113,15 @@ Global {6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86 {6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseWin|x86.Build.0 = ReleaseWin|x86 {ED007796-367F-4142-AA55-5450C7645C2C}.DebugLinux|x64.ActiveCfg = DebugWin|x64 - {ED007796-367F-4142-AA55-5450C7645C2C}.DebugLinux|x86.ActiveCfg = DebugWin|Win32 + {ED007796-367F-4142-AA55-5450C7645C2C}.DebugLinux|x86.ActiveCfg = DebugWin|x64 {ED007796-367F-4142-AA55-5450C7645C2C}.DebugWin|x64.ActiveCfg = DebugWin|x64 {ED007796-367F-4142-AA55-5450C7645C2C}.DebugWin|x64.Build.0 = DebugWin|x64 {ED007796-367F-4142-AA55-5450C7645C2C}.DebugWin|x86.ActiveCfg = DebugWin|Win32 - {ED007796-367F-4142-AA55-5450C7645C2C}.DebugWin|x86.Build.0 = DebugWin|Win32 {ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseLinux|x64.ActiveCfg = ReleaseWin|x64 - {ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseLinux|x86.ActiveCfg = ReleaseWin|Win32 + {ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseLinux|x86.ActiveCfg = ReleaseWin|x64 {ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64 {ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseWin|x64.Build.0 = ReleaseWin|x64 {ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseWin|x86.ActiveCfg = ReleaseWin|Win32 - {ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseWin|x86.Build.0 = ReleaseWin|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Vocaluxe/Lib/Sound/Gstreamer/CGstreamerAudioWrapper.cs b/Vocaluxe/Lib/Sound/Gstreamer/CGstreamerAudioWrapper.cs index b356492d..930a494c 100644 --- a/Vocaluxe/Lib/Sound/Gstreamer/CGstreamerAudioWrapper.cs +++ b/Vocaluxe/Lib/Sound/Gstreamer/CGstreamerAudioWrapper.cs @@ -18,84 +18,85 @@ namespace Vocaluxe.Lib.Sound.Gstreamer #endif #endregion arch + [UnmanagedFunctionPointer(CallingConvention.StdCall)] public delegate void LogCallback(string message); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention=CallingConvention.Cdecl)] public static extern void SetLogCallback(LogCallback c); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] [return: MarshalAs(UnmanagedType.U1)] public static extern bool Init(); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void SetGlobalVolume(float Volume); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern int GetStreamCount(); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void CloseAll(); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern int Load(string Media); - [DllImport(Dll, EntryPoint = "LoadPrescan")] + [DllImport(Dll, EntryPoint = "LoadPrescan", CallingConvention = CallingConvention.Cdecl)] public static extern int Load(string Media, [MarshalAs(UnmanagedType.U1)] bool Prescan); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void Close(int Stream); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void Play(int Stream); [DllImport(Dll, EntryPoint = "PlayLoop")] public static extern void Play(int Stream, [MarshalAs(UnmanagedType.U1)] bool Loop); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void Pause(int Stream); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void Stop(int Stream); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void Fade(int Stream, float TargetVolume, float Seconds); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void FadeAndPause(int Stream, float TargetVolume, float Seconds); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void FadeAndStop(int Stream, float TargetVolume, float Seconds); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void SetStreamVolume(int Stream, float Volume); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void SetStreamVolumeMax(int Stream, float Volume); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern float GetLength(int Stream); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern float GetPosition(int Stream); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] [return: MarshalAs(UnmanagedType.U1)] public static extern bool IsPlaying(int Stream); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] [return: MarshalAs(UnmanagedType.U1)] public static extern bool IsPaused(int Stream); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] [return: MarshalAs(UnmanagedType.U1)] public static extern bool IsFinished(int Stream); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void SetPosition(int Stream, float Position); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void Update(); } } \ No newline at end of file diff --git a/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs b/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs index 15cd38bf..8b5754a0 100644 --- a/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs +++ b/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs @@ -291,10 +291,10 @@ namespace PortAudioSharp #endif #endif - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern int Pa_GetVersion(); - [DllImport(PaDll, EntryPoint = "Pa_GetVersionText")] + [DllImport(PaDll, EntryPoint = "Pa_GetVersionText", CallingConvention = CallingConvention.Cdecl)] private static extern IntPtr IntPtr_Pa_GetVersionText(); public static string Pa_GetVersionText() @@ -303,7 +303,7 @@ namespace PortAudioSharp return Marshal.PtrToStringAnsi(strptr); } - [DllImport(PaDll, EntryPoint = "Pa_GetErrorText")] + [DllImport(PaDll, EntryPoint = "Pa_GetErrorText", CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr IntPtr_Pa_GetErrorText(PaError errorCode); public static string Pa_GetErrorText(PaError errorCode) @@ -312,19 +312,19 @@ namespace PortAudioSharp return Marshal.PtrToStringAnsi(strptr); } - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_Initialize(); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_Terminate(); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern int Pa_GetHostApiCount(); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern int Pa_GetDefaultHostApi(); - [DllImport(PaDll, EntryPoint = "Pa_GetHostApiInfo")] + [DllImport(PaDll, EntryPoint = "Pa_GetHostApiInfo", CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr IntPtr_Pa_GetHostApiInfo(int hostApi); public static PaHostApiInfo Pa_GetHostApiInfo(int hostApi) @@ -333,13 +333,13 @@ namespace PortAudioSharp return (PaHostApiInfo)Marshal.PtrToStructure(structptr, typeof(PaHostApiInfo)); } - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern int Pa_HostApiTypeIdToHostApiIndex(PaHostApiTypeId type); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern int Pa_HostApiDeviceIndexToDeviceIndex(int hostApi, int hostApiDeviceIndex); - [DllImport(PaDll, EntryPoint = "Pa_GetLastHostErrorInfo")] + [DllImport(PaDll, EntryPoint = "Pa_GetLastHostErrorInfo", CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr IntPtr_Pa_GetLastHostErrorInfo(); public static PaHostErrorInfo Pa_GetLastHostErrorInfo() @@ -348,16 +348,16 @@ namespace PortAudioSharp return (PaHostErrorInfo)Marshal.PtrToStructure(structptr, typeof(PaHostErrorInfo)); } - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern int Pa_GetDeviceCount(); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern int Pa_GetDefaultInputDevice(); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern int Pa_GetDefaultOutputDevice(); - [DllImport(PaDll, EntryPoint = "Pa_GetDeviceInfo")] + [DllImport(PaDll, EntryPoint = "Pa_GetDeviceInfo", CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr IntPtr_Pa_GetDeviceInfo(int device); public static PaDeviceInfo Pa_GetDeviceInfo(int device) @@ -366,13 +366,13 @@ namespace PortAudioSharp return (PaDeviceInfo)Marshal.PtrToStructure(structptr, typeof(PaDeviceInfo)); } - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_IsFormatSupported( ref PaStreamParameters inputParameters, ref PaStreamParameters outputParameters, double sampleRate); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_OpenStream( out IntPtr stream, ref PaStreamParameters inputParameters, @@ -383,7 +383,7 @@ namespace PortAudioSharp PaStreamCallbackDelegate streamCallback, IntPtr userData); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_OpenStream( out IntPtr stream, ref PaStreamParameters inputParameters, @@ -394,7 +394,7 @@ namespace PortAudioSharp PaStreamCallbackDelegate streamCallback, IntPtr userData); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_OpenStream( out IntPtr stream, IntPtr inputParameters, @@ -405,7 +405,7 @@ namespace PortAudioSharp PaStreamCallbackDelegate streamCallback, IntPtr userData); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_OpenDefaultStream( out IntPtr stream, int numInputChannels, @@ -416,30 +416,30 @@ namespace PortAudioSharp PaStreamCallbackDelegate streamCallback, IntPtr userData); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_CloseStream(IntPtr stream); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_SetStreamFinishedCallback( ref IntPtr stream, [MarshalAs(UnmanagedType.FunctionPtr)] PaStreamFinishedCallbackDelegate streamFinishedCallback); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_StartStream(IntPtr stream); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_StopStream(IntPtr stream); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_AbortStream(IntPtr stream); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_IsStreamStopped(IntPtr stream); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_IsStreamActive(IntPtr stream); - [DllImport(PaDll, EntryPoint = "Pa_GetStreamInfo")] + [DllImport(PaDll, EntryPoint = "Pa_GetStreamInfo", CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr IntPtr_Pa_GetStreamInfo(IntPtr stream); public static PaStreamInfo Pa_GetStreamInfo(IntPtr stream) @@ -448,106 +448,106 @@ namespace PortAudioSharp return (PaStreamInfo)Marshal.PtrToStructure(structptr, typeof(PaStreamInfo)); } - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern double Pa_GetStreamTime(IntPtr stream); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern double Pa_GetStreamCpuLoad(IntPtr stream); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_ReadStream( IntPtr stream, [Out] float[] buffer, uint frames); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_ReadStream( IntPtr stream, [Out] byte[] buffer, uint frames); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_ReadStream( IntPtr stream, [Out] sbyte[] buffer, uint frames); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_ReadStream( IntPtr stream, [Out] ushort[] buffer, uint frames); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_ReadStream( IntPtr stream, [Out] short[] buffer, uint frames); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_ReadStream( IntPtr stream, [Out] uint[] buffer, uint frames); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_ReadStream( IntPtr stream, [Out] int[] buffer, uint frames); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_WriteStream( IntPtr stream, [In] float[] buffer, uint frames); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_WriteStream( IntPtr stream, [In] byte[] buffer, uint frames); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_WriteStream( IntPtr stream, [In] sbyte[] buffer, uint frames); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_WriteStream( IntPtr stream, [In] ushort[] buffer, uint frames); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_WriteStream( IntPtr stream, [In] short[] buffer, uint frames); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_WriteStream( IntPtr stream, [In] uint[] buffer, uint frames); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_WriteStream( IntPtr stream, [In] int[] buffer, uint frames); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern int Pa_GetStreamReadAvailable(IntPtr stream); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern int Pa_GetStreamWriteAvailable(IntPtr stream); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern PaError Pa_GetSampleSize(PaSampleFormat format); - [DllImport(PaDll)] + [DllImport(PaDll, CallingConvention = CallingConvention.Cdecl)] public static extern void Pa_Sleep(int msec); #endregion diff --git a/Vocaluxe/Lib/Sound/Portaudio/PortAudioASIO.cs b/Vocaluxe/Lib/Sound/Portaudio/PortAudioASIO.cs index f737fcf4..557358c9 100644 --- a/Vocaluxe/Lib/Sound/Portaudio/PortAudioASIO.cs +++ b/Vocaluxe/Lib/Sound/Portaudio/PortAudioASIO.cs @@ -72,7 +72,7 @@ namespace PortAudioSharp /// On Windows, the calling application's main window handle, /// on Macintosh this value should be zero. /// - [DllImport("PortAudio.dll")] + [DllImport("PortAudio.dll", CallingConvention = CallingConvention.Cdecl)] public static extern PaError PaAsio_ShowControlPanel(int device, IntPtr systemSpecific); // /// Retrieve a pointer to a string containing the name of the specified input channel. @@ -93,7 +93,7 @@ namespace PortAudioSharp /// Note that this function may fail if the stream is alredy running and the /// ASIO driver does not support switching the sample rate of a running stream. /// paIncompatibleStreamHostApi if stream is not a paASIO stream. - [DllImport("PortAudio.dll")] + [DllImport("PortAudio.dll", CallingConvention = CallingConvention.Cdecl)] public static extern PaError PaAsio_SetStreamSampleRate(IntPtr stream, double sampleRate); #endregion } diff --git a/Vocaluxe/Lib/Video/Gstreamer/CGstreamerVideoWrapper.cs b/Vocaluxe/Lib/Video/Gstreamer/CGstreamerVideoWrapper.cs index e1f82d89..7d781f33 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\\gstreamerhelper.dll"; + private const string Dll = "x86\\gstreamer\\gstreamerhelper.dll"; #endif #endif @@ -37,32 +37,33 @@ namespace Vocaluxe.Lib.Video.Gstreamer #endif #endregion arch + [UnmanagedFunctionPointer(CallingConvention.StdCall)] public delegate void LogCallback(string message); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void SetVideoLogCallback(LogCallback c); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] [return: MarshalAs(UnmanagedType.U1)] public static extern bool InitVideo(); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void CloseAllVideos(); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern int LoadVideo(string VideoFileName); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] [return: MarshalAs(UnmanagedType.U1)] public static extern bool CloseVideo(int StreamID); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern int GetVideoNumStreams(); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern float GetVideoLength(int StreamID); - [DllImport(Dll, EntryPoint = "GetFrame")] + [DllImport(Dll, EntryPoint = "GetFrame", CallingConvention = CallingConvention.Cdecl)] public static extern NativeFrame GetFrameNative(int StreamID, float Time); public static ManagedFrame GetFrame(int StreamID, float Time) @@ -86,25 +87,25 @@ namespace Vocaluxe.Lib.Video.Gstreamer return m; } - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] [return: MarshalAs(UnmanagedType.U1)] public static extern bool Skip(int StreamID, float Start, float Gap); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void SetVideoLoop(int StreamID, [MarshalAs(UnmanagedType.U1)] bool Loop); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void PauseVideo(int StreamID); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] public static extern void ResumeVideo(int StreamID); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] [return: MarshalAs(UnmanagedType.U1)] public static extern bool Finished(int StreamID); - [DllImport(Dll)] + [DllImport(Dll, CallingConvention = CallingConvention.Cdecl)] [return: MarshalAs(UnmanagedType.U1)] public static extern bool UpdateVideo(); } diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj index cf32e0fc..0d5d0f91 100644 --- a/Vocaluxe/Vocaluxe.csproj +++ b/Vocaluxe/Vocaluxe.csproj @@ -10,7 +10,7 @@ Properties Vocaluxe Vocaluxe - v2.0 + v4.0 512 false Vocaluxe.MainProgram diff --git a/Vocaluxe/app.config b/Vocaluxe/app.config index 49666a2b..7fb031b0 100644 --- a/Vocaluxe/app.config +++ b/Vocaluxe/app.config @@ -1,6 +1,6 @@ - - + + diff --git a/VocaluxeLib/VocaluxeLib.csproj b/VocaluxeLib/VocaluxeLib.csproj index b66a1afd..3eb1307d 100644 --- a/VocaluxeLib/VocaluxeLib.csproj +++ b/VocaluxeLib/VocaluxeLib.csproj @@ -10,7 +10,7 @@ Properties VocaluxeLib VocaluxeLib - v2.0 + v4.0 512