|
| 1 | +diff --git a/mythtv/libs/libmyth/programinfo.cpp b/mythtv/libs/libmyth/programinfo.cpp |
| 2 | +index 8c8991a..8325f82 100644 |
| 3 | +--- a/mythtv/libs/libmyth/programinfo.cpp |
| 4 | ++++ b/mythtv/libs/libmyth/programinfo.cpp |
| 5 | +@@ -1589,7 +1589,7 @@ bool ProgramInfo::LoadProgramFromRecorded( |
| 6 | + "WHERE r.chanid = :CHANID AND " |
| 7 | + " r.starttime = :RECSTARTTS"); |
| 8 | + query.bindValue(":CHANID", _chanid); |
| 9 | +- query.bindValue(":RECSTARTTS", _recstartts); |
| 10 | ++ query.bindValue(":RECSTARTTS", _recstartts.toString("yyyy-MM-dd hh:mm:ss")); |
| 11 | + |
| 12 | + if (!query.exec()) |
| 13 | + { |
| 14 | +@@ -2669,7 +2669,7 @@ void ProgramInfo::UpdateLastDelete(bool setTime) const |
| 15 | + } |
| 16 | + else |
| 17 | + { |
| 18 | +- query.prepare("UPDATE record SET last_delete = '0000-00-00T00:00:00' " |
| 19 | ++ query.prepare("UPDATE record SET last_delete = '0000-00-00 00:00:00' " |
| 20 | + "WHERE recordid = :RECORDID"); |
| 21 | + } |
| 22 | + query.bindValue(":RECORDID", recordid); |
| 23 | +@@ -2888,7 +2888,7 @@ void ProgramInfo::SaveMarkupMap( |
| 24 | + " (chanid, starttime, mark, type)" |
| 25 | + " VALUES ( :CHANID , :STARTTIME , :MARK , :TYPE );"); |
| 26 | + query.bindValue(":CHANID", chanid); |
| 27 | +- query.bindValue(":STARTTIME", recstartts); |
| 28 | ++ query.bindValue(":STARTTIME", recstartts.toString("yyyy-MM-dd hh:mm:ss")); |
| 29 | + } |
| 30 | + query.bindValue(":MARK", (quint64)frame); |
| 31 | + query.bindValue(":TYPE", mark_type); |
| 32 | +@@ -3288,7 +3288,7 @@ void ProgramInfo::SaveAspect( |
| 33 | + " VALUES" |
| 34 | + " ( :CHANID, :STARTTIME, :MARK, :TYPE, :DATA);"); |
| 35 | + query.bindValue(":CHANID", chanid); |
| 36 | +- query.bindValue(":STARTTIME", recstartts); |
| 37 | ++ query.bindValue(":STARTTIME", recstartts.toString("yyyy-MM-dd hh:mm:ss")); |
| 38 | + |
| 39 | + query.bindValue(":MARK", (quint64)frame); |
| 40 | + query.bindValue(":TYPE", type); |
| 41 | +@@ -3317,7 +3317,7 @@ void ProgramInfo::SaveFrameRate(uint64_t frame, uint framerate) |
| 42 | + " VALUES" |
| 43 | + " ( :CHANID, :STARTTIME, :MARK, :TYPE, :DATA);"); |
| 44 | + query.bindValue(":CHANID", chanid); |
| 45 | +- query.bindValue(":STARTTIME", recstartts); |
| 46 | ++ query.bindValue(":STARTTIME", recstartts.toString("yyyy-MM-dd hh:mm:ss")); |
| 47 | + query.bindValue(":MARK", (quint64)frame); |
| 48 | + query.bindValue(":TYPE", MARK_VIDEO_RATE); |
| 49 | + query.bindValue(":DATA", framerate); |
| 50 | +@@ -3351,7 +3351,7 @@ void ProgramInfo::SaveTotalDuration(int64_t duration) |
| 51 | + " VALUES" |
| 52 | + " ( :CHANID, :STARTTIME, 0, :TYPE, :DATA);"); |
| 53 | + query.bindValue(":CHANID", chanid); |
| 54 | +- query.bindValue(":STARTTIME", recstartts); |
| 55 | ++ query.bindValue(":STARTTIME", recstartts.toString("yyyy-MM-dd hh:mm:ss")); |
| 56 | + query.bindValue(":TYPE", MARK_DURATION_MS); |
| 57 | + query.bindValue(":DATA", (uint)(duration / 1000)); |
| 58 | + |
| 59 | +@@ -3375,7 +3375,7 @@ void ProgramInfo::SaveResolution(uint64_t frame, uint width, uint height) |
| 60 | + " VALUES" |
| 61 | + " ( :CHANID, :STARTTIME, :MARK, :TYPE, :DATA);"); |
| 62 | + query.bindValue(":CHANID", chanid); |
| 63 | +- query.bindValue(":STARTTIME", recstartts); |
| 64 | ++ query.bindValue(":STARTTIME", recstartts.toString("yyyy-MM-dd hh:mm:ss")); |
| 65 | + query.bindValue(":MARK", (quint64)frame); |
| 66 | + query.bindValue(":TYPE", MARK_VIDEO_WIDTH); |
| 67 | + query.bindValue(":DATA", width); |
| 68 | +@@ -3388,7 +3388,7 @@ void ProgramInfo::SaveResolution(uint64_t frame, uint width, uint height) |
| 69 | + " VALUES" |
| 70 | + " ( :CHANID, :STARTTIME, :MARK, :TYPE, :DATA);"); |
| 71 | + query.bindValue(":CHANID", chanid); |
| 72 | +- query.bindValue(":STARTTIME", recstartts); |
| 73 | ++ query.bindValue(":STARTTIME", recstartts.toString("yyyy-MM-dd hh:mm:ss")); |
| 74 | + query.bindValue(":MARK", (quint64)frame); |
| 75 | + query.bindValue(":TYPE", MARK_VIDEO_HEIGHT); |
| 76 | + query.bindValue(":DATA", height); |
| 77 | +diff --git a/mythtv/libs/libmythtv/dbcheck.cpp b/mythtv/libs/libmythtv/dbcheck.cpp |
| 78 | +index fa43d1a..f21ec29 100644 |
| 79 | +--- a/mythtv/libs/libmythtv/dbcheck.cpp |
| 80 | ++++ b/mythtv/libs/libmythtv/dbcheck.cpp |
| 81 | +@@ -2019,7 +2019,7 @@ NULL |
| 82 | + "UPDATE settings SET value = 'MythFillGrabberSuggestsTime' " |
| 83 | + "WHERE value = 'HonorGrabberNextSuggestedMythfilldatabaseRunTime';", |
| 84 | + "UPDATE settings SET value = 'MythFillSuggestedRunTime', " |
| 85 | +- " data = '1970-01-01T00:00:00' " |
| 86 | ++ " data = '1970-01-01 00:00:00' " |
| 87 | + "WHERE value = 'NextSuggestedMythfilldatabaseRun';", |
| 88 | + NULL |
| 89 | + }; |
| 90 | +diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp |
| 91 | +index bd81323..76b5308 100644 |
| 92 | +--- a/mythtv/programs/mythbackend/scheduler.cpp |
| 93 | ++++ b/mythtv/programs/mythbackend/scheduler.cpp |
| 94 | +@@ -532,15 +532,15 @@ void Scheduler::UpdateRecStatus(RecordingInfo *pginfo) |
| 95 | + { |
| 96 | + if (p->GetRecordingStatus() != pginfo->GetRecordingStatus()) |
| 97 | + { |
| 98 | +- VERBOSE(VB_IMPORTANT, |
| 99 | ++ VERBOSE(VB_IMPORTANT, |
| 100 | + QString("Updating status for %1 on cardid %2 (%3 => %4)") |
| 101 | + .arg(p->toString(ProgramInfo::kTitleSubtitle)) |
| 102 | + .arg(p->GetCardID()) |
| 103 | +- .arg(toString(p->GetRecordingStatus(), |
| 104 | ++ .arg(toString(p->GetRecordingStatus(), |
| 105 | + p->GetRecordingRuleType())) |
| 106 | +- .arg(toString(pginfo->GetRecordingStatus(), |
| 107 | ++ .arg(toString(pginfo->GetRecordingStatus(), |
| 108 | + p->GetRecordingRuleType()))); |
| 109 | +- bool resched = |
| 110 | ++ bool resched = |
| 111 | + ((p->GetRecordingStatus() != rsRecording && |
| 112 | + p->GetRecordingStatus() != rsTuning) || |
| 113 | + (pginfo->GetRecordingStatus() != rsRecording && |
| 114 | +@@ -577,15 +577,15 @@ void Scheduler::UpdateRecStatus(uint cardid, uint chanid, |
| 115 | + |
| 116 | + if (p->GetRecordingStatus() != recstatus) |
| 117 | + { |
| 118 | +- VERBOSE(VB_IMPORTANT, |
| 119 | ++ VERBOSE(VB_IMPORTANT, |
| 120 | + QString("Updating status for %1 on cardid %2 (%3 => %4)") |
| 121 | + .arg(p->toString(ProgramInfo::kTitleSubtitle)) |
| 122 | + .arg(p->GetCardID()) |
| 123 | +- .arg(toString(p->GetRecordingStatus(), |
| 124 | ++ .arg(toString(p->GetRecordingStatus(), |
| 125 | + p->GetRecordingRuleType())) |
| 126 | +- .arg(toString(recstatus, |
| 127 | ++ .arg(toString(recstatus, |
| 128 | + p->GetRecordingRuleType()))); |
| 129 | +- bool resched = |
| 130 | ++ bool resched = |
| 131 | + ((p->GetRecordingStatus() != rsRecording && |
| 132 | + p->GetRecordingStatus() != rsTuning) || |
| 133 | + (recstatus != rsRecording && |
| 134 | +@@ -1446,7 +1446,7 @@ void Scheduler::UpdateNextRecord(void) |
| 135 | + if (nextRecMap[recid].isNull() || !next_record.isValid()) |
| 136 | + { |
| 137 | + subquery.prepare("UPDATE record " |
| 138 | +- "SET next_record = '0000-00-00T00:00:00' " |
| 139 | ++ "SET next_record = '0000-00-00 00:00:00' " |
| 140 | + "WHERE recordid = :RECORDID;"); |
| 141 | + subquery.bindValue(":RECORDID", recid); |
| 142 | + } |
| 143 | +@@ -1455,7 +1455,7 @@ void Scheduler::UpdateNextRecord(void) |
| 144 | + subquery.prepare("UPDATE record SET next_record = :NEXTREC " |
| 145 | + "WHERE recordid = :RECORDID;"); |
| 146 | + subquery.bindValue(":RECORDID", recid); |
| 147 | +- subquery.bindValue(":NEXTREC", nextRecMap[recid]); |
| 148 | ++ subquery.bindValue(":NEXTREC", nextRecMap[recid].toString("yyyy-MM-dd hh:mm:ss")); |
| 149 | + } |
| 150 | + if (!subquery.exec()) |
| 151 | + MythDB::DBError("Update next_record", subquery); |
| 152 | +@@ -3876,7 +3876,7 @@ static bool comp_storage_perc_free_space(FileSystemInfo *a, FileSystemInfo *b) |
| 153 | + if (b->totalSpaceKB == 0) |
| 154 | + return true; |
| 155 | + |
| 156 | +- if ((a->freeSpaceKB * 100.0) / a->totalSpaceKB > |
| 157 | ++ if ((a->freeSpaceKB * 100.0) / a->totalSpaceKB > |
| 158 | + (b->freeSpaceKB * 100.0) / b->totalSpaceKB) |
| 159 | + return true; |
| 160 | + |
0 commit comments