Ticket #11954: recinput.mythtv.v0.28-pre-519-gd8c710d.patch

mythtv/bindings/perl/MythTV.pm

@@ -107 +107 @@
 # 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 = "79";
-    our $PROTO_TOKEN = "BasaltGiant";
+    our $PROTO_VERSION = "80";
+    our $PROTO_TOKEN = "SeaBird";
 
 # currentDatabaseVersion is defined in libmythtv in
 # mythtv/libs/libmythtv/dbcheck.cpp and should be the current MythTV core

mythtv/bindings/perl/MythTV/Program.pm

@@ -94 +94 @@
         $self->{'parttotal'}         = $_[47]; # part total
         $self->{'categorytype'}      = $_[48]; # category type (enum)
 
+        $self->{'recinput'}          = $_[49]; # recording input
+
     # Load the channel data
         if ($self->{'chanid'}) {
             $self->{'channel'} = $self->{'_mythtv'}->channel($self->{'chanid'});
@@ -190 +192 @@
                     $self->{'year'}           , # 44 production year
                     $self->{'partnumber'}     , # 45 part number
                     $self->{'parttotal'}      , # 46 part total
+
+                    $self->{'recinput'}       , # 47 rec input
                     ''                          # trailing separator
                    );
     }

mythtv/bindings/php/MythBackend.php

@@ -11 +11 @@
 
 // MYTH_PROTO_VERSION is defined in libmyth in mythtv/libs/libmyth/mythcontext.h
 // and should be the current MythTV protocol version.
-    static $protocol_version        = '79';
-    static $protocol_token          = 'BasaltGiant';
+    static $protocol_version        = '80';
+    static $protocol_token          = 'SeaBird';
 
 // The character string used by the backend to separate records
     static $backend_separator       = '[]:[]';

mythtv/bindings/php/MythTVProgram.php

@@ -45 +45 @@
     public $airdate;
     public $playgroup;
     public $recpriority2;
+    public $recinput;
     public $parentid;
     public $storagegroup;
     public $audioprop;

mythtv/bindings/php/MythTVRecording.php

@@ -34 +34 @@
     public  $transcoder;
     public  $timestretch;
     public  $recpriority;
+    public  $recinput;
     public  $basename;
     public  $progstart;
     public  $progend;

mythtv/bindings/python/MythTV/mythproto.py

@@ -841 +841 @@
                      'airdate',      'playgroup',    'recpriority2',
                      'parentid',     'storagegroup', 'audio_props',
                      'video_props',  'subtitle_type','year',
-                     'part_number',  'part_total',   'categorytype']
+                     'part_number',  'part_total',   'categorytype',
+                     'recinput']
     _field_type = [  3,      3,      3,
                      0,      0,      0,
                      3,
@@ -858 +859 @@
                      5,      3,      0,
                      3,      3,      0,
                      0,      0,      0,
-                     0,      0,      0]
+                     0,      0,      0,
+                     3]
     def __str__(self):
         return u"<Program '%s','%s' at %s>" % (self.title,
                  self.starttime.isoformat(' '), hex(id(self)))
@@ -886 +888 @@
         for key in ('title','subTitle','seriesId','programId','airdate',
                 'category','hostname','chanNum','callSign','playGroup',
                 'recGroup','rectype','programFlags','chanId','recStatus',
-                'commFree','stars','filesize'):
+                'commFree','stars','filesize','recinput'):
             if key in xmldat:
                 dat[key.lower()] = xmldat[key]
         for key in ('startTime','endTime','lastModified',
@@ -914 +916 @@
                 ('ChanId', 'CallSign', 'ChanNum', 'InputId', 'SourceId'), True)
         CopyData2(prog['Channel'], dat, (('ChannelName', 'channame'),))
         CopyData(prog['Recording'], dat,
-                ('DupMethod', 'PlayGroup', 'RecType', 'RecordId'), True)
+                ('DupMethod', 'PlayGroup', 'RecType', 'RecordId', 'RecInput'), True)
         CopyData2(prog['Recording'], dat, (('DupInType', 'dupin'),
                                            ('Status', 'recstatus')))
 

