[GEM-cvs] SF.net SVN: pd-gem:[2622] trunk/Gem/src/Pixes/filmMPEG3.cpp

[<zmo...@us...>]

Revision: 2622
          http://pd-gem.svn.sourceforge.net/pd-gem/?rev=2622&view=rev
Author:   zmoelnig
Date:     2008-12-12 20:19:32 +0000 (Fri, 12 Dec 2008)

Log Message:
-----------
handle API change in libmpeg3

Modified Paths:
--------------
    trunk/Gem/src/Pixes/filmMPEG3.cpp

Modified: trunk/Gem/src/Pixes/filmMPEG3.cpp
===================================================================
--- trunk/Gem/src/Pixes/filmMPEG3.cpp	2008-12-11 13:48:15 UTC (rev 2621)
+++ trunk/Gem/src/Pixes/filmMPEG3.cpp	2008-12-12 20:19:32 UTC (rev 2622)
@@ -15,6 +15,14 @@
 /////////////////////////////////////////////////////////
 #include "Pixes/filmMPEG3.h"
 
+/* take care of API changes */
+#ifdef MPEG3_MAJOR
+# if MPEG3_MINOR > 6
+#  define FILMMPEG3_OPEN17
+# endif
+#endif /* MPEG3 version defines */
+
+
 /////////////////////////////////////////////////////////
 //
 // filmMPEG3
@@ -61,7 +69,13 @@
 bool filmMPEG3 :: open(char *filename, int format)
 {
   if (mpeg3_check_sig(filename)){/* ok, this is mpeg(3) */
+#ifdef FILMMPEG3_OPEN17
+    // new API with more sophisticated error-feedback
+    mpeg_file= mpeg3_open(filename, 0);
+#else
+    // old API
     mpeg_file= mpeg3_open(filename);
+#endif
     if(!mpeg_file) {
       //post("GEM:\xA0pix_film: this file %s does not seem to hold any video data", filename);
       goto unsupported;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.