From 7ce43a07c6d17358e4a6f1792a82ecb423156780 Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Sat, 7 Jul 2012 23:41:35 +1200 Subject: [PATCH] Fix a long standing bug where the XML protocol was wrong. I suspect that a pre-release version of MythTV had 23058 as the version, and it was changed to 58 at some point in time. --- ChangeLog | 4 ++++ bin/mythtv-status | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45f09ad..a55019a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,10 @@ If the next recording is in more than 1 day, then switch to showing it in days and hours, for example "1 Day, 2 Hours". + Hrmm, the XML protocol version was wrong for the encoder status, + so we incorrectly showed "7" instead of "Recording" for an encoder + that was in fact recording. + 2012-07-06 Andrew Ruthven Correctly handle UTF-8 in the output from MythTV. diff --git a/bin/mythtv-status b/bin/mythtv-status index d5f1d23..93ea250 100755 --- a/bin/mythtv-status +++ b/bin/mythtv-status @@ -238,7 +238,7 @@ my @blocks = ( 'name' => 'Encoders', 'type' => 'xpath', 'xpath' => "//Status/Encoders/Encoder", - 'protocol_version' => [ ">= 44", "< 23058" ], + 'protocol_version' => [ ">= 44", "< 58" ], 'attrs' => [ qw/hostname id state connected/ ], 'template' => "__hostname__ (__id__) - __state____connected__", 'rewrite' => { @@ -265,7 +265,7 @@ my @blocks = ( 'name' => 'Encoders', 'type' => 'xpath', 'xpath' => "//Status/Encoders/Encoder", - 'protocol_version' => [ ">= 23058" ], + 'protocol_version' => [ ">= 58" ], 'attrs' => [ qw/hostname id state connected/ ], 'template' => "__hostname__ (__id__) - __state____connected__", 'rewrite' => { -- 2.30.2