v3.2

Author: Zackptg5

AudioModificationLibrary.sh

@@ -1,54 +1,54 @@
-#libam3daudioenhancement~6723dd80-f0b7-11e0-98a2-0002a5d5c51b
+#libam3daudioenhancement.so~6723dd80-f0b7-11e0-98a2-0002a5d5c51b
 patch_cfgs am3daudioenhancement 6723dd80-f0b7-11e0-98a2-0002a5d5c51b am3daudioenhancement $libfile
-#libv4a_fx~41d3c987-e6cf-11e3-a88a-11aba5d5c51b
+#libv4a_fx.so~41d3c987-e6cf-11e3-a88a-11aba5d5c51b
 patch_cfgs v4a_standard_fx 41d3c987-e6cf-11e3-a88a-11aba5d5c51b v4a_fx $libfile
-#libv4a_fx_ics~41d3c987-e6cf-11e3-a88a-11aba5d5c51b
+#libv4a_fx_ics.so~41d3c987-e6cf-11e3-a88a-11aba5d5c51b
 patch_cfgs v4a_standard_fx 41d3c987-e6cf-11e3-a88a-11aba5d5c51b v4a_fx $libfile
-#libv4a_xhifi_ics~d92c3a90-3e26-11e2-a25f-0800200c9a66
+#libv4a_xhifi_ics.so~d92c3a90-3e26-11e2-a25f-0800200c9a66
 patch_cfgs v4a_standard_xhifi d92c3a90-3e26-11e2-a25f-0800200c9a66 v4a_xhifi $libfile
-#libhwdax~9d4921da-8225-4f29-aefa-6e6f69726861
+#libhwdax.so~9d4921da-8225-4f29-aefa-6e6f69726861
 patch_cfgs -pl dax 9d4921da-8225-4f29-aefa-6e6f69726861 dax_sw 6ab06da4-c516-4611-8166-6168726e6f69 $(dirname $libfile)/libswdax.so dax_hw a0c30891-8246-4aef-b8ad-696f6e726861 $libfile
-#libswdax~9d4921da-8225-4f29-aefa-6e6f69726861
+#libswdax.so~9d4921da-8225-4f29-aefa-6e6f69726861
 patch_cfgs dax 9d4921da-8225-4f29-aefa-6e6f69726861 dax $libfile
-#libswdap~9d4921da-8225-4f29-aefa-39537a04bcaa
+#libswdap.so~9d4921da-8225-4f29-aefa-39537a04bcaa
 patch_cfgs dap 9d4921da-8225-4f29-aefa-39537a04bcaa dap $libfile
-#libhwdap~a0c30891-8246-4aef-b8ad-d53e26da0253
+#libhwdap.so~a0c30891-8246-4aef-b8ad-d53e26da0253
 patch_cfgs -pl dap 9d4921da-8225-4f29-aefa-6e6f69726861 dap_sw 6ab06da4-c516-4611-8166-452799218539 $(dirname $libfile)/libswdap.so dap_hw a0c30891-8246-4aef-b8ad-d53e26da0253 $libfile
-#libdseffect~9d4921da-8225-4f29-aefa-39537a04bcaa
+#libdseffect.so~9d4921da-8225-4f29-aefa-39537a04bcaa
 patch_cfgs dsplus 9d4921da-8225-4f29-aefa-39537a04bcaa ds $libfile
-#libswvlldp~3783c334-d3a0-4d13-874f-0032e5fb80e2
+#libswvlldp.so~3783c334-d3a0-4d13-874f-0032e5fb80e2
 patch_cfgs vlldp 3783c334-d3a0-4d13-874f-0032e5fb80e2 vlldp $libfile
 patch_cfgs -ole music atmos 9d4921da-8225-4f29-aefa-aacb40a73593 atmos $(dirname $libfile)/libatmos.so
