Ticket #1772: ajm_scheduler.patch
File ajm_scheduler.patch, 5.5 KB (added by , 18 years ago) |
---|
-
programs/mythbackend/scheduler.cpp
old new 416 416 << p->chanstr.rightJustify(4, ' ') << " " << p->chanid 417 417 << p->recstartts.toString(" dd hh:mm-").local8Bit() 418 418 << p->recendts.toString("hh:mm ").local8Bit() 419 << p->cardid << " " << p->inputid << " "419 << p->cardid << " " << p->inputid << " " << p->mplexid << " " 420 420 << p->RecTypeChar() << " " << p->RecStatusChar() << " " 421 421 << (QString::number(p->recpriority) + "/" + 422 422 QString::number(p->recpriority2)).rightJustify(5, ' ') … … 680 680 continue; 681 681 if (p->recendts <= q->recstartts || p->recstartts >= q->recendts) 682 682 continue; 683 if (p->inputid == q->inputid && p->mplexid == q->mplexid) // if mplex ids are the same don't conflict 684 continue; 683 685 if (p->inputid == q->inputid && p->shareable) 684 686 continue; 685 687 … … 2019 2021 "program.airdate, program.stars, program.originalairdate, RECTABLE.inactive, " 2020 2022 "RECTABLE.parentid, ") + progfindid + ", RECTABLE.playgroup, " 2021 2023 "oldrecstatus.recstatus, oldrecstatus.reactivate, " 2022 "channel.recpriority + cardinput.recpriority, program.hdtv " 2024 "channel.recpriority + cardinput.recpriority, program.hdtv, " 2025 "channel.mplexid " 2023 2026 + QString( 2024 2027 "FROM recordmatch " 2025 2028 … … 2157 2160 p->chancommfree = result.value(23).toInt(); 2158 2161 p->cardid = result.value(24).toInt(); 2159 2162 p->inputid = result.value(25).toInt(); 2163 p->mplexid = result.value(41).toInt(); 2160 2164 p->shareable = result.value(26).toInt(); 2161 2165 p->seriesid = result.value(27).toString(); 2162 2166 p->programid = result.value(28).toString(); … … 2276 2280 "RECTABLE.starttime, RECTABLE.startdate, RECTABLE.endtime, RECTABLE.enddate, " 2277 2281 "RECTABLE.startoffset, RECTABLE.endoffset, " 2278 2282 "RECTABLE.title, RECTABLE.subtitle, RECTABLE.description, " 2279 "channel.channum, channel.callsign, channel.name "2283 "channel.channum, channel.callsign, channel.name, channel.mplexid " 2280 2284 "FROM RECTABLE " 2281 2285 " INNER JOIN channel ON (channel.chanid = RECTABLE.chanid) " 2282 2286 " LEFT JOIN recordmatch on RECTABLE.recordid = recordmatch.recordid " … … 2347 2351 p->chanstr = result.value(12).toString(); 2348 2352 p->chansign = QString::fromUtf8(result.value(13).toString()); 2349 2353 p->channame = QString::fromUtf8(result.value(14).toString()); 2354 p->mplexid = result.value(15).toInt(); 2350 2355 2351 2356 p->schedulerid = p->startts.toString() + "_" + p->chanid; 2352 2357 … … 2370 2375 "channel.name, RECTABLE.recordid, RECTABLE.recgroup, RECTABLE.dupin, " 2371 2376 "RECTABLE.dupmethod, channel.commfree, channel.channum, RECTABLE.station, " 2372 2377 "RECTABLE.seriesid, RECTABLE.programid, RECTABLE.category, RECTABLE.findid, " 2373 "RECTABLE.playgroup "2378 "RECTABLE.playgroup, channel.mplexid " 2374 2379 "FROM RECTABLE " 2375 2380 "LEFT JOIN channel ON channel.callsign = RECTABLE.station " 2376 2381 "GROUP BY recordid " … … 2446 2451 proginfo->programid = result.value(19).toString(); 2447 2452 proginfo->category = result.value(20).toString(); 2448 2453 proginfo->findid = result.value(21).toInt(); 2454 proginfo->mplexid = result.value(23).toInt(); 2449 2455 2450 2456 proginfo->recstartts = proginfo->startts; 2451 2457 proginfo->recendts = proginfo->endts; -
libs/libmythtv/programinfo.cpp
old new 104 104 sourceid = 0; 105 105 inputid = 0; 106 106 cardid = 0; 107 mplexid = 0; 107 108 shareable = false; 108 109 duplicate = false; 109 110 schedulerid = ""; … … 195 196 sourceid = other.sourceid; 196 197 inputid = other.inputid; 197 198 cardid = other.cardid; 199 mplexid = other.mplexid; 198 200 shareable = other.shareable; 199 201 duplicate = other.duplicate; 200 202 schedulerid = QDeepCopy<QString>(other.schedulerid); … … 283 285 STR_TO_LIST(hostname) 284 286 INT_TO_LIST(sourceid) 285 287 INT_TO_LIST(cardid) 288 INT_TO_LIST(mplexid) 286 289 INT_TO_LIST(inputid) 287 290 INT_TO_LIST(recpriority) 288 291 INT_TO_LIST(recstatus) … … 381 384 STR_FROM_LIST(hostname) 382 385 INT_FROM_LIST(sourceid) 383 386 INT_FROM_LIST(cardid) 387 INT_FROM_LIST(mplexid) 384 388 INT_FROM_LIST(inputid) 385 389 INT_FROM_LIST(recpriority) 386 390 ENUM_FROM_LIST(recstatus, RecStatusType) … … 2984 2988 recstartts = found->recstartts; 2985 2989 recendts = found->recendts; 2986 2990 cardid = found->cardid; 2991 mplexid = found->mplexid; 2987 2992 inputid = found->inputid; 2988 2993 } 2989 2994 return found; … … 4085 4090 p->recstartts = s->recstartts; 4086 4091 p->recendts = s->recendts; 4087 4092 p->cardid = s->cardid; 4093 p->mplexid = s->mplexid; 4088 4094 p->inputid = s->inputid; 4089 4095 p->dupin = s->dupin; 4090 4096 p->dupmethod = s->dupmethod; -
libs/libmythtv/programinfo.h
old new 300 300 int sourceid; 301 301 int inputid; 302 302 int cardid; 303 int mplexid; 303 304 bool shareable; 304 305 bool duplicate; 305 306