Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gstreamer is installed automatically (only if it is not installed on the system)

Browse Source
This commit is contained in:
lukeIam committed 2015-08-29 18:53:50 +02:00
1 parent dee0e2139f
commit 3c32d3fec8
3 files changed
+22 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs
+18 -3
View File
@@ -18,6 +18,7 @@
using Gst;
using System;
using Vocaluxe.Base;
using System.IO;
namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
{
@@ -35,12 +36,26 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
const string varName = "GSTREAMER_1_0_ROOT_X86_64";
#endif
string gstreamerEnvVar = Environment.GetEnvironmentVariable(varName, EnvironmentVariableTarget.User);
string dllDirectory;
if (gstreamerEnvVar == null)
{
CLog.LogError("Gstreamer not found! Make sure you installed it correctly and if it set the environment variable '" + varName + "'!", true);
return false;
#if ARCH_X86
dllDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "gstreamer86\\bin\\");
#endif
#if ARCH_X64
dllDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "gstreamer64\\bin\\");
#endif
if (!Directory.Exists(dllDirectory))
{
CLog.LogError("Gstreamer not found! Make sure you installed it correctly and if it set the environment variable '" + varName + "'!", true);
return false;
}
}
string dllDirectory = gstreamerEnvVar + "bin\\";
else
{
dllDirectory = gstreamerEnvVar + "bin\\";
}
COSFunctions.AddEnvironmentPath(dllDirectory);
#endif
Application.Init();
Vocaluxe/Vocaluxe.csproj
+3 -1
View File
@@ -31,7 +31,7 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<NuGetPackageImportStamp>82574e3f</NuGetPackageImportStamp>
<NuGetPackageImportStamp>561bc599</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -578,6 +578,7 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.0\build\vocaluxe.dependencies.slimdx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.slimdx.1.0.0\build\vocaluxe.dependencies.slimdx.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.themes.ambient.1.0.0\build\vocaluxe.themes.ambient.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.themes.ambient.1.0.0\build\vocaluxe.themes.ambient.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.1.0.0\build\vocaluxe.dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.1.0.0\build\vocaluxe.dependencies.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.0\build\vocaluxe.dependencies.gstreamer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamer.1.0.0\build\vocaluxe.dependencies.gstreamer.targets'))" />
</Target>
<Import Project="..\packages\vocaluxe.dependencies.sqlite.1.0.0\build\vocaluxe.dependencies.sqlite.targets" Condition="Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.0\build\vocaluxe.dependencies.sqlite.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.acinerella.1.0.0\build\vocaluxe.dependencies.acinerella.targets" Condition="Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.0\build\vocaluxe.dependencies.acinerella.targets')" />
@@ -590,4 +591,5 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb
<Import Project="..\packages\vocaluxe.dependencies.slimdx.1.0.0\build\vocaluxe.dependencies.slimdx.targets" Condition="Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.0\build\vocaluxe.dependencies.slimdx.targets')" />
<Import Project="..\packages\vocaluxe.themes.ambient.1.0.0\build\vocaluxe.themes.ambient.targets" Condition="Exists('..\packages\vocaluxe.themes.ambient.1.0.0\build\vocaluxe.themes.ambient.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.1.0.0\build\vocaluxe.dependencies.targets" Condition="Exists('..\packages\vocaluxe.dependencies.1.0.0\build\vocaluxe.dependencies.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.gstreamer.1.0.0\build\vocaluxe.dependencies.gstreamer.targets" Condition="Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.0\build\vocaluxe.dependencies.gstreamer.targets')" />
</Project>
Vocaluxe/packages.config
+1
View File
@@ -7,6 +7,7 @@
<package id="vocaluxe.dependencies.aforgevideo" version="1.0.0" targetFramework="net40" />
<package id="vocaluxe.dependencies.csharpsqlite" version="1.0.0" targetFramework="net40" />
<package id="vocaluxe.dependencies.ffmpeg" version="1.0.0" targetFramework="net40" />
<package id="vocaluxe.dependencies.gstreamer" version="1.0.0" targetFramework="net40" />
<package id="vocaluxe.dependencies.gstreamersharp" version="1.0.0" targetFramework="net40" />
<package id="vocaluxe.dependencies.hidapi" version="1.0.0" targetFramework="net40" />
<package id="vocaluxe.dependencies.jsonnet" version="1.0.0" targetFramework="net40" />