-#libicepower~f1c02420-777f-11e3-981f-0800200c9a66
+#libicepower.so~f1c02420-777f-11e3-981f-0800200c9a66
 patch_cfgs -l icepower $libfile
 patch_cfgs -e icepower_algo f1c02420-777f-11e3-981f-0800200c9a66 icepower
 patch_cfgs -e icepower_eq 50dbef80-4ad4-11e3-8f96-0800200c9a66 icepower
 patch_cfgs -e icepower_test e5456320-5391-11e3-8f96-0800200c9a66 icepower
 patch_cfgs -e icepower_load bf51a790-512b-11e3-8f96-0800200c9a66 icepower
 patch_cfgs -e icepower_null 63509430-52aa-11e3-8f96-0800200c9a66 icepower
-#libarkamys~17852d50-161e-11e2-892e-0800200c9a66
+#libarkamys.so~17852d50-161e-11e2-892e-0800200c9a66
 patch_cfgs -ole music Arkamysfx 17852d50-161e-11e2-892e-0800200c9a66 arkamys $libfile
-#libdirac~4c6383e0-ff7d-11e0-b6d8-0002a5d5c51b
+#libdirac.so~4c6383e0-ff7d-11e0-b6d8-0002a5d5c51b
 patch_cfgs dirac 4c6383e0-ff7d-11e0-b6d8-0002a5d5c51b dirac $libfile
 patch_cfgs -e dirac_controller b437f4de-da28-449b-9673-667f8b9643fe dirac
 patch_cfgs -e dirac_music b437f4de-da28-449b-9673-667f8b964304 dirac
-#libdirac~e069d9e0-8329-11df-9168-0002a5d5c51b
+#libdirac.so~e069d9e0-8329-11df-9168-0002a5d5c51b
 patch_cfgs -ole music dirac e069d9e0-8329-11df-9168-0002a5d5c51b dirac $libfile
-#libjamesdsp~f27317f4-c984-4de6-9a90-545759495bf2
+#libjamesdsp.so~f27317f4-c984-4de6-9a90-545759495bf2
 patch_cfgs jamesdsp f27317f4-c984-4de6-9a90-545759495bf2 jdsp $libfile
-#libmaxxeffect-cembedded~ae12da60-99ac-11df-b456-0002a5d5c51b
+#libmaxxeffect-cembedded.so~ae12da60-99ac-11df-b456-0002a5d5c51b
 patch_cfgs -ole music maxxaudio3 ae12da60-99ac-11df-b456-0002a5d5c51b maxxaudio3 $libfile
-#libbassboostMz~850b6319-bf66-4f93-bec0-dc6964367786
+#libbassboostMz.so~850b6319-bf66-4f93-bec0-dc6964367786
 patch_cfgs bassboostMz 850b6319-bf66-4f93-bec0-dc6964367786 bassboostMz $libfile
 patch_cfgs virtualizerMz 0e9779c9-4e8f-494d-b2b1-b4ad4e37c54c virtualizerMz $(dirname $libfile)/libvirtualizerMz.so
 patch_cfgs livemusicMz 0bbc89fe-52dc-4c40-8211-cae4da538b50 livemusicMz $(dirname $libfile)/liblivemusicMz.so
 patch_cfgs equalizerMz 9626da93-9c71-4bb2-8e23-9fc707fb9703 equalizerMz $(dirname $libfile)/ibequalizerMz.so
-#libsonysweffect~50786e95-da76-4557-976b-7981bdf6feb9
+#libsonysweffect.so~50786e95-da76-4557-976b-7981bdf6feb9
 patch_cfgs -qle mic,camcorder ZNR b8a031e0-6bbf-11e5-b9ef-0002a5d5c51b znrwrapper $(dirname $libfile)/libznrwrapper.so
 patch_cfgs -pl sonyeffect af8da7e0-2ca1-11e3-b71d-0002a5d5c51b sonyeffect_sw 50786e95-da76-4557-976b-7981bdf6feb9 $libfile sonyeffect_hw f9ed8ae0-1b9c-11e4-8900-0002a5d5c51b $(dirname $libfile)/libsonypostprocbundle.so
