Merge branch 'develop'

Author: Algorithman

README.md

@@ -2,14 +2,27 @@
 
 Based on ZweiStein's SoundSense, this is a c# port to get rid of installing java on windows systems.
 
-Using the NAudio libraries of Mark Heath there is now full volume control over all audio channels.
+Using the [fmod audio](http://fmod.org "fmod audio") libraries by Firelight Technologies there is now full volume control for all sound channels.
 
 *System requirements:*
 
-Windows + .NET 4.5.1 (might get lower in the future, need to finish the code first)
+- Mono or .NET 4.0 (depending on your OS)
+- a sound card
+- Dwarf Fortress
+- Fun
+
+
+On windows you have to install the gtk-sharp libraries ([http://www.mono-project.com/download/#download-win](http://www.mono-project.com/download/#download-win)).
+On linux or OSX apparently the mono framework (successfully tested on a debian with mono version 3.28) and the gtk libraries are needed.
+
+Memory footprint is around 30-45 MB, cpu load around 1.5% on a 4-core AMD phenom II X4 @ 3.2GHz.
 
-Memory footprint is spiking up to 500MB (caching the sounds, there will be a future option for low memory systems, but that increases cpu load), normally around 70-80MB
 
 
 Credits:
-  Thx to ZweiStein for his good work
+
+- Toady One and ThreeToe for Dwarf Fortress
+- Firelight Techonologies for fmod audio libraries
+- ZweiStein for his good work on SoundSense
+- jecowa for his efforts on OSX testing
+

SoundCenSe GTK/Misc/Misc.csproj

@@ -7,7 +7,6 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Misc</RootNamespace>
     <AssemblyName>Misc</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <ReleaseVersion>1.3.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

SoundCenSe GTK/SoundCenSeGTK/SoundCenSeGTK.csproj

@@ -7,7 +7,6 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>SoundCenSeGTK</RootNamespace>
     <AssemblyName>SoundCenSeGTK</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <ReleaseVersion>1.3.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -53,13 +52,13 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-    <Reference Include="NLog">
-      <HintPath>..\packages\NLog.4.3.6\lib\net45\NLog.dll</HintPath>
-    </Reference>
+    <Reference Include="System.Xml" />
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog">
+      <HintPath>..\packages\NLog.4.3.6\lib\net40\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="gtk-gui\gui.stetic">
@@ -131,19 +130,10 @@
     <None Include="libfmod.dylib">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="libfmodL.dylib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="libfmodstudio.dylib">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="libfmodstudioL.dylib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="libfmod.so.8.8">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="libfmodL.so.8.8">
+    <None Include="libfmod.so">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

SoundCenSe GTK/SoundCenSeGTK/libfmod.so.8.8 renamed to SoundCenSe GTK/SoundCenSeGTK/libfmod.so

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="NLog" version="4.3.6" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
+  <package id="NLog" version="4.3.6" targetFramework="net40" />
   <package id="NLog.Config" version="4.3.6.1" targetFramework="net45" />
   <package id="NLog.Schema" version="4.3.6.1" targetFramework="net45" />
 </packages>

SoundCenSe GTK/SoundCenSeGTK/libfmodL.dylib

@@ -7,7 +7,6 @@
     <OutputType>Library</OutputType>
     <RootNamespace>SoundCenSeGUI</RootNamespace>
     <AssemblyName>SoundCenSeGUI</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <ReleaseVersion>1.3.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">