From: Christian Schmidt Date: Fri, 16 May 2008 13:37:46 +0000 (+0200) Subject: Some small changes for mpfire V3 X-Git-Tag: v2.3-beta1~68 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=6cd3f682eb346c8fc0bfd680036df429578960ab;hp=e3872fbd1c03d36323cb4dbb5d55fb0bcb04fd33 Some small changes for mpfire V3 --- diff --git a/config/mpfire/webradio b/config/mpfire/webradio index f8f1a5d1af..f085dedee7 100644 --- a/config/mpfire/webradio +++ b/config/mpfire/webradio @@ -1,57 +1,57 @@ -62.75.176.45/rtl-high|89.0 RTL Hitradio|http://www.89.0rtl.de -gffstream.ic.llnwd.net/stream/gffstream_stream_wdr_einslive_b|Einslive|http://www.einslive.de/ -213.186.41.149:8040|Deepinside Radio European|http://www.deepinside.co.uk -62.75.176.40:80/bigfm-cbr-128|BigFM|http://www.bigfm.de -62.75.176.44/brocken-high|Hit-Radio Brocken|http://www.radiobrocken.de -87.118.100.135:9191|Spaceworld Radio|http://spaceworld-radio.de/ -dsl.blackbeats.fm:13000|BlackBeats FM|http://www.blackbeats.fm -87.118.64.197:3100|Discofox-Radio|http://www.discofox-radio.de -rmnradio.powerstream.de:8022|RMNradio|http://www.rmnradio.de/ -relay.radio.ethz.ch:8000/kohina.ogg|Kohina|http://www.kohina.com -relay1.slayradio.org:8000|Slay Radio|http://www.slayradio.com/ -www.scenemusic.eu:8002/high.ogg|Nectarine 100% Demoscene Radio|http://www.scenemusic.eu/ -radioparadise.steadyhost.com:8060|Radio Paradise|http://www.radioparadise.com/ -160.79.128.40:7234|DI.FM Future Pop|http://www.di.fm -scfire-ntc-aa03.stream.aol.com:80/stream/1003|DI.FM Trance|http://www.di.fm -scfire-ntc-aa04.stream.aol.com:80/stream/1065|DI.FM Vocal Trance|http://www.di.fm -scfire-nyk-aa03.stream.aol.com:80/stream/1035|DI.FM Chillout|http://www.di.fm -scfire-nyk-aa03.stream.aol.com:80/stream/1024|DI.FM Euro Dance|http://www.di.fm -scfire-nyk-aa04.stream.aol.com:80/stream/1007|DI.FM House|http://www.di.fm -205.188.215.232:8016|DI.FM Soulfull House|http://www.di.fm -scfire-chi-aa02.stream.aol.com:80/stream/1025|DI.FM Hard Dance|http://www.di.fm -66.250.45.118:7204|DI.FM Techno|http://www.di.fm -scfire-ntc-aa02.stream.aol.com:80/stream/1026|DI.FM Progressive|http://www.di.fm -scfire-ntc-aa03.stream.aol.com:80/stream/1008|DI.FM Goa-Psy Trance|http://www.di.fm -scfire-ntc-aa04.stream.aol.com:80/stream/1004|DI.FM Hardcore|http://www.di.fm -209.247.146.100:8000|DI.FM DJ Mixes|http://www.di.fm -scfire-ntc-aa03.stream.aol.com:80/stream/1009|DI.FM Lounge|http://www.di.fm -207.200.96.229:8030|DI.FM Drum 'n' Bass|http://www.di.fm -205.188.215.225:8004|DI.FM Classic Electronica|http://www.di.fm -205.188.215.228:8006|DI.FM Ambient|http://www.di.fm -205.188.215.225:8002|DI.FM Breaks|http://www.di.fm -205.188.215.226:8006|DI.FM Gabber|http://www.di.fm -160.79.128.40:7794|SKY.FM Solo Piano|http://www.sky.fm -160.79.128.40:7814|SKY.FM Piano Jazz|http://www.sky.fm -160.79.128.40:7804|SKY.FM Bossa Nova Jazz|http://www.sky.fm -160.79.128.40:7774|SKY.FM Simply Soundtracks|http://www.sky.fm -160.79.128.40:7784|SKY.FM Contemporary Christian|http://www.sky.fm -scfire-chi-aa04.stream.aol.com:80/stream/1010|SKY.FM Smooth Jazz|http://www.sky.fm -160.79.128.61:7714|SKY.FM Uptempo Smooth Jazz|http://www.sky.fm -scfire-chi-aa01.stream.aol.com:80/stream/1014|SKY.FM Top Hits!|http://www.sky.fm -scfire-ntc-aa03.stream.aol.com:80/stream/1013|SKY.FM Best of the 80's|http://www.sky.fm -scfire-chi-aa04.stream.aol.com:80/stream/1076|SKY.FM All Hit 70's|http://www.sky.fm -160.79.128.61:7684|SKY.FM Oldies|http://www.sky.fm -scfire-dll-aa03.stream.aol.com:80/stream/1006|SKY.FM Mostly Classical|http://www.sky.fm -205.188.215.226:8020|SKY.FM Classical Guitar|http://www.sky.fm -scfire-nyk-aa04.stream.aol.com:80/stream/1002|SKY.FM New Age|http://www.sky.fm -160.79.128.61:7674|SKY.FM World Music|http://www.sky.fm -scfire-nyk-aa04.stream.aol.com:80/stream/1017|SKY.FM Roots Reggae|http://www.sky.fm -38.119.49.140:8030|SKY.FM DaTempo Lounge|http://www.sky.fm -scfire-chi-aa02.stream.aol.com:80/stream/1019|SKY.FM Country|http://www.sky.fm -160.79.128.40:7734|SKY.FM Classic Rock|http://www.sky.fm -160.79.128.40:7754|SKY.FM Alternative Rock|http://www.sky.fm -66.135.38.32:8000|SKY.FM Urban Jamz|http://www.sky.fm -160.79.128.61:7694|SKY.FM Classic Rap|http://www.sky.fm -160.79.128.61:7724|SKY.FM Indie Rock|http://www.sky.fm -205.188.215.231:8010|SKY.FM Salsa|http://www.sky.fm -205.188.215.227:8008|SKY.FM Modern Jazz|http://www.sky.fm +62.75.176.45/rtl-high|89.0 RTL Hitradio|http://www.89.0rtl.de +gffstream.ic.llnwd.net/stream/gffstream_stream_wdr_einslive_b|Einslive|http://www.einslive.de/ +213.186.41.149:8040|Deepinside Radio European|http://www.deepinside.co.uk +62.75.176.40:80/bigfm-cbr-128|BigFM|http://www.bigfm.de +62.75.176.44/brocken-high|Hit-Radio Brocken|http://www.radiobrocken.de +www.magic-island.eu:10001|Magic Island|http://www.magic-island.eu +dsl.blackbeats.fm:13000|BlackBeats FM|http://www.blackbeats.fm +87.118.64.197:3100|Discofox-Radio|http://www.discofox-radio.de +rmnradio.powerstream.de:8022|RMNradio|http://www.rmnradio.de/ +relay.radio.ethz.ch:8000/kohina.ogg|Kohina|http://www.kohina.com +relay1.slayradio.org:8000|Slay Radio|http://www.slayradio.com/ +www.scenemusic.eu:8002/high.ogg|Nectarine 100% Demoscene Radio|http://www.scenemusic.eu/ +radioparadise.steadyhost.com:8060|Radio Paradise|http://www.radioparadise.com/ +160.79.128.40:7234|DI.FM Future Pop|http://www.di.fm +scfire-ntc-aa03.stream.aol.com:80/stream/1003|DI.FM Trance|http://www.di.fm +scfire-ntc-aa04.stream.aol.com:80/stream/1065|DI.FM Vocal Trance|http://www.di.fm +scfire-nyk-aa03.stream.aol.com:80/stream/1035|DI.FM Chillout|http://www.di.fm +scfire-nyk-aa03.stream.aol.com:80/stream/1024|DI.FM Euro Dance|http://www.di.fm +scfire-nyk-aa04.stream.aol.com:80/stream/1007|DI.FM House|http://www.di.fm +205.188.215.232:8016|DI.FM Soulfull House|http://www.di.fm +scfire-chi-aa02.stream.aol.com:80/stream/1025|DI.FM Hard Dance|http://www.di.fm +66.250.45.118:7204|DI.FM Techno|http://www.di.fm +scfire-ntc-aa02.stream.aol.com:80/stream/1026|DI.FM Progressive|http://www.di.fm +scfire-ntc-aa03.stream.aol.com:80/stream/1008|DI.FM Goa-Psy Trance|http://www.di.fm +scfire-ntc-aa04.stream.aol.com:80/stream/1004|DI.FM Hardcore|http://www.di.fm +209.247.146.100:8000|DI.FM DJ Mixes|http://www.di.fm +scfire-ntc-aa03.stream.aol.com:80/stream/1009|DI.FM Lounge|http://www.di.fm +207.200.96.229:8030|DI.FM Drum 'n' Bass|http://www.di.fm +205.188.215.225:8004|DI.FM Classic Electronica|http://www.di.fm +205.188.215.228:8006|DI.FM Ambient|http://www.di.fm +205.188.215.225:8002|DI.FM Breaks|http://www.di.fm +205.188.215.226:8006|DI.FM Gabber|http://www.di.fm +160.79.128.40:7794|SKY.FM Solo Piano|http://www.sky.fm +160.79.128.40:7814|SKY.FM Piano Jazz|http://www.sky.fm +160.79.128.40:7804|SKY.FM Bossa Nova Jazz|http://www.sky.fm +160.79.128.40:7774|SKY.FM Simply Soundtracks|http://www.sky.fm +160.79.128.40:7784|SKY.FM Contemporary Christian|http://www.sky.fm +scfire-chi-aa04.stream.aol.com:80/stream/1010|SKY.FM Smooth Jazz|http://www.sky.fm +160.79.128.61:7714|SKY.FM Uptempo Smooth Jazz|http://www.sky.fm +scfire-chi-aa01.stream.aol.com:80/stream/1014|SKY.FM Top Hits!|http://www.sky.fm +scfire-ntc-aa03.stream.aol.com:80/stream/1013|SKY.FM Best of the 80's|http://www.sky.fm +scfire-chi-aa04.stream.aol.com:80/stream/1076|SKY.FM All Hit 70's|http://www.sky.fm +160.79.128.61:7684|SKY.FM Oldies|http://www.sky.fm +scfire-dll-aa03.stream.aol.com:80/stream/1006|SKY.FM Mostly Classical|http://www.sky.fm +205.188.215.226:8020|SKY.FM Classical Guitar|http://www.sky.fm +scfire-nyk-aa04.stream.aol.com:80/stream/1002|SKY.FM New Age|http://www.sky.fm +160.79.128.61:7674|SKY.FM World Music|http://www.sky.fm +scfire-nyk-aa04.stream.aol.com:80/stream/1017|SKY.FM Roots Reggae|http://www.sky.fm +38.119.49.140:8030|SKY.FM DaTempo Lounge|http://www.sky.fm +scfire-chi-aa02.stream.aol.com:80/stream/1019|SKY.FM Country|http://www.sky.fm +160.79.128.40:7734|SKY.FM Classic Rock|http://www.sky.fm +160.79.128.40:7754|SKY.FM Alternative Rock|http://www.sky.fm +66.135.38.32:8000|SKY.FM Urban Jamz|http://www.sky.fm +160.79.128.61:7694|SKY.FM Classic Rap|http://www.sky.fm +160.79.128.61:7724|SKY.FM Indie Rock|http://www.sky.fm +205.188.215.231:8010|SKY.FM Salsa|http://www.sky.fm +205.188.215.227:8008|SKY.FM Modern Jazz|http://www.sky.fm diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi index 2f883a910e..06134af83d 100644 --- a/html/cgi-bin/mpfire.cgi +++ b/html/cgi-bin/mpfire.cgi @@ -101,7 +101,7 @@ if ( $ENV{'QUERY_STRING'} =~ /title/){ - +
END ; print"

