Some small changes for mpfire V3

diff --git a/config/mpfire/webradio b/config/mpfire/webradio
index f8f1a5d1afc45c2f521a71b645a76a3441a92b48..f085dedee73a2fdae84473587ea486e00ce92293 100644 (file)
--- 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\r
-gffstream.ic.llnwd.net/stream/gffstream_stream_wdr_einslive_b|Einslive|http://www.einslive.de/\r
-213.186.41.149:8040|Deepinside Radio European|http://www.deepinside.co.uk\r
-62.75.176.40:80/bigfm-cbr-128|BigFM|http://www.bigfm.de\r
-62.75.176.44/brocken-high|Hit-Radio Brocken|http://www.radiobrocken.de\r
-87.118.100.135:9191|Spaceworld Radio|http://spaceworld-radio.de/\r
-dsl.blackbeats.fm:13000|BlackBeats FM|http://www.blackbeats.fm\r
-87.118.64.197:3100|Discofox-Radio|http://www.discofox-radio.de\r
-rmnradio.powerstream.de:8022|RMNradio|http://www.rmnradio.de/\r
-relay.radio.ethz.ch:8000/kohina.ogg|Kohina|http://www.kohina.com\r
-relay1.slayradio.org:8000|Slay Radio|http://www.slayradio.com/\r
-www.scenemusic.eu:8002/high.ogg|Nectarine 100% Demoscene Radio|http://www.scenemusic.eu/\r
-radioparadise.steadyhost.com:8060|Radio Paradise|http://www.radioparadise.com/\r
-160.79.128.40:7234|DI.FM Future Pop|http://www.di.fm\r
-scfire-ntc-aa03.stream.aol.com:80/stream/1003|DI.FM Trance|http://www.di.fm\r
-scfire-ntc-aa04.stream.aol.com:80/stream/1065|DI.FM Vocal Trance|http://www.di.fm\r
-scfire-nyk-aa03.stream.aol.com:80/stream/1035|DI.FM Chillout|http://www.di.fm\r
-scfire-nyk-aa03.stream.aol.com:80/stream/1024|DI.FM Euro Dance|http://www.di.fm\r
-scfire-nyk-aa04.stream.aol.com:80/stream/1007|DI.FM House|http://www.di.fm\r
-205.188.215.232:8016|DI.FM Soulfull House|http://www.di.fm\r
-scfire-chi-aa02.stream.aol.com:80/stream/1025|DI.FM Hard Dance|http://www.di.fm\r
-66.250.45.118:7204|DI.FM Techno|http://www.di.fm\r
-scfire-ntc-aa02.stream.aol.com:80/stream/1026|DI.FM Progressive|http://www.di.fm\r
-scfire-ntc-aa03.stream.aol.com:80/stream/1008|DI.FM Goa-Psy Trance|http://www.di.fm\r
-scfire-ntc-aa04.stream.aol.com:80/stream/1004|DI.FM Hardcore|http://www.di.fm\r
-209.247.146.100:8000|DI.FM DJ Mixes|http://www.di.fm\r
-scfire-ntc-aa03.stream.aol.com:80/stream/1009|DI.FM Lounge|http://www.di.fm\r
-207.200.96.229:8030|DI.FM Drum 'n' Bass|http://www.di.fm\r
-205.188.215.225:8004|DI.FM Classic Electronica|http://www.di.fm\r
-205.188.215.228:8006|DI.FM Ambient|http://www.di.fm\r
-205.188.215.225:8002|DI.FM Breaks|http://www.di.fm\r
-205.188.215.226:8006|DI.FM Gabber|http://www.di.fm\r
-160.79.128.40:7794|SKY.FM Solo Piano|http://www.sky.fm\r
-160.79.128.40:7814|SKY.FM Piano Jazz|http://www.sky.fm\r
-160.79.128.40:7804|SKY.FM Bossa Nova Jazz|http://www.sky.fm\r
-160.79.128.40:7774|SKY.FM Simply Soundtracks|http://www.sky.fm\r
-160.79.128.40:7784|SKY.FM Contemporary Christian|http://www.sky.fm\r
-scfire-chi-aa04.stream.aol.com:80/stream/1010|SKY.FM Smooth Jazz|http://www.sky.fm\r
-160.79.128.61:7714|SKY.FM Uptempo Smooth Jazz|http://www.sky.fm\r
-scfire-chi-aa01.stream.aol.com:80/stream/1014|SKY.FM Top Hits!|http://www.sky.fm\r
-scfire-ntc-aa03.stream.aol.com:80/stream/1013|SKY.FM Best of the 80's|http://www.sky.fm\r
-scfire-chi-aa04.stream.aol.com:80/stream/1076|SKY.FM All Hit 70's|http://www.sky.fm\r
-160.79.128.61:7684|SKY.FM Oldies|http://www.sky.fm\r
-scfire-dll-aa03.stream.aol.com:80/stream/1006|SKY.FM Mostly Classical|http://www.sky.fm\r
-205.188.215.226:8020|SKY.FM Classical Guitar|http://www.sky.fm\r
-scfire-nyk-aa04.stream.aol.com:80/stream/1002|SKY.FM New Age|http://www.sky.fm\r
-160.79.128.61:7674|SKY.FM World Music|http://www.sky.fm\r
-scfire-nyk-aa04.stream.aol.com:80/stream/1017|SKY.FM Roots Reggae|http://www.sky.fm\r
-38.119.49.140:8030|SKY.FM DaTempo Lounge|http://www.sky.fm\r
-scfire-chi-aa02.stream.aol.com:80/stream/1019|SKY.FM Country|http://www.sky.fm\r
-160.79.128.40:7734|SKY.FM Classic Rock|http://www.sky.fm\r
-160.79.128.40:7754|SKY.FM Alternative Rock|http://www.sky.fm\r
-66.135.38.32:8000|SKY.FM Urban Jamz|http://www.sky.fm\r
-160.79.128.61:7694|SKY.FM Classic Rap|http://www.sky.fm\r
-160.79.128.61:7724|SKY.FM Indie Rock|http://www.sky.fm\r
-205.188.215.231:8010|SKY.FM Salsa|http://www.sky.fm\r
-205.188.215.227:8008|SKY.FM Modern Jazz|http://www.sky.fm\r
+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 2f883a910ed1743501abb372f9ec219b7a7be9c5..06134af83d4e5d4c348de7a0aa2702ad704ca1c8 100644 (file)
--- a/html/cgi-bin/mpfire.cgi
+++ b/html/cgi-bin/mpfire.cgi
@@ -101,7 +101,7 @@ if ( $ENV{'QUERY_STRING'} =~ /title/){
 <meta http-equiv='refresh' content='5'>
 <title></title>
 <body>
 <meta http-equiv='refresh' content='5'>
 <title></title>
 <body>

-<table width='100%' cellspacing='0' align='center' style="background-image:url(/images/mpfire/box.png)">
+<table width='100%' cellspacing='0' align='center' style="background-image:url(/images/mpfire/box.png);background-repeat:no-repeat">

 END
 ;
        print"<tr ><td align='center'><font color='red' face='Verdana' size='2'><br />".encode('utf-8', $song)."<br /><br /></font></td></tr></table></body>";
 END
 ;
        print"<tr ><td align='center'><font color='red' face='Verdana' size='2'><br />".encode('utf-8', $song)."<br /><br /></font></td></tr></table></body>";


@@ -440,7 +440,7 @@ END
 &Header::openbox('100%', 'center', $Lang::tr{'mpfire search'});
 # box to quickly search artist, album or title
 print <<END
 &Header::openbox('100%', 'center', $Lang::tr{'mpfire search'});
 # box to quickly search artist, album or title
 print <<END

-<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+<form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'mpfire songs'}'>

 <table width='95%' cellspacing='0'>
 <tr>
 <td align='right' width='33%'>$Lang::tr{'artist'}</td>
 <table width='95%' cellspacing='0'>
 <tr>
 <td align='right' width='33%'>$Lang::tr{'artist'}</td>

