Ticket #4615: property_flags_v2.diff
File property_flags_v2.diff, 15.8 KB (added by , 16 years ago) |
---|
-
libs/libmythtv/eit.cpp
133 133 "SELECT title, subtitle, description, " 134 134 " category, category_type, " 135 135 " starttime, endtime, " 136 " closecaptioned, stereo, hdtv, "136 " subtitletypes, audioprop, videoprop, " 137 137 " seriesid, programid, " 138 138 " partnumber, parttotal, " 139 139 " syndicatedepisodenumber, " … … 351 351 " description = :DESC, " 352 352 " category = :CAT, category_type = :CATTYPE, " 353 353 " starttime = :STARTTIME, endtime = :ENDTIME, " 354 " closecaptioned = :CC, "354 " closecaptioned = :CC, subtitled = :SUBTITLED, " 355 355 " stereo = :STEREO, hdtv = :HDTV, " 356 " subtitletypes = :SUBTYPE, " 357 " audioprop = :AUDIOPROP, videoprop = :VIDEOPROP, " 356 358 " partnumber = :PARTNO, parttotal = :PARTTOTAL, " 357 359 " syndicatedepisodenumber = :SYNDICATENO, " 358 360 " airdate = :AIRDATE, originalairdate=:ORIGAIRDATE, " … … 371 373 query.bindValue(":CATTYPE", lcattype.utf8()); 372 374 query.bindValue(":STARTTIME", starttime); 373 375 query.bindValue(":ENDTIME", endtime); 374 query.bindValue(":CC", lsubtype); 375 query.bindValue(":STEREO", laudio); 376 query.bindValue(":HDTV", lvideo); 376 query.bindValue(":CC", lsubtype & SUB_HARDHEAR ? true : false); 377 query.bindValue(":SUBTITLED", lsubtype & SUB_NORMAL ? true : false); 378 query.bindValue(":STEREO", laudio & AUD_STEREO ? true : false); 379 query.bindValue(":HDTV", lvideo & VID_HDTV ? true : false); 380 query.bindValue(":SUBTYPE", lsubtype); 381 query.bindValue(":AUDIOPROP", laudio); 382 query.bindValue(":VIDEOPROP", lvideo); 377 383 query.bindValue(":PARTNO", lpartnumber); 378 384 query.bindValue(":PARTTOTAL", lparttotal); 379 385 query.bindValue(":SYNDICATENO", lsyndicatedepisodenumber.utf8()); … … 505 511 " chanid, title, subtitle, description, " 506 512 " category, category_type, " 507 513 " starttime, endtime, " 508 " closecaptioned, stereo, hdtv, " 514 " closecaptioned, stereo, hdtv, subtitled, " 515 " subtitletypes, audioprop, videoprop, " 509 516 " partnumber, parttotal, " 510 517 " syndicatedepisodenumber, " 511 518 " airdate, originalairdate,listingsource, " … … 514 521 " :CHANID, :TITLE, :SUBTITLE, :DESCRIPTION, " 515 522 " :CATEGORY, :CATTYPE, " 516 523 " :STARTTIME, :ENDTIME, " 517 " :CC, :STEREO, :HDTV, " 524 " :CC, :STEREO, :HDTV, :SUBTITLED, " 525 " :SUBTYPES, :AUDIOPROP, :VIDEOPROP, " 518 526 " :PARTNUMBER, :PARTTOTAL, " 519 527 " :SYNDICATENO, " 520 528 " :AIRDATE, :ORIGAIRDATE, :LSOURCE, " 521 " :SERIESID, :PROGRAMID ,:PREVSHOWN) ");529 " :SERIESID, :PROGRAMID, :PREVSHOWN) "); 522 530 523 531 QString cattype = myth_category_type_to_string(category_type); 524 532 … … 530 538 query.bindValue(":CATTYPE", cattype.utf8()); 531 539 query.bindValue(":STARTTIME", starttime); 532 540 query.bindValue(":ENDTIME", endtime); 533 query.bindValue(":CC", subtitleType); 534 query.bindValue(":STEREO", audioProps); 535 query.bindValue(":HDTV", videoProps); 541 query.bindValue(":CC", subtitleType & SUB_HARDHEAR ? true : false); 542 query.bindValue(":STEREO", audioProps & AUD_STEREO ? true : false); 543 query.bindValue(":HDTV", videoProps & VID_HDTV ? true : false); 544 query.bindValue(":SUBTITLED", subtitleType & SUB_NORMAL ? true : false); 545 query.bindValue(":SUBTYPES", subtitleType); 546 query.bindValue(":AUDIOPROP", audioProps); 547 query.bindValue(":VIDEOPROP", videoProps); 536 548 query.bindValue(":PARTNUMBER", partnumber); 537 549 query.bindValue(":PARTTOTAL", parttotal); 538 550 query.bindValue(":SYNDICATENO", syndicatedepisodenumber.utf8()); -
libs/libmythtv/dbcheck.cpp
13 13 #define MINIMUM_DBMS_VERSION 5 14 14 15 15 /// This is the DB schema version expected by the running MythTV instance. 16 const QString currentDatabaseVersion = "12 09";16 const QString currentDatabaseVersion = "1210"; 17 17 18 18 static bool UpdateDBVersionNumber(const QString &newnumber); 19 19 static bool performActualUpdate(const QString updates[], QString version, … … 3449 3449 return false; 3450 3450 } 3451 3451 3452 if (dbver == "1209") 3453 { 3454 const QString updates[] = { 3455 "ALTER TABLE program ADD audioprop tinyint(3) unsigned NOT NULL; ", 3456 "ALTER TABLE program ADD subtitletypes tinyint(3) unsigned NOT NULL; ", 3457 "ALTER TABLE program ADD videoprop tinyint(3) unsigned NOT NULL; ", 3458 "ALTER TABLE recordedprogram ADD audioprop tinyint(3) unsigned NOT NULL; ", 3459 "ALTER TABLE recordedprogram ADD subtitletypes tinyint(3) unsigned NOT NULL; ", 3460 "ALTER TABLE recordedprogram ADD videoprop tinyint(3) unsigned NOT NULL; ", 3461 "UPDATE program SET audioprop = stereo;", 3462 "UPDATE program SET subtitletypes = closecaptioned | (subtitled << 1);", 3463 "UPDATE program SET videoprop = hdtv;", 3464 "UPDATE recordedprogram SET audioprop = stereo;", 3465 "UPDATE recordedprogram SET subtitletypes = closecaptioned | (subtitled << 1);", 3466 "UPDATE recordedprogram SET videoprop = hdtv;", 3467 "" 3468 }; 3469 if (!performActualUpdate(updates, "1210", dbver)) 3470 return false; 3471 } 3472 3452 3473 //"ALTER TABLE cardinput DROP COLUMN preference;" in 0.22 3453 3474 //"ALTER TABLE channel DROP COLUMN atscsrcid;" in 0.22 3454 3475 //"ALTER TABLE recordedmarkup DROP COLUMN offset;" in 0.22 … … 3462 3483 //"ALTER TABLE recordedmarkup DROP COLUMN offset;" in 0.22 3463 3484 //"ALTER TABLE channel DROP COLUMN commfree;" in 0.22 3464 3485 3486 //"ALTER TABLE program DROP column stereo;" deprecated 3487 //"ALTER TABLE program DROP column hdtv;" deprecated 3488 //"ALTER TABLE program DROP column closecaptioned;" deprecated 3489 //"ALTER TABLE program DROP column subtitled;" deprecated 3490 //"ALTER TABLE program DROP column stereo;" deprecated 3491 //"ALTER TABLE recordedprogram DROP column stereo;" deprecated 3492 //"ALTER TABLE recordedprogram DROP column hdtv;" deprecated 3493 //"ALTER TABLE recordedprogram DROP column closecaptioned;" deprecated 3494 //"ALTER TABLE recordedprogram DROP column subtitled;" deprecated 3495 3465 3496 return true; 3466 3497 } 3467 3498 -
libs/libmythtv/datadirect.cpp
22 22 #include "mythcontext.h" 23 23 #include "mythdbcon.h" 24 24 #include "util.h" 25 #include "programinfo.h" 25 26 26 27 #define SHOW_WGET_OUTPUT 0 27 28 … … 804 805 if (!query.exec("INSERT IGNORE INTO program (chanid, starttime, endtime, " 805 806 "title, subtitle, description, " 806 807 "showtype, category, category_type, " 807 "airdate, stars, previouslyshown, stereo, subtitled, " 808 "airdate, stars, previouslyshown, audioprop, " 809 "subtitletypes, videoprop, stereo, subtitled, " 808 810 "hdtv, closecaptioned, partnumber, parttotal, seriesid, " 809 811 "originalairdate, colorcode, syndicatedepisodenumber, " 810 812 "programid) " … … 813 815 "DATE_ADD(endtime, INTERVAL channel.tmoffset MINUTE), " 814 816 "title, subtitle, description, " 815 817 "showtype, dd_genre.class, category_type, " 816 "airdate, stars, previouslyshown, stereo, subtitled, " 818 "airdate, stars, previouslyshown, stereo, " 819 "(subtitled << 1 ) | closecaptioned, hdtv, " 820 "stereo, subtitled, " 817 821 "hdtv, closecaptioned, partnumber, parttotal, seriesid, " 818 822 "originalairdate, colorcode, syndicatedepisodenumber, " 819 823 "dd_v_program.programid FROM (dd_v_program, channel) " -
libs/libmythtv/programdata.cpp
240 240 "stars >= (:STARS - 0.001) AND stars <= (:STARS + 0.001) AND " 241 241 "previouslyshown=:PREVIOUSLYSHOWN AND " 242 242 "title_pronounce=:TITLE_PRONOUNCE AND " 243 " stereo=:STEREOAND "244 " hdtv=:HDTVAND "245 " closecaptioned=:CLOSECAPTIONEDAND "243 "audioprop=:AUDIOPROP AND " 244 "videoprop=:VIDEOPROP AND " 245 "subtitletypes=:SUBTYPES AND " 246 246 "partnumber=:PARTNUMBER AND " 247 247 "parttotal=:PARTTOTAL AND " 248 248 "seriesid=:SERIESID AND " … … 262 262 query.bindValue(":STARS", (*i).stars.utf8()); 263 263 query.bindValue(":PREVIOUSLYSHOWN", (*i).previouslyshown); 264 264 query.bindValue(":TITLE_PRONOUNCE", (*i).title_pronounce.utf8()); 265 query.bindValue(": STEREO", (*i).audioproperties);266 query.bindValue(": HDTV", (*i).videoproperties);267 query.bindValue(": CLOSECAPTIONED", (*i).subtitletype);265 query.bindValue(":AUDIOPROP", (*i).audioproperties); 266 query.bindValue(":VIDEOPROP", (*i).videoproperties); 267 query.bindValue(":SUBTYPES", (*i).subtitletype); 268 268 query.bindValue(":PARTNUMBER", (*i).partnumber); 269 269 query.bindValue(":PARTTOTAL", (*i).parttotal); 270 270 query.bindValue(":SERIESID", (*i).seriesid); … … 341 341 "title,subtitle,description,category," 342 342 "category_type,airdate,stars,previouslyshown," 343 343 "title_pronounce,stereo,hdtv," 344 "audioprop,videoprop,subtitled,subtitletypes," 344 345 "closecaptioned,partnumber,parttotal," 345 346 "seriesid,originalairdate,showtype,colorcode," 346 347 "syndicatedepisodenumber,programid) " … … 348 349 ":SUBTITLE,:DESCRIPTION,:CATEGORY,:CATEGORY_TYPE," 349 350 ":AIRDATE,:STARS,:PREVIOUSLYSHOWN," 350 351 ":TITLE_PRONOUNCE,:STEREO,:HDTV," 352 ":AUDIOPROP,:VIDEOPROP,:SUBTYPES,:SUBTITLED," 351 353 ":CLOSECAPTIONED,:PARTNUMBER,:PARTTOTAL," 352 354 ":SERIESID,:ORIGINALAIRDATE,:SHOWTYPE,:COLORCODE," 353 355 ":SYNDICATEDEPISODENUMBER,:PROGRAMID);"); … … 363 365 query.bindValue(":STARS", (*i).stars.utf8()); 364 366 query.bindValue(":PREVIOUSLYSHOWN", (*i).previouslyshown); 365 367 query.bindValue(":TITLE_PRONOUNCE", (*i).title_pronounce.utf8()); 366 query.bindValue(":STEREO", (*i).audioproperties); 367 query.bindValue(":HDTV", (*i).videoproperties); 368 query.bindValue(":CLOSECAPTIONED", (*i).subtitletype); 368 query.bindValue(":AUDIOPROP", (*i).audioproperties); 369 query.bindValue(":VIDEOPROP", (*i).videoproperties); 370 query.bindValue(":SUBTYPES", (*i).subtitletype); 371 query.bindValue(":HDTV", (*i).videoproperties & VID_HDTV ? true : false); 372 query.bindValue(":STEREO", (*i).audioproperties & AUD_STEREO ? true : false); 373 query.bindValue(":SUBTITLED", (*i).subtitletype & SUB_NORMAL ? true : false); 374 query.bindValue(":CLOSECAPTIONED", (*i).subtitletype & SUB_HARDHEAR ? true : false); 369 375 query.bindValue(":PARTNUMBER", (*i).partnumber); 370 376 query.bindValue(":PARTTOTAL", (*i).parttotal); 371 377 query.bindValue(":SERIESID", (*i).seriesid); -
libs/libmythtv/programinfo.cpp
3542 3542 ptable = "recordedprogram"; 3543 3543 3544 3544 query.prepare(QString("SELECT category_type, airdate, stars," 3545 " partnumber, parttotal, stereo, hdtv,"3546 " closecaptioned, syndicatedepisodenumber, generic,"3545 " partnumber, parttotal, audioprop, videoprop," 3546 " subtitletypes, syndicatedepisodenumber, generic," 3547 3547 " showtype, colorcode, title_pronounce" 3548 3548 " FROM %1 WHERE chanid = :CHANID AND" 3549 3549 " starttime = :STARTTIME ;").arg(ptable)); … … 4003 4003 4004 4004 MSqlQuery query(MSqlQuery::InitCon()); 4005 4005 4006 query.prepare("SELECT stereo, hdtv, closecaptioned"4006 query.prepare("SELECT audioprop, videoprop, subtitletypes " 4007 4007 "FROM recorded LEFT JOIN recordedprogram ON " 4008 4008 "(recorded.chanid = recordedprogram.chanid AND " 4009 4009 "recorded.progstart = recordedprogram.starttime) " … … 4793 4793 "recorded.originalairdate, recorded.playgroup, " 4794 4794 "recorded.basename, recorded.progstart, " 4795 4795 "recorded.progend, recorded.stars, " 4796 "recordedprogram. stereo, recordedprogram.hdtv, "4797 "recordedprogram. closecaptioned, recorded.watched, "4796 "recordedprogram.audioprop, recordedprogram.videoprop, " 4797 "recordedprogram.subtitletypes, recorded.watched, " 4798 4798 "recorded.storagegroup " 4799 4799 "FROM recorded " 4800 4800 "LEFT JOIN record ON recorded.recordid = record.recordid " -
programs/mythbackend/mainserver.cpp
1125 1125 "recorded.originalairdate, recorded.playgroup, " 1126 1126 "recorded.basename, recorded.progstart, " 1127 1127 "recorded.progend, recorded.stars, " 1128 "recordedprogram. stereo, recordedprogram.hdtv, "1129 "recordedprogram. closecaptioned, transcoded, "1128 "recordedprogram.audioprop, recordedprogram.videoprop, " 1129 "recordedprogram.subtitletypes, transcoded, " 1130 1130 "recorded.recpriority, watched, recorded.preserve, " 1131 1131 "recorded.storagegroup " 1132 1132 "FROM recorded " -
programs/mythbackend/scheduler.cpp
2536 2536 "(cardinput.cardinputid = RECTABLE.prefinput) * %1").arg(prefinputpri); 2537 2537 2538 2538 if (hdtvpriority) 2539 pwrpri += QString(" + (program.hdtv & %1) * %2").arg(VID_HDTV) 2540 .arg(hdtvpriority); 2539 pwrpri += QString(" + (program.hdtv > 0) * %1").arg(hdtvpriority); 2541 2540 2542 2541 QString schedTmpRecord = recordTable; 2543 2542 … … 2743 2742 "program.airdate, program.stars, program.originalairdate, RECTABLE.inactive, " 2744 2743 "RECTABLE.parentid, ") + progfindid + ", RECTABLE.playgroup, " 2745 2744 "oldrecstatus.recstatus, oldrecstatus.reactivate, " 2746 "program. hdtv, program.closecaptioned, program.stereo, "2745 "program.videoprop, program.subtitletypes, program.audioprop, " 2747 2746 "RECTABLE.storagegroup, capturecard.hostname, recordmatch.oldrecstatus, " + 2748 2747 pwrpri + QString( 2749 2748 "FROM recordmatch "