From 882293b6c2380469c106e094208904e480b7e6ec Mon Sep 17 00:00:00 2001
From: Brett Sanderson <l-brett-l@hotmail.com>
Date: Thu, 3 Mar 2016 22:23:02 -0500
Subject: [PATCH] update build

---
 KaraokePlayer/KaraokePlayer.csproj           | 2 +-
 KaraokePlayer/KaraokeVideoPlayer.Designer.cs | 4 ++--
 KaraokePlayer/KaraokeVideoPlayer.cs          | 6 ++++++
 KaraokePlayer/KaraokeVideoPlayer.resx        | 7 -------
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/KaraokePlayer/KaraokePlayer.csproj b/KaraokePlayer/KaraokePlayer.csproj
index cdfa45b..2e4a823 100644
--- a/KaraokePlayer/KaraokePlayer.csproj
+++ b/KaraokePlayer/KaraokePlayer.csproj
@@ -1013,7 +1013,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>XCOPY "$(ProjectDir)lib" "$(TargetDir)" /S /y /c</PostBuildEvent>
+    <PostBuildEvent>XCOPY "$(ProjectDir)lib" "$(TargetDir)lib" /S /y /c</PostBuildEvent>
   </PropertyGroup>
   <!-- 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.
diff --git a/KaraokePlayer/KaraokeVideoPlayer.Designer.cs b/KaraokePlayer/KaraokeVideoPlayer.Designer.cs
index 11404af..f57a212 100644
--- a/KaraokePlayer/KaraokeVideoPlayer.Designer.cs
+++ b/KaraokePlayer/KaraokeVideoPlayer.Designer.cs
@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(KaraokeVideoPlayer));
             this.vlcPlayer = new Vlc.DotNet.Forms.VlcControl();
             ((System.ComponentModel.ISupportInitialize)(this.vlcPlayer)).BeginInit();
             this.SuspendLayout();
@@ -43,7 +42,7 @@
             this.vlcPlayer.Spu = -1;
             this.vlcPlayer.TabIndex = 0;
             this.vlcPlayer.Text = "vlcControl1";
-            this.vlcPlayer.VlcLibDirectory = ((System.IO.DirectoryInfo)(resources.GetObject("vlcPlayer.VlcLibDirectory")));
+            this.vlcPlayer.VlcLibDirectory = null;
             this.vlcPlayer.VlcMediaplayerOptions = new string[] {
         "--projectm-preset-path=Presets",
         "--projectm-width=1680",
@@ -53,6 +52,7 @@
         "--no-video",
         "--extraintf=logger",
         "--verbose=2"};
+            this.vlcPlayer.VlcLibDirectoryNeeded += new System.EventHandler<Vlc.DotNet.Forms.VlcLibDirectoryNeededEventArgs>(this.vlcPlayer_VlcLibDirectoryNeeded);
             this.vlcPlayer.Playing += new System.EventHandler<Vlc.DotNet.Core.VlcMediaPlayerPlayingEventArgs>(this.vlcPlayer_Playing);
             this.vlcPlayer.TimeChanged += new System.EventHandler<Vlc.DotNet.Core.VlcMediaPlayerTimeChangedEventArgs>(this.vlcPlayer_TimeChanged);
             this.vlcPlayer.Stopped += new System.EventHandler<Vlc.DotNet.Core.VlcMediaPlayerStoppedEventArgs>(this.vlcPlayer_Stopped);
diff --git a/KaraokePlayer/KaraokeVideoPlayer.cs b/KaraokePlayer/KaraokeVideoPlayer.cs
index 98f7d06..8d86e64 100644
--- a/KaraokePlayer/KaraokeVideoPlayer.cs
+++ b/KaraokePlayer/KaraokeVideoPlayer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Drawing;
 using System.IO;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Timers;
@@ -80,5 +81,10 @@ namespace KaraokePlayer
                 _overlayForm.Controls.Add(_lyrics);
             }
         }
+
+        private void vlcPlayer_VlcLibDirectoryNeeded(object sender, Vlc.DotNet.Forms.VlcLibDirectoryNeededEventArgs e)
+        {
+            e.VlcLibDirectory = new DirectoryInfo(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"lib\vlc\"));
+        }
     }
 }
\ No newline at end of file
diff --git a/KaraokePlayer/KaraokeVideoPlayer.resx b/KaraokePlayer/KaraokeVideoPlayer.resx
index ec16eeb..1af7de1 100644
--- a/KaraokePlayer/KaraokeVideoPlayer.resx
+++ b/KaraokePlayer/KaraokeVideoPlayer.resx
@@ -117,11 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="vlcPlayer.VlcLibDirectory" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAEAQAAABdTeXN0ZW0uSU8uRGlyZWN0b3J5SW5mbwIAAAAMT3JpZ2luYWxQ
-        YXRoCEZ1bGxQYXRoAQEGAgAAAEBDOlxVc2Vyc1xsLWJyZVxEZXNrdG9wXEthcmFva2VQbGF5ZXJcS2Fy
-        YW9rZVBsYXllclxiaW5cRGVidWdcVkxDCQIAAAAL
-</value>
-  </data>
 </root>
\ No newline at end of file