diff --git a/lfs/mpfire b/lfs/mpfire
index 54d0ae037d00aca7e2ebc22b9d5aa1ab5822e50f..a7e2e91fca84d3dadc23508f149efe5e45917438 100644 (file)
--- 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/
        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
        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 5bc82cc8dbe8e05460d7e55e3e6d0362c9ddfac0..3e9c59a0334ff7b0e4cea323941d6416d19ff1de 100644 (file)
--- a/src/initscripts/init.d/mpd
+++ b/src/initscripts/init.d/mpd
@@ -12,7 +12,7 @@
 case "$1" in
        start)
                boot_mesg "Starting MPD..."
 case "$1" in
        start)
                boot_mesg "Starting MPD..."

-               /bin/nice --20 /usr/bin/mpd
+               /bin/nice --5 /usr/bin/mpd

     evaluate_retval
                ;;
        stop)
     evaluate_retval
                ;;
        stop)

diff --git a/src/paks/mpfire/update.sh b/src/paks/mpfire/update.sh
index 800823ef50bde1623c522e37274d393954af6439..89c40d0d7c5d3dd57b5944f3af4977d5f8d76760 100644 (file)
--- a/src/paks/mpfire/update.sh
+++ b/src/paks/mpfire/update.sh
@@ -22,3 +22,5 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

+./uninstall.sh
+./install.sh