Advertisement
Guest User

Untitled

a guest
Dec 19th, 2012
58
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.55 KB | None | 0 0
  1. diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp
  2. index 3db2883..c378733 100644
  3. --- a/mythtv/programs/mythbackend/scheduler.cpp
  4. +++ b/mythtv/programs/mythbackend/scheduler.cpp
  5. @@ -54,6 +54,7 @@ bool debugConflicts = false;
  6. Scheduler::Scheduler(bool runthread, QMap<int, EncoderLink *> *tvList,
  7. QString tmptable, Scheduler *master_sched) :
  8. MThread("Scheduler"),
  9. + inSchedLiveTV(false),
  10. recordTable(tmptable),
  11. priorityTable("powerpriority"),
  12. schedLock(),
  13. @@ -519,7 +520,7 @@ void Scheduler::PrintList(RecList &list, bool onlyFutureRecordings)
  14.  
  15. void Scheduler::PrintRec(const RecordingInfo *p, const char *prefix)
  16. {
  17. - if (!VERBOSE_LEVEL_CHECK(VB_SCHEDULE, LOG_INFO))
  18. + if (!VERBOSE_LEVEL_CHECK(VB_SCHEDULE, LOG_INFO) && !inSchedLiveTV)
  19. return;
  20.  
  21. QString outstr;
  22. @@ -4967,7 +4968,9 @@ void Scheduler::SchedPreserveLiveTV(void)
  23. if (retrylist.empty())
  24. return;
  25.  
  26. + inSchedLiveTV = true;
  27. MoveHigherRecords(false);
  28. + inSchedLiveTV = false;
  29.  
  30. while (!retrylist.empty())
  31. {
  32. diff --git a/mythtv/programs/mythbackend/scheduler.h b/mythtv/programs/mythbackend/scheduler.h
  33. index 3875749..c4b05d8 100644
  34. --- a/mythtv/programs/mythbackend/scheduler.h
  35. +++ b/mythtv/programs/mythbackend/scheduler.h
  36. @@ -87,6 +87,7 @@ class Scheduler : public MThread, public MythScheduler
  37. virtual void run(void); // MThread
  38.  
  39. private:
  40. + bool inSchedLiveTV;
  41. QString recordTable;
  42. QString priorityTable;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement