Ticket #2344: mfdb_preset_fix.diff
File mfdb_preset_fix.diff, 5.7 KB (added by , 18 years ago) |
---|
-
programs/mythfilldatabase/filldata.cpp
old new void handleChannels(int id, QValueList<C 2075 2075 } 2076 2076 else 2077 2077 { 2078 int major, minor , freqid = (*i).freqid.toInt();2078 int major, minor; 2079 2079 long long freq; 2080 get_atsc_stuff((*i).chanstr, id, freqid, major, minor, freq);2080 get_atsc_stuff((*i).chanstr, id, (*i).freqid.toInt(), major, minor, freq); 2081 2081 2082 2082 if (interactive && ((minor == 0) || (freq > 0))) 2083 2083 { … … void handleChannels(int id, QValueList<C 2088 2088 cout << "### callsign = " << (*i).callsign.local8Bit() << endl; 2089 2089 cout << "### channum = " << (*i).chanstr.local8Bit() << endl; 2090 2090 if (channel_preset) 2091 cout << "### freqid = " << freqid<< endl;2091 cout << "### freqid = " << (*i).freqid.local8Bit() << endl; 2092 2092 cout << "### finetune = " << (*i).finetune.local8Bit() << endl; 2093 2093 cout << "### tvformat = " << (*i).tvformat.local8Bit() << endl; 2094 2094 cout << "### icon = " << localfile.local8Bit() << endl; … … void handleChannels(int id, QValueList<C 2111 2111 0 /*service id*/, major, minor, 2112 2112 false /*use on air guide*/, false /*hidden*/, 2113 2113 false /*hidden in guide*/, 2114 freqid,localfile, (*i).tvformat,2114 (*i).freqid, localfile, (*i).tvformat, 2115 2115 (*i).xmltvid)) 2116 2116 { 2117 2117 cout << "### " << endl; … … void handleChannels(int id, QValueList<C 2168 2168 0 /*service id*/, major, minor, 2169 2169 false /*use on air guide*/, false /*hidden*/, 2170 2170 false /*hidden in guide*/, 2171 freqid, localfile, (*i).tvformat,2171 (*i).freqid, localfile, (*i).tvformat, 2172 2172 (*i).xmltvid); 2173 2173 } 2174 2174 } -
libs/libmythtv/channelutil.cpp
old new bool ChannelUtil::CreateChannel(uint db_ 1008 1008 bool use_on_air_guide, 1009 1009 bool hidden, 1010 1010 bool hidden_in_guide, 1011 intfreqid,1011 QString freqid, 1012 1012 QString icon, 1013 1013 QString format, 1014 1014 QString xmltvid) … … bool ChannelUtil::CreateChannel(uint db_ 1048 1048 query.bindValue(":VISIBLE", !hidden); 1049 1049 (void) hidden_in_guide; // MythTV can't hide the channel in just the guide. 1050 1050 1051 if ( freqid > 0)1051 if (!freqid.isEmpty()) 1052 1052 query.bindValue(":FREQID", freqid); 1053 1053 1054 1054 QString tvformat = (atsc_minor_channel > 0) ? "ATSC" : format; -
libs/libmythtv/channelutil.h
old new class ChannelUtil 103 103 bool use_on_air_guide, 104 104 bool hidden, 105 105 bool hidden_in_guide, 106 intfreqid,106 QString freqid, 107 107 QString icon = "", 108 108 QString format = "Default", 109 109 QString xmltvid = ""); -
libs/libmythtv/datadirect.cpp
old new static void update_channel_basic(uint 1879 1879 callsign, name, channum, 1880 1880 serviceid, majorC, minorC, 1881 1881 oag, hidden, hidden_in_guide, 1882 freqid, icon, tvformat,1882 QString::number(freqid), icon, tvformat, 1883 1883 xmltvid); 1884 1884 } 1885 1885 } -
libs/libmythtv/siscan.cpp
old new void SIScan::UpdatePMTinDB( 1010 1010 chan_num, 1011 1011 pmt->ProgramNumber(), 1012 1012 0, 0, 1013 false, false, false, freqid);1013 false, false, false, QString::number(freqid)); 1014 1014 } 1015 1015 else 1016 1016 { // The service is in database, update it … … void SIScan::UpdateVCTinDB(int db_mplexi 1166 1166 vct->MajorChannel(i), vct->MinorChannel(i), 1167 1167 !vct->IsHiddenInGuide(i) /* use on air guide */, 1168 1168 vct->IsHidden(i), vct->IsHiddenInGuide(i), 1169 freqid);1169 QString::number(freqid)); 1170 1170 } 1171 1171 } 1172 1172 else … … void SIScan::UpdateSDTinDB(int /*mplexid 1287 1287 sdt->HasEITSchedule(i) || 1288 1288 sdt->HasEITPresentFollowing(i) || 1289 1289 force_guide_present, 1290 false, false, -1);1290 false, false, QString()); 1291 1291 } 1292 1292 } 1293 1293 else if (force_update || (desc && have_uk_chan_num))