-#libatmos~74697567-7261-6564-6864-65726f206678
+#libatmos.so~74697567-7261-6564-6864-65726f206678
 patch_cfgs dolbyatmos 74697567-7261-6564-6864-65726f206678 dolbyatmos $libfile
 osp_detect "alarm notification ring"
-#libdtsaudio~146edfc0-7ed2-11e4-80eb-0002a5d5c51b
+#libdtsaudio.so~146edfc0-7ed2-11e4-80eb-0002a5d5c51b
 patch_cfgs -ole music dtsaudio 146edfc0-7ed2-11e4-80eb-0002a5d5c51b dtsaudio $libfile
 #end

README.md

@@ -3,6 +3,11 @@ AudModLib is a compatibility framework that allows the seamless integration of m
 To uninstall, REMOVE WITH MAGISK MANAGER
 
 ## Change Log
+### v3.2 - 03.17.2020
+* Restructured script for better efficiency/faster running time - may fix xposed issues
+* Fix prop issue where non-aml supported mods were affected
+* Favor module .aml.sh scripts over built-ins
+
 ### v3.1 - 03.14.2020
 * Enhanced osp_detect - needed for some mods
 * Added chcon fix for Q - may fix issues some users have with v4a/jdsp

customize.sh

@@ -5,20 +5,6 @@ ui_print " "
 ui_print "  Also note that disabled mods will be ignored!"
 ui_print " "
 
-# Set vars in script
-amldir=$NVBASE/aml
-[ $API -ge 26 ] && libdir="/vendor" || libdir="/system"
-sed -i -e "s|moddir=|moddir=$NVBASE/modules|" -e "s|amldir=|amldir=$amldir|" $MODPATH/uninstall.sh
-sed -i "s|MODPATH=|MODPATH=$(echo $MODPATH | sed 's/modules_update/modules/')|" $MODPATH/post-fs-data.sh
-for i in MAGISKTMP API IS64BIT libdir amldir; do
-  sed -i "s|$i=|$i=$(eval echo \$$i)|" $MODPATH/post-fs-data.sh
-done
-
-# Place fallback script in the event idiot user deletes aml module in file explorer
-install -m 0755 $MODPATH/uninstall.sh $SERVICED/aml.sh
-sed -i "1a[ -d \"$(echo $MODPATH | sed 's/modules_update/modules/')\" ] && exit 0" $SERVICED/aml.sh
-echo 'rm -f $0' >> $SERVICED/aml.sh
-
 # Escape each backslash and space since shell will expand it during echo
 sed -i -e 's/\\/\\\\/g' -e 's/\ /\\ /g' $MODPATH/AudioModificationLibrary.sh
 # Separate AML into individual files for each audio mod
@@ -33,3 +19,22 @@ while read line; do
   esac
 done < $MODPATH/AudioModificationLibrary.sh
 rm -f $MODPATH/AudioModificationLibrary.sh
+# Generate libs var for faster script running
+for i in $MODPATH/.scripts/*; do
+  libs="$libs-name \"$(basename $i | sed "s/~.*//")\" "
+done
+libs="$(echo $libs | sed "s/\" /\" -o /g")"
+
+# Set vars in script
+amldir=$NVBASE/aml
+[ $API -ge 26 ] && libdir="/vendor" || libdir="/system"
+sed -i -e "s|moddir=|moddir=$NVBASE/modules|" -e "s|amldir=|amldir=$amldir|" $MODPATH/uninstall.sh
+sed -i -e "s|<libs>|$libs|" -e "s|MODPATH=|MODPATH=$(echo $MODPATH | sed 's/modules_update/modules/')|" $MODPATH/post-fs-data.sh
+for i in MAGISKTMP API IS64BIT libdir amldir; do
+  sed -i "s|$i=|$i=$(eval echo \$$i)|" $MODPATH/post-fs-data.sh
+done
+
+# Place fallback script in the event idiot user deletes aml module in file explorer
+cp -f $MODPATH/uninstall.sh $SERVICED/aml.sh && chmod 0755 $SERVICED/aml.sh
+sed -i "1a[ -d \"$(echo $MODPATH | sed 's/modules_update/modules/')\" ] && exit 0" $SERVICED/aml.sh
+echo 'rm -f $0' >> $SERVICED/aml.sh

