From abfd774638d509a0d5fe5a61fe69b890fa3e0fc6 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 29 Jan 2017 11:59:18 -0500 Subject: Scripting changes and background music! --- ShiftOS.WinForms/AudioManager.cs | 17 ++++++++++++ ShiftOS.WinForms/Program.cs | 1 + ShiftOS.WinForms/ShiftOS.WinForms.csproj | 6 ++++ ShiftOS.WinForms/ShiftOSAudioProvider.cs | 47 ++++++++++++++++++++++++++++++++ ShiftOS.WinForms/packages.config | 1 + 5 files changed, 72 insertions(+) create mode 100644 ShiftOS.WinForms/AudioManager.cs create mode 100644 ShiftOS.WinForms/ShiftOSAudioProvider.cs (limited to 'ShiftOS.WinForms') diff --git a/ShiftOS.WinForms/AudioManager.cs b/ShiftOS.WinForms/AudioManager.cs new file mode 100644 index 0000000..530a700 --- /dev/null +++ b/ShiftOS.WinForms/AudioManager.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShiftOS.WinForms +{ + public static class AudioManager + { + + public static void Test() + { + + } + } +} diff --git a/ShiftOS.WinForms/Program.cs b/ShiftOS.WinForms/Program.cs index ea6445c..30a29e2 100644 --- a/ShiftOS.WinForms/Program.cs +++ b/ShiftOS.WinForms/Program.cs @@ -47,6 +47,7 @@ namespace ShiftOS.WinForms Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); //if ANYONE puts code before those two winforms config lines they will be declared a drunky. - Michael + ShiftOS.Engine.AudioManager.Init(new ShiftOSAudioProvider()); Localization.RegisterProvider(new WFLanguageProvider()); Shiftorium.RegisterProvider(new WinformsShiftoriumProvider()); AppearanceManager.OnExit += () => diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj index 739719b..3cc3b4f 100644 --- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj +++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj @@ -47,6 +47,10 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Vlc.DotNet.Core.Interops.2.1.130\lib\net45\x86\Vlc.DotNet.Core.Interops.dll + True + @@ -169,6 +173,7 @@ Terminal.cs + UserControl @@ -198,6 +203,7 @@ Oobe.cs + diff --git a/ShiftOS.WinForms/ShiftOSAudioProvider.cs b/ShiftOS.WinForms/ShiftOSAudioProvider.cs new file mode 100644 index 0000000..f217325 --- /dev/null +++ b/ShiftOS.WinForms/ShiftOSAudioProvider.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Newtonsoft.Json; +using ShiftOS.Engine; + +namespace ShiftOS.WinForms +{ + class ShiftOSAudioProvider : IAudioProvider + { + public int Count + { + get + { + var wc = new System.Net.WebClient(); + return JsonConvert.DeserializeObject>(wc.DownloadString("http://getshiftos.ml/api.php?q=soundtrack")).Count; + } + } + + private float _vol = 1.0f; + + public float Volume + { + get + { + return _vol; + } + + set + { + _vol = value; + } + } + + public byte[] GetTrack(int index) + { + var wc = new System.Net.WebClient(); + var st = JsonConvert.DeserializeObject>(wc.DownloadString("http://getshiftos.ml/api.php?q=soundtrack")); + + return wc.DownloadData(st[index]); + } + } + + +} diff --git a/ShiftOS.WinForms/packages.config b/ShiftOS.WinForms/packages.config index 9d64bf3..51393a5 100644 --- a/ShiftOS.WinForms/packages.config +++ b/ShiftOS.WinForms/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file -- cgit v1.2.3