[Feature] remove presets built by code #153

GioF71 · Nov 24, 2022 · c5c8ef7 · c5c8ef7
1 parent eda4c87
commit c5c8ef7
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 78 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -6,6 +6,12 @@ There is roughly a release for each entry of the following changelog. Older buil
 
 ## Changelog
 
+### 2022-11-24
+
+Date|Feature|Description
+:---|:---|:---
+2022-11-24|Improvement|All presets moved to `builtin-presets.conf`
+
 ### 2022-11-06
 
 Date|Feature|Description

diff --git a/app/assets/builtin-presets.conf b/app/assets/builtin-presets.conf
@@ -1,27 +1,81 @@
 no-dsd.exclude-codecs=dsd
-gustard-x12.device="hw:CARD=x20,DEV=0"
 
-# devices
+goldilocks.upsampling=v::4:28:95:105:45
+extremus.upsampling=v::3.05:28:99.7:100:45
+
+goldilocks_96k.rates=96000:200
+goldilocks_96k.upsampling=v::4:28:95:105:45
+
+goldilocks_2x_only.rates=88200,96000:200
+goldilocks_2x_only.upsampling=v::4:28:95:105:45
+
+goldilocks_4x_only.rates=176400,192000:200
+goldilocks_4x_only.upsampling=v::4:28:95:105:45
+
+goldilocks_8x_only.rates=352800,384000:200
+goldilocks_8x_only.upsampling=v::4:28:95:105:45
+
+rates_96k.rates=96000:200
+
+rates_up_to_96k.rates=44100-96000:200
+rates_up_to_192k.rates=44100-192000:200
+rates_up_to_384k.rates=44100-384000:200
+rates_up_to_768k.rates=44100-768000:200
+
+rates_2x_only.rates=88200,96000:200
+rates_4x_only.rates=176400,192000:200
+rates_8x_only.rates=352800,384000:200
+rates_16x_only.rates=705600,768000:200
+
+archimago-goldilocks.upsampling=v::4:28:95:105:45
+archimago-extremus.upsampling=v::3.05:28:99.7:100:45
+
+goldilocks_up_to_96k.rates=44100-96000:200
+goldilocks_up_to_96k.upsampling=v::4:28:95:105:45
+
+goldilocks_up_to_192k.rates=44100-192000:200
+goldilocks_up_to_192k.upsampling=v::4:28:95:105:45
+
+goldilocks_up_to_384k.rates=44100-384000:200
+goldilocks_up_to_384k.upsampling=v::4:28:95:105:45
+
+goldilocks_up_to_768k.rates=44100-768000:200
+goldilocks_up_to_768k.upsampling=v::4:28:95:105:45
+
+# DACs
+
+## Generic
 dac.device="hw:CARD=DAC,DEV=0"
 x20.device="hw:CARD=x20,DEV=0"
-topping-d10.device="hw:CARD=D10,DEV=0"
-hifiberry-dac-plus.device="hw:CARD=sndrpihifiberry,DEV=0"
-fiio-e18.device="hw:CARD=DACE18,DEV=0"
-ifi-zen-dac.device="hw:CARD=Audio,DEV=0"
-yulong-d200.device="hw:CARD=DAC,DEV=0"
-aune-x1s.device="hw:CARD=DAC,DEV=0"
+
+## Actual DACs
 aune-s6.device="hw:CARD=DAC,DEV=0"
-peachtree-dacit.device="hw:CARD=DAC,DEV=0"
+
+aune-x1s.device="hw:CARD=DAC,DEV=0"
+
+fiio-e18.device="hw:CARD=DACE18,DEV=0"
+
 gustard-u12.device="hw:CARD=x20,DEV=0"
 
-# complex devices
+gustard-x12.device="hw:CARD=x20,DEV=0"
+
 gustard-x12-goldilocks.device="hw:CARD=x20,DEV=0"
 gustard-x12-goldilocks.rates=44100-384000:200
 gustard-x12-goldilocks.upsampling=v::4:28:95:105:45
 
+gustard-x16.device="hw:CARD=G20,DEV=0"
+
+hifiberry-dac-plus.device="hw:CARD=sndrpihifiberry,DEV=0"
+
+ifi-zen-dac.device="hw:CARD=Audio,DEV=0"
+
+peachtree-dacit.device="hw:CARD=DAC,DEV=0"
+
 pi-headphones.device="hw:CARD=Headphones,DEV=0"
 