module.prop

@@ -1,7 +1,7 @@
 id=aml
 name=Audio Modification Library
-version=v3.1
-versionCode=50
+version=v3.2
+versionCode=51
 author=zackptg5, ahrion
 description=AudModLib is a framework that allows the seamless integration of multiple audio mods in Magisk.
 support=https://forum.xda-developers.com/apps/magisk/module-audio-modification-library-t3579612

post-fs-data.sh

@@ -223,48 +223,44 @@ done
 osp_detect "music"
 
 # Detect/install audio mods
-for mod in $(find $moddir/* -maxdepth 0 -type d); do
+for mod in $(find $moddir/* -maxdepth 0 -type d ! -name "aml"); do
   modname="$(basename $mod)"
-  [ "$mod" == "$MODPATH" -o -f "$mod/disable" ] && continue
-  builtin=false
-  for audmod in $MODPATH/.scripts/*; do
-    lib=$(echo "$(basename $audmod)" | sed -r "s|(.*)~.*.sh|\1|")
-    # Favor vendor libs if oreo+
-    libfile="$(find $mod/system/vendor/lib/soundfx $mod/**/lib/soundfx -type f -name $lib.so 2>/dev/null | head -n1)"
-    [ -f "$libfile" ] || continue
-    uuid=$(echo "$(basename $audmod)" | sed -r "s|.*~(.*).sh|\1|")
-    hexuuid="$(echo $uuid | sed -r -e "s/^(..)(..)(..)(..)-(..)(..)-(..)(..)-/\4\3\2\1\6\5\8\7-/" -e "s/-(..)(..)-(............)$/\2\1\3/")"
-    xxd -p $libfile | tr -d '\n' | grep -q "$hexuuid"
-    [ $? -eq 0 ] || continue
-    builtin=true
-    [ "$(grep -x "$modname" $amldir/modlist)" ] || echo "$modname" >> $amldir/modlist
-    files=$(find $mod/system -type f -name "*audio_effects*.conf" -o -name "*audio_effects*.xml" -o -name "*audio_*policy*.conf" -o -name "*audio_*policy*.xml" -o -name "*mixer_paths*.xml" -o -name "*mixer_gains*.xml" -o -name "*audio_device*.xml" -o -name "*sapa_feature*.xml" -o -name "*audio_platform_info*.xml" -o -name "*audio_configs*.xml" -o -name "*audio_device*.xml")
-    for file in $files; do
-      cp_mv -m $file $amldir/$modname/$(echo "$file" | sed "s|$mod/||")
+  [ -f "$mod/disable" ] && continue
+  # Move files
+  files="$(find $mod/system -type f -name "*audio_effects*.conf" -o -name "*audio_effects*.xml" -o -name "*audio_*policy*.conf" -o -name "*audio_*policy*.xml" -o -name "*mixer_paths*.xml" -o -name "*mixer_gains*.xml" -o -name "*audio_device*.xml" -o -name "*sapa_feature*.xml" -o -name "*audio_platform_info*.xml" -o -name "*audio_configs*.xml" -o -name "*audio_device*.xml")"
+  [ "$files" ] && echo "$modname" >> $amldir/modlist
+  for file in $files; do
+    cp_mv -m $file $amldir/$modname/$(echo "$file" | sed "s|$mod/||")
+  done
+  # .aml.sh file should take precedence
+  if [ -f "$mod/.aml.sh" ]; then
+    $(grep -x "$modname" $amldir/modlist) || echo "$modname" >> $amldir/modlist
+    if grep -qE '\$MODPATH/\$NAME|RUNONCE=|COUNT=' $mod/.aml.sh; then
+      legacy_script
+    else
+      (. $mod/.aml.sh) || echo "Error in $modname aml.sh script" >> $MODPATH/errors.txt
+    fi
+  else
+    # Favor vendor libs over system ones, no aml builtins are 64bit only - use 32bit lib dir
+    libs="$(find $mod/system/vendor/lib/soundfx $mod/system/lib/soundfx -type f <libs>)"
+    for lib in $libs; do
+      for audmod in $MODPATH/.scripts/$(basename $lib)~*; do
+        uuid=$(basename $audmod | sed -r "s/.*~(.*).sh/\1/")
+        hexuuid="$(echo $uuid | sed -r -e "s/^(..)(..)(..)(..)-(..)(..)-(..)(..)-/\4\3\2\1\6\5\8\7-/" -e "s/-(..)(..)-(............)$/\2\1\3/")"
+        xxd -p $lib | tr -d '\n' | grep -q "$hexuuid"
+        [ $? -eq 0 ] || continue
+        $(grep -xq "$modname" $amldir/modlist) || echo "$modname" >> $amldir/modlist
+        libfile="$(echo $lib | sed -e "s|$mod||" -e "s|/system/vendor|/vendor|")"
+        . $audmod
+      done
     done
