start mpd normally, patch from Stefan Monnier

SVN-Revision: 20318

diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile
index 2b1f26c051086701b81b4e186b8dbf6bae855741..e5a7eb911c88e7f6002f6512a3a61446c860aa8a 100644 (file)
--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mpd
 PKG_VERSION:=0.15.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/musicpd

diff --git a/sound/mpd/files/mpd.init b/sound/mpd/files/mpd.init
index 017ad7701d1437e0ad2d90fbd8f529a4dd301e1b..381c592d171dfc62799054f0f617f5befb6f7802 100644 (file)
--- a/sound/mpd/files/mpd.init
+++ b/sound/mpd/files/mpd.init
@@ -4,27 +4,21 @@ START=93
 
 start() {
        #create mpd directories
-       md=`grep music_directory /etc/mpd.conf | cut -d "\"" -f 2 | sed "s/~/\/root/g"`
-       if [ ! -d $md ]; then
-               mkdir -p $md
-       fi
        pld=`grep playlist_directory /etc/mpd.conf | cut -d "\"" -f 2 | sed "s/~/\/root/g"`
        if [ ! -d $pld ]; then
                mkdir -p $pld
        fi
-       #create mpd db
-       /usr/bin/mpd --stdout --create-db
-
-       #optional export for mpc
-       #export MPD_HOST=127.0.0.1
+       # Set the initial volume to something manageable
+       amixer set PCM 40
 
        #start mpd
-       /usr/bin/mpd
-
-       #generate playlist and start to play
-       /usr/bin/mpc listall | /usr/bin/mpc add -
-       /usr/bin/mpc play
-       /usr/bin/mpc repeat
+       if [ -x /bin/nice ]; then
+               # This has real-time constraints, so let's at least tell the OS
+               # that this should have higher priority to avoid skipping
+               # when doing other things in the background.
+               nice="nice -n -10"
+       fi
+       $nice /usr/bin/mpd
 }
 
 stop() {