Merge pull request #139 from derivator/linux-update
Make Vocaluxe buildable and playable on GNU/Linux
No files matched your search
@@ -0,0 +1,4 @@
|
|||||||
|
# Build Vocaluxe - HowTo (Linux)
|
||||||
|
|
||||||
|
* Clone the repository (see [this](https://github.com/Vocaluxe/Vocaluxe/blob/develop/HowToBuildWin.md) for help)
|
||||||
|
* Navigate to the cloned repository and execute `make`. Make sure that all dependencies are installed and the process completes without errors.
|
||||||
|
After Width: | Height: | Size: 326 B |
|
Before Width: | Height: | Size: 499 B After Width: | Height: | Size: 473 B |
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 8.4 KiB |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
@@ -93,9 +93,14 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>if exist "$(SolutionDir)Output\PartyModes\$(TargetName)\Code" rd "$(SolutionDir)Output\PartyModes\$(TargetName)\Code" /S /Q
|
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">if exist "$(SolutionDir)Output\PartyModes\$(TargetName)\Code" rd "$(SolutionDir)Output\PartyModes\$(TargetName)\Code" /S /Q
|
||||||
cd $(SolutionDir)Partymodes\
|
cd $(SolutionDir)Partymodes\
|
||||||
xcopy "$(ProjectDir)*.cs" "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\" /EXCLUDE:Excludes.txt /I /Y</PostBuildEvent>
|
xcopy "$(ProjectDir)*.cs" "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\" /EXCLUDE:Excludes.txt /I /Y</PostBuildEvent>
|
||||||
|
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">rm -rf "$(SolutionDir)Output\PartyModes\$(TargetName)\Code"
|
||||||
|
mkdir -p "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\"
|
||||||
|
cp -R $(ProjectDir)*.cs "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\"
|
||||||
|
rm -f "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\GlobalSuppressions.cs"
|
||||||
|
</PostBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- 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.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
|
|||||||
@@ -93,9 +93,14 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>if exist "$(SolutionDir)Output\PartyModes\$(TargetName)\Code" rd "$(SolutionDir)Output\PartyModes\$(TargetName)\Code" /S /Q
|
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">if exist "$(SolutionDir)Output\PartyModes\$(TargetName)\Code" rd "$(SolutionDir)Output\PartyModes\$(TargetName)\Code" /S /Q
|
||||||
cd $(SolutionDir)Partymodes\
|
cd $(SolutionDir)Partymodes\
|
||||||
xcopy "$(ProjectDir)*.cs" "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\" /EXCLUDE:Excludes.txt /I /Y</PostBuildEvent>
|
xcopy "$(ProjectDir)*.cs" "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\" /EXCLUDE:Excludes.txt /I /Y</PostBuildEvent>
|
||||||
|
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">rm -rf "$(SolutionDir)Output\PartyModes\$(TargetName)\Code"
|
||||||
|
mkdir -p "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\"
|
||||||
|
cp -R $(ProjectDir)*.cs "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\"
|
||||||
|
rm -f "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\GlobalSuppressions.cs"
|
||||||
|
</PostBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- 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.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
|
|||||||
@@ -92,9 +92,14 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>if exist "$(SolutionDir)Output\PartyModes\$(TargetName)\Code" rd "$(SolutionDir)Output\PartyModes\$(TargetName)\Code" /S /Q
|
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">if exist "$(SolutionDir)Output\PartyModes\$(TargetName)\Code" rd "$(SolutionDir)Output\PartyModes\$(TargetName)\Code" /S /Q
|
||||||
cd $(SolutionDir)Partymodes\
|
cd $(SolutionDir)Partymodes\
|
||||||
xcopy "$(ProjectDir)*.cs" "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\" /EXCLUDE:Excludes.txt /I /Y</PostBuildEvent>
|
xcopy "$(ProjectDir)*.cs" "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\" /EXCLUDE:Excludes.txt /I /Y</PostBuildEvent>
|
||||||
|
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">rm -rf "$(SolutionDir)Output\PartyModes\$(TargetName)\Code"
|
||||||
|
mkdir -p "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\"
|
||||||
|
cp -R $(ProjectDir)*.cs "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\"
|
||||||
|
rm -f "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\GlobalSuppressions.cs"
|
||||||
|
</PostBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- 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.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
#include <stddef.h>
|
||||||
float* short2FloatArray(short* in, size_t len);
|
float* short2FloatArray(short* in, size_t len);
|
||||||
double* short2DoubleArray(short* in, size_t len, bool scale = true);
|
double* short2DoubleArray(short* in, size_t len, bool scale = true);
|
||||||
void freeFloatArray(float* floats);
|
void freeFloatArray(float* floats);
|
||||||
|
|||||||
@@ -4,7 +4,12 @@
|
|||||||
#include "ptAKF.h"
|
#include "ptAKF.h"
|
||||||
#include "dywapitchtrack/ptDyWa.h"
|
#include "dywapitchtrack/ptDyWa.h"
|
||||||
|
|
||||||
|
#ifdef __linux__
|
||||||
|
#define DllExport extern "C"
|
||||||
|
#else
|
||||||
#define DllExport extern "C" __declspec(dllexport)
|
#define DllExport extern "C" __declspec(dllexport)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
DllExport Analyzer* Analyzer_Create(unsigned step);
|
DllExport Analyzer* Analyzer_Create(unsigned step);
|
||||||
DllExport void Analyzer_Free(Analyzer* analyzer);
|
DllExport void Analyzer_Free(Analyzer* analyzer);
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
objects = \
|
||||||
|
compatibility.o \
|
||||||
|
dywapitchtrack/dywapitchtrack.o \
|
||||||
|
dywapitchtrack/ptDyWa.o \
|
||||||
|
FFT/FFT.o \
|
||||||
|
FFT/RealFFTf.o \
|
||||||
|
Helper.o \
|
||||||
|
performous/pitch.o \
|
||||||
|
ptAKF.o \
|
||||||
|
PitchWrapper.o
|
||||||
|
|
||||||
|
CPPFLAGS = -std=gnu++11 -fPIC
|
||||||
|
|
||||||
|
PitchTracker: $(objects)
|
||||||
|
gcc -shared -o libPitchTracker.dll.so -fPIC $(objects)
|
||||||
|
strip libPitchTracker.dll.so
|
||||||
|
cp libPitchTracker.dll.so ../Output/
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f ../Output/libPitchTracker.dll.so libPitchTracker.dll.so $(objects)
|
||||||
@@ -202,10 +202,6 @@ Global
|
|||||||
{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x64.Build.0 = Release|x64
|
{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x64.Build.0 = Release|x64
|
||||||
{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x86.ActiveCfg = Release|Win32
|
{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x86.ActiveCfg = Release|Win32
|
||||||
{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x86.Build.0 = Release|Win32
|
{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x86.Build.0 = Release|Win32
|
||||||
{93356718-3A0B-4784-AAE1-215065BFFC66}.DebugLinux|x64.ActiveCfg = Debug|x64
|
|
||||||
{93356718-3A0B-4784-AAE1-215065BFFC66}.DebugLinux|x64.Build.0 = Debug|x64
|
|
||||||
{93356718-3A0B-4784-AAE1-215065BFFC66}.DebugLinux|x86.ActiveCfg = Debug|x86
|
|
||||||
{93356718-3A0B-4784-AAE1-215065BFFC66}.DebugLinux|x86.Build.0 = Debug|x86
|
|
||||||
{93356718-3A0B-4784-AAE1-215065BFFC66}.DebugWin|x64.ActiveCfg = Debug|x64
|
{93356718-3A0B-4784-AAE1-215065BFFC66}.DebugWin|x64.ActiveCfg = Debug|x64
|
||||||
{93356718-3A0B-4784-AAE1-215065BFFC66}.DebugWin|x64.Build.0 = Debug|x64
|
{93356718-3A0B-4784-AAE1-215065BFFC66}.DebugWin|x64.Build.0 = Debug|x64
|
||||||
{93356718-3A0B-4784-AAE1-215065BFFC66}.DebugWin|x86.ActiveCfg = Debug|x86
|
{93356718-3A0B-4784-AAE1-215065BFFC66}.DebugWin|x86.ActiveCfg = Debug|x86
|
||||||
@@ -214,10 +210,6 @@ Global
|
|||||||
{93356718-3A0B-4784-AAE1-215065BFFC66}.InstallerWin|x64.Build.0 = Release|x64
|
{93356718-3A0B-4784-AAE1-215065BFFC66}.InstallerWin|x64.Build.0 = Release|x64
|
||||||
{93356718-3A0B-4784-AAE1-215065BFFC66}.InstallerWin|x86.ActiveCfg = Release|x86
|
{93356718-3A0B-4784-AAE1-215065BFFC66}.InstallerWin|x86.ActiveCfg = Release|x86
|
||||||
{93356718-3A0B-4784-AAE1-215065BFFC66}.InstallerWin|x86.Build.0 = Release|x86
|
{93356718-3A0B-4784-AAE1-215065BFFC66}.InstallerWin|x86.Build.0 = Release|x86
|
||||||
{93356718-3A0B-4784-AAE1-215065BFFC66}.ReleaseLinux|x64.ActiveCfg = Release|x64
|
|
||||||
{93356718-3A0B-4784-AAE1-215065BFFC66}.ReleaseLinux|x64.Build.0 = Release|x64
|
|
||||||
{93356718-3A0B-4784-AAE1-215065BFFC66}.ReleaseLinux|x86.ActiveCfg = Release|x86
|
|
||||||
{93356718-3A0B-4784-AAE1-215065BFFC66}.ReleaseLinux|x86.Build.0 = Release|x86
|
|
||||||
{93356718-3A0B-4784-AAE1-215065BFFC66}.ReleaseWin|x64.ActiveCfg = Release|x64
|
{93356718-3A0B-4784-AAE1-215065BFFC66}.ReleaseWin|x64.ActiveCfg = Release|x64
|
||||||
{93356718-3A0B-4784-AAE1-215065BFFC66}.ReleaseWin|x64.Build.0 = Release|x64
|
{93356718-3A0B-4784-AAE1-215065BFFC66}.ReleaseWin|x64.Build.0 = Release|x64
|
||||||
{93356718-3A0B-4784-AAE1-215065BFFC66}.ReleaseWin|x86.ActiveCfg = Release|x86
|
{93356718-3A0B-4784-AAE1-215065BFFC66}.ReleaseWin|x86.ActiveCfg = Release|x86
|
||||||
|
|||||||
@@ -17,7 +17,9 @@
|
|||||||
|
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using Vocaluxe.Lib.Sound.Record;
|
using Vocaluxe.Lib.Sound.Record;
|
||||||
|
#if WIN
|
||||||
using Vocaluxe.Lib.Sound.Record.DirectSound;
|
using Vocaluxe.Lib.Sound.Record.DirectSound;
|
||||||
|
#endif
|
||||||
using Vocaluxe.Lib.Sound.Record.PortAudio;
|
using Vocaluxe.Lib.Sound.Record.PortAudio;
|
||||||
using VocaluxeLib;
|
using VocaluxeLib;
|
||||||
|
|
||||||
|
|||||||
@@ -98,6 +98,7 @@ namespace Vocaluxe
|
|||||||
|
|
||||||
public static bool CheckRequirements()
|
public static bool CheckRequirements()
|
||||||
{
|
{
|
||||||
|
#if WIN
|
||||||
if (!_IsVC2012Installed())
|
if (!_IsVC2012Installed())
|
||||||
{
|
{
|
||||||
CLog.LogError(
|
CLog.LogError(
|
||||||
@@ -119,7 +120,8 @@ namespace Vocaluxe
|
|||||||
true, true);
|
true, true);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
* */
|
*/
|
||||||
|
#endif //TODO: check for dependencies on linux?
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -29,6 +29,9 @@ using System.Data.SQLite;
|
|||||||
|
|
||||||
#else
|
#else
|
||||||
using Mono.Data.Sqlite;
|
using Mono.Data.Sqlite;
|
||||||
|
using SQLiteCommand = Mono.Data.Sqlite.SqliteCommand;
|
||||||
|
using SQLiteDataReader = Mono.Data.Sqlite.SqliteDataReader;
|
||||||
|
using SQLiteTransaction = Mono.Data.Sqlite.SqliteTransaction;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace Vocaluxe.Lib.Database
|
namespace Vocaluxe.Lib.Database
|
||||||
|
|||||||
@@ -22,6 +22,9 @@ using System.Data.SQLite;
|
|||||||
|
|
||||||
#else
|
#else
|
||||||
using Mono.Data.Sqlite;
|
using Mono.Data.Sqlite;
|
||||||
|
using SQLiteCommand = Mono.Data.Sqlite.SqliteCommand;
|
||||||
|
using SQLiteConnection = Mono.Data.Sqlite.SqliteConnection;
|
||||||
|
using SQLiteDataReader = Mono.Data.Sqlite.SqliteDataReader;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace Vocaluxe.Lib.Database
|
namespace Vocaluxe.Lib.Database
|
||||||
|
|||||||
@@ -29,6 +29,10 @@ using System.Data.SQLite;
|
|||||||
|
|
||||||
#else
|
#else
|
||||||
using Mono.Data.Sqlite;
|
using Mono.Data.Sqlite;
|
||||||
|
using SQLiteCommand = Mono.Data.Sqlite.SqliteCommand;
|
||||||
|
using SQLiteConnection = Mono.Data.Sqlite.SqliteConnection;
|
||||||
|
using SQLiteDataReader = Mono.Data.Sqlite.SqliteDataReader;
|
||||||
|
using SQLiteTransaction = Mono.Data.Sqlite.SqliteTransaction;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace Vocaluxe.Lib.Database
|
namespace Vocaluxe.Lib.Database
|
||||||
|
|||||||
@@ -28,6 +28,10 @@ using System.Data.SQLite;
|
|||||||
|
|
||||||
#else
|
#else
|
||||||
using Mono.Data.Sqlite;
|
using Mono.Data.Sqlite;
|
||||||
|
using SQLiteCommand = Mono.Data.Sqlite.SqliteCommand;
|
||||||
|
using SQLiteConnection = Mono.Data.Sqlite.SqliteConnection;
|
||||||
|
using SQLiteDataReader = Mono.Data.Sqlite.SqliteDataReader;
|
||||||
|
using SQLiteTransaction = Mono.Data.Sqlite.SqliteTransaction;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace Vocaluxe.Lib.Database
|
namespace Vocaluxe.Lib.Database
|
||||||
|
|||||||
@@ -154,6 +154,9 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
protected void _OnMouseLeave(object sender, EventArgs e)
|
protected void _OnMouseLeave(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
_Mouse.Visible = false;
|
_Mouse.Visible = false;
|
||||||
|
#if !WIN && !DEBUG
|
||||||
|
_Form.Cursor = Cursors.Default;
|
||||||
|
#endif
|
||||||
Cursor.Show();
|
Cursor.Show();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -161,6 +164,9 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
{
|
{
|
||||||
Cursor.Hide();
|
Cursor.Hide();
|
||||||
_Mouse.Visible = true;
|
_Mouse.Visible = true;
|
||||||
|
#if !WIN && !DEBUG //don't want to be stuck without a cursor when debugging
|
||||||
|
_Form.Cursor = new Cursor("Linux/blank.cur"); //Cursor.Hide() doesn't work in Mono
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|||||||
@@ -109,7 +109,11 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
bool ok = false;
|
bool ok = false;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
#if WIN
|
||||||
var gm = new GraphicsMode(32, 24, 0, (int)CConfig.Config.Graphics.AAMode);
|
var gm = new GraphicsMode(32, 24, 0, (int)CConfig.Config.Graphics.AAMode);
|
||||||
|
#else
|
||||||
|
var gm = new GraphicsMode(24, 24, 0, (int)CConfig.Config.Graphics.AAMode);
|
||||||
|
#endif
|
||||||
_Control = new GLControl(gm, 2, 1, GraphicsContextFlags.Default);
|
_Control = new GLControl(gm, 2, 1, GraphicsContextFlags.Default);
|
||||||
if (_Control.GraphicsMode != null)
|
if (_Control.GraphicsMode != null)
|
||||||
ok = true;
|
ok = true;
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ namespace Vocaluxe.Lib.Input
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if LINUX
|
#if LINUX
|
||||||
private const string _HIDApiDll = "libhidapi.so";
|
private const string _HIDApiDll = "libhidapi-libusb.so";
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
|
|||||||
{
|
{
|
||||||
if (_Initialized)
|
if (_Initialized)
|
||||||
return false;
|
return false;
|
||||||
|
#if WIN
|
||||||
#if ARCH_X86
|
#if ARCH_X86
|
||||||
const string varName = "GSTREAMER_1_0_ROOT_X86";
|
const string varName = "GSTREAMER_1_0_ROOT_X86";
|
||||||
#endif
|
#endif
|
||||||
@@ -42,7 +42,7 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
|
|||||||
}
|
}
|
||||||
string dllDirectory = gstreamerEnvVar + "bin\\";
|
string dllDirectory = gstreamerEnvVar + "bin\\";
|
||||||
COSFunctions.AddEnvironmentPath(dllDirectory);
|
COSFunctions.AddEnvironmentPath(dllDirectory);
|
||||||
|
#endif
|
||||||
Application.Init();
|
Application.Init();
|
||||||
|
|
||||||
_Initialized = Application.IsInitialized;
|
_Initialized = Application.IsInitialized;
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
|
|||||||
return false;
|
return false;
|
||||||
Length = -1;
|
Length = -1;
|
||||||
Element convert = ElementFactory.Make("audioconvert", "convert");
|
Element convert = ElementFactory.Make("audioconvert", "convert");
|
||||||
Element audiosink = ElementFactory.Make("directsoundsink", "audiosink");
|
Element audiosink = ElementFactory.Make("autoaudiosink", "audiosink");
|
||||||
|
|
||||||
if (convert == null || audiosink == null)
|
if (convert == null || audiosink == null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -136,7 +136,10 @@ namespace Vocaluxe.Lib.Sound.Record.PortAudio
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
foreach (IntPtr handle in _RecHandle)
|
foreach (IntPtr handle in _RecHandle)
|
||||||
|
{
|
||||||
PortAudioSharp.PortAudio.Pa_StopStream(handle);
|
PortAudioSharp.PortAudio.Pa_StopStream(handle);
|
||||||
|
PortAudioSharp.PortAudio.Pa_CloseStream(handle);
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -186,7 +186,7 @@ namespace Vocaluxe.Lib.Video.Acinerella
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if LINUX
|
#if LINUX
|
||||||
private const string _AcDll = "x64/libacinerella.so";
|
private const string _AcDll = "libacinerella.so";
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,7 @@
|
|||||||
#include <libswresample/swresample.h>
|
#include <libswresample/swresample.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
|
||||||
#define AUDIO_BUFFER_BASE_SIZE AVCODEC_MAX_AUDIO_FRAME_SIZE
|
#define AUDIO_BUFFER_BASE_SIZE AVCODEC_MAX_AUDIO_FRAME_SIZE
|
||||||
|
|
||||||
#define CODEC_TYPE_VIDEO AVMEDIA_TYPE_VIDEO
|
#define CODEC_TYPE_VIDEO AVMEDIA_TYPE_VIDEO
|
||||||
@@ -252,7 +253,7 @@ void CALL_CONVT ac_free_package(lp_ac_package pPackage)
|
|||||||
if (pPackage != NULL) {
|
if (pPackage != NULL) {
|
||||||
AVPacket* pkt = &((lp_ac_package_data)pPackage)->ffpackage;
|
AVPacket* pkt = &((lp_ac_package_data)pPackage)->ffpackage;
|
||||||
if (pkt) {
|
if (pkt) {
|
||||||
if (pkt->destruct) pkt->destruct(pkt);
|
if (pkt->destruct){pkt->destruct = av_destruct_packet; pkt->destruct(pkt);} //FIXME: workaround for deprecation of AVPacket::destruct
|
||||||
pkt->data = NULL; pkt->size = 0;
|
pkt->data = NULL; pkt->size = 0;
|
||||||
}
|
}
|
||||||
av_free((lp_ac_package_data)pPackage);
|
av_free((lp_ac_package_data)pPackage);
|
||||||
|
|||||||
@@ -1,10 +1,14 @@
|
|||||||
acinerella: acinerella.c acinerella.h
|
acinerella: acinerella.c acinerella.h
|
||||||
gcc -c acinerella.c -I /usr/local/include
|
gcc -c -fPIC acinerella.c -I /usr/local/include
|
||||||
|
|
||||||
ifeq ($(shell uname),Linux)
|
ifeq ($(shell uname),Linux)
|
||||||
gcc -shared -o libacinerella.so acinerella.o -lavformat -lavcodec -lavutil -lm -lswscale
|
gcc -shared -o libacinerella.so acinerella.o -lavformat -lavcodec -lavutil -lm -lswscale -lswresample
|
||||||
strip libacinerella.so
|
strip libacinerella.so
|
||||||
|
cp libacinerella.so ../../../../Output/
|
||||||
else
|
else
|
||||||
gcc -shared -o acinerella.dll -fPIC acinerella.o -lavformat -lavcodec -lavutil -lm -lswscale -lws2_32
|
gcc -shared -o acinerella.dll -fPIC acinerella.o -lavformat -lavcodec -lavutil -lm -lswscale -lws2_32
|
||||||
strip acinerella.dll
|
strip acinerella.dll
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f libacinerella.so ../../../../Output/libacinerella.so
|
||||||
@@ -349,6 +349,9 @@ namespace Vocaluxe
|
|||||||
CLog.LogError("Cannot load assembly " + args.Name + " from " + path + ": " + e + "\r\nOuter Error: " + e1);
|
CLog.LogError("Cannot load assembly " + args.Name + " from " + path + ": " + e + "\r\nOuter Error: " + e1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#if LINUX
|
||||||
|
catch(FileNotFoundException){}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
return assembly;
|
return assembly;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">DebugWin</Configuration>
|
<Configuration Condition=" '$(Configuration)' == '' ">DebugWin</Configuration>
|
||||||
@@ -178,8 +178,8 @@
|
|||||||
<Reference Include="Community.CsharpSqlite">
|
<Reference Include="Community.CsharpSqlite">
|
||||||
<HintPath>..\Output\Community.CsharpSqlite.dll</HintPath>
|
<HintPath>..\Output\Community.CsharpSqlite.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL">
|
<Reference Include="glib-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>True</SpecificVersion>
|
||||||
<HintPath>..\Output\glib-sharp.dll</HintPath>
|
<HintPath>..\Output\glib-sharp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="gstreamer-sharp, Version=0.99.0.0, Culture=neutral, PublicKeyToken=5cbf79803e97ff61, processorArchitecture=MSIL">
|
<Reference Include="gstreamer-sharp, Version=0.99.0.0, Culture=neutral, PublicKeyToken=5cbf79803e97ff61, processorArchitecture=MSIL">
|
||||||
@@ -213,6 +213,7 @@
|
|||||||
<Reference Include="System.Web.Services" />
|
<Reference Include="System.Web.Services" />
|
||||||
<Reference Include="System.Windows.Forms" />
|
<Reference Include="System.Windows.Forms" />
|
||||||
<Reference Include="System.XML" />
|
<Reference Include="System.XML" />
|
||||||
|
<Reference Include="Mono.Data.Sqlite" Condition=" !('$(Configuration)' == 'DebugWin' Or '$(Configuration)' == 'ReleaseWin' Or '$(Configuration)' == 'InstallerWin')"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="Base\CBackgroundMusic.cs" />
|
<Compile Include="Base\CBackgroundMusic.cs" />
|
||||||
@@ -288,8 +289,8 @@
|
|||||||
<Compile Include="Lib\Input\CControllerFramework.cs" />
|
<Compile Include="Lib\Input\CControllerFramework.cs" />
|
||||||
<Compile Include="Lib\Sound\Playback\GstreamerSharp\CGstreamerSharpAudio.cs" />
|
<Compile Include="Lib\Sound\Playback\GstreamerSharp\CGstreamerSharpAudio.cs" />
|
||||||
<Compile Include="Lib\Sound\Record\CRecordBase.cs" />
|
<Compile Include="Lib\Sound\Record\CRecordBase.cs" />
|
||||||
<Compile Include="Lib\Sound\Record\DirectSound\CSampleDataEventArgs.cs" />
|
<Compile Include="Lib\Sound\Record\DirectSound\CSampleDataEventArgs.cs" Condition=" ('$(Configuration)' == 'DebugWin' Or '$(Configuration)' == 'ReleaseWin' Or '$(Configuration)' == 'InstallerWin')"/>
|
||||||
<Compile Include="Lib\Sound\Record\DirectSound\CSoundCardSource.cs" />
|
<Compile Include="Lib\Sound\Record\DirectSound\CSoundCardSource.cs" Condition=" ('$(Configuration)' == 'DebugWin' Or '$(Configuration)' == 'ReleaseWin' Or '$(Configuration)' == 'InstallerWin')"/>
|
||||||
<Compile Include="Lib\Sound\Record\PitchTracker\CPitchTrackerTest.cs" />
|
<Compile Include="Lib\Sound\Record\PitchTracker\CPitchTrackerTest.cs" />
|
||||||
<Compile Include="Lib\Sound\Record\PitchTracker\CPtAKF.cs" />
|
<Compile Include="Lib\Sound\Record\PitchTracker\CPtAKF.cs" />
|
||||||
<Compile Include="Lib\Sound\Record\PitchTracker\CPtDyWa.cs" />
|
<Compile Include="Lib\Sound\Record\PitchTracker\CPtDyWa.cs" />
|
||||||
@@ -304,7 +305,7 @@
|
|||||||
<Compile Include="GameModes\IGameMode.cs" />
|
<Compile Include="GameModes\IGameMode.cs" />
|
||||||
<Compile Include="SongQueue\ISongQueue.cs" />
|
<Compile Include="SongQueue\ISongQueue.cs" />
|
||||||
<Compile Include="GlobalSuppressions.cs" />
|
<Compile Include="GlobalSuppressions.cs" />
|
||||||
<Compile Include="Lib\Draw\CDirect3D.cs">
|
<Compile Include="Lib\Draw\CDirect3D.cs" Condition=" ('$(Configuration)' == 'DebugWin' Or '$(Configuration)' == 'ReleaseWin' Or '$(Configuration)' == 'InstallerWin')">
|
||||||
<SubType>Form</SubType>
|
<SubType>Form</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="Lib\Draw\CDrawWinForm.cs">
|
<Compile Include="Lib\Draw\CDrawWinForm.cs">
|
||||||
@@ -319,7 +320,7 @@
|
|||||||
<Compile Include="Lib\Input\WiiMote\CWiiMote.cs" />
|
<Compile Include="Lib\Input\WiiMote\CWiiMote.cs" />
|
||||||
<Compile Include="Lib\Input\WiiMote\WiiMoteLib.cs" />
|
<Compile Include="Lib\Input\WiiMote\WiiMoteLib.cs" />
|
||||||
<Compile Include="Lib\Playlist\CPlaylistFile.cs" />
|
<Compile Include="Lib\Playlist\CPlaylistFile.cs" />
|
||||||
<Compile Include="Lib\Sound\Record\DirectSound\CDirectSoundRecord.cs" />
|
<Compile Include="Lib\Sound\Record\DirectSound\CDirectSoundRecord.cs" Condition=" ('$(Configuration)' == 'DebugWin' Or '$(Configuration)' == 'ReleaseWin' Or '$(Configuration)' == 'InstallerWin')" />
|
||||||
<Compile Include="Lib\Sound\Playback\OpenAL\COpenALPlay.cs" />
|
<Compile Include="Lib\Sound\Playback\OpenAL\COpenALPlay.cs" />
|
||||||
<Compile Include="Base\CSound.cs" />
|
<Compile Include="Base\CSound.cs" />
|
||||||
<Compile Include="Lib\Sound\Playback\PortAudio\CPortAudioPlay.cs" />
|
<Compile Include="Lib\Sound\Playback\PortAudio\CPortAudioPlay.cs" />
|
||||||
@@ -531,12 +532,13 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>xcopy /E /D /Y "$(ProjectDir)\Website" "$(SolutionDir)\PhoneGap"
|
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">xcopy /E /D /Y "$(ProjectDir)\Website" "$(SolutionDir)\PhoneGap"
|
||||||
powershell -command "$version = git describe --long; (Get-Content -Encoding UTF8 '$(ProjectDir)..\Output\Website\js\main.js') | Foreach-Object {$_ -replace '(?<=var *matchingServerVersion * = *\\\")\w*(?=\\\" *;)', %2524('@(VersionNumber)'+' ('+$version+')')} | Set-Content -Encoding UTF8 '$(ProjectDir)..\Output\Website\js\main.js'"
|
powershell -command "$version = git describe --long; (Get-Content -Encoding UTF8 '$(ProjectDir)..\Output\Website\js\main.js') | Foreach-Object {$_ -replace '(?<=var *matchingServerVersion * = *\\\")\w*(?=\\\" *;)', %2524('@(VersionNumber)'+' ('+$version+')')} | Set-Content -Encoding UTF8 '$(ProjectDir)..\Output\Website\js\main.js'"
|
||||||
powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs') | Foreach-Object {$_ -replace '(?<=AssemblyInformationalVersion\()(.*)(?=\))', '\"GITVERSION\"'} | Set-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs'"</PostBuildEvent>
|
powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs') | Foreach-Object {$_ -replace '(?<=AssemblyInformationalVersion\()(.*)(?=\))', '\"GITVERSION\"'} | Set-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs'"</PostBuildEvent>
|
||||||
|
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">cp -ruT "$(ProjectDir)Website" "$(SolutionDir)/PhoneGap"</PostBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PreBuildEvent>powershell -command "$version = git describe --long; (Get-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs') | Foreach-Object {$_ -replace 'GITVERSION', $version} | Set-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs'"</PreBuildEvent>
|
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">powershell -command "$version = git describe --long; (Get-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs') | Foreach-Object {$_ -replace 'GITVERSION', $version} | Set-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs'"</PreBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- 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.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
|
|||||||
@@ -12,6 +12,8 @@
|
|||||||
<AssemblyName>VocaluxeLib</AssemblyName>
|
<AssemblyName>VocaluxeLib</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
|
||||||
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
|
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|AnyCPU'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|AnyCPU'">
|
||||||
@@ -112,7 +114,7 @@
|
|||||||
<Compile Include="XmlStructs.cs" />
|
<Compile Include="XmlStructs.cs" />
|
||||||
<Compile Include="Xml\CTypeExtensions.cs" />
|
<Compile Include="Xml\CTypeExtensions.cs" />
|
||||||
<Compile Include="Xml\CXmlDeserializer.cs" />
|
<Compile Include="Xml\CXmlDeserializer.cs" />
|
||||||
<Compile Include="Xml\CXmlReader.cs" />
|
<Compile Include="Xml\CXMLReader.cs" />
|
||||||
<Compile Include="Xml\CXmlReaderBase.cs" />
|
<Compile Include="Xml\CXmlReaderBase.cs" />
|
||||||
<Compile Include="Xml\CXmlSerializer.cs" />
|
<Compile Include="Xml\CXmlSerializer.cs" />
|
||||||
<Compile Include="Enums.cs" />
|
<Compile Include="Enums.cs" />
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
windowsLibs = Output/gstreamer-sharp.dll Output/glib-sharp.dll
|
||||||
|
all:
|
||||||
|
$(MAKE) -C PitchTracker
|
||||||
|
$(MAKE) -C Vocaluxe/Lib/Video/Acinerella
|
||||||
|
rm -f $(windowsLibs)
|
||||||
|
xbuild /property:Platform=x64 /property:Configuration=ReleaseLinux
|
||||||
|
|
||||||
|
clean:
|
||||||
|
xbuild /target:Clean
|
||||||
|
$(MAKE) -C PitchTracker clean
|
||||||
|
$(MAKE) -C Vocaluxe/Lib/Video/Acinerella clean
|
||||||
|
git checkout $(windowsLibs)
|
||||||