mirrors/ympd
1
0
Fork 0
mirror of https://github.com/SuperBFG7/ympd synced 2025-07-03 10:32:57 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/jcorporation/myMPD

Browse Source
This commit is contained in:
jcorporation 2019-02-03 22:19:08 +00:00
commit 81f93d6f82
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -25,8 +25,8 @@ RUN tar -czvf /mympd.tar.gz -C /myMPD-dist .
FROM library/debian:9-slim FROM library/debian:9-slim
ENV MYMPD_LOGLEVEL=1 ENV MYMPD_LOGLEVEL=1
ENV MPD_MPDHOST=127.0.0.1 ENV MPD_HOST=127.0.0.1
ENV MPD_MPDPORT=6600 ENV MPD_PORT=6600
ENV WEBSERVER_SSL=true ENV WEBSERVER_SSL=true
RUN apt-get update && apt-get install libssl-dev openssl -y RUN apt-get update && apt-get install libssl-dev openssl -y
COPY --from=build /libmpdclient-master.tar.gz / COPY --from=build /libmpdclient-master.tar.gz /

1
README.md
View File

@ -90,4 +90,5 @@ Copyright
--------- ---------
myMPD: 2018-2019 <mail@jcgames.de> myMPD: 2018-2019 <mail@jcgames.de>
ympd: 2013-2014 <andy@ndyk.de> ympd: 2013-2014 <andy@ndyk.de>

4
contrib/docker/compose
View File

@ -4,8 +4,8 @@ services:
mympd: mympd:
container_name: mympd container_name: mympd
# environment: # environment:
# MPD_MPDHOST: 192.168.1.1 # MPD_HOST: 192.168.1.1
# MPD_MPDPORT: 6600 # MPD_PORT: 6600
# WEBSERVER_SSL: true # WEBSERVER_SSL: true
# MYMPD_LOGLEVEL: 2 # MYMPD_LOGLEVEL: 2
# image: mympd:latest # image: mympd:latest

6
contrib/mympd.conf.dist
View File

@ -2,9 +2,9 @@
[mpd] [mpd]
#Connection to mpd #Connection to mpd
mpdhost = 127.0.0.1 host = 127.0.0.1
mpdport = 6600 port = 6600
#mpdpass = #pass =
#Port for mpd http stream #Port for mpd http stream
streamport = 8000 streamport = 8000

8
src/main.c
View File

@ -57,14 +57,14 @@ static int mympd_inihandler(void *user, const char *section, const char *name, c
#define MATCH(s, n) strcasecmp(section, s) == 0 && strcasecmp(name, n) == 0 #define MATCH(s, n) strcasecmp(section, s) == 0 && strcasecmp(name, n) == 0
if (MATCH("mpd", "mpdhost")) { if (MATCH("mpd", "host")) {
free(p_config->mpdhost); free(p_config->mpdhost);
p_config->mpdhost = strdup(value); p_config->mpdhost = strdup(value);
} }
else if (MATCH("mpd", "mpdport")) { else if (MATCH("mpd", "port")) {
p_config->mpdport = strtol(value, &crap, 10); p_config->mpdport = strtol(value, &crap, 10);
} }
else if (MATCH("mpd", "mpdpass")) { else if (MATCH("mpd", "pass")) {
free(p_config->mpdpass); free(p_config->mpdpass);
p_config->mpdpass = strdup(value); p_config->mpdpass = strdup(value);
} }
@ -199,7 +199,7 @@ static void mympd_parse_env(struct t_config *config, const char *envvar) {
} }
static void mympd_get_env(struct t_config *config) { static void mympd_get_env(struct t_config *config) {
const char* env_vars[]={"MPD_MPDHOST", "MPD_MPDPORT", "MPD_STREAMPORT", const char* env_vars[]={"MPD_HOST", "MPD_PORT", "MPD_PASS", "MPD_STREAMPORT",
"WEBSERVER_WEBPORT", "WEBSERVER_SSL", "WEBSERVER_SSLPORT", "WEBSERVER_SSLCERT", "WEBSERVER_SSLKEY", "WEBSERVER_WEBPORT", "WEBSERVER_SSL", "WEBSERVER_SSLPORT", "WEBSERVER_SSLCERT", "WEBSERVER_SSLKEY",
"MYMPD_LOGLEVEL", "MYMPD_USER", "MYMPD_LOCALPLAYER", "MYMPD_COVERIMAGE", "MYMPD_COVERIMAGENAME", "MYMPD_LOGLEVEL", "MYMPD_USER", "MYMPD_LOCALPLAYER", "MYMPD_COVERIMAGE", "MYMPD_COVERIMAGENAME",
"MYMPD_COVERIMAGESIZE", "MYMPD_VARLIBDIR", "MYMPD_MIXRAMP", "MYMPD_STICKERS", "MYMPD_TAGLIST", "MYMPD_COVERIMAGESIZE", "MYMPD_VARLIBDIR", "MYMPD_MIXRAMP", "MYMPD_STICKERS", "MYMPD_TAGLIST",