mythtv/bindings/python/MythTV/static.py

@@ -8 +8 @@
 SCHEMA_VERSION = 1321
 NVSCHEMA_VERSION = 1007
 MUSICSCHEMA_VERSION = 1018
-PROTO_VERSION = '79'
-PROTO_TOKEN = 'BasaltGiant'
+PROTO_VERSION = '80'
+PROTO_TOKEN = 'SeaBird'
 BACKEND_SEP = '[]:[]'
 INSTALL_PREFIX = '/usr/local'
 

mythtv/libs/libmyth/programinfo.cpp

@@ -66 +66 @@
     "       r.findid,           rec.dupin,      rec.dupmethod,     "//45-47
     "       p.syndicatedepisodenumber, p.partnumber, p.parttotal,  "//48-50
     "       p.season,           p.episode,      p.totalepisodes,   "//51-53
-    "       p.category_type                                        "//54
+    "       p.category_type,    r.recinput                         "//54-55
     "FROM recorded AS r "
     "LEFT JOIN channel AS c "
     "ON (r.chanid    = c.chanid) "
@@ -123 +123 @@
     director(),
 
     recpriority(0),
+    recinput(),
 
     chanid(0),
     chanstr(),
@@ -207 +208 @@
     director(other.director),
 
     recpriority(other.recpriority),
+    recinput(other.recinput),
 
     chanid(other.chanid),
     chanstr(other.chanstr),
@@ -317 +319 @@
     CategoryType  _catType,
 
     int _recpriority,
+    const QString &_recinput,
 
     uint64_t _filesize,
 
@@ -357 +360 @@
     director(),
 
     recpriority(_recpriority),
+    recinput(_recinput),
 
     chanid(_chanid),
     chanstr(_channum),
@@ -475 +479 @@
     director(),
 
     recpriority(0),
+    recinput(),
 
     chanid(_chanid),
     chanstr(_channum),
@@ -602 +607 @@
     director(),
 
     recpriority(0),
+    recinput(),
 
     chanid(_chanid),
     chanstr(_channum),
@@ -746 +752 @@
     director(),
 
     recpriority(0),
+    recinput(),
 
     chanid(_chanid),
     chanstr(_channum),
@@ -1010 +1017 @@
     catType = other.catType;
 
     recpriority = other.recpriority;
+    recinput = other.recinput;
 
     filesize = other.filesize;
 
@@ -1079 +1087 @@
     programid.detach();
     inetref.detach();
 
+    recinput.detach();
+
     sortTitle.detach();
     inUseForWhat.detach();
 }
@@ -1116 +1126 @@
     seriesid.clear();
     programid.clear();
     inetref.clear();
+    recinput.clear();
     catType = kCategoryNone;
 
     sortTitle.clear();
@@ -1311 +1322 @@
     INT_TO_LIST(partnumber);   // 46
     INT_TO_LIST(parttotal);    // 47
     INT_TO_LIST(catType);      // 48
+    STR_TO_LIST(recinput);     // 49
 /* do not forget to update the NUMPROGRAMLINES defines! */
 }
 
@@ -1415 +1427 @@
     INT_FROM_LIST(partnumber);        // 46
     INT_FROM_LIST(parttotal);         // 47
     ENUM_FROM_LIST(catType, CategoryType); // 48
+    STR_FROM_LIST(recinput);          // 49
 
     if (!origChanid || !origRecstartts.isValid() ||
         (origChanid != chanid) || (origRecstartts != recstartts))
@@ -1533 +1546 @@
         if (timeNow.toLocalTime().date().year() !=
             endts.toLocalTime().date().year())
             progMap["endyear"] = endts.toLocalTime().toString("yyyy");
+        progMap["inputname"] = recinput;
     }
 
     using namespace MythDate;
@@ -1620 +1634 @@
 
     progMap["card"] = ::toString(GetRecordingStatus(), cardid);
     progMap["input"] = ::toString(GetRecordingStatus(), inputid);
-    progMap["inputname"] = QueryInputDisplayName();
 
     progMap["recpriority"] = recpriority;
     progMap["recpriority2"] = recpriority2;
