Ticket #10046: libmythtv.patch

File libmythtv.patch, 3.2 KB (added by Jerry Rubinow <jerrymr@…>, 8 years ago)

patch for files in libmythtv

  • mythtv/libs/libmythtv/channelutil.cpp

    diff -ur mythtv-original/mythtv/libs/libmythtv/channelutil.cpp mythtv/mythtv/libs/libmythtv/channelutil.cpp
    old new  
    15761576    query.bindValue(":CHANID",    new_channel_id);
    15771577    query.bindValue(":CHANNUM",   chanNum);
    15781578    query.bindValue(":SOURCEID",  db_sourceid);
    1579     query.bindValue(":CALLSIGN",  callsign);
    1580     query.bindValue(":NAME",      service_name);
     1579    query.bindValue(":CALLSIGN",  callsign.trimmed());
     1580    query.bindValue(":NAME",      service_name.trimmed());
    15811581
    15821582    if (db_mplexid > 0)
    15831583        query.bindValue(":MPLEXID",   db_mplexid);
     
    16611661        query.bindValue(":CHANNUM", chan_num);
    16621662
    16631663    query.bindValue(":SOURCEID",  source_id);
    1664     query.bindValue(":CALLSIGN",  callsign);
    1665     query.bindValue(":NAME",      service_name);
     1664    query.bindValue(":CALLSIGN",  callsign.trimmed());
     1665    query.bindValue(":NAME",      service_name.trimmed());
    16661666
    16671667    query.bindValue(":MPLEXID",   db_mplexid);
    16681668
  • mythtv/libs/libmythtv/datadirect.cpp

     diff -ur mythtv-original/mythtv/libs/libmythtv/datadirect.cpp mythtv/mythtv/libs/libmythtv/datadirect.cpp
    old new  
    812812            continue;
    813813        }
    814814
    815         chan_update_q.bindValue(":CALLSIGN",  dd_station_info.value(0));
    816         chan_update_q.bindValue(":NAME",      dd_station_info.value(1));
     815        chan_update_q.bindValue(":CALLSIGN",  dd_station_info.value(0).trimmed());
     816        chan_update_q.bindValue(":NAME",      dd_station_info.value(1).trimmed());
    817817        chan_update_q.bindValue(":STATIONID", dd_station_info.value(2));
    818818        chan_update_q.bindValue(":CHANNUM",   channum);
    819819        chan_update_q.bindValue(":SOURCEID",  sourceid);
     
    22952295            new_name = (new_name.isEmpty()) ? new_callsign : new_name;
    22962296
    22972297            chan_update_q.bindValue(":CHANID",   chanid);
    2298             chan_update_q.bindValue(":NAME",     new_name);
    2299             chan_update_q.bindValue(":CALLSIGN", new_callsign);
     2298            chan_update_q.bindValue(":NAME",     new_name.trimmed());
     2299            chan_update_q.bindValue(":CALLSIGN", new_callsign.trimmed());
    23002300            chan_update_q.bindValue(":XMLTVID",  xmltvid);
    23012301            chan_update_q.bindValue(":SOURCEID", sourceid);
    23022302
  • mythtv/libs/libmythtv/tv_rec.cpp

     diff -ur mythtv-original/mythtv/libs/libmythtv/tv_rec.cpp mythtv/mythtv/libs/libmythtv/tv_rec.cpp
    old new  
    31873187        "    xmltvid  = :XMLTVID   "
    31883188        "WHERE chanid   = :CHANID AND "
    31893189        "      sourceid = :SOURCEID");
    3190     query.bindValue(":CALLSIGN", callsign);
     3190    query.bindValue(":CALLSIGN", callsign.trimmed());
    31913191    query.bindValue(":CHANNUM",  channum);
    3192     query.bindValue(":CHANNAME", channame);
     3192    query.bindValue(":CHANNAME", channame.trimmed());
    31933193    query.bindValue(":XMLTVID",  xmltvid);
    31943194    query.bindValue(":CHANID",   chanid);
    31953195    query.bindValue(":SOURCEID", sourceid);