-# see issue #25
+topping-d10.device="hw:CARD=D10,DEV=0"
+
 topping-dx5.device="hw:CARD=DX5,DEV=0"
-gustard-x16.device="hw:CARD=G20,DEV=0"
+
+yulong-d200.device="hw:CARD=DAC,DEV=0"
 
diff --git a/app/bin/run-presets.sh b/app/bin/run-presets.sh
@@ -1,73 +1,7 @@
 #!/bin/bash
 
-## HARD coded presets
-upsampling_goldilocks="v::4:28:95:105:45"
-upsampling_extremus="v::3.05:28:99.7:100:45"
-rate_delay=200
-
-rate_44="44100"
-rate_48="48000"
-rate_88="88200"
-rate_96="96000"
-rate_176="176400"
-rate_192="192000"
-rate_352="352800"
-rate_384="384000"
-rate_704="705600"
-rate_768="768000"
-
-rates_96k=$rate_96
-rates_2x_only="$rate_88,$rate_96"
-rates_4x_only="$rate_176,$rate_192"
-rates_8x_only="$rate_352,$rate_384"
-rates_16x_only="$rate_704,$rate_768"
-rates_up_to_96k="$rate_44-$rate_96"
-rates_up_to_192k="$rate_44-$rate_192"
-rates_up_to_384k="$rate_44-$rate_384"
-rates_up_to_768k="$rate_44-$rate_768"
-
 declare -A presets
 
-presets[goldilocks.upsampling]=$upsampling_goldilocks
-presets[extremus.upsampling]=$upsampling_extremus
-
-presets[archimago-goldilocks.upsampling]=$upsampling_goldilocks
-presets[archimago-extremus.upsampling]=$upsampling_extremus
-
-presets[rates_96k.rates]=$rate_96":"$rate_delay
-presets[rates_2x_only.rates]=$rates_2x_only":"$rate_delay
-presets[rates_4x_only.rates]=$rates_4x_only":"$rate_delay
-presets[rates_8x_only.rates]=$rates_8x_only":"$rate_delay
-presets[rates_16x_only.rates]=$rates_16x_only":"$rate_delay
-presets[rates_up_to_96k.rates]=$rates_up_to_96k":"$rate_delay
-presets[rates_up_to_192k.rates]=$rates_up_to_192k":"$rate_delay
-presets[rates_up_to_384k.rates]=$rates_up_to_384k":"$rate_delay
-presets[rates_up_to_768k.rates]=$rates_up_to_768k":"$rate_delay
-
-presets[goldilocks_96k.rates]=$rates_96k":"$rate_delay
-presets[goldilocks_96k.upsampling]=$upsampling_goldilocks
-
-presets[goldilocks_2x_only.rates]=$rates_2x_only":"$rate_delay
-presets[goldilocks_2x_only.upsampling]=$upsampling_goldilocks
-
-presets[goldilocks_4x_only.rates]=$rates_4x_only":"$rate_delay
-presets[goldilocks_4x_only.upsampling]=$upsampling_goldilocks
-
-presets[goldilocks_8x_only.rates]=$rates_8x_only":"$rate_delay
-presets[goldilocks_8x_only.upsampling]=$upsampling_goldilocks
-
-presets[goldilocks_up_to_96k.rates]=$rates_up_to_96k":"$rate_delay
-presets[goldilocks_up_to_96k.upsampling]=$upsampling_goldilocks
-
-presets[goldilocks_up_to_192k.rates]=$rates_up_to_192k":"$rate_delay
-presets[goldilocks_up_to_192k.upsampling]=$upsampling_goldilocks
-
-presets[goldilocks_up_to_384k.rates]=$rates_up_to_384k":"$rate_delay
-presets[goldilocks_up_to_384k.upsampling]=$upsampling_goldilocks
-
-presets[goldilocks_up_to_768k.rates]=$rates_up_to_768k":"$rate_delay
-presets[goldilocks_up_to_768k.upsampling]=$upsampling_goldilocks
-
 function load_preset_file() {
     echo "Loading $2 Presets..."
     while IFS= read -r line