[matroska] r1133 - in trunk/DvdMenuXtractor: . mpegparser

Author: robux4
Date: 2005-04-12 23:00:20 +0400 (Tue, 12 Apr 2005)
New Revision: 1133

Modified:
   trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
   trunk/DvdMenuXtractor/mpegparser/CircBuffer.cpp
Log:
DMX: compilation cleaning

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2005-04-12 18:51:07 UTC (rev 1132)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2005-04-12 19:00:20 UTC (rev 1133)
@@ -21,7 +21,6 @@
 #include <inttypes.h>
 #include "IFOFile.h"
 #include "VobParser.h"
-#include "SUBDecoder.h"
 #include "base64.h"
 #include "iso/iso_lang.h"
 
@@ -635,7 +634,7 @@
 				fOverWrite = OverWrite.ShowModal();
 			}
 
-			if (fOverWrite !=  wxID_YES)
+			if (fOverWrite != wxID_YES)
 				return;
 
 			wxFile MtxCommandFile;

Modified: trunk/DvdMenuXtractor/mpegparser/CircBuffer.cpp
===================================================================
--- trunk/DvdMenuXtractor/mpegparser/CircBuffer.cpp	2005-04-12 18:51:07 UTC (rev 1132)
+++ trunk/DvdMenuXtractor/mpegparser/CircBuffer.cpp	2005-04-12 19:00:20 UTC (rev 1133)
@@ -40,7 +40,7 @@
 int32_t CircBuffer::Skip(uint32_t numBytes){
   assert(numBytes > 0);
   if(can_read(numBytes)){
-    int32_t bbw = bytes_before_wrap_read(); //how many bytes we have before the buffer must be wrapped
+    uint32_t bbw = bytes_before_wrap_read(); //how many bytes we have before the buffer must be wrapped
     if(bbw >= numBytes){
       move_pointer(&read_ptr, numBytes);
       bytes_in_buf -= numBytes;
@@ -61,7 +61,7 @@
 
 int32_t CircBuffer::Read(binary* dest, uint32_t numBytes){
   if(can_read(numBytes)){
-    int32_t bbw = bytes_before_wrap_read(); //how many bytes we have before the buffer must be wrapped
+    uint32_t bbw = bytes_before_wrap_read(); //how many bytes we have before the buffer must be wrapped
     if(bbw >= numBytes){
       memcpy(dest, read_ptr, numBytes);
       move_pointer(&read_ptr, numBytes);
@@ -86,7 +86,7 @@
 
 int32_t CircBuffer::Write(binary* data, uint32_t length){
   if(can_write(length)){
-    int32_t bbw = bytes_before_wrap_write();
+    uint32_t bbw = bytes_before_wrap_write();
     if(bbw >= length){
       memcpy(write_ptr, data, length);
       move_pointer(&write_ptr, length);