Commit ceabd566 authored by Jean-Francois Dockes's avatar Jean-Francois Dockes
Browse files

small touchups + bump version

parent 35ffc732
AC_INIT([upmpdcli], [1.5.11], [jfd@lesbonscomptes.com], AC_INIT([upmpdcli], [1.5.12], [jfd@lesbonscomptes.com],
[upmpdcli], [http://www.lesbonscomptes.com/upmpdcli]) [upmpdcli], [http://www.lesbonscomptes.com/upmpdcli])
AC_PREREQ([2.53]) AC_PREREQ([2.53])
AC_CONFIG_MACRO_DIRS([m4]) AC_CONFIG_MACRO_DIRS([m4])
......
upmpdcli (1.5.12-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
* Add small Media Server plugin (upradios) for exporting the radio list.
* uprcl: export the radio list as a playlist
* uprcl: small improvements
* Deezer, Qobuz: set pictures for artists and playlists
-- Jean-Francois Dockes <jf@dockes.org> Thu, 22 Apr 2021 09:48:00 +0200
upmpdcli (1.5.11-1~ppaPPAVERS~SERIES1) SERIES; urgency=low upmpdcli (1.5.11-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
* Fix possible issue when volume controlled from Kazoo * Fix possible issue when volume controlled from Kazoo
......
...@@ -1075,7 +1075,7 @@ possible ways, described just below. ...@@ -1075,7 +1075,7 @@ possible ways, described just below.
In both cases, after creating the tree, you need to compile the openhome In both cases, after creating the tree, you need to compile the openhome
software. See the sc2mpd build section below. software. See the sc2mpd build section below.
===== The easy way ===== OpenHome source tree, the easy way
Download the tar file of the appropriately patched openhome code from the Download the tar file of the appropriately patched openhome code from the
upmpdcli downloads page (use the current one, the date on the one below is upmpdcli downloads page (use the current one, the date on the one below is
...@@ -1084,9 +1084,9 @@ just an example), create an empty directory, untar it in it ...@@ -1084,9 +1084,9 @@ just an example), create an empty directory, untar it in it
cd /home/me cd /home/me
mkdir openhome mkdir openhome
cd openhome cd openhome
tar xf /path/to/openhome-sc2-20200704.tar.gz tar xf /path/to/openhome-sc2-20210305.tar.gz
===== The complicated way ===== OpenHome source tree, the complicated way
The *sc2mpd* source comes with a shell script named _ohbuild.sh_ to help The *sc2mpd* source comes with a shell script named _ohbuild.sh_ to help
with this. It has several functions: with this. It has several functions:
......
...@@ -111,7 +111,7 @@ static void ...@@ -111,7 +111,7 @@ static void
versionInfo(FILE *fp) versionInfo(FILE *fp)
{ {
fprintf(fp, "Upmpdcli %s %s\n", fprintf(fp, "Upmpdcli %s %s\n",
UPMPDCLI_PACKAGE_VERSION, LibUPnP::versionString().c_str()); UPMPDCLI_PACKAGE_VERSION, LibUPnP::versionString().c_str());
} }
static void static void
...@@ -397,11 +397,11 @@ int main(int argc, char *argv[]) ...@@ -397,11 +397,11 @@ int main(int argc, char *argv[])
g_config->get("ohproductroom", ohProductDesc.room); g_config->get("ohproductroom", ohProductDesc.room);
// ProductName is set to ModelName by default // ProductName is set to ModelName by default
if (ohProductDesc.product.name.empty()) { if (ohProductDesc.product.name.empty()) {
ohProductDesc.product.name = ohProductDesc.model.name; ohProductDesc.product.name = ohProductDesc.model.name;
} }
// ProductRoom is set to "Main Room" by default // ProductRoom is set to "Main Room" by default
if (ohProductDesc.room.empty()) { if (ohProductDesc.room.empty()) {
ohProductDesc.room = "Main Room"; ohProductDesc.room = "Main Room";
} }
g_config->get("scsenderpath", senderpath); g_config->get("scsenderpath", senderpath);
...@@ -490,7 +490,7 @@ int main(int argc, char *argv[]) ...@@ -490,7 +490,7 @@ int main(int argc, char *argv[])
LOGFAT("Can't write pidfile: " << pidfile.getreason() << endl); LOGFAT("Can't write pidfile: " << pidfile.getreason() << endl);
return 1; return 1;
} }
if (opts.cachedir.empty()) if (opts.cachedir.empty())
opts.cachedir = "/var/cache/upmpdcli"; opts.cachedir = "/var/cache/upmpdcli";
} else if (runas == geteuid()) { } else if (runas == geteuid()) {
// Already running as upmpdcli user. There are actually 2 // Already running as upmpdcli user. There are actually 2
...@@ -504,10 +504,10 @@ int main(int argc, char *argv[]) ...@@ -504,10 +504,10 @@ int main(int argc, char *argv[])
// package was installed. One way to fix this if this if it is // package was installed. One way to fix this if this if it is
// wrong is to set cachedir in the configuration file // wrong is to set cachedir in the configuration file
// (opts.cachedir will be non-empty then). // (opts.cachedir will be non-empty then).
if (opts.cachedir.empty()) if (opts.cachedir.empty())
opts.cachedir = "/var/cache/upmpdcli"; opts.cachedir = "/var/cache/upmpdcli";
} else { } else {
if (opts.cachedir.empty()) if (opts.cachedir.empty())
opts.cachedir = path_cat(path_tildexpand("~") , "/.cache/upmpdcli"); opts.cachedir = path_cat(path_tildexpand("~") , "/.cache/upmpdcli");
} }
......
...@@ -12,6 +12,10 @@ ...@@ -12,6 +12,10 @@
# title. # title.
# - preferScript: decide if values from script should override the ICY # - preferScript: decide if values from script should override the ICY
# metadata returned by mpd. # metadata returned by mpd.
# - mime: the MIME value for the stream. Defaults to audio/mpeg. This is not
# really useful when used with upmpdcli because mpd will determine this from
# the stream itself. It may be useful however when the list is exported
# through the media server
# #
# Example: # Example:
# #
...@@ -46,6 +50,7 @@ artUrl = https://www.radioparadise.com/graphics/fb_logo.png ...@@ -46,6 +50,7 @@ artUrl = https://www.radioparadise.com/graphics/fb_logo.png
#artScript = radio-paradise-get-art.sh #artScript = radio-paradise-get-art.sh
metaScript = radio-paradise-meta.py 0 metaScript = radio-paradise-meta.py 0
preferScript = 1 preferScript = 1
mime = audio/aac
[radio Paradise Mellow (mp3 192)] [radio Paradise Mellow (mp3 192)]
url = http://stream.radioparadise.com/mellow-192 url = http://stream.radioparadise.com/mellow-192
...@@ -65,6 +70,12 @@ artUrl = https://www.radioparadise.com/graphics/fb_logo.png ...@@ -65,6 +70,12 @@ artUrl = https://www.radioparadise.com/graphics/fb_logo.png
metaScript = radio-paradise-meta.py 3 metaScript = radio-paradise-meta.py 3
preferScript = 1 preferScript = 1
[radio Radio Paradise | eclectic-flac]
url = http://stream.radioparadise.com/eclectic-flacm
mime = application/x-flac
artUrl = http://192.x.x.x/radio-logo/radio-paradise.png
metaScript = radio-paradise-metadata.py 3
preferScript = 1
[radio Naim Radio] [radio Naim Radio]
url = http://37.130.228.60:8090/listen.pls url = http://37.130.228.60:8090/listen.pls
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment