From d77af23ea8de5ffe461e4e1addf6fdb92e5e4cbd Mon Sep 17 00:00:00 2001 From: "craig.p.drummond" Date: Sun, 21 Oct 2012 18:13:55 +0000 Subject: [PATCH] Encode/decode UTF-8 sent to /recieved from MPD. BUG:120 --- dynamic/cantata-dynamic | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dynamic/cantata-dynamic b/dynamic/cantata-dynamic index 5e453f45c..4028853c6 100755 --- a/dynamic/cantata-dynamic +++ b/dynamic/cantata-dynamic @@ -33,6 +33,7 @@ use IO::Socket; use threads; use threads::shared; use URI::Escape; +use Encode; my $isServerMode : shared =0; my $dynamicIsActive : shared =1; @@ -122,10 +123,14 @@ sub sendCommand() { my $status = 0; my $sock=&connectToMpd(); my $sockData; + $cmd="${cmd}\n"; if ($sock && $sock->connected()) { - $sock->send("${cmd}\n"); + print $sock encode('utf-8' => $cmd); $sockData=&readReply($sock); - eval { close $sock; };undef $sock; + eval { close $sock; }; undef $sock; + } + if ($sockData ne '') { + return decode_utf8($sockData); } return $sockData; }