Sync, other stuff

diff --git a/stream.cc b/stream.cc
index a5ba6a4d3ebee3c1ac1f955d4bb0db4ae72434dc..f61ecfbd80e3dd1e0631834fc254244ce8909432 100644 (file)
--- 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 d437b3efa1f06acf997e61e0df0219998c20b206..01f953edf53e42c6599f98eb57ab6fbf8782ed19 100644 (file)
--- 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);