[xiph-commits] r12438 - experimental/dholth/oggpy

[dholth at svn.xiph.org]

Author: dholth
Date: 2007-02-05 19:33:20 -0800 (Mon, 05 Feb 2007)
New Revision: 12438

Modified:
   experimental/dholth/oggpy/oggcc.h
   experimental/dholth/oggpy/theorapy.cpp
   experimental/dholth/oggpy/vorbiscc.h
Log:
Apply patch to oggpy for compatibility with 64-bit systems. Contributed by Charles Duffy.


Modified: experimental/dholth/oggpy/oggcc.h
===================================================================
--- experimental/dholth/oggpy/oggcc.h	2007-02-06 03:24:47 UTC (rev 12437)
+++ experimental/dholth/oggpy/oggcc.h	2007-02-06 03:33:20 UTC (rev 12438)
@@ -120,7 +120,7 @@
 
             void writealign (  )                            { oggpack_writealign ( this->get_data() ); }
             void writeclear (  )                            { oggpack_writeclear ( this->get_data() ); }
-            void writecopy  ( void *source, long bits )     { oggpack_writecopy ( this->get_data(), source, bits );  }
+            void writecopy  ( unsigned char *source, long bits )     { oggpack_writecopy ( this->get_data(), source, bits );  }
             void writetrunc ( long bits )                   { oggpack_writetrunc ( this->get_data(), bits );  }
     };
 
@@ -143,7 +143,7 @@
 
             void writealign (  )                            { oggpackB_writealign ( this->get_data() ); }
             void writeclear (  )                            { oggpackB_writeclear ( this->get_data() ); }
-            void writecopy  ( void *source, long bits )     { oggpackB_writecopy ( this->get_data(), source, bits );  }
+            void writecopy  ( unsigned char *source, long bits )     { oggpackB_writecopy ( this->get_data(), source, bits );  }
             void writetrunc ( long bits )                   { oggpackB_writetrunc ( this->get_data(), bits );  }
     };
 

Modified: experimental/dholth/oggpy/theorapy.cpp
===================================================================
--- experimental/dholth/oggpy/theorapy.cpp	2007-02-06 03:24:47 UTC (rev 12437)
+++ experimental/dholth/oggpy/theorapy.cpp	2007-02-06 03:33:20 UTC (rev 12438)
@@ -46,7 +46,7 @@
         .def_readwrite("version_major", &theora_info::version_major)
         .def_readwrite("version_minor", &theora_info::version_minor)
         .def_readwrite("version_subminor", &theora_info::version_subminor)
-        .def_readwrite("codec_setup", &theora_info::codec_setup)
+        .def_readwrite("codec_setup", (char*theora_info::*)&theora_info::codec_setup)
         .def_readwrite("dropframes_p", &theora_info::dropframes_p)
         .def_readwrite("keyframe_auto_p", &theora_info::keyframe_auto_p)
         .def_readwrite("keyframe_frequency", &theora_info::keyframe_frequency)

Modified: experimental/dholth/oggpy/vorbiscc.h
===================================================================
--- experimental/dholth/oggpy/vorbiscc.h	2007-02-06 03:24:47 UTC (rev 12437)
+++ experimental/dholth/oggpy/vorbiscc.h	2007-02-06 03:33:20 UTC (rev 12438)
@@ -126,7 +126,7 @@
                                                   base_quality); }
 
 
-                int encode_ctl(vorbis_info *vi, int number, void *arg) {
+                int encode_ctl(vorbis_info *vi, int number, unsigned char *arg) {
                     return vorbis_encode_ctl( &this->data, number, arg ); }