Merge branch 'devel'

CMakeLists.txt

@@ -10,7 +10,7 @@ project (mympd C)
 #the source files
 set(CPACK_PACKAGE_VERSION_MAJOR "9")
 set(CPACK_PACKAGE_VERSION_MINOR "3")
-set(CPACK_PACKAGE_VERSION_PATCH "3")
+set(CPACK_PACKAGE_VERSION_PATCH "4")
 
 #minimal cmake version needed for correct GNUInstallDirs
 cmake_minimum_required(VERSION 3.4)

contrib/man/mympd-script.1

@@ -1,6 +1,6 @@
 .\" Manpage for mympd-script.
 .\" Contact <[email protected]> to correct errors or typos.
-.TH man 1 "23 May 2022" "9.3.3" "mympd-script man page"
+.TH man 1 "07 Jun 2022" "9.3.4" "mympd-script man page"
 .SH NAME
 mympd-script \- execute lua scripts through myMPD
 .SH SYNOPSIS

contrib/man/mympd.1

@@ -1,6 +1,6 @@
 .\" Manpage for mympd.
 .\" Contact <[email protected]> to correct errors or typos.
-.TH man 1 "23 May 2022" "9.3.3" "mympd man page"
+.TH man 1 "07 Jun 2022" "9.3.4" "mympd man page"
 
 .SH NAME
 myMPD \- standalone and mobile friendly web mpd client

contrib/packaging/alpine/APKBUILD

@@ -6,7 +6,7 @@
 # Maintainer: Juergen Mang <[email protected]>
 #
 pkgname=mympd
-pkgver=9.3.3
+pkgver=9.3.4
 pkgrel=0
 pkgdesc="myMPD is a standalone and mobile friendly web-based MPD client."
 url="https://jcorporation.github.io/myMPD/"

contrib/packaging/arch/PKGBUILD

@@ -4,7 +4,7 @@
 
 pkgname=mympd
 _pkgname=myMPD
-pkgver=9.3.3
+pkgver=9.3.4
 pkgrel=1
 pkgdesc="A standalone and mobile friendly web-based MPD client."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')

contrib/packaging/debian/changelog

@@ -1,5 +1,5 @@
-mympd (9.3.3-1) unstable; urgency=medium
+mympd (9.3.4-1) unstable; urgency=medium
 
   * Release from master
 
- -- Juergen Mang <[email protected]>  Mon, 23 May 2022 21:05:37 +0200
+ -- Juergen Mang <[email protected]>  Tue, 07 Jun 2022 20:06:17 +0200

contrib/packaging/openwrt/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME := mympd
-PKG_VERSION := 9.3.3
+PKG_VERSION := 9.3.4
 PKG_RELEASE := 1
 
 PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz

contrib/packaging/rpm/mympd.spec

@@ -4,7 +4,7 @@
 # (c) 2018-2022 Juergen Mang <[email protected]>
 
 Name:           mympd
-Version:        9.3.3
+Version:        9.3.4
 Release:        0
 License:        GPL-3.0-or-later
 Group:          Productivity/Multimedia/Sound/Players
@@ -68,5 +68,5 @@ fi
 %license LICENSE.md
 
 %changelog
-* Mon May 23 2022 Juergen Mang <[email protected]> 9.3.3-0
+* Tue Jun 07 2022 Juergen Mang <[email protected]> 9.3.4-0
 - Version from master

docs/_includes/version

@@ -1 +1 @@
-9.3.3
+9.3.4

htdocs/js/version.js

@@ -1 +1 @@
-const myMPDversion = '9.3.3';
+const myMPDversion = '9.3.4';

htdocs/js/webradio.js

@@ -517,8 +517,8 @@ function getWebradiodb() {
         filterWebradiodbFilter('filterWebradiodbCodec', 'webradioCodecs', 'Codec', '');
         filterWebradiodbFilter('filterWebradiodbBitrate', 'webradioBitrates', 'Bitrate', '');
         const result = searchWebradiodb(app.current.search, app.current.filter.genre,
-            app.current.filter.country, app.current.filter.language, app.current.sort,
-            app.current.offset, app.current.limit);
+            app.current.filter.country, app.current.filter.language, app.current.filter.codec,
+            app.current.filter.bitrate, app.current.sort, app.current.offset, app.current.limit);
         parseSearchWebradiodb(result);
     }, false);
 }

htdocs/sw.js

@@ -2,7 +2,7 @@
 // myMPD (c) 2018-2022 Juergen Mang <[email protected]>
 // https://github.com/jcorporation/mympd
 
-const CACHE = 'myMPD-cache-v9.3.3';
+const CACHE = 'myMPD-cache-v9.3.4';
 const subdir = self.location.pathname.replace('/sw.js', '').replace(/\/$/, '');
 const urlsToCache = [
     subdir + '/',