From 0611148ec4cbf2095f03fdd19178d4451dc74583 Mon Sep 17 00:00:00 2001 From: Flamefire Date: Thu, 25 Sep 2014 19:11:03 +0200 Subject: [PATCH] Handle gstreamer audio init better --- .../GstreamerSharp/CGstreamerSharpAudio.cs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs index 7d35df67..e32d3795 100644 --- a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs +++ b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs @@ -17,6 +17,7 @@ using Gst; using System; +using Vocaluxe.Base; namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp { @@ -26,13 +27,20 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp { if (_Initialized) return false; + #if ARCH_X86 - var gstreamerEnvVar = Environment.GetEnvironmentVariable("GSTREAMER_1_0_ROOT_X86", EnvironmentVariableTarget.User); + const string varName = "GSTREAMER_1_0_ROOT_X86"; #endif #if ARCH_X64 - var gstreamerEnvVar = Environment.GetEnvironmentVariable("GSTREAMER_1_0_ROOT_X86_64", EnvironmentVariableTarget.User); + const string varName = "GSTREAMER_1_0_ROOT_X86_64"; #endif - var dllDirectory = gstreamerEnvVar + "bin\\"; + string gstreamerEnvVar = Environment.GetEnvironmentVariable(varName, EnvironmentVariableTarget.User); + 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; + } + string dllDirectory = gstreamerEnvVar + "bin\\"; COSFunctions.AddEnvironmentPath(dllDirectory); Application.Init();