r9986 - in /trunk/libaudio-mpd-perl: bin/mpd-dynamic debian/changelog lib/Audio/MPD.pm

[joeyh at users.alioth.debian.org]

Author: joeyh
Date: Thu Nov 29 00:21:15 2007
New Revision: 9986

URL: http://svn.debian.org/wsvn/?sc=1&rev=9986
Log:
* Support MPD_HOST of the form password at host, as used by mpc.
* mpd-dynamic: Connect before daemonising so that errors are
  visible.

Modified:
    trunk/libaudio-mpd-perl/bin/mpd-dynamic
    trunk/libaudio-mpd-perl/debian/changelog
    trunk/libaudio-mpd-perl/lib/Audio/MPD.pm

Modified: trunk/libaudio-mpd-perl/bin/mpd-dynamic
URL: http://svn.debian.org/wsvn/trunk/libaudio-mpd-perl/bin/mpd-dynamic?rev=9986&op=diff
==============================================================================
--- trunk/libaudio-mpd-perl/bin/mpd-dynamic (original)
+++ trunk/libaudio-mpd-perl/bin/mpd-dynamic Thu Nov 29 00:21:15 2007
@@ -18,7 +18,6 @@
 use Proc::Daemon;
 use Time::HiRes    qw[ usleep ];
 
-Proc::Daemon::Init unless $ARGV{debug};
 
 #
 my $song     = 0; # song currently playing
@@ -28,6 +27,7 @@
 # fetch list of songs known by mpd.
 my @files = $mpd->collection->all_pathes;
 
+Proc::Daemon::Init unless $ARGV{debug};
 
 while (1) { # endless loop
     my $status;

Modified: trunk/libaudio-mpd-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libaudio-mpd-perl/debian/changelog?rev=9986&op=diff
==============================================================================
--- trunk/libaudio-mpd-perl/debian/changelog (original)
+++ trunk/libaudio-mpd-perl/debian/changelog Thu Nov 29 00:21:15 2007
@@ -1,5 +1,8 @@
 libaudio-mpd-perl (0.18.3-1) unstable; urgency=low
 
   * Initial debianisation.
+  * Support MPD_HOST of the form password at host, as used by mpc.
+  * mpd-dynamic: Connect before daemonising so that errors are
+    visible.
 
  -- Joey Hess <joeyh at debian.org>  Wed, 28 Nov 2007 17:44:52 -0500

Modified: trunk/libaudio-mpd-perl/lib/Audio/MPD.pm
URL: http://svn.debian.org/wsvn/trunk/libaudio-mpd-perl/lib/Audio/MPD.pm?rev=9986&op=diff
==============================================================================
--- trunk/libaudio-mpd-perl/lib/Audio/MPD.pm (original)
+++ trunk/libaudio-mpd-perl/lib/Audio/MPD.pm Thu Nov 29 00:21:15 2007
@@ -46,9 +46,11 @@
     my ($host, $port, $password) = @_;
 
     # use mpd defaults.
-    $host     = $ENV{MPD_HOST}     || 'localhost' unless defined $host;
+    my ($default_password, $default_host)=split('@', $ENV{MPD_HOST})
+    	if exists $ENV{MPD_HOST};
+    $host     = $default_host      || 'localhost' unless defined $host;
     $port     = $ENV{MPD_PORT}     || '6600'      unless defined $port;
-    $password = $ENV{MPD_PASSWORD} || ''          unless defined $password;
+    $password = $ENV{MPD_PASSWORD} || $default_password  || ''  unless defined $password;
 
     # create & bless the object.
     my $self = {