File onscripter-avifile-47.patch of Package onscripter

Index: onscripter-20130317/AVIWrapper.cpp
===================================================================
--- onscripter-20130317.orig/AVIWrapper.cpp
+++ onscripter-20130317/AVIWrapper.cpp
@@ -35,8 +35,6 @@
 #define DEFAULT_AUDIOBUF 4096
 #define AVI_FINISH_EVENT 12345
 
-#define AVIFILE_VERSION 747
-
 AVIWrapper::AVIWrapper()
 {
     screen_overlay = NULL;
@@ -61,11 +59,7 @@ AVIWrapper::~AVIWrapper()
 int AVIWrapper::init( char *filename, bool debug_flag )
 {
     this->debug_flag = debug_flag;
-#if AVIFILE_VERSION >= 747
-    if ( !debug_flag ) avm::AvmOutput::singleton()->resetDebugLevels(-1);
-#else
     if ( !debug_flag ) avm::out.resetDebugLevels(-1);
-#endif
 
     i_avi = CreateIAviReadFile( filename );
     if ( i_avi == NULL || i_avi->IsValid() == false ){
@@ -145,9 +139,9 @@ void AVIWrapper::audioCallback( void *us
     if ( len == 0 )
         status = AVI_STOP;
 
-    size_t ocnt;
-    size_t samples;
-    size_t count = 0;
+    uint_t ocnt;
+    uint_t samples;
+    uint_t count = 0;
 
     if ( remaining_count > 0 ){
         if ( remaining_count <= len ){
@@ -191,21 +185,13 @@ double AVIWrapper::getAudioTime()
     if ( time_start == 0 )
     {
         frame_start = (v_stream) ? v_stream->GetTime() : 0.;
-#if AVIFILE_VERSION >= 747
-        time_start = avm_get_time_us();
-#else
         time_start = longcount();
-#endif
     }
 
     if ( a_stream )
         return a_stream->GetTime();
     else
-#if AVIFILE_VERSION >= 747
-        return frame_start + to_float(avm_get_time_us(), time_start);
-#else
         return frame_start + to_float(longcount(), time_start);
-#endif
 }
 
 static int playVideo( void *userdata )