Skip to content

Commit

Permalink
Removed and deprecated no longer used audio tools
Browse files Browse the repository at this point in the history
Also changed audio util exe resolution algorithm. We will now look for a pre-packaged tool, but if we don't find one we'll search the system for a binary on PATH.

Re added missing mp3 libs to sox folder.

Removed AP.Settings.json because we no lonfer have any configurable settings.

Work done for #196
  • Loading branch information
atruskie committed Mar 9, 2020
1 parent 433f4bf commit 103ad4d
Show file tree
Hide file tree
Showing 30 changed files with 586 additions and 768 deletions.
1 change: 0 additions & 1 deletion AudioAnalysis.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.editorconfig = .editorconfig
tests\Acoustics.Test\.runsettings = tests\Acoustics.Test\.runsettings
src\AP.CopyFiles.targets = src\AP.CopyFiles.targets
src\AP.Settings.json = src\AP.Settings.json
src\AP.VersionBuild.targets = src\AP.VersionBuild.targets
src\AssemblyMetadata.cs.template = src\AssemblyMetadata.cs.template
src\AssemblyMetadata.Generated.targets = src\AssemblyMetadata.Generated.targets
Expand Down
33 changes: 18 additions & 15 deletions AudioAnalysis.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_INVOCATION_LPAR/@EntryValue">True</s:Boolean>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARGUMENTS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>



<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
&lt;TypePattern DisplayName="Non-reorderable types"&gt;&#xD;
Expand Down Expand Up @@ -247,16 +247,16 @@
<s:Boolean x:Key="/Default/Environment/Hierarchy/Build/SolutionBuilderNext/LogMessagesToOutput/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/Hierarchy/Build/SolutionBuilderNext/LogToOutput/@EntryValue">True</s:Boolean>
<s:String x:Key="/Default/Environment/Hierarchy/PsiConfigurationSettingsKey/CustomLocation/@EntryValue">C:\Users\Anthony\AppData\Local\JetBrains\Transient\ReSharperPlatformVs15\v11_97704549\SolutionCaches</s:String>










<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=AutoRecoverer/@EntryIndexedValue">LIVE_MONITOR</s:String>
<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=Format/@EntryIndexedValue">LIVE_MONITOR</s:String>
<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=LSL/@EntryIndexedValue">LIVE_MONITOR</s:String>
Expand Down Expand Up @@ -303,11 +303,14 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=ffmpeg/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=ffprobe/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=flac/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Musl/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Pteropus/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Redirector/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=resampled/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Runtimes/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Shntool/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=spectrograms/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Splt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Subband/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Submatrix/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Anthony/@EntryIndexedValue">True</s:Boolean>
Expand All @@ -324,5 +327,5 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=Tahoma/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=templated/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Towsey/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Truskinger/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

<s:Boolean x:Key="/Default/UserDictionary/Words/=Truskinger/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Wvunpack/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
23 changes: 19 additions & 4 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,27 @@
<PropertyGroup>
<Deterministic>true</Deterministic>
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)style.ruleset</CodeAnalysisRuleSet>

<DotnetFscCompilerPath></DotnetFscCompilerPath>
<!-- all of these are 64 bit except for linux-arm -->
<RuntimeIdentifiers>win-x64;win-arm64;linux-x64;linux-musl-x64;linux-arm;osx-x64</RuntimeIdentifiers>
<IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
<IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
<RuntimeIdentifiers>win-x64;win-arm64;linux-x64;linux-musl-x64;linux-arm;linux-arm64;osx-x64</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup
Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
<BuildIsOSX>true</BuildIsOSX>
<DefineConstants>$(DefineConstants);BUILDING_ON_OSX</DefineConstants>
</PropertyGroup>
<PropertyGroup
Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">
<BuildIsLinux>true</BuildIsLinux>
<DefineConstants>$(DefineConstants);BUILDING_ON_LINUX</DefineConstants>
</PropertyGroup>
<PropertyGroup
Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">
<BuildIsWindows>true</BuildIsWindows>
<DefineConstants>$(DefineConstants);BUILDING_ON_WINDOWS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(RuntimeIdentifier.Contains('musl'))">
<DefineConstants>$(DefineConstants);BUILT_AGAINST_MUSL</DefineConstants>
</PropertyGroup>
<PropertyGroup Label="Common">
<Company>QUT Ecoacoustics Research Group</Company>
Expand Down
3 changes: 3 additions & 0 deletions build/azure-pipelines-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ parameters:
- rid: linux-arm
pool: ubuntu-latest
configurations: [release]
- rid: linux-arm64
pool: ubuntu-latest
configurations: [release]
- rid: osx-x64
pool: macos-latest
configurations: [debug, release]
Expand Down
3 changes: 3 additions & 0 deletions lib/audio-utils/win-x64/sox/lame_enc.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/win-x64/sox/lame_enc.ini
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/win-x64/sox/libmad.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions lib/audio-utils/win-x64/sox/libmp3lame.dll
Git LFS file not shown
36 changes: 0 additions & 36 deletions src/AP.Settings.json

This file was deleted.

6 changes: 0 additions & 6 deletions src/Acoustics.Shared/Acoustics.Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<None Include="..\AP.Settings.json">
<Link>AP.Settings.json</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="ConsoleTools" Version="0.5.3" />
<PackageReference Include="CsvHelper" Version="14.0.0" />
Expand Down
Loading

0 comments on commit 103ad4d

Please sign in to comment.