@@ -1943 +1956 @@
     catType      = string_to_myth_category_type(query.value(54).toString());
 
     recpriority  = query.value(16).toInt();
+    recinput     = query.value(55).toString();
 
     filesize     = query.value(20).toULongLong();
 
@@ -4333 +4347 @@
     SendUpdateEvent();
 }
 
+/** \fn ProgramInfo::SaveRecInput(const QString)
+ *  \brief Sets recording input display name in database,
+ *         and sets "recinput" field.
+ */
+void ProgramInfo::SaveRecInput(const QString &inputName)
+{
+    recinput = inputName;
+
+    MSqlQuery query(MSqlQuery::InitCon());
+
+    query.prepare(
+        "UPDATE recorded "
+        "SET recinput = :RECINPUT "
+        "WHERE chanid = :CHANID AND starttime = :STARTTIME "
+        "AND recordid = :RECORDID");
+
+    query.bindValue(":RECINPUT",   inputName);
+    query.bindValue(":CHANID",     chanid);
+    query.bindValue(":STARTTIME",  recstartts);
+    query.bindValue(":RECORDID",   recordid);
+    query.exec();
+}
+
 /** \brief Attempts to ascertain if the main file for this ProgramInfo
  *         is readable.
  *  \note This method often initiates a QUERY_CHECKFILE MythProto
@@ -4688 +4725 @@
     }
 }
 
-/** \brief Returns the display name of the card input for this program.
- *  \note Ideally this would call CardUtil::GetDisplayName(), but
- *        that's in libmythtv.  Dupliacte code for now until a better
- *        solution can be found.
- */
-QString ProgramInfo::QueryInputDisplayName(void) const
-{
-    if (!inputid)
-        return QString::null;
-
-    MSqlQuery query(MSqlQuery::InitCon());
-    query.prepare("SELECT displayname, cardid, inputname "
-                  "FROM cardinput "
-                  "WHERE cardinputid = :INPUTID");
-    query.bindValue(":INPUTID", inputid);
-
-    if (!query.exec())
-        MythDB::DBError("ProgramInfo::GetInputDisplayName(uint)", query);
-    else if (query.next())
-    {
-        QString result = query.value(0).toString();
-        if (result.isEmpty())
-            result = QString("%1: %2").arg(query.value(1).toInt())
-                                      .arg(query.value(2).toString());
-        return result;
-    }
-
-    return QString::null;
-}
-
 static int init_tr(void)
 {
     static bool done = false;
@@ -4842 +4849 @@
     str.replace(QString("%PLAYGROUP%"), playgroup);
     str.replace(QString("%CHANID%"), QString::number(chanid));
     str.replace(QString("%INETREF%"), inetref);
+    str.replace(QString("%RECINPUT%"), recinput);
     str.replace(QString("%PARTNUMBER%"), QString::number(partnumber));
     str.replace(QString("%PARTTOTAL%"), QString::number(parttotal));
     str.replace(QString("%ORIGINALAIRDATE%"),
@@ -5342 +5350 @@
                 string_to_myth_category_type(query.value(54).toString()), // category_type
 
                 query.value(16).toInt(),  // recpriority
+                query.value(55).toString(), // recinput
 
                 query.value(20).toULongLong(),  // filesize
 

mythtv/libs/libmyth/programinfo.h

@@ -30 +30 @@
    mythtv/bindings/python/MythTV/static.py (version number)
    mythtv/bindings/python/MythTV/mythproto.py (layout)
 */
-#define NUMPROGRAMLINES 49
+#define NUMPROGRAMLINES 50
 
 class ProgramInfo;
 typedef AutoDeleteDeque<ProgramInfo*> ProgramList;
@@ -112 +112 @@
                 CategoryType  catType,
 
                 int recpriority,
+                const QString &recinput,
 
                 uint64_t filesize,
 
@@ -416 +417 @@
     QString GetCategoryTypeString(void)   const;
     int     GetRecordingPriority(void)    const { return recpriority;  }
     int     GetRecordingPriority2(void)   const { return recpriority2; }
+    QString GetRecInput(void)             const { return recinput;     }
     float   GetStars(void)                const { return stars;        }
     uint    GetStars(uint range_max)      const
         { return (int)(stars * range_max + 0.5f); }
@@ -503 +505 @@
     void SetRecordingPriority2(int priority)     { recpriority2 = priority; }
     void SetRecordingRuleID(uint id)                { recordid     = id;    }
     void SetSourceID(uint id)                       { sourceid     = id;    }
-    void SetInputID( uint id)                       { inputid      = id;    }
+    virtual void
+         SetInputID( uint id)                       { inputid      = id;    }
     void SetCardID(  uint id)                       { cardid       = id;    }
+    void SetRecInput(      const QString &inpName)  { recinput     = inpName; }
     void SetReactivated(bool reactivate)
     {
         programflags &= ~FL_REACTIVATE;
@@ -547 +551 @@
     AutoExpireType QueryAutoExpire(void) const;
     TranscodingStatus QueryTranscodeStatus(void) const;
     bool        QueryTuningInfo(QString &channum, QString &input) const;
-    QString     QueryInputDisplayName(void) const;
     uint        QueryAverageWidth(void) const;
     uint        QueryAverageHeight(void) const;
     uint        QueryAverageFrameRate(void) const;
@@ -585 +588 @@
     void UpdateInUseMark(bool force = false);
     void SaveSeasonEpisode(uint seas, uint ep);
     void SaveInetRef(const QString &inet);
+    void SaveRecInput(const QString &inputName);
 
     // Extremely slow functions that cannot be called from the UI thread.
     QString DiscoverRecordingDirectory(void) const;
@@ -687 +691 @@
     QString director;
 
     int32_t recpriority;
+    QString recinput;
 
     uint32_t chanid;
     QString chanstr; // Channum

mythtv/libs/libmythbase/mythversion.h

@@ -39 +39 @@
  *       http://www.mythtv.org/wiki/Category:Myth_Protocol_Commands
  *       http://www.mythtv.org/wiki/Category:Myth_Protocol
  */
-#define MYTH_PROTO_VERSION "79"
-#define MYTH_PROTO_TOKEN "BasaltGiant"
+#define MYTH_PROTO_VERSION "80"
+#define MYTH_PROTO_TOKEN "SeaBird"
 
 /** \brief Increment this whenever the MythTV core database schema changes.
  *

mythtv/libs/libmythservicecontracts/datacontracts/recording.h

@@ -41 +41 @@
     Q_PROPERTY( int                     EncoderId    READ EncoderId    WRITE setEncoderId    DESIGNABLE SerializeDetails )
     Q_PROPERTY( QString                 EncoderName  READ EncoderName  WRITE setEncoderName  DESIGNABLE SerializeDetails )
     Q_PROPERTY( QString                 Profile      READ Profile      WRITE setProfile      DESIGNABLE SerializeDetails )
+    Q_PROPERTY( QString                 InputName    READ InputName    WRITE setInputName    DESIGNABLE SerializeDetails )
 
     /*
     Not using since Q_ENUMS seem to require the enum be defined in this class
@@ -66 +67 @@
     PROPERTYIMP     ( int                    , EncoderId   )
     PROPERTYIMP     ( QString                , EncoderName )
     PROPERTYIMP     ( QString                , Profile     )
+    PROPERTYIMP     ( QString                , InputName   )
 
     // Used only by Serializer
     PROPERTYIMP( bool, SerializeDetails )
@@ -109 +111 @@
             m_DupMethod       = src.m_DupMethod        ;
             m_EncoderId       = src.m_EncoderId        ;
             m_Profile         = src.m_Profile          ;
+            m_InputName       = src.m_InputName        ;
             m_SerializeDetails= src.m_SerializeDetails ;
         }
 };

mythtv/libs/libmythtv/recordinginfo.cpp

@@ -30 +30 @@
 #include "mythdb.h"
 #include "mythlogging.h"
 #include "previewgenerator.h"
+#include "cardutil.h"
 #include "channelutil.h"
 
 #define LOC      QString("RecordingInfo(%1): ").arg(GetBasename())
@@ -156 +157 @@
     inputid = _inputid;
     cardid = _cardid;
 
+    SetRecInput(CardUtil::GetDisplayName(inputid));
+
     findid = _findid;
 
     properties = ((_subtitleType    << 11) |
@@ -793 +796 @@
     AddHistory(true, true);
 }
 
+/** \fn RecordingInfo::SetInputID(uint id)
+ *  \brief Extend ProgramInfo's method to set the recording input
+ &         name as a side effect.
+ */
+void RecordingInfo::SetInputID(uint id)
+{
+    ProgramInfo::SetInputID(id);
+    SaveRecInput(CardUtil::GetDisplayName(id));
+}
+
 /** \fn RecordingInfo::QuickRecord(void)
  *  \brief Create a kSingleRecord if not already scheduled.
  */
@@ -961 +974 @@
         "    stars,     previouslyshown,              originalairdate,  "
         "    findid,    transcoder,  playgroup,       recpriority,      "
         "    basename,  progstart,   progend,         profile,          "
-        "    duplicate, storagegroup) "
+        "    duplicate, storagegroup,recinput) "
         "VALUES"
         "  (:CHANID,   :STARTS,     :ENDS,           :TITLE,            "
         "   :SUBTITLE, :DESC,       :SEASON,         :EPISODE,          "
@@ -970 +983 @@
         "   :STARS,    :REPEAT,                      :ORIGAIRDATE,      "
         "   :FINDID,   :TRANSCODER, :PLAYGROUP,      :RECPRIORITY,      "
         "   :BASENAME, :PROGSTART,  :PROGEND,        :PROFILE,          "
-        "   0,         :STORGROUP) "
+        "   0,         :STORGROUP,  :RECINPUT)"
         );
 
     if (pg->rectype == kOverrideRecord)
@@ -1004 +1017 @@
     query.bindValue(":TRANSCODER",  rule->m_transcoder);
     query.bindValue(":PLAYGROUP",   pg->playgroup);
     query.bindValue(":RECPRIORITY", rule->m_recPriority);
+    query.bindValue(":RECINPUT",    null_to_empty(pg->recinput));
     query.bindValue(":BASENAME",    pg->pathname);
     query.bindValue(":STORGROUP",   null_to_empty(pg->storagegroup));
     query.bindValue(":PROGSTART",   pg->startts);

mythtv/libs/libmythtv/recordinginfo.h

@@ -272 +272 @@
     QDateTime desiredrecstartts;
     QDateTime desiredrecendts;
 
+    void SetInputID(uint id);
+
   private:
     mutable class RecordingRule *record;
 

mythtv/libs/libmythtv/videosource.cpp

@@ -2561 +2561 @@
     {
         setLabel(QObject::tr("Display name (optional)"));
         setHelpText(QObject::tr(
-                        "This name is displayed on screen when Live TV begins "
-                        "and when changing the selected input or card. If you "
-                        "use this, make sure the information is unique for "
-                        "each input."));
+                        "This name is displayed on screen when Live TV begins, "
+                        "when changing the selected input or card, and on a "
+                        "recording's info dialog. If you use this, make sure "
+                        "the information is unique for each input."));
     };
 };
 

