From 2b6ba99bc08481db8b25e50a89d066088577d28c Mon Sep 17 00:00:00 2001
From: Chase Douglas <chase.douglas@canonical.com>
Date: Tue, 2 Aug 2011 19:55:59 -0700
Subject: [PATCH 2/4] Populate gen_psip variable of FireWireDBOptions
---
mythtv/libs/libmythtv/tv_rec.cpp | 4 +++-
mythtv/libs/libmythtv/tv_rec.h | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp
index f0daa86..b5f286c 100644
|
a
|
b
|
bool TVRec::GetDevices(uint cardid,
|
| 1531 | 1531 | "" |
| 1532 | 1532 | " dvb_on_demand, dvb_tuning_delay, dvb_eitscan," |
| 1533 | 1533 | "" |
| 1534 | | " firewire_speed, firewire_model, firewire_connection " |
| | 1534 | " firewire_speed, firewire_model, firewire_connection, " |
| | 1535 | " firewire_gen_psip " |
| 1535 | 1536 | "" |
| 1536 | 1537 | "FROM capturecard " |
| 1537 | 1538 | "WHERE cardid = :CARDID"); |
| … |
… |
bool TVRec::GetDevices(uint cardid,
|
| 1597 | 1598 | firewire_opts.model = test; |
| 1598 | 1599 | |
| 1599 | 1600 | firewire_opts.connection = query.value(fireoff + 2).toUInt(); |
| | 1601 | firewire_opts.gen_psip = query.value(fireoff + 3).toBool(); |
| 1600 | 1602 | |
| 1601 | 1603 | return true; |
| 1602 | 1604 | } |
diff --git a/mythtv/libs/libmythtv/tv_rec.h b/mythtv/libs/libmythtv/tv_rec.h
index 8ed742b..13833dc 100644
|
a
|
b
|
class DVBDBOptions
|
| 83 | 83 | class FireWireDBOptions |
| 84 | 84 | { |
| 85 | 85 | public: |
| 86 | | FireWireDBOptions() : speed(-1), connection(-1), model("") {;} |
| | 86 | FireWireDBOptions() : speed(-1), connection(-1), model(""), gen_psip(false) {;} |
| 87 | 87 | |
| 88 | 88 | int speed; |
| 89 | 89 | int connection; |
| 90 | 90 | QString model; |
| | 91 | bool gen_psip; |
| 91 | 92 | }; |
| 92 | 93 | |
| 93 | 94 | class TuningRequest |