#! /bin/sh /usr/share/dpatch/dpatch-run
## 06-idirectfbvideoprovider_avifile-avm_fourcc.dpatch by Elias Mussi <elias@mussicorp.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad directfb-extra~/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_avifile.cpp directfb-extra/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_avifile.cpp
--- directfb-extra~/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_avifile.cpp	2008-05-29 14:24:09.000000000 -0300
+++ directfb-extra/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_avifile.cpp	2008-05-29 15:05:35.000000000 -0300
@@ -74,7 +74,7 @@
 static class Foo { public: Foo() {} } foo;
 
 #include <aviplay.h>
-#include <fourcc.h>
+#include <avm_fourcc.h>
 
 /*
  * private data struct of IDirectFBVideoProvider
@@ -361,7 +361,7 @@
      if (!seconds)
         return DFB_INVARG;
 
-     *seconds = data->player->GetVideoLength();
+     *seconds = data->player->GetVideoLengthTime();
 
      return DFB_OK;
 }
@@ -470,14 +470,13 @@
      buffer_data = (IDirectFBDataBuffer_data*) buffer->priv;
 
      try {
-          data->player = CreateAviPlayer( buffer_data->filename, 16 /* FIXME */ );
+          data->player = CreateAviPlayer( buffer_data->filename, 16 );
 
           data->player->SetDrawCallback2( AviFile_DrawCallback, data );
           data->player->SetKillHandler( AviFile_KillCallback, data );
      }
-     catch (FatalError e) {
-          D_ERROR( "DirectFB/AviFile: CreateAviPlayer failed: %s\n",
-                    e.GetDesc() );
+     catch (std::FatalError &e) {
+          D_ERROR( "DirectFB/AviFile: CreateAviPlayer failed: \n" );
           DIRECT_DEALLOCATE_INTERFACE( thiz );
           return DFB_FAILURE;
      }