Skip to content

Commit d720cac

Browse files
author
Robert McNamara
committed
ProgramInfo: get the video, audio, and sub types from program.
This constructor is only used in one spot, when calculating the guide. For us to support more advanced features in our own guide, and third party guides using the Services API, these properties need to be present. In a MythUI guide, this will allow for statetypes for HD, stereo, dolby, etc. Services API addition to follow.
1 parent b4f030c commit d720cac

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

mythtv/libs/libmyth/programinfo.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,10 @@ ProgramInfo::ProgramInfo(
511511
bool commfree,
512512
bool repeat,
513513

514+
uint _videoproperties,
515+
uint _audioproperties,
516+
uint _subtitleType,
517+
514518
const ProgramList &schedList, bool oneChanid) :
515519
title(_title),
516520
subtitle(_subtitle),
@@ -565,7 +569,7 @@ ProgramInfo::ProgramInfo(
565569
findid(_findid),
566570

567571
programflags(FL_NONE),
568-
properties(0),
572+
properties((_subtitleType<<11) | (_videoproperties<<6) | _audioproperties),
569573
year(_year),
570574

571575
recstatus(_recstatus),
@@ -4376,7 +4380,8 @@ static bool FromProgramQuery(
43764380
" program.airdate, program.stars, program.originalairdate, "
43774381
" program.category_type, oldrecstatus.recordid, "
43784382
" oldrecstatus.rectype, oldrecstatus.recstatus, "
4379-
" oldrecstatus.findid "
4383+
" oldrecstatus.findid, program.videoprop+0, program.audioprop+0, "
4384+
" program.subtitletypes+0 "
43804385
"FROM program "
43814386
"LEFT JOIN channel ON program.chanid = channel.chanid "
43824387
"LEFT JOIN oldrecorded AS oldrecstatus ON "
@@ -4464,6 +4469,9 @@ bool LoadFromProgram(
44644469

44654470
query.value(11).toInt() == COMM_DETECT_COMMFREE, // commfree
44664471
query.value(10).toInt(), // repeat
4472+
query.value(23).toInt(), // videoprop
4473+
query.value(24).toInt(), // audioprop
4474+
query.value(25).toInt(), // subtitletypes
44674475

44684476
schedList, oneChanid));
44694477
}

mythtv/libs/libmyth/programinfo.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,10 @@ class MPUBLIC ProgramInfo
194194
bool commfree,
195195
bool repeat,
196196

197+
uint videoprops,
198+
uint audioprops,
199+
uint subtitletype,
200+
197201
const ProgramList &schedList,
198202
bool oneChanid);
199203
/// Constructs a basic ProgramInfo (used by RecordingInfo)

mythtv/libs/libmythbase/mythversion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/// Update this whenever the plug-in API changes.
1313
/// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and
1414
/// libmythui class methods used by plug-ins.
15-
#define MYTH_BINARY_VERSION "0.25.20111031-1"
15+
#define MYTH_BINARY_VERSION "0.25.20111101-1"
1616

1717
/** \brief Increment this whenever the MythTV network protocol changes.
1818
*

0 commit comments

Comments
 (0)