Permalink
Browse files

Bump protocol version again so that we don't lose catType when serial…

…ising data
  • Loading branch information...
stuartm committed Nov 11, 2013
1 parent 226c9bb commit 3af71b4f758df4183eec13686eea4614433799de
@@ -107,8 +107,8 @@ package MythTV;
# Note: as of July 21, 2010, this is actually a string, to account for proto
# versions of the form "58a". This will get used if protocol versions are
# changed on a fixes branch ongoing.
- our $PROTO_VERSION = "78";
- our $PROTO_TOKEN = "IceBurns";
+ our $PROTO_VERSION = "79";
+ our $PROTO_TOKEN = "BasaltGiant";
# currentDatabaseVersion is defined in libmythtv in
# mythtv/libs/libmythtv/dbcheck.cpp and should be the current MythTV core
@@ -120,7 +120,7 @@ package MythTV;
# NUMPROGRAMLINES is defined in mythtv/libs/libmythtv/programinfo.h and is
# the number of items in a ProgramInfo QStringList group used by
# ProgramInfo::ToSringList and ProgramInfo::FromStringList.
- our $NUMPROGRAMLINES = 48;
+ our $NUMPROGRAMLINES = 49;
# Reasons a recording wouldn't be happening (from libs/libmythtv/programinfo.h)
our %RecStatus_Types = (
@@ -92,6 +92,7 @@ package MythTV::Program;
$self->{'year'} = $_[45]; # Production year
$self->{'partnumber'} = $_[46]; # part number
$self->{'parttotal'} = $_[47]; # part total
+ $self->{'categorytype'} = $_[48]; # category type (enum)
# Load the channel data
if ($self->{'chanid'}) {
@@ -11,16 +11,16 @@ class MythBackend {
// MYTH_PROTO_VERSION is defined in libmyth in mythtv/libs/libmyth/mythcontext.h
// and should be the current MythTV protocol version.
- static $protocol_version = '78';
- static $protocol_token = 'IceBurns';
+ static $protocol_version = '79';
+ static $protocol_token = 'BasaltGiant';
// The character string used by the backend to separate records
static $backend_separator = '[]:[]';
// NUMPROGRAMLINES is defined in mythtv/libs/libmythtv/programinfo.h and is
// the number of items in a ProgramInfo QStringList group used by
// ProgramInfo::ToSringList and ProgramInfo::FromStringList.
- static $program_line_number = 48;
+ static $program_line_number = 49;
private $fp = null;
private $connected = false;
@@ -841,7 +841,7 @@ class Program( CMPRecord, DictData, RECSTATUS, AUDIO_PROPS, \
'airdate', 'playgroup', 'recpriority2',
'parentid', 'storagegroup', 'audio_props',
'video_props', 'subtitle_type','year',
- 'part_number', 'part_total']
+ 'part_number', 'part_total', 'categorytype']
_field_type = [ 3, 3, 3,
0, 0, 0,
3,
@@ -858,7 +858,7 @@ class Program( CMPRecord, DictData, RECSTATUS, AUDIO_PROPS, \
5, 3, 0,
3, 3, 0,
0, 0, 0,
- 0, 0]
+ 0, 0, 0]
def __str__(self):
return u"<Program '%s','%s' at %s>" % (self.title,
self.starttime.isoformat(' '), hex(id(self)))
@@ -8,8 +8,8 @@
SCHEMA_VERSION = 1320
NVSCHEMA_VERSION = 1007
MUSICSCHEMA_VERSION = 1018
-PROTO_VERSION = '78'
-PROTO_TOKEN = 'IceBurns'
+PROTO_VERSION = '79'
+PROTO_TOKEN = 'BasaltGiant'
BACKEND_SEP = '[]:[]'
INSTALL_PREFIX = '/usr/local'
@@ -1310,6 +1310,7 @@ void ProgramInfo::ToStringList(QStringList &list) const
INT_TO_LIST(year); // 45
INT_TO_LIST(partnumber); // 46
INT_TO_LIST(parttotal); // 47
+ INT_TO_LIST(catType); // 48
/* do not forget to update the NUMPROGRAMLINES defines! */
}
@@ -1413,6 +1414,7 @@ bool ProgramInfo::FromStringList(QStringList::const_iterator &it,
INT_FROM_LIST(year); // 45
INT_FROM_LIST(partnumber); // 46
INT_FROM_LIST(parttotal); // 47
+ ENUM_FROM_LIST(catType, CategoryType); // 48
if (!origChanid || !origRecstartts.isValid() ||
(origChanid != chanid) || (origRecstartts != recstartts))
@@ -30,7 +30,7 @@
mythtv/bindings/python/MythTV/static.py (version number)
mythtv/bindings/python/MythTV/mythproto.py (layout)
*/
-#define NUMPROGRAMLINES 48
+#define NUMPROGRAMLINES 49
class ProgramInfo;
typedef AutoDeleteDeque<ProgramInfo*> ProgramList;
@@ -39,8 +39,8 @@
* http://www.mythtv.org/wiki/Category:Myth_Protocol_Commands
* http://www.mythtv.org/wiki/Category:Myth_Protocol
*/
-#define MYTH_PROTO_VERSION "78"
-#define MYTH_PROTO_TOKEN "IceBurns"
+#define MYTH_PROTO_VERSION "79"
+#define MYTH_PROTO_TOKEN "BasaltGiant"
/** \brief Increment this whenever the MythTV core database schema changes.
*

0 comments on commit 3af71b4

Please sign in to comment.