diff options
| author | Michael <[email protected]> | 2017-01-29 11:59:18 -0500 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-01-29 11:59:18 -0500 |
| commit | abfd774638d509a0d5fe5a61fe69b890fa3e0fc6 (patch) | |
| tree | 62e7e7aea3a98615331180d28a3a5970f298d3a6 /ShiftOS_TheReturn | |
| parent | b5d51784117f5fdecb14bc1cef6a6d2477a7c810 (diff) | |
| download | shiftos_thereturn-abfd774638d509a0d5fe5a61fe69b890fa3e0fc6.tar.gz shiftos_thereturn-abfd774638d509a0d5fe5a61fe69b890fa3e0fc6.tar.bz2 shiftos_thereturn-abfd774638d509a0d5fe5a61fe69b890fa3e0fc6.zip | |
Scripting changes and background music!
Diffstat (limited to 'ShiftOS_TheReturn')
| -rw-r--r-- | ShiftOS_TheReturn/AudioManager.cs | 76 | ||||
| -rw-r--r-- | ShiftOS_TheReturn/Scripting.cs | 31 | ||||
| -rw-r--r-- | ShiftOS_TheReturn/ShiftOS.Engine.csproj | 5 | ||||
| -rw-r--r-- | ShiftOS_TheReturn/packages.config | 1 |
4 files changed, 113 insertions, 0 deletions
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 + { + /// <summary> + /// Gets a byte[] array corresponding to an MP3 track given an index. + /// </summary> + /// <param name="index">A track index to use when finding the right track.</param> + /// <returns>The MP3 byte[] array.</returns> + byte[] GetTrack(int index); + + /// <summary> + /// Gets the 1-based count of all available tracks. + /// </summary> + int Count { get; } + + /// <summary> + /// Gets or sets the track player's volume. + /// </summary> + 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 { /// <summary> 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 @@ <Reference Include="Discoursistency.Util"> <HintPath>..\Libraries\Discoursistency.Util.dll</HintPath> </Reference> + <Reference Include="NAudio, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\NAudio.1.8.0\lib\net35\NAudio.dll</HintPath> + <Private>True</Private> + </Reference> <Reference Include="NetSockets"> <HintPath>..\Libraries\NetSockets.dll</HintPath> </Reference> @@ -115,6 +119,7 @@ <ItemGroup> <Compile Include="AppearanceManager.cs" /> <Compile Include="AppLauncherDaemon.cs" /> + <Compile Include="AudioManager.cs" /> <Compile Include="Commands.cs" /> <Compile Include="Command.cs" /> <Compile Include="CrashHandler.cs" /> 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 @@ <package id="DynamicLua" version="1.1.2.0" targetFramework="net452" /> <package id="IronPython" version="2.7.5" targetFramework="net452" /> <package id="IronPython.Interpreter" version="2.7.4" targetFramework="net452" /> + <package id="NAudio" version="1.8.0" targetFramework="net451" /> <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" /> </packages>
\ No newline at end of file |
