Replaced Amberol with Decibels

Author: hmlendea

scripts/customise-launchers.sh

@@ -811,12 +811,13 @@ done
 #####################
 for LAUNCHER in "${GLOBAL_LAUNCHERS_DIR}/lxmusic.desktop" \
                 "${GLOBAL_FLATPAK_LAUNCHERS_DIR}/io.bassi.Amberol.desktop" \
-                "${LOCAL_FLATPAK_LAUNCHERS_DIR}/io.bassi.Amberol.dekstop"; do
+                "${GLOBAL_FLATPAK_LAUNCHERS_DIR}/org.gnome.Decibels.desktop" \
+                "${LOCAL_FLATPAK_LAUNCHERS_DIR}/io.bassi.Amberol.dekstop" \
+                "${LOCAL_FLATPAK_LAUNCHERS_DIR}/org.gnome.Decibels.dekstop"; do
     set_launcher_entries "${LAUNCHER}" \
         Name "Music" \
         Name[ro] "Muzică" \
-        MimeType "application/x-ogg;application/ogg;audio/x-vorbis+ogg;audio/vorbis;audio/x-vorbis;audio/x-scpls;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;audio/x-flac;audio/mp4;x-scheme-handler/itms;x-scheme-handler/itmss;"
-
+        MineType 'application/x-ogg;application/ogg;audio/mpeg;audio/wav;audio/x-aac;audio/x-aiff;audio/x-ape;audio/x-flac;audio/x-m4a;audio/x-m4b;audio/x-mp1;audio/x-mp2;audio/x-mp3;audio/mp4;audio/x-mpg;audio/x-mpeg;audio/x-mpegurl;audio/x-opus+ogg;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-scpls;audio/x-speex;audio/vorbis;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-wavpack;x-scheme-handler/itms;x-scheme-handler/itmss;'
     [ "${DEVICE_TYPE}" = 'Mobile' ] && set_launcher_entry "${LAUNCHER}" NoDisplay true
 done
 

scripts/install-packages.sh

@@ -627,8 +627,9 @@ fi
 ### Music Players ###
 #####################
 if ${IS_GENERAL_PURPOSE_DEVICE}; then
-    if [ "${DESKTOP_ENVIRONMENT}" = 'GNOME' ] \
-    || [ "${DESKTOP_ENVIRONMENT}" = 'Phosh' ]; then
+    if [ "${DESKTOP_ENVIRONMENT}" = 'GNOME' ]; then
+        install_flatpak 'org.gnome.Decibels'
+    elif [ "${DESKTOP_ENVIRONMENT}" = 'Phosh' ]; then
         install_flatpak 'io.bassi.Amberol'
     fi
 

scripts/uninstall-packages.sh

@@ -80,6 +80,8 @@ fi
 keep_first_installed_package 'dev.alextren.Spot' 'com.spotify.Client'
 uninstall_android_package 'org.lineageos.eleven'
 uninstall_android_package 'com.xiaomi.mimusic2'
+[ "${DESKTOP_ENVIRONMENT}" = 'GNOME' ] && keep_first_installed_package 'org.gnome.Decibels' 'io.bassi.Amberol' 'org.gnome.Rhythmbox3'
+[ "${DESKTOP_ENVIRONMENT}" = 'Phosh' ] && keep_first_installed_package 'io.bassi.Amberol' 'org.gnome.Decibels' 'org.gnome.Rhythmbox3'
 
 # Note Taking apps
 keep_first_installed_package "com.automattic.simplenote" "foundation.e.notes"
@@ -144,7 +146,6 @@ if [ "${DISTRO_FAMILY}" = "Arch" ]; then
 
     uninstall_flatpak "org.gnome.Cheese"        # Replaced by org.gnome.Snapshot
     uninstall_flatpak "org.gnome.gedit"         # Replaced by org.gnome.TextEditor
-    uninstall_flatpak "org.gnome.Rhythmbox3"    # Replaced by io.bassi.Amberol
 
     # App Stores
     if is_native_package_installed "gnome-software"; then
@@ -208,10 +209,6 @@ if [ "${DISTRO_FAMILY}" = "Arch" ]; then
         uninstall_flatpak "com.github.vladimiry.ElectronMail"
         uninstall_flatpak "org.telegram.desktop"
         uninstall_flatpak "io.github.mimbrero.WhatsAppDesktop"
-
-        # Multimedia
-        uninstall_flatpak "io.bassi.Amberol"
-        uninstall_flatpak "org.gnome.Totem"
     fi
 
     # Obsolete