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

[dholth at motherfish-iii.xiph.org]

Author: dholth
Date: 2004-12-12 11:08:21 -0800 (Sun, 12 Dec 2004)
New Revision: 8375

Modified:
   experimental/dholth/oggpy/Makefile
   experimental/dholth/oggpy/oggcc.h
   experimental/dholth/oggpy/theoracc.h
Log:
iso C++ fix


Modified: experimental/dholth/oggpy/Makefile
===================================================================
--- experimental/dholth/oggpy/Makefile	2004-12-12 18:56:57 UTC (rev 8374)
+++ experimental/dholth/oggpy/Makefile	2004-12-12 19:08:21 UTC (rev 8375)
@@ -1,7 +1,8 @@
 PYTHON_HEADER_DIR=/usr/include/python2.3
 BOOST_HEADER_DIR=/home/dholth/opt/include/boost-1_31
 
-all: module
+all:
+	./setup.py build
 
 #multiple: oggpy.pyste vorbispy.pyste theorapy.pyste
 #	pyste --multiple --module=oggpy --out=oggpy -I. -I$(PYTHON_HEADER_DIR) -I$(BOOST_HEADER_DIR) -I$(HOME)/include/theora \

Modified: experimental/dholth/oggpy/oggcc.h
===================================================================
--- experimental/dholth/oggpy/oggcc.h	2004-12-12 18:56:57 UTC (rev 8374)
+++ experimental/dholth/oggpy/oggcc.h	2004-12-12 19:08:21 UTC (rev 8375)
@@ -52,7 +52,7 @@
             userpacket(std::string bytes, ogg_int64_t granulepos, bool bos = false, bool eos = false)
             {
                 this->bytes = bytes;
-                (const char*)(this->get_data()->packet) = bytes.c_str();
+                this->get_data()->packet = (unsigned char*)bytes.c_str();
                 this->get_data()->granulepos = granulepos;
                 this->get_data()->bytes      = bytes.size();
                 this->get_data()->b_o_s      = bos;

Modified: experimental/dholth/oggpy/theoracc.h
===================================================================
--- experimental/dholth/oggpy/theoracc.h	2004-12-12 18:56:57 UTC (rev 8374)
+++ experimental/dholth/oggpy/theoracc.h	2004-12-12 19:08:21 UTC (rev 8375)
@@ -139,16 +139,16 @@
                 int decode_header ( theora::comment *cc , ogg::packet *op )  { 
                     return  theora_decode_header ( this->get_data() , cc->get_data() , op->get_data() ); }
         };
+        
 
-		
         /// YUV image data
         class yuv_image : public yuv_buffer
         {
             public:
                 yuv_buffer *get_data()  { return (yuv_buffer*)this; }
         };
+	
 
-		
         /// Codec state.
         class state {
             private: