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 diff --git a/ShiftOS_TheReturn/AudioManager.cs b/ShiftOS_TheReturn/AudioManager.cs new file mode 100644 index 0000000..d133f07 --- /dev/null +++ b/ShiftOS_TheReturn/AudioManager.cs @@ -0,0 +1,76 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using NAudio; +using NAudio.Wave; + +namespace ShiftOS.Engine +{ + public static class AudioManager + { + private static WaveOut _out = null; + private static AudioFileReader _reader = null; + private static IAudioProvider _provider = null; + private static bool _running = true; + + public static void Init(IAudioProvider _p) + { + _provider = _p; + AppearanceManager.OnExit += () => + { + _running = false; + _out?.Stop(); + _reader?.Dispose(); + _out?.Dispose(); + System.IO.File.Delete("temp.mp3"); + }; + var t = new Thread(() => + { + Random rnd = new Random(); + while(_running == true) + { + int track = rnd.Next(0, _provider.Count); + byte[] mp3 = _provider.GetTrack(track); + System.IO.File.WriteAllBytes("temp.mp3", mp3); + _reader = new AudioFileReader("temp.mp3"); + _out = new WaveOut(); + _out.Init(_reader); + _out.Volume = _provider.Volume; + + _out.Play(); + while(_out.PlaybackState == PlaybackState.Playing) + { + Thread.Sleep(5000); //even when the player isn't playing, this will give a good delay between songs. + } + } + }); + t.IsBackground = true; + t.Start(); + } + + + } + + public interface IAudioProvider + { + /// + /// Gets a byte[] array corresponding to an MP3 track given an index. + /// + /// A track index to use when finding the right track. + /// The MP3 byte[] array. + byte[] GetTrack(int index); + + /// + /// Gets the 1-based count of all available tracks. + /// + int Count { get; } + + /// + /// Gets or sets the track player's volume. + /// + float Volume { get; set; } + } +} diff --git a/ShiftOS_TheReturn/Scripting.cs b/ShiftOS_TheReturn/Scripting.cs index bea2568..4d5c1a7 100644 --- a/ShiftOS_TheReturn/Scripting.cs +++ b/ShiftOS_TheReturn/Scripting.cs @@ -148,6 +148,37 @@ namespace ShiftOS.Engine.Scripting } } + [Exposed("console")] + public class ConsoleFunctions + { + public void write(dynamic text) + { + Console.Write(text.ToString()); + } + + public void writeLine(dynamic text) + { + Console.WriteLine(text.ToString()); + } + } + + [Exposed("sos")] + public class SystemFunctions + { + public int getCodepoints() { return SaveSystem.CurrentSave.Codepoints; } + + + public bool runCommand(string cmd) + { + var args = TerminalBackend.GetArgs(ref cmd); + + return TerminalBackend.RunClient(cmd, args); + } + + + } + + public class ExposedAttribute : Attribute { /// diff --git a/ShiftOS_TheReturn/ShiftOS.Engine.csproj b/ShiftOS_TheReturn/ShiftOS.Engine.csproj index ce22f3c..1ae2855 100644 --- a/ShiftOS_TheReturn/ShiftOS.Engine.csproj +++ b/ShiftOS_TheReturn/ShiftOS.Engine.csproj @@ -61,6 +61,10 @@ ..\Libraries\Discoursistency.Util.dll + + ..\packages\NAudio.1.8.0\lib\net35\NAudio.dll + True + ..\Libraries\NetSockets.dll @@ -115,6 +119,7 @@ + diff --git a/ShiftOS_TheReturn/packages.config b/ShiftOS_TheReturn/packages.config index ace2c07..2827246 100644 --- a/ShiftOS_TheReturn/packages.config +++ b/ShiftOS_TheReturn/packages.config @@ -3,5 +3,6 @@ + \ No newline at end of file