DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Merge pull request #293 from SpoinkyNL/development

Browse Source 
1.8.0.1
This commit is contained in:
Robert Beekman 2017-01-26 13:10:20 +01:00 committed by GitHub
commit 4e2f852bcb
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Artemis/Artemis/Artemis.csproj
View File

@ -188,7 +188,7 @@
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\squirrel.windows.1.5.1\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath> <HintPath>..\packages\squirrel.windows.1.4.4\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
@ -244,7 +244,7 @@
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\squirrel.windows.1.5.1\lib\Net45\NuGet.Squirrel.dll</HintPath> <HintPath>..\packages\squirrel.windows.1.4.4\lib\Net45\NuGet.Squirrel.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Open.WinKeyboardHook, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Open.WinKeyboardHook, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
@ -271,8 +271,8 @@
<HintPath>..\packages\SpotifyAPI-NET.2.12.0\lib\SpotifyAPI.dll</HintPath> <HintPath>..\packages\SpotifyAPI-NET.2.12.0\lib\SpotifyAPI.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Squirrel, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Squirrel, Version=1.4.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\squirrel.windows.1.5.1\lib\Net45\Squirrel.dll</HintPath> <HintPath>..\packages\squirrel.windows.1.4.4\lib\Net45\Squirrel.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />

7
Artemis/Artemis/Modules/Games/TheDivision/TheDivisionModel.cs
View File

@ -64,12 +64,15 @@ namespace Artemis.Modules.Games.TheDivision
// Convert the given string to a list of ints // Convert the given string to a list of ints
var stringParts = reply.Split(' '); var stringParts = reply.Split(' ');
if (stringParts[0] != "1")
return;
// Parse into a list of ints and interpertrate
var parts = new int[stringParts.Length]; var parts = new int[stringParts.Length];
for (var i = 0; i < stringParts.Length; i++) for (var i = 0; i < stringParts.Length; i++)
parts[i] = int.Parse(stringParts[i]); parts[i] = int.Parse(stringParts[i]);
if (parts[0] == 1) InterpertrateDivisionKey(parts);
InterpertrateDivisionKey(parts);
} }
// Parses Division key data to game data // Parses Division key data to game data

8
Artemis/Artemis/Profiles/Layers/Types/Audio/AudioCapturing/AudioCapture.cs
View File

@ -24,6 +24,7 @@ namespace Artemis.Profiles.Layers.Types.Audio.AudioCapturing
private BasicSpectrumProvider _spectrumProvider; private BasicSpectrumProvider _spectrumProvider;
private GainSource _volume; private GainSource _volume;
private int _volumeIndex; private int _volumeIndex;
private bool _starting;
public AudioCapture(ILogger logger, MMDevice device, MmDeviceType type) public AudioCapture(ILogger logger, MMDevice device, MmDeviceType type)
{ {
@ -134,7 +135,11 @@ namespace Artemis.Profiles.Layers.Types.Audio.AudioCapturing
private void Start() private void Start()
{ {
if (_starting)
return;
Logger.Debug("Starting audio capture for device: {0}", Device?.FriendlyName ?? "default"); Logger.Debug("Starting audio capture for device: {0}", Device?.FriendlyName ?? "default");
_starting = true;
try try
{ {
@ -190,6 +195,7 @@ namespace Artemis.Profiles.Layers.Types.Audio.AudioCapturing
{ {
Logger.Warn(e, "Failed to start WASAPI audio capture"); Logger.Warn(e, "Failed to start WASAPI audio capture");
} }
_starting = false;
} }
private void Stop() private void Stop()
@ -211,6 +217,8 @@ namespace Artemis.Profiles.Layers.Types.Audio.AudioCapturing
_disableTimer.Stop(); _disableTimer.Stop();
_volumeTimer.Stop(); _volumeTimer.Stop();
_mayStop = false;
} }
} }
} }

BIN
Artemis/Artemis/Resources/Keyboards/default-profiles.zip
View File

Binary file not shown.

2
Artemis/Artemis/packages.config
View File

@ -29,6 +29,6 @@
<package id="SharpDX.Direct3D9" version="3.1.1" targetFramework="net461" /> <package id="SharpDX.Direct3D9" version="3.1.1" targetFramework="net461" />
<package id="Splat" version="2.0.0" targetFramework="net461" /> <package id="Splat" version="2.0.0" targetFramework="net461" />
<package id="SpotifyAPI-NET" version="2.12.0" targetFramework="net461" /> <package id="SpotifyAPI-NET" version="2.12.0" targetFramework="net461" />
<package id="squirrel.windows" version="1.5.1" targetFramework="net461" /> <package id="squirrel.windows" version="1.4.4" targetFramework="net461" />
<package id="WpfExceptionViewer" version="1.0.0.0" targetFramework="net452" /> <package id="WpfExceptionViewer" version="1.0.0.0" targetFramework="net452" />
</packages> </packages>