mbrucedogs/KaraokePC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update build

Browse Source
This commit is contained in:
Brett Sanderson 2016-03-03 22:23:02 -05:00
parent fe0d1e9970
commit 882293b6c2
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
KaraokePlayer/KaraokePlayer.csproj
View File

@ -1013,7 +1013,7 @@
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>XCOPY "$(ProjectDir)lib" "$(TargetDir)" /S /y /c</PostBuildEvent> <PostBuildEvent>XCOPY "$(ProjectDir)lib" "$(TargetDir)lib" /S /y /c</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.

4
KaraokePlayer/KaraokeVideoPlayer.Designer.cs generated
View File

@ -28,7 +28,6 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(KaraokeVideoPlayer));
this.vlcPlayer = new Vlc.DotNet.Forms.VlcControl(); this.vlcPlayer = new Vlc.DotNet.Forms.VlcControl();
((System.ComponentModel.ISupportInitialize)(this.vlcPlayer)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.vlcPlayer)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
@ -43,7 +42,7 @@
this.vlcPlayer.Spu = -1; this.vlcPlayer.Spu = -1;
this.vlcPlayer.TabIndex = 0; this.vlcPlayer.TabIndex = 0;
this.vlcPlayer.Text = "vlcControl1"; this.vlcPlayer.Text = "vlcControl1";
this.vlcPlayer.VlcLibDirectory = ((System.IO.DirectoryInfo)(resources.GetObject("vlcPlayer.VlcLibDirectory"))); this.vlcPlayer.VlcLibDirectory = null;
this.vlcPlayer.VlcMediaplayerOptions = new string[] { this.vlcPlayer.VlcMediaplayerOptions = new string[] {
"--projectm-preset-path=Presets", "--projectm-preset-path=Presets",
"--projectm-width=1680", "--projectm-width=1680",
@ -53,6 +52,7 @@
"--no-video", "--no-video",
"--extraintf=logger", "--extraintf=logger",
"--verbose=2"}; "--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.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.TimeChanged += new System.EventHandler<Vlc.DotNet.Core.VlcMediaPlayerTimeChangedEventArgs>(this.vlcPlayer_TimeChanged);
this.vlcPlayer.Stopped += new System.EventHandler<Vlc.DotNet.Core.VlcMediaPlayerStoppedEventArgs>(this.vlcPlayer_Stopped); this.vlcPlayer.Stopped += new System.EventHandler<Vlc.DotNet.Core.VlcMediaPlayerStoppedEventArgs>(this.vlcPlayer_Stopped);

6
KaraokePlayer/KaraokeVideoPlayer.cs
View File

@ -1,6 +1,7 @@
using System; using System;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.Reflection;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Timers; using System.Timers;
@ -80,5 +81,10 @@ namespace KaraokePlayer
_overlayForm.Controls.Add(_lyrics); _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\"));
}
} }
} }

7
KaraokePlayer/KaraokeVideoPlayer.resx
View File

@ -117,11 +117,4 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="vlcPlayer.VlcLibDirectory" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAEAQAAABdTeXN0ZW0uSU8uRGlyZWN0b3J5SW5mbwIAAAAMT3JpZ2luYWxQ
YXRoCEZ1bGxQYXRoAQEGAgAAAEBDOlxVc2Vyc1xsLWJyZVxEZXNrdG9wXEthcmFva2VQbGF5ZXJcS2Fy
YW9rZVBsYXllclxiaW5cRGVidWdcVkxDCQIAAAAL
</value>
</data>
</root> </root>