From: Mark Calderbank <mark@vomp.tv>
Date: Sun, 11 Feb 2007 17:44:44 +0000 (+0000)
Subject: Small fixes to player.cc
X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=cb355bcacefe44c39c931f2406085b2cdeed85a5;p=vompclient-marten.git

Small fixes to player.cc
---

diff --git a/player.cc b/player.cc
index 447a41e..ef2c0f9 100644
--- a/player.cc
+++ b/player.cc
@@ -799,7 +799,7 @@ void Player::restartAtFramePI(ULONG newFrame)
   videoLength = demuxer->stripAudio(buffer, amountReceived);
   video->displayIFrame(buffer, videoLength);
   video->displayIFrame(buffer, videoLength); // If you do it twice, it works :)
-  free(threadBuffer);
+  free(buffer);
 
   currentFrameNumber = iframeNumber;
 }
@@ -1168,7 +1168,7 @@ void Player::threadFeedScan()
   UINT amountReceived;
   UINT videoLength;
 
-#ifndef _MSC_VER
+#ifndef WIN32
   struct timeval clock0 = {0,0};  // Time stamp after fetching I-frame info
   struct timeval clock1 = {0,0};  // Time stamp after fetching I-frame data
   struct timeval clock2 = {0,0} ; // Time stamp after displaying I-frame
@@ -1190,6 +1190,7 @@ void Player::threadFeedScan()
     baseFrameNumber = currentFrameNumber;
     do
     {
+      threadCheckExit();
       if (!vdr->getNextIFrame(baseFrameNumber, direction, &filePos, &iframeNumber, &iframeLength))
         return;