+  fi
+  if $(grep -x "$modname" $amldir/modlist); then
+    [ -s "$mod/system.prop" ] && { prop_process $mod/system.prop; cp_mv -m $mod/system.prop $amldir/$modname/system.prop; }
     # Chcon fix for Android Q+
     [ $API -ge 29 ] && chcon -R u:object_r:vendor_file:s0 $mod/system/vendor/lib*/soundfx 2>/dev/null
-    libfile="$(echo $libfile | sed -e "s|$mod||" -e "s|/system/vendor|/vendor|")"
-    . $audmod
-    [ -s "$mod/system.prop" ] && { prop_process $mod/system.prop; cp_mv -m $mod/system.prop $amldir/$modname/system.prop; }
-  done
-  if ! $builtin; then
-    files=$(find $mod/system -type f -name "*audio_effects*.conf" -o -name "*audio_effects*.xml" -o -name "*audio_*policy*.conf" -o -name "*audio_*policy*.xml" -o -name "*mixer_paths*.xml" -o -name "*mixer_gains*.xml" -o -name "*audio_device*.xml" -o -name "*sapa_feature*.xml" -o -name "*audio_platform_info*.xml" -o -name "*audio_configs*.xml" -o -name "*audio_device*.xml")
-    [ "$files" ] && [ ! "$(grep -x "$modname" $amldir/modlist)" ] && echo "$modname" >> $amldir/modlist
-    for file in $files; do
-      cp_mv -m $file $amldir/$modname/$(echo "$file" | sed "s|$mod/||")
-    done
-    if [ -f "$mod/.aml.sh" ]; then
-      if grep -qE '\$MODPATH/\$NAME|RUNONCE=|COUNT=' $mod/.aml.sh; then
-        legacy_script
-      else
-        (. $mod/.aml.sh) || echo "Error in $modname aml.sh script" >> $MODPATH/errors.txt
-      fi
-      [ -s "$mod/system.prop" ] && { prop_process $mod/system.prop; cp_mv -m $mod/system.prop $amldir/$modname/system.prop; }
-    fi
   fi
 done
-[ -s $MODPATH/system.prop ] && { [ "$(tail -1 $MODPATH/system.prop)" ] && echo >> $MODPATH/system.prop; } || rm -f $MODPATH/system.prop
 
 # Set perms and such
 set_perm_recursive $MODPATH/system 0 0 0755 0644