Ticket #7818: mythtv_inputgrouppref.patch

File mythtv_inputgrouppref.patch, 3.9 KB (added by Mark Spieth, 17 years ago)

  • mythplugins/mythweb/modules/tv/includes/schedule_utils.php 

    commit 225fd592ed6d91658ce7eaff4552c20a9f72ef18
Author: Mark Spieth <mspieth@digivation.com.au>
Date:   Tue Dec 29 12:44:33 2009 +1100

    input pref recording attribute will test by input group if available

diff --git a/mythplugins/mythweb/modules/tv/includes/schedule_utils.php b/mythplugins/mythweb/modules/tv/includes/schedule_utils.php
index dca9ea2..dc3becb 100644
    a b  
    2222    // Gather the data
    2323        if (empty($inputs)) {
    2424            global $db;
     25            $sh = $db->query('SELECT DISTINCT (inputgroupid + 1000),
     26                                     IF(LENGTH(IFNULL(inputgroupname,"")) > 0,
     27                                        inputgroupname,
     28                                        CONCAT("Group ", inputgroupid)
     29                                       ) AS name
     30                                FROM inputgroup
     31                            ORDER BY inputgroupid');
     32            while (list($id, $name) = $sh->fetch_row()) {
     33                $inputs[$id] = $name;
     34            }
    2535            $sh = $db->query('SELECT cardinputid,
    2636                                     IF(LENGTH(IFNULL(displayname,"")) > 0,
    2737                                        displayname,

  • mythtv/programs/mythbackend/scheduler.cpp 

    diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp
index 7a998cd..f44fb23 100644
    a b void Scheduler::AddNewRecords(void)  
    29332933
    29342934    if (prefinputpri)
    29352935        pwrpri += QString(" + "
    2936         "(cardinput.cardinputid = RECTABLE.prefinput) * %1").arg(prefinputpri);
     2936        "(cardinput.cardinputid = RECTABLE.prefinput OR (inputgroup.inputgroupid + 1000) = RECTABLE.prefinput) * %1").arg(prefinputpri);
    29372937
    29382938    if (hdtvpriority)
    29392939        pwrpri += QString(" + (program.hdtv > 0 OR "
    … … void Scheduler::AddNewRecords(void)  
    31633163"program.previouslyshown, RECTABLE.recgroup, RECTABLE.dupmethod, "
    31643164"channel.commmethod, capturecard.cardid, "
    31653165"cardinput.cardinputid, UPPER(cardinput.shareable) = 'Y' AS shareable, "
     3166"inputgroup.inputgroupid, "
    31663167"program.seriesid, program.programid, program.category_type, "
    31673168"program.airdate, program.stars, program.originalairdate, RECTABLE.inactive, "
    31683169"RECTABLE.parentid, ") + progfindid + ", RECTABLE.playgroup, "
    … … void Scheduler::AddNewRecords(void)  
    31773178"                        recordmatch.manualid = program.manualid) "
    31783179" INNER JOIN channel ON (channel.chanid = program.chanid) "
    31793180" INNER JOIN cardinput ON (channel.sourceid = cardinput.sourceid) "
     3181" INNER JOIN inputgroup ON (channel.sourceid = cardinput.sourceid) "
    31803182" INNER JOIN capturecard ON (capturecard.cardid = cardinput.cardid) "
    31813183" LEFT JOIN oldrecorded as oldrecstatus ON "
    31823184"  ( oldrecstatus.station = channel.callsign AND "

  • mythtv/programs/mythfrontend/scheduleeditor.cpp 

    diff --git a/mythtv/programs/mythfrontend/scheduleeditor.cpp b/mythtv/programs/mythfrontend/scheduleeditor.cpp
index 3d6ed1b..c11388a 100644
    a b void SchedOptEditor::Load()  
    515515    new MythUIButtonListItem(m_inputList, tr("Use any available input"),
    516516                             qVariantFromValue(0));
    517517
     518    query.prepare("SELECT DISTINCT inputgroupid, inputgroupname FROM inputgroup ORDER BY inputgroupid");
     519
     520    if (query.exec())
     521    {
     522        while (query.next())
     523        {
     524            QString group_name = query.value(1).toString();
     525            if (group_name.isEmpty())
     526                group_name = QString("%1").arg(query.value(0).toInt());
     527            new MythUIButtonListItem(m_inputList, tr("Prefer group %1")
     528                                        .arg(group_name), query.value(0).toInt() + 1000);
     529        }
     530    }
     531
     532
    518533    query.prepare("SELECT cardinputid, cardid, inputname, displayname "
    519534                  "FROM cardinput ORDER BY cardinputid");
    520535