mythtv/programs/mythbackend/services/serviceUtil.cpp

@@ -133 +133 @@
                                                                pProgram->Channel()->SourceId());
                 pRecording->setEncoderName( encoderName );
             }
+            pRecording->setInputName   ( pInfo->GetRecInput()             );
 
             const RecordingInfo ri(*pInfo);
             pRecording->setProfile( ri.GetProgramRecordingProfile() );

mythtv/programs/mythfrontend/progdetails.cpp

@@ -664 +664 @@
     addItem("FINDID", tr("Find ID"), s);
 
     QString recordingHost;
+    QString recordingInput;
     QString recordedFilename;
     QString recordedFileSize;
     QString recordingGroup;
@@ -674 +675 @@
     if (recorded)
     {
         recordingHost = m_progInfo.GetHostname();
+        recordingInput = m_progInfo.GetRecInput();
         recordedFilename = m_progInfo.GetBasename();
         recordedFileSize = QString("%1 ")
             .arg(m_progInfo.GetFilesize()/((double)(1<<30)),0,'f',2);
@@ -698 +700 @@
         recordingProfile =  record->m_recProfile;
     }
     addItem("RECORDING_HOST", tr("Recording Host"), recordingHost);
+    addItem("RECORDING_INPUT", tr("Recording Input"), recordingInput);
     addItem("RECORDED_FILE_NAME", tr("Recorded File Name"), recordedFilename);
     addItem("RECORDED_FILE_SIZE", tr("Recorded File Size"), recordedFileSize);
     addItem("RECORDING_PROFILE", tr("Recording Profile"), recordingProfile);

