Setting Audio.Outputs.Current property throws AccessViolationException (

#493) Fixes #492 Thanks @Rukhlov
ZeBobo5 · Jan 19, 2019 · f0d3e2a · f0d3e2a
1 parent fcb247b
commit f0d3e2a
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 13 deletions.
diff --git a/src/Samples/Samples.WinForms.Advanced/Sample.Designer.cs b/src/Samples/Samples.WinForms.Advanced/Sample.Designer.cs
diff --git a/src/Samples/Samples.WinForms.Advanced/Sample.cs b/src/Samples/Samples.WinForms.Advanced/Sample.cs
@@ -7,13 +7,42 @@
 using Vlc.DotNet.Core.Interops.Signatures;
 using Vlc.DotNet.Forms;
 
+using System.Linq;
+using System.Collections.Generic;
+
 namespace Samples.WinForms.Advanced
 {
     public partial class Sample : Form
     {
         public Sample()
         {
             InitializeComponent();
+
+            if (myVlcControl.Audio != null)
+            {
+                var outputs = myVlcControl.Audio.Outputs;
+                if (outputs != null)
+                {
+
+                    myCbxAudioOutputs.DataSource = new List<AudioOutputDescription>(outputs.All);
+                    myCbxAudioOutputs.DisplayMember = "Description";
+                    myCbxAudioOutputs.Enabled = true;
+                    myCbxAudioOutputs.SelectedIndex = -1;
+                    myCbxAudioOutputs.SelectedValueChanged += (o, a) =>
+                    {
+                        var val = myCbxAudioOutputs.SelectedValue;
+                        if (val != null)
+                        {
+                            var output = val as AudioOutputDescription;
+                            if (output != null)
+                            {
+                                outputs.Current = output;
+                            }
+                        }
+                    };
+
+                }
+            }
         }
 
         /// <summary>

diff --git a/src/Samples/Samples.WinForms.MultiplePlayers/App.config b/src/Samples/Samples.WinForms.MultiplePlayers/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/src/Samples/Samples.WinForms.MultiplePlayers/Samples.WinForms.MultiplePlayers.csproj b/src/Samples/Samples.WinForms.MultiplePlayers/Samples.WinForms.MultiplePlayers.csproj
@@ -14,6 +14,7 @@
     <Deterministic>true</Deterministic>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/src/Vlc.DotNet.Core.Interops/Signatures/libvlc_media_player.h/libvlc_audio_output_set.cs b/src/Vlc.DotNet.Core.Interops/Signatures/libvlc_media_player.h/libvlc_audio_output_set.cs
@@ -8,5 +8,5 @@ namespace Vlc.DotNet.Core.Interops.Signatures
     /// </summary>
     [LibVlcFunction("libvlc_audio_output_set")]
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    internal delegate void SetAudioOutput(IntPtr mediaPlayerInstance, Utf8StringHandle audioOutputName);
+    internal delegate int SetAudioOutput(IntPtr mediaPlayerInstance, Utf8StringHandle audioOutputName);
 }
diff --git a/src/Vlc.DotNet.Core.Interops/VlcManager.SetAudioOutput.cs b/src/Vlc.DotNet.Core.Interops/VlcManager.SetAudioOutput.cs
@@ -5,18 +5,18 @@ namespace Vlc.DotNet.Core.Interops
 {
     public sealed partial class VlcManager
     {
-        public void SetAudioOutput(AudioOutputDescriptionStructure output)
+        public int SetAudioOutput(VlcMediaPlayerInstance mediaPlayerInstance, AudioOutputDescriptionStructure output)
         {
-            SetAudioOutput(output.Name);
+            return SetAudioOutput(mediaPlayerInstance, output.Name);
         }
 
-        public void SetAudioOutput(string outputName)
+        public int SetAudioOutput(VlcMediaPlayerInstance mediaPlayerInstance, string outputName)
         {
             EnsureVlcInstance();
 
             using (var outputInterop = Utf8InteropStringConverter.ToUtf8StringHandle(outputName))
             {
-                GetInteropDelegate<SetAudioOutput>().Invoke(myVlcInstance, outputInterop);
+                return GetInteropDelegate<SetAudioOutput>().Invoke(mediaPlayerInstance, outputInterop);
             }
         }
     }

diff --git a/src/Vlc.DotNet.Core/AudioOutputsManagement.cs b/src/Vlc.DotNet.Core/AudioOutputsManagement.cs
@@ -45,7 +45,7 @@ public AudioOutputDescription Current
             {
                 throw new NotSupportedException("Not implemented in LibVlc.");
             }
-            set { myManager.SetAudioOutput(value.Name); }
+            set { myManager.SetAudioOutput(myMediaPlayerInstance, value.Name); }
         }
     }
 }
diff --git a/src/Vlc.DotNet.Core/VlcMediaPlayer/VlcMediaPlayer.cs b/src/Vlc.DotNet.Core/VlcMediaPlayer/VlcMediaPlayer.cs
@@ -99,6 +99,11 @@ public IntPtr VideoHostControlHandle
             set { Manager.SetMediaPlayerVideoHostHandle(myMediaPlayerInstance, value); }
         }
 
+        public int SetAudioOutput(string outputName)
+        {
+            return this.Manager.SetAudioOutput(myMediaPlayerInstance, outputName);
+        }
+
         public void Dispose()
         {
             Dispose(true);