Index: myththemes/MythCenter/ui.xml
===================================================================
--- myththemes/MythCenter/ui.xml (revision 8926)
+++ myththemes/MythCenter/ui.xml (working copy)
@@ -1565,6 +1565,18 @@
type/processing.png
160,195
+
+ type/stereo.png
+ 195,195
+
+
+ type/cc.png
+ 230,195
+
+
+ type/hd.png
+ 275,195
+
Index: mythtv/libs/libmythtv/programinfo.h
===================================================================
--- mythtv/libs/libmythtv/programinfo.h (revision 8926)
+++ mythtv/libs/libmythtv/programinfo.h (working copy)
@@ -273,6 +273,9 @@
QString year;
float stars;
+ bool stereo;
+ bool cc;
+ bool hd;
QDate originalAirDate;
QDateTime lastmodified;
Index: mythtv/libs/libmythtv/programinfo.cpp
===================================================================
--- mythtv/libs/libmythtv/programinfo.cpp (revision 8926)
+++ mythtv/libs/libmythtv/programinfo.cpp (working copy)
@@ -74,6 +74,9 @@
chanOutputFilters = "";
year = "";
stars = 0;
+ stereo = 0;
+ cc = 0;
+ hd = 0;
availableStatus = asAvailable;
pathname = "";
@@ -216,6 +219,9 @@
originalAirDate = other.originalAirDate;
stars = other.stars;
+ stereo = other.stereo;
+ cc = other.cc;
+ hd = other.hd;
year = QDeepCopy(other.year);
ignoreBookmark = other.ignoreBookmark;
@@ -301,6 +307,9 @@
STR_TO_LIST(programid)
DATETIME_TO_LIST(lastmodified)
FLOAT_TO_LIST(stars)
+ INT_TO_LIST(stereo)
+ INT_TO_LIST(cc)
+ INT_TO_LIST(hd)
DATETIME_TO_LIST(QDateTime(originalAirDate))
INT_TO_LIST(hasAirDate)
STR_TO_LIST((playgroup != "") ? playgroup : "Default")
@@ -399,6 +408,9 @@
STR_FROM_LIST(programid)
DATETIME_FROM_LIST(lastmodified)
FLOAT_FROM_LIST(stars)
+ INT_FROM_LIST(stereo)
+ INT_FROM_LIST(cc)
+ INT_FROM_LIST(hd)
DATE_FROM_LIST(originalAirDate);
INT_FROM_LIST(hasAirDate);
STR_FROM_LIST(playgroup)
@@ -596,6 +608,10 @@
}
else
progMap["stars"] = "";
+
+ progMap["stereo"] = stereo;
+ progMap["cc"] = cc;
+ progMap["hdtv"] = hd;
if (hasAirDate)
{
@@ -699,6 +715,9 @@
p->programid = "";
p->year = "";
p->stars = 0.0f;
+ p->stereo = 0;
+ p->cc = 0;
+ p->hd = 0;
if (!genUnknown)
return p;
@@ -3964,7 +3983,8 @@
" program.airdate, program.stars, program.originalairdate, "
" program.category_type, oldrecstatus.recordid, "
" oldrecstatus.rectype, oldrecstatus.recstatus, "
- " oldrecstatus.findid "
+ " oldrecstatus.findid, program.stereo, program.hdtv, "
+ " program.closecaptioned "
"FROM program "
"LEFT JOIN channel ON program.chanid = channel.chanid "
"LEFT JOIN oldrecorded AS oldrecstatus ON "
@@ -4035,6 +4055,9 @@
p->rectype = RecordingType(query.value(20).toInt());
p->recstatus = RecStatusType(query.value(21).toInt());
p->findid = query.value(22).toInt();
+ p->stereo = query.value(23).toInt();
+ p->cc = query.value(25).toInt();
+ p->hd = query.value(24).toInt();
ProgramInfo *s;
for (s = schedList.first(); s; s = schedList.next())
@@ -4052,6 +4075,9 @@
p->dupin = s->dupin;
p->dupmethod = s->dupmethod;
p->findid = s->findid;
+ p->stereo = s->stereo;
+ p->cc = s->cc;
+ p->hd = s->hd;
}
}
Index: mythtv/programs/mythfrontend/playbackbox.cpp
===================================================================
--- mythtv/programs/mythfrontend/playbackbox.cpp (revision 8926)
+++ mythtv/programs/mythfrontend/playbackbox.cpp (working copy)
@@ -741,6 +741,33 @@
itype->hide();
}
+ itype = (UIImageType *)container->GetType("stereo");
+ if (itype)
+ {
+ if (curitem->stereo)
+ itype->show();
+ else
+ itype->hide();
+ }
+
+ itype = (UIImageType *)container->GetType("cc");
+ if (itype)
+ {
+ if (curitem->cc)
+ itype->show();
+ else
+ itype->hide();
+ }
+
+ itype = (UIImageType *)container->GetType("hdtv");
+ if (itype)
+ {
+ if (curitem->hd)
+ itype->show();
+ else
+ itype->hide();
+ }
+
container->Draw(&tmp, 6, (type == Delete) ? 1 : 0);
}
Index: mythtv/programs/mythbackend/mainserver.cpp
===================================================================
--- mythtv/programs/mythbackend/mainserver.cpp (revision 8926)
+++ mythtv/programs/mythbackend/mainserver.cpp (working copy)
@@ -958,10 +958,14 @@
"recorded.lastmodified, recorded.findid, "
"recorded.originalairdate, recorded.playgroup, "
"recorded.basename, recorded.progstart, "
- "recorded.progend, recorded.stars "
+ "recorded.progend, recorded.stars, "
+ "recordedprogram.stereo, recordedprogram.hdtv, "
+ "recordedprogram.closecaptioned "
"FROM recorded "
"LEFT JOIN record ON recorded.recordid = record.recordid "
"LEFT JOIN channel ON recorded.chanid = channel.chanid "
+ "LEFT JOIN recordedprogram ON (recorded.chanid = recordedprogram.chanid "
+ "AND recorded.starttime = recordedprogram.starttime) "
"WHERE (recorded.deletepending = 0 OR "
"DATE_ADD(recorded.lastmodified, "
"INTERVAL 5 MINUTE) <= NOW()) "
@@ -1086,6 +1090,9 @@
}
proginfo->stars = query.value(31).toDouble();
+ proginfo->stereo = query.value(32).toInt();
+ proginfo->cc = query.value(34).toInt();
+ proginfo->hd = query.value(33).toInt();
QString lpath = fileprefix + "/" + basename;
PlaybackSock *slave = NULL;