mythtv/themes/MythCenter-wide/htmls/progdetails_page2.html

@@ -36 +36 @@
     <h1>%SEARCH_PHRASE_LABEL%</h1> <p>%SEARCH_PHRASE%</p>
     <h1>%FINDID_LABEL%</h1> <p>%FINDID%</p>
     <h1>%RECORDING_HOST_LABEL%</h1> <p>%RECORDING_HOST%</p>
+    <h1>%RECORDING_INPUT_LABEL%</h1> <p>%RECORDING_INPUT%</p>
     <h1>%RECORDED_FILE_NAME_LABEL%</h1> <p>%RECORDED_FILE_NAME%</p>
     <h1>%RECORDED_FILE_SIZE_LABEL%</h1> <p>%RECORDED_FILE_SIZE%</p>
     <h1>%RECORDING_PROFILE_LABEL%</h1> <p>%RECORDING_PROFILE%</p>

mythtv/themes/MythCenter/htmls/progdetails_page2.html

@@ -38 +38 @@
     <h1>%SEARCH_PHRASE_LABEL%</h1> <p>%SEARCH_PHRASE%</p>
     <h1>%FINDID_LABEL%</h1> <p>%FINDID%</p>
     <h1>%RECORDING_HOST_LABEL%</h1> <p>%RECORDING_HOST%</p>
