Fixed some mpfire things

diff --git a/config/mpfire/mpfire.pl b/config/mpfire/mpfire.pl
index e72b2fcae65785bc867c391c4c5690d64a280130..66413145de61a1545bd4ac992a3801d6f7168f39 100644 (file)
--- a/config/mpfire/mpfire.pl
+++ b/config/mpfire/mpfire.pl
@@ -26,13 +26,6 @@ elsif ($ARGV[0] eq 'playadd') {
   if ($debug){print "Yes we are called and we will add $ARGV[1]\n";}
   system("mpc add \"$ARGV[1]\" >/dev/null && mpc play >/dev/null");
   }
-elsif ($ARGV[0] eq 'playlist') {
-  &checkmute();
-  &shuffle();
-  &clearplaylist();
-  if ($debug){print "Yes we are called and we will play your Playlist\n";}
-  system("mpc load playlist >/dev/null && mpc play >/dev/null");
-  }
 elsif ($ARGV[0] eq 'clearplaylist') {
   if ($debug){print "Deleting playlist\n";}
   &clearplaylist();

diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi
index c49342807c3b8d150a8657d144b30dffe025cfef..ae86226747051f6087dac044c8f2813ebeb92010 100644 (file)
--- a/html/cgi-bin/mpfire.cgi
+++ b/html/cgi-bin/mpfire.cgi
@@ -231,8 +231,7 @@ if ( $mpfiresettings{'ACTION'} eq "scan" ){
 }elsif ( $mpfiresettings{'ACTION'} eq "playweb" ){
        $message=system("/usr/local/bin/mpfirectrl","playweb","\"$mpfiresettings{'FILE'}\"","2>/dev/null");
 }elsif ( $mpfiresettings{'ACTION'} eq "playlist" ){
-# on keypress play the playlist
-       $message=system("/usr/local/bin/mpfirectrl playlist 2>/dev/null");
+       $mpd->play();
 }elsif ( $mpfiresettings{'ACTION'} eq "emptyplaylist" ){
 # on keypress clear the playlist
        $mpd->playlist->clear();

diff --git a/lfs/mpfire b/lfs/mpfire
index 4403121051f9901ab1641cb3ab4643cdbf9fe0ed..b163a95292833f5b8aa318543d916d06b2c92aa9 100644 (file)
--- a/lfs/mpfire
+++ b/lfs/mpfire
@@ -30,7 +30,7 @@ THISAPP    = mpfire-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpfire
-PAK_VER    = 6
+PAK_VER    = 7
 
 DEPS       = "mpd mpc"