Ticket #1512: eit_sourceid.diff

File eit_sourceid.diff, 2.1 KB (added by Mark.Buechler@…, 15 years ago)

The pach..

  • libs/libmythtv/eithelper.cpp

    diff -rup mythtv.default/libs/libmythtv/eithelper.cpp mythtv/libs/libmythtv/eithelper.cpp
    old new static int get_chan_id_from_db(int sourc 
    156156            "WHERE atscsrcid = :ATSCSRCID AND "
    157157            "      sourceid  = :SOURCEID");
    158158        query.bindValue(":ATSCSRCID", event.ServiceID);
     159        query.bindValue(":SOURCEID", sourceid);
    159160    }
    160161    else
    161162    {
    static int get_chan_id_from_db(int sourc 
    166167            "WHERE serviceid        = :SERVICEID   AND "
    167168            "      networkid        = :NETWORKID   AND "
    168169            "      transportid      = :TRANSPORTID AND "
    169             "      channel.sourceid = :SOURCEID    AND "
    170170            "      channel.mplexid = dtv_multiplex.mplexid");
    171171        query.bindValue(":SERVICEID",   event.ServiceID);
    172172        query.bindValue(":NETWORKID",   event.NetworkID);
    173173        query.bindValue(":TRANSPORTID", event.TransportID);
    174174    }
    175     query.bindValue(":SOURCEID", sourceid);
    176175
    177176    if (!query.exec() || !query.isActive())
    178177        MythContext::DBError("Looking up chanID", query);
    static int get_chan_id_from_db(int sourc 
    183182        return (useOnAirGuide) ? query.value(0).toInt() : -1;       
    184183    }
    185184
    186     VERBOSE(VB_EIT, "EITHelper: " +
    187             QString("chanid not found for service %1 on source %2,")
    188             .arg(event.ServiceID).arg(sourceid) +
    189             "\n\t\t\tso event updates were skipped.");
     185    if (event.ATSC)
     186        VERBOSE(VB_EIT, "EITHelper: " +
     187                QString("chanid not found for service %1 on source %2,")
     188                .arg(event.ServiceID).arg(sourceid) +
     189                "\n\t\t\tso event updates were skipped.");
     190    else
     191        VERBOSE(VB_EIT, "EITHelper: " +
     192                QString("chanid not found for service %1 on network %2,")
     193                .arg(event.ServiceID).arg(event.NetworkID) +
     194                "\n\t\t\tso event updates were skipped.");
    190195
    191196    return -1;
    192197}