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.WinForms | |
| 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.WinForms')
| -rw-r--r-- | ShiftOS.WinForms/AudioManager.cs | 17 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Program.cs | 1 | ||||
| -rw-r--r-- | ShiftOS.WinForms/ShiftOS.WinForms.csproj | 6 | ||||
| -rw-r--r-- | ShiftOS.WinForms/ShiftOSAudioProvider.cs | 47 | ||||
| -rw-r--r-- | ShiftOS.WinForms/packages.config | 1 |
5 files changed, 72 insertions, 0 deletions
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 @@ <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"> <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> + <Reference Include="Vlc.DotNet.Core.Interops, Version=2.1.130.0, Culture=neutral, PublicKeyToken=84529da31f4eb963, processorArchitecture=x86"> + <HintPath>..\packages\Vlc.DotNet.Core.Interops.2.1.130\lib\net45\x86\Vlc.DotNet.Core.Interops.dll</HintPath> + <Private>True</Private> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="Applications\Artpad.cs"> @@ -169,6 +173,7 @@ <Compile Include="Applications\Terminal.Designer.cs"> <DependentUpon>Terminal.cs</DependentUpon> </Compile> + <Compile Include="AudioManager.cs" /> <Compile Include="Commands.cs" /> <Compile Include="Controls\ColorControl.cs"> <SubType>UserControl</SubType> @@ -198,6 +203,7 @@ <Compile Include="Oobe.Designer.cs"> <DependentUpon>Oobe.cs</DependentUpon> </Compile> + <Compile Include="ShiftOSAudioProvider.cs" /> <Compile Include="Tools\ColorPickerDataBackend.cs" /> <Compile Include="Tools\ControlManager.cs" /> <Compile Include="Tools\DitheringEngine.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<List<string>>(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<List<string>>(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 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" /> + <package id="Vlc.DotNet.Core.Interops" version="2.1.130" targetFramework="net451" /> </packages>
\ No newline at end of file |