+    <h1>%RECORDING_INPUT_LABEL%</h1> <p>%RECORDING_INPUT%</p>
     <h1>%RECORDED_FILE_NAME_LABEL%</h1> <p>%RECORDED_FILE_NAME%</p>
     <h1>%RECORDED_FILE_SIZE_LABEL%</h1> <p>%RECORDED_FILE_SIZE%</p>
     <h1>%RECORDING_PROFILE_LABEL%</h1> <p>%RECORDING_PROFILE%</p>

mythtv/themes/Terra/htmls/progdetails_page2.html

@@ -41 +41 @@
     <h1>%SEARCH_PHRASE_LABEL%</h1> <p>%SEARCH_PHRASE%</p>
     <h1>%FINDID_LABEL%</h1> <p>%FINDID%</p>
     <h1>%RECORDING_HOST_LABEL%</h1> <p>%RECORDING_HOST%</p>
+    <h1>%RECORDING_INPUT_LABEL%</h1> <p>%RECORDING_INPUT%</p>
     <h1>%RECORDED_FILE_NAME_LABEL%</h1> <p>%RECORDED_FILE_NAME%</p>
     <h1>%RECORDED_FILE_SIZE_LABEL%</h1> <p>%RECORDED_FILE_SIZE%</p>
     <h1>%RECORDING_PROFILE_LABEL%</h1> <p>%RECORDING_PROFILE%</p>

mythtv/themes/default/htmls/progdetails_page2.html

@@ -38 +38 @@
     <h1>%SEARCH_PHRASE_LABEL%</h1> <p>%SEARCH_PHRASE%</p>
     <h1>%FINDID_LABEL%</h1> <p>%FINDID%</p>
     <h1>%RECORDING_HOST_LABEL%</h1> <p>%RECORDING_HOST%</p>
+    <h1>%RECORDING_INPUT_LABEL%</h1> <p>%RECORDING_INPUT%</p>
     <h1>%RECORDED_FILE_NAME_LABEL%</h1> <p>%RECORDED_FILE_NAME%</p>
     <h1>%RECORDED_FILE_SIZE_LABEL%</h1> <p>%RECORDED_FILE_SIZE%</p>
     <h1>%RECORDING_PROFILE_LABEL%</h1> <p>%RECORDING_PROFILE%</p>