diff -Nru audacious-plugins-4.0.4/acinclude.m4 audacious-plugins-4.0.5/acinclude.m4
--- audacious-plugins-4.0.4/acinclude.m4	2020-06-01 16:56:01.000000000 +0000
+++ audacious-plugins-4.0.5/acinclude.m4	2020-07-10 19:46:37.000000000 +0000
@@ -220,6 +220,7 @@
     PKG_CHECK_VAR([QTBINPATH], [Qt5Core >= 5.2], [host_bins])
     PKG_CHECK_MODULES([QT], [Qt5Core Qt5Gui Qt5Widgets >= 5.2])
     AC_DEFINE([USE_QT], [1], [Define if Qt support enabled])
+    AC_DEFINE([QT_NO_DEPRECATED_WARNINGS], [1], [Qt 6 is not supported yet])
 
     # needed if Qt was built with -reduce-relocations
     QTCORE_CFLAGS="$QTCORE_CFLAGS -fPIC"
diff -Nru audacious-plugins-4.0.4/config.h.in audacious-plugins-4.0.5/config.h.in
--- audacious-plugins-4.0.4/config.h.in	2020-06-01 17:10:24.000000000 +0000
+++ audacious-plugins-4.0.5/config.h.in	2020-07-10 20:35:30.000000000 +0000
@@ -121,6 +121,9 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Qt 6 is not supported yet */
+#undef QT_NO_DEPRECATED_WARNINGS
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
diff -Nru audacious-plugins-4.0.4/configure audacious-plugins-4.0.5/configure
--- audacious-plugins-4.0.4/configure	2020-06-01 17:10:24.000000000 +0000
+++ audacious-plugins-4.0.5/configure	2020-07-10 20:35:30.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for audacious-plugins 4.0.4.
+# Generated by GNU Autoconf 2.69 for audacious-plugins 4.0.5.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -579,8 +579,8 @@
 # Identity of this package.
 PACKAGE_NAME='audacious-plugins'
 PACKAGE_TARNAME='audacious-plugins'
-PACKAGE_VERSION='4.0.4'
-PACKAGE_STRING='audacious-plugins 4.0.4'
+PACKAGE_VERSION='4.0.5'
+PACKAGE_STRING='audacious-plugins 4.0.5'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1550,7 +1550,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures audacious-plugins 4.0.4 to adapt to many kinds of systems.
+\`configure' configures audacious-plugins 4.0.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1617,7 +1617,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of audacious-plugins 4.0.4:";;
+     short | recursive ) echo "Configuration of audacious-plugins 4.0.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1892,7 +1892,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-audacious-plugins configure 4.0.4
+audacious-plugins configure 4.0.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2411,7 +2411,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by audacious-plugins $as_me 4.0.4, which was
+It was created by audacious-plugins $as_me 4.0.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7281,6 +7281,9 @@
 $as_echo "#define USE_QT 1" >>confdefs.h
 
 
+$as_echo "#define QT_NO_DEPRECATED_WARNINGS 1" >>confdefs.h
+
+
     # needed if Qt was built with -reduce-relocations
     QTCORE_CFLAGS="$QTCORE_CFLAGS -fPIC"
     QT_CFLAGS="$QT_CFLAGS -fPIC"
@@ -15755,7 +15758,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by audacious-plugins $as_me 4.0.4, which was
+This file was extended by audacious-plugins $as_me 4.0.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15821,7 +15824,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-audacious-plugins config.status 4.0.4
+audacious-plugins config.status 4.0.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -Nru audacious-plugins-4.0.4/configure.ac audacious-plugins-4.0.5/configure.ac
--- audacious-plugins-4.0.4/configure.ac	2020-06-01 16:56:01.000000000 +0000
+++ audacious-plugins-4.0.5/configure.ac	2020-07-10 19:46:37.000000000 +0000
@@ -5,7 +5,7 @@
 dnl Initialize
 dnl ==========
 AC_PREREQ([2.59])
-AC_INIT([audacious-plugins], [4.0.4])
+AC_INIT([audacious-plugins], [4.0.5])
 AC_COPYRIGHT([Copyright (C) 2001-2020 Audacious developers and others])
 
 AC_DEFINE_UNQUOTED([PACKAGE], "$PACKAGE_NAME", [Name of package])
diff -Nru audacious-plugins-4.0.4/debian/changelog audacious-plugins-4.0.5/debian/changelog
--- audacious-plugins-4.0.4/debian/changelog	2017-12-06 01:18:33.000000000 +0000
+++ audacious-plugins-4.0.5/debian/changelog	2017-12-06 01:18:33.000000000 +0000
@@ -1,4 +1,4 @@
-audacious-plugins (4.0.4-0build1~ubuntu18.04) bionic; urgency=low
+audacious-plugins (4.0.5-0build1~ubuntu18.04) bionic; urgency=medium
 
   * No-change rebuild against libcdio17
 
diff -Nru audacious-plugins-4.0.4/mkrelease.sh audacious-plugins-4.0.5/mkrelease.sh
--- audacious-plugins-4.0.4/mkrelease.sh	2020-06-01 16:56:01.000000000 +0000
+++ audacious-plugins-4.0.5/mkrelease.sh	2020-07-10 19:46:37.000000000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if ! test -d .git
+if ! test -e .git
 then
 	echo This script must be run in a Git repository
 	exit 1
diff -Nru audacious-plugins-4.0.4/src/amidiplug/i_configure-fluidsynth.cc audacious-plugins-4.0.5/src/amidiplug/i_configure-fluidsynth.cc
--- audacious-plugins-4.0.4/src/amidiplug/i_configure-fluidsynth.cc	2020-06-01 16:56:01.000000000 +0000
+++ audacious-plugins-4.0.5/src/amidiplug/i_configure-fluidsynth.cc	2020-07-10 19:46:37.000000000 +0000
@@ -311,7 +311,11 @@
     ~SoundFontListModel ();
 
 protected:
-    int rowCount (const QModelIndex &) const { return m_file_names.len (); }
+    int rowCount (const QModelIndex & parent) const
+    {
+        return parent.isValid() ? 0 : m_file_names.len();
+    }
+
     int columnCount (const QModelIndex &) const { return NColumns; }
     QVariant data (const QModelIndex & index, int role) const;
     QVariant headerData (int section, Qt::Orientation, int role) const;
diff -Nru audacious-plugins-4.0.4/src/cdaudio/cdaudio-ng.cc audacious-plugins-4.0.5/src/cdaudio/cdaudio-ng.cc
--- audacious-plugins-4.0.4/src/cdaudio/cdaudio-ng.cc	2020-06-01 16:56:01.000000000 +0000
+++ audacious-plugins-4.0.5/src/cdaudio/cdaudio-ng.cc	2020-07-10 19:46:37.000000000 +0000
@@ -126,7 +126,7 @@
  "use_cdtext", "TRUE",
  "use_cddb", "TRUE",
  "cddbhttp", "FALSE",
- "cddbserver", "freedb.org",
+ "cddbserver", "gnudb.gnudb.org",
  "cddbport", "8880",
  nullptr};
 
diff -Nru audacious-plugins-4.0.4/src/ffaudio/ffaudio-core.cc audacious-plugins-4.0.5/src/ffaudio/ffaudio-core.cc
--- audacious-plugins-4.0.4/src/ffaudio/ffaudio-core.cc	2020-06-01 16:56:01.000000000 +0000
+++ audacious-plugins-4.0.5/src/ffaudio/ffaudio-core.cc	2020-07-10 19:46:37.000000000 +0000
@@ -391,6 +391,7 @@
     {Tuple::String, Tuple::Artist, {"author", "hor", "artist", nullptr}},
     {Tuple::String, Tuple::Title, {"title", "le", nullptr}},
     {Tuple::String, Tuple::Album, {"album", "WM/AlbumTitle", nullptr}},
+    {Tuple::String, Tuple::AlbumArtist, {"album_artist", nullptr}},
     {Tuple::String, Tuple::Performer, {"performer", nullptr}},
     {Tuple::String, Tuple::Copyright, {"copyright", nullptr}},
     {Tuple::String, Tuple::Genre, {"genre", "WM/Genre", nullptr}},
diff -Nru audacious-plugins-4.0.4/src/playlist-manager-qt/playlist-manager-qt.cc audacious-plugins-4.0.5/src/playlist-manager-qt/playlist-manager-qt.cc
--- audacious-plugins-4.0.4/src/playlist-manager-qt/playlist-manager-qt.cc	2020-06-01 16:56:01.000000000 +0000
+++ audacious-plugins-4.0.5/src/playlist-manager-qt/playlist-manager-qt.cc	2020-07-10 19:46:37.000000000 +0000
@@ -80,7 +80,11 @@
     void update (Playlist::UpdateLevel level);
 
 protected:
-    int rowCount (const QModelIndex & parent) const { return m_rows; }
+    int rowCount (const QModelIndex & parent) const
+    {
+        return parent.isValid() ? 0 : m_rows;
+    }
+
     int columnCount (const QModelIndex & parent) const { return NColumns; }
 
     Qt::DropActions supportedDropActions () const { return Qt::MoveAction; }
diff -Nru audacious-plugins-4.0.4/src/qtui/playlist_model.cc audacious-plugins-4.0.5/src/qtui/playlist_model.cc
--- audacious-plugins-4.0.4/src/qtui/playlist_model.cc	2020-06-01 16:56:01.000000000 +0000
+++ audacious-plugins-4.0.5/src/qtui/playlist_model.cc	2020-07-10 19:46:37.000000000 +0000
@@ -54,7 +54,10 @@
 {
 }
 
-int PlaylistModel::rowCount(const QModelIndex & parent) const { return m_rows; }
+int PlaylistModel::rowCount(const QModelIndex & parent) const
+{
+    return parent.isValid() ? 0 : m_rows;
+}
 
 int PlaylistModel::columnCount(const QModelIndex & parent) const
 {
diff -Nru audacious-plugins-4.0.4/src/qtui/playlist_tabs.cc audacious-plugins-4.0.5/src/qtui/playlist_tabs.cc
--- audacious-plugins-4.0.4/src/qtui/playlist_tabs.cc	2020-06-01 16:56:01.000000000 +0000
+++ audacious-plugins-4.0.5/src/qtui/playlist_tabs.cc	2020-07-10 19:46:37.000000000 +0000
@@ -158,7 +158,8 @@
 
 void PlaylistTabs::currentChangedTrigger(int idx)
 {
-    Playlist::by_index(idx).activate();
+    if (!m_in_update)
+        Playlist::by_index(idx).activate();
 }
 
 bool PlaylistTabs::eventFilter(QObject * obj, QEvent * e)
@@ -186,12 +187,15 @@
 
 void PlaylistTabs::playlist_activate_cb()
 {
+    m_in_update = true;
     setCurrentIndex(Playlist::active_playlist().index());
     m_tabbar->cancelRename();
+    m_in_update = false;
 }
 
 void PlaylistTabs::playlist_update_cb(Playlist::UpdateLevel global_level)
 {
+    m_in_update = true;
     if (global_level == Playlist::Structure)
         addRemovePlaylists();
     if (global_level >= Playlist::Metadata)
@@ -201,6 +205,7 @@
         playlistWidget(i)->playlistUpdate();
 
     setCurrentIndex(Playlist::active_playlist().index());
+    m_in_update = false;
 }
 
 void PlaylistTabs::playlist_position_cb(Playlist list)
diff -Nru audacious-plugins-4.0.4/src/qtui/playlist_tabs.h audacious-plugins-4.0.5/src/qtui/playlist_tabs.h
--- audacious-plugins-4.0.4/src/qtui/playlist_tabs.h	2020-06-01 16:56:01.000000000 +0000
+++ audacious-plugins-4.0.5/src/qtui/playlist_tabs.h	2020-07-10 19:46:37.000000000 +0000
@@ -48,6 +48,7 @@
 private:
     QMenu * m_pl_menu;
     PlaylistTabBar * m_tabbar;
+    bool m_in_update = false;
 
     void activateSearch();
     void addRemovePlaylists();
diff -Nru audacious-plugins-4.0.4/src/scrobbler2/scrobbler_communication.cc audacious-plugins-4.0.5/src/scrobbler2/scrobbler_communication.cc
--- audacious-plugins-4.0.4/src/scrobbler2/scrobbler_communication.cc	2020-06-01 16:56:01.000000000 +0000
+++ audacious-plugins-4.0.5/src/scrobbler2/scrobbler_communication.cc	2020-07-10 19:46:37.000000000 +0000
@@ -98,7 +98,7 @@
         buf.insert (-1, "&");
         buf.insert (-1, name);
         buf.insert (-1, "=");
-        buf.insert (-1, esc);
+        buf.insert (-1, esc ? esc : "");
         curl_free (esc);
     }
 
diff -Nru audacious-plugins-4.0.4/src/search-tool-qt/search-model.h audacious-plugins-4.0.5/src/search-tool-qt/search-model.h
--- audacious-plugins-4.0.4/src/search-tool-qt/search-model.h	2020-06-01 16:56:01.000000000 +0000
+++ audacious-plugins-4.0.5/src/search-tool-qt/search-model.h	2020-07-10 19:46:37.000000000 +0000
@@ -76,7 +76,11 @@
     void do_search (const Index<String> & terms, int max_results);
 
 protected:
-    int rowCount (const QModelIndex & parent) const { return m_rows; }
+    int rowCount (const QModelIndex & parent) const
+    {
+        return parent.isValid() ? 0 : m_rows;
+    }
+
     int columnCount (const QModelIndex & parent) const { return 1; }
     QVariant data (const QModelIndex & index, int role) const;
 
Binary files /tmp/tmplMyOw3/eTQNBmhUUj/audacious-plugins-4.0.4/src/skins-data/Skins/Default/balance.png and /tmp/tmplMyOw3/Mu16hSnRzB/audacious-plugins-4.0.5/src/skins-data/Skins/Default/balance.png differ
Binary files /tmp/tmplMyOw3/eTQNBmhUUj/audacious-plugins-4.0.4/src/skins-data/Skins/Refugee/numbers.png and /tmp/tmplMyOw3/Mu16hSnRzB/audacious-plugins-4.0.5/src/skins-data/Skins/Refugee/numbers.png differ