From 23a9e5f4edeeda4f7ec28f1f8cfd7cadd402a686 Mon Sep 17 00:00:00 2001
From: Chris Tallon <chris@vomp.tv>
Date: Sun, 23 Apr 2006 20:25:23 +0000
Subject: [PATCH] Sync, other stuff

---
 stream.cc    | 4 +++-
 vvideorec.cc | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/stream.cc b/stream.cc
index a5ba6a4..f61ecfb 100644
--- a/stream.cc
+++ b/stream.cc
@@ -243,7 +243,9 @@ int Stream::drain(DrainTarget* dt)
   if (cur_packet_pos==cur_mp.length) {
     cur_packet_pos=0;
     mediapackets.pop_back();
-    if ((int)(tail+cur_mp.length) < mark) {
+//    if ((int)(tail+cur_mp.length) < mark) {
+    if ((((ULONG)tail)+cur_mp.length) < ((ULONG)mark))
+    {
       bufferTail=tail+cur_mp.length;
     } else {
       bufferTail=0;
diff --git a/vvideorec.cc b/vvideorec.cc
index d437b3e..01f953e 100644
--- a/vvideorec.cc
+++ b/vvideorec.cc
@@ -371,7 +371,8 @@ void VVideoRec::timercall(int clientReference)
 
 void VVideoRec::drawBarClocks()
 {
-  Log::getInstance()->log("VVideoRec", Log::DEBUG, "Draw bar clocks");
+  Log* logger = Log::getInstance();
+  logger->log("VVideoRec", Log::DEBUG, "Draw bar clocks");
 
   rectangle(clocksRegion, barBlue);
 
@@ -395,6 +396,9 @@ void VVideoRec::drawBarClocks()
   else
   {
     SNPRINTF(buffer, 99, "%01i:%02i:%02i / %01i:%02i:%02i", chours, cminutes, cseconds, ehours, eminutes, eseconds);
+    logger->log("VVideoRec", Log::DEBUG, buffer);
+
+//    if (chours > 0) abort();
   }
 
   drawText(buffer, clocksRegion.x, clocksRegion.y, Colour::LIGHTTEXT);
-- 
2.39.5