".encode('utf-8', $song)."

"; @@ -440,7 +440,7 @@ END &Header::openbox('100%', 'center', $Lang::tr{'mpfire search'}); # box to quickly search artist, album or title print < +
diff --git a/lfs/mpfire b/lfs/mpfire index 54d0ae037d..a7e2e91fca 100644 --- a/lfs/mpfire +++ b/lfs/mpfire @@ -70,7 +70,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chmod 755 /srv/web/ipfire/html/images/mpfire install -v -m 644 $(DIR_SRC)/config/backup/includes/mpfire /var/ipfire/backup/addons/includes/mpfire -mkdir -p /usr/lib/perl5/site_perl/5.8.8/Audio/ - -mkdir -p /usr/lib/perl5/site_perl/5.8.8/Audio/ cp -vrf $(DIR_SRC)/config/mpfire/perl/Audio/MPD* /usr/lib/perl5/site_perl/5.8.8/Audio/ cp -vrf $(DIR_SRC)/config/mpfire/perl/Accessor* /usr/lib/perl5/5.8.8/Class/ cp -vrf $(DIR_SRC)/config/mpfire/perl/Readonly.pm /usr/lib/perl5/5.8.8/Readonly.pm diff --git a/src/initscripts/init.d/mpd b/src/initscripts/init.d/mpd index 5bc82cc8db..3e9c59a033 100644 --- a/src/initscripts/init.d/mpd +++ b/src/initscripts/init.d/mpd @@ -12,7 +12,7 @@ case "$1" in start) boot_mesg "Starting MPD..." - /bin/nice --20 /usr/bin/mpd + /bin/nice --5 /usr/bin/mpd evaluate_retval ;; stop) diff --git a/src/paks/mpfire/update.sh b/src/paks/mpfire/update.sh index 800823ef50..89c40d0d7c 100644 --- a/src/paks/mpfire/update.sh +++ b/src/paks/mpfire/update.sh @@ -22,3 +22,5 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh
$Lang::tr{'artist'}