Ticket #1449: manualschedulefix.patch

File manualschedulefix.patch, 2.4 KB (added by shrimp@…, 14 years ago)
Line 
1*** scheduler.cpp       2006-02-09 06:27:56.000000000 +0000
2--- ../../../../mythtv-0.19/programs/mythbackend/scheduler.cpp  2006-02-21 21:46:02.000000000 +0000
3***************
4*** 2257,2265 ****
5  "RECTABLE.starttime, RECTABLE.startdate, RECTABLE.endtime, RECTABLE.enddate, "
6  "RECTABLE.startoffset, RECTABLE.endoffset, "
7  "RECTABLE.title, RECTABLE.subtitle, RECTABLE.description, "
8! "channel.channum, channel.callsign, channel.name "
9  "FROM RECTABLE "
10  " INNER JOIN channel ON (channel.chanid = RECTABLE.chanid) "
11  " LEFT JOIN recordmatch on RECTABLE.recordid = recordmatch.recordid "
12  "WHERE (type = %1 OR type = %2) AND recordmatch.chanid IS NULL")
13          .arg(kSingleRecord)
14--- 2272,2282 ----
15  "RECTABLE.starttime, RECTABLE.startdate, RECTABLE.endtime, RECTABLE.enddate, "
16  "RECTABLE.startoffset, RECTABLE.endoffset, "
17  "RECTABLE.title, RECTABLE.subtitle, RECTABLE.description, "
18! "channel.channum, channel.callsign, channel.name, channel.sourceid, "
19! "cardinput.cardinputid, cardinput.cardid "
20  "FROM RECTABLE "
21  " INNER JOIN channel ON (channel.chanid = RECTABLE.chanid) "
22+ " INNER JOIN cardinput ON (channel.sourceid = cardinput.sourceid) "
23  " LEFT JOIN recordmatch on RECTABLE.recordid = recordmatch.recordid "
24  "WHERE (type = %1 OR type = %2) AND recordmatch.chanid IS NULL")
25          .arg(kSingleRecord)
26***************
27*** 2294,2300 ****
28      while (result.next())
29      {
30          ProgramInfo *p = new ProgramInfo;
31!         p->recstatus = rsNotListed;
32          p->recordid = result.value(0).toInt();
33          p->rectype = RecordingType(result.value(1).toInt());
34          p->chanid = result.value(2).toString();
35--- 2311,2318 ----
36      while (result.next())
37      {
38          ProgramInfo *p = new ProgramInfo;
39!         //p->recstatus = rsNotListed;
40!         p->recstatus = rsWillRecord; // fake, work around!
41          p->recordid = result.value(0).toInt();
42          p->rectype = RecordingType(result.value(1).toInt());
43          p->chanid = result.value(2).toString();
44***************
45*** 2329,2334 ****
46--- 2347,2357 ----
47          p->chansign = QString::fromUtf8(result.value(13).toString());
48          p->channame = QString::fromUtf8(result.value(14).toString());
49 
50+         // added this lines!
51+         p->sourceid = result.value(15).toInt();
52+         p->inputid = result.value(16).toInt();
53+         p->cardid = result.value(17).toInt();
54+
55          p->schedulerid = p->startts.toString() + "_" + p->chanid;
56 
57          if (p == NULL)