summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert McNamara <rmcnamara@mythtv.org>2011-06-19 14:39:13 (GMT)
committer Robert McNamara <rmcnamara@mythtv.org>2011-06-19 14:39:13 (GMT)
commit422a88f7c3f17678b8bc9b0a54e5583051674cc4 (patch)
tree070f275874b4345669068d2935cbfb7281307165
parent958dd8ca1662064c147c986408128340d1baf5d4 (diff)
HDHomeRun: Backport fix for IP-defined HDHomeRuns.
Fixes the issue where the second simultaneous recording on HDHomeRuns defined by IP would fail. See master commit for rationale. Fixes #9247.
-rw-r--r--mythtv/libs/libmythhdhomerun/hdhomerun_device.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mythtv/libs/libmythhdhomerun/hdhomerun_device.c b/mythtv/libs/libmythhdhomerun/hdhomerun_device.c
index ce03a7a..d2a4ef5 100644
--- a/mythtv/libs/libmythhdhomerun/hdhomerun_device.c
+++ b/mythtv/libs/libmythhdhomerun/hdhomerun_device.c
@@ -216,14 +216,15 @@ static struct hdhomerun_device_t *hdhomerun_device_create_from_str_ip(const char
{
unsigned long a[4];
unsigned int port = 0;
+ unsigned int tuner = 0;
if (sscanf(device_str, "%lu.%lu.%lu.%lu:%u", &a[0], &a[1], &a[2], &a[3], &port) != 5) {
- if (sscanf(device_str, "%lu.%lu.%lu.%lu", &a[0], &a[1], &a[2], &a[3]) != 4) {
+ if (sscanf(device_str, "%lu.%lu.%lu.%lu-%u", &a[0], &a[1], &a[2], &a[3], &tuner) != 5) {
return NULL;
}
}
unsigned long device_ip = (a[0] << 24) | (a[1] << 16) | (a[2] << 8) | (a[3] << 0);
- struct hdhomerun_device_t *hd = hdhomerun_device_create(HDHOMERUN_DEVICE_ID_WILDCARD, (uint32_t)device_ip, 0, dbg);
+ struct hdhomerun_device_t *hd = hdhomerun_device_create(HDHOMERUN_DEVICE_ID_WILDCARD, (uint32_t)device_ip, tuner, dbg);
if (!hd) {
return NULL;
}