Advertisement
Guest User

Untitled

a guest
Jul 9th, 2014
221
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.87 KB | None | 0 0
  1. diff --git a/mythtv/libs/libmythbase/threadedfilewriter.cpp b/mythtv/libs/libmythbase/threadedfilewriter.cpp
  2. old mode 100644
  3. new mode 100755
  4. index a3ec813..14ba241
  5. --- a/mythtv/libs/libmythbase/threadedfilewriter.cpp
  6. +++ b/mythtv/libs/libmythbase/threadedfilewriter.cpp
  7. @@ -299,8 +299,8 @@ uint ThreadedFileWriter::Write(const void *data, uint count)
  8. left -= towrite;
  9. }
  10.  
  11. - LOG(VB_FILE, LOG_DEBUG, LOC + QString("Write(*, %1) total %2 cnt %3")
  12. - .arg(count,4).arg(totalBufferUse).arg(writeBuffers.size()));
  13. +// LOG(VB_FILE, LOG_DEBUG, LOC + QString("Write(*, %1) total %2 cnt %3")
  14. +// .arg(count,4).arg(totalBufferUse).arg(writeBuffers.size()));
  15.  
  16. return count;
  17. }
  18. diff --git a/mythtv/libs/libmythtv/ringbuffer.cpp b/mythtv/libs/libmythtv/ringbuffer.cpp
  19. index 8505d10..e7dd4f5 100755
  20. --- a/mythtv/libs/libmythtv/ringbuffer.cpp
  21. +++ b/mythtv/libs/libmythtv/ringbuffer.cpp
  22. @@ -1248,6 +1248,10 @@ int RingBuffer::ReadPriv(void *buf, int count, bool peek)
  23. LOG(VB_FILE, LOG_DEBUG, LOC + loc_desc +
  24. QString(" @%1 -- begin").arg(rbrpos));
  25.  
  26. + if (count > 900000)
  27. + {
  28. + LOG(VB_FILE, LOG_WARNING, LOC + QString("ReadPriv > 900K (%1)").arg(count));
  29. + }
  30. rwlock.lockForRead();
  31. if (writemode)
  32. {
  33. diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp
  34. index 20c5f23..8a27110 100644
  35. --- a/mythtv/libs/libmythtv/tv_rec.cpp
  36. +++ b/mythtv/libs/libmythtv/tv_rec.cpp
  37. @@ -1348,12 +1348,23 @@ void TVRec::run(void)
  38. pendingRecordings.find(cardid) != pendingRecordings.end();
  39. pendingRecLock.unlock();
  40.  
  41. + const int time_out = 60;
  42. + bool debug_start_new = false;
  43. + if (!debugNextRecTime.isValid())
  44. + debugNextRecTime = now.addSecs(time_out);
  45. + if (now >= debugNextRecTime)
  46. + {
  47. + debug_start_new = true;
  48. + debugNextRecTime = now.addSecs(time_out);
  49. + }
  50. +
  51. if (has_rec && (has_finish || (now > recordEndTime)))
  52. {
  53. SetPseudoLiveTVRecording(NULL);
  54. }
  55. else if (!has_rec && !rec_soon && curRecording &&
  56. - (now >= curRecording->GetScheduledEndTime()))
  57. + (now >= curRecording->GetScheduledEndTime() ||
  58. + debug_start_new))
  59. {
  60. if (!switchingBuffer)
  61. {
  62. diff --git a/mythtv/libs/libmythtv/tv_rec.h b/mythtv/libs/libmythtv/tv_rec.h
  63. index 0c2f00c..aa09f37 100644
  64. --- a/mythtv/libs/libmythtv/tv_rec.h
  65. +++ b/mythtv/libs/libmythtv/tv_rec.h
  66. @@ -398,6 +398,7 @@ class MTV_PUBLIC TVRec : public SignalMonitorListener, public QRunnable
  67.  
  68. // LiveTV file chain
  69. LiveTVChain *tvchain;
  70. + QDateTime debugNextRecTime;
  71.  
  72. // RingBuffer info
  73. RingBuffer *ringBuffer;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement