diff options
| author | David Leadbeater | 2015-01-10 18:20:58 +0000 |
|---|---|---|
| committer | David Leadbeater | 2015-01-10 18:20:58 +0000 |
| commit | 9dd374273f01012e5d71e350a6c77dfc47f75f9b (patch) | |
| tree | 1f1cdd3a7fccfb32be52dcc2a9f74042bc6af899 /scripts | |
| parent | 32169517d391c25cf0a5ba20c4adefcb5fe8fbd0 (diff) | |
| parent | 65c49045f33485721103cdeaae63aa2c598235e7 (diff) | |
| download | scripts.irssi.org-9dd374273f01012e5d71e350a6c77dfc47f75f9b.tar.bz2 | |
Merge pull request #35 from mkroman/add-more-mpd-stats
Add bitrate and volume format directives
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mpd.pl | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/scripts/mpd.pl b/scripts/mpd.pl index e0f8453..035aba1 100644 --- a/scripts/mpd.pl +++ b/scripts/mpd.pl @@ -30,6 +30,8 @@ # Some minor changes # # 0.6: Added some more format directives(time, album) # # Added support for password authentication # +# 0.7: Added format directives for bitrate and volume # +# Fixed socket not timing out at specified interval # ####################################################################### use strict; @@ -38,11 +40,11 @@ use Irssi; use vars qw{$VERSION %IRSSI %MPD}; -$VERSION = "0.6"; +$VERSION = "0.7"; %IRSSI = ( name => 'mpd', - authors => 'Erik Scharwaechter, Tobias Böhm', - contact => 'diozaka@gmx.de, code@aibor.de', + authors => 'Erik Scharwaechter, Tobias Böhm, Mikkel Kroman', + contact => 'diozaka@gmx.de, code@aibor.de, mk@maero.dk', license => 'GPLv2', description => 'print the song you are listening to', ); @@ -76,7 +78,7 @@ sub np { Proto => 'tcp', PeerPort => $MPD{'port'}, PeerAddr => $MPD{'host'}, - timeout => $MPD{'timeout'} + Timeout => $MPD{'timeout'} ); if (not $socket) { @@ -109,6 +111,8 @@ sub np { $MPD{'filename'} = ""; $MPD{'elapsed'} = ""; $MPD{'total'} = ""; + $MPD{'volume'} = ""; + $MPD{'bitrate'} = ""; my $ans = ""; my $str = ""; @@ -125,6 +129,10 @@ sub np { } elsif ($ans =~ /^time: (\d+):(\d+)$/) { $MPD{'elapsed'} = sprintf("%01d:%02d", $1/60,$1%60); $MPD{'total'} = sprintf("%01d:%02d", $2/60,$2%60); + } elsif ($ans =~ /^volume: (\d+)$/) { + $MPD{'volume'} = $1 + } elsif ($ans =~ /^bitrate: (\d+)$/) { + $MPD{'bitrate'} = $1 } } @@ -165,6 +173,8 @@ sub np { $str =~ s/\%FILENAME/$MPD{'filename'}/g; $str =~ s/\%ELAPSED/$MPD{'elapsed'}/g; $str =~ s/\%TOTAL/$MPD{'total'}/g; + $str =~ s/\%BITRATE/$MPD{'bitrate'}/g; + $str =~ s/\%VOLUME/$MPD{'volume'}/g; if ($witem && ($witem->{type} eq "CHANNEL" || $witem->{type} eq "QUERY")) { |