Ticket #7205: 0001-Add-firewire_gen_psip-boolean-to-capturecard-db-sche.patch

File 0001-Add-firewire_gen_psip-boolean-to-capturecard-db-sche.patch, 4.6 KB (added by Chase Douglas <chasedouglas@…>, 8 years ago)
  • mythtv/bindings/perl/MythTV.pm

    From 438b236b1bd06718cb4d52f661520267b1900d4b Mon Sep 17 00:00:00 2001
    From: Chase Douglas <chase.douglas@canonical.com>
    Date: Tue, 2 Aug 2011 19:39:14 -0700
    Subject: [PATCH 1/4] Add firewire_gen_psip boolean to capturecard db schema
    
    If firewire_gen_psip is true, MPEG2-TS PAT and PMT packets will be
    generated by MythTV. This is a workaround for cable boxes like the
    PACE RNG110 that do not emit these packets.
    ---
     mythtv/bindings/perl/MythTV.pm          |    2 +-
     mythtv/bindings/python/MythTV/static.py |    2 +-
     mythtv/libs/libmythbase/mythversion.h   |    2 +-
     mythtv/libs/libmythtv/dbcheck.cpp       |   30 +++++++++++++++++++++---------
     4 files changed, 24 insertions(+), 12 deletions(-)
    
    diff --git a/mythtv/bindings/perl/MythTV.pm b/mythtv/bindings/perl/MythTV.pm
    index cc9892e..442b7fb 100644
    a b package MythTV; 
    114114# schema version supported in the main code.  We need to check that the schema
    115115# version in the database is as expected by the bindings, which are expected
    116116# to be kept in sync with the main code.
    117     our $SCHEMA_VERSION = "1280";
     117    our $SCHEMA_VERSION = "1281";
    118118
    119119# NUMPROGRAMLINES is defined in mythtv/libs/libmythtv/programinfo.h and is
    120120# the number of items in a ProgramInfo QStringList group used by
  • mythtv/bindings/python/MythTV/static.py

    diff --git a/mythtv/bindings/python/MythTV/static.py b/mythtv/bindings/python/MythTV/static.py
    index 179eebd..b392b55 100644
    a b Contains any static and global variables for MythTV Python Bindings 
    55"""
    66
    77OWN_VERSION = (0,25,-1,2)
    8 SCHEMA_VERSION = 1280
     8SCHEMA_VERSION = 1281
    99NVSCHEMA_VERSION = 1007
    1010MUSICSCHEMA_VERSION = 1018
    1111PROTO_VERSION = '69'
  • mythtv/libs/libmythbase/mythversion.h

    diff --git a/mythtv/libs/libmythbase/mythversion.h b/mythtv/libs/libmythbase/mythversion.h
    index d201d62..cbc06a4 100644
    a b  
    5151 *  MythTV Python Bindings
    5252 *      mythtv/bindings/python/MythTV/static.py
    5353 */
    54 #define MYTH_DATABASE_VERSION "1280"
     54#define MYTH_DATABASE_VERSION "1281"
    5555
    5656
    5757 MBASE_PUBLIC  const char *GetMythSourceVersion();
  • mythtv/libs/libmythtv/dbcheck.cpp

    diff --git a/mythtv/libs/libmythtv/dbcheck.cpp b/mythtv/libs/libmythtv/dbcheck.cpp
    index 37bbb99..066fa33 100644
    a b are all "DVB" specific configuration parameters. 
    150150Both 'dvb_recordts' and 'dvb_hw_decoder' are unused, and
    151151will be dropped in future versions of MythTV.
    152152
    153 The 'firewire_port', 'firewire_node', 'firewire_speed',
    154 'firewire_model', 'firewire_connection' are all "FIREWIRE" specific
    155 configuration parameters. The first three define the connection,
    156 and function much like 'videodevice' does for other capture "cards".
    157 The 'firewire_model' describes the cable box model, for example
    158 "DCT-6000" describes a box that communicates using the same protocol
    159 as the Motorola DCT-6000. The 'firewire_connection' field describes
    160 the overall communication protocol, i.e. are we using "Broadcast"
    161 or "Point-to-Point" communication.
     153The 'firewire_speed', 'firewire_model', 'firewire_connection',
     154and 'firewire_gen_psip' are all "FIREWIRE" specific configuration
     155parameters. The 'firewire_speed' describes the speed of the firewire
     156link. The 'firewire_model' describes the cable box model, for
     157example "DCT-6000" describes a box that communicates using the same
     158protocol as the Motorola DCT-6000. The 'firewire_connection' field
     159describes the overall communication protocol, i.e. are we using
     160"Broadcast" or "Point-to-Point" communication. The
     161'firewire_gen_psip' field specifies whether MythTV should generate
     162MPEG2-TS PAT and PMT packets for broken cable boxes that do not.
    162163
    163164\section dtv_multiplex_table Digital Television Multiplex Table (dtv_multiplex)
    164165This table contains the information needed to tune to a particular
    NULL 
    58455846            return false;
    58465847    }
    58475848
     5849    if (dbver == "1280")
     5850    {
     5851        const char *updates[] = {
     5852"ALTER TABLE capturecard ADD COLUMN firewire_gen_psip tinyint(1) default '0';",
     5853NULL
     5854};
     5855        if (!performActualUpdate(updates, "1281", dbver))
     5856            return false;
     5857    }
     5858
    58485859    return true;
    58495860}
    58505861
    tmp.constData(), 
    59275938"  firewire_speed int(10) unsigned NOT NULL default '0',"
    59285939"  firewire_model varchar(32) default NULL,"
    59295940"  firewire_connection int(10) unsigned NOT NULL default '0',"
     5941"  firewire_gen_psip tinyint(1) default '0',"
    59305942"  dbox2_port int(10) unsigned NOT NULL default '31338',"
    59315943"  dbox2_httpport int(10) unsigned NOT NULL default '80',"
    59325944"  dbox2_host varchar(32) default NULL,"