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

[dholth at motherfish-iii.xiph.org]

Author: dholth
Date: 2004-12-12 11:53:07 -0800 (Sun, 12 Dec 2004)
New Revision: 8376

Added:
   experimental/dholth/oggpy/theoracc.cc
Modified:
   experimental/dholth/oggpy/setup.py
   experimental/dholth/oggpy/theora_wrappers.cc
   experimental/dholth/oggpy/theora_wrappers.h
   experimental/dholth/oggpy/theoracc.h
   experimental/dholth/oggpy/theorapy.cpp
Log:
moved namespace function defs out of header


Modified: experimental/dholth/oggpy/setup.py
===================================================================
--- experimental/dholth/oggpy/setup.py	2004-12-12 19:08:21 UTC (rev 8375)
+++ experimental/dholth/oggpy/setup.py	2004-12-12 19:53:07 UTC (rev 8376)
@@ -22,7 +22,7 @@
 Topic :: Multimedia :: Video
 """
 
-version = "0.5.2"
+version = "0.5.3"
 url = "http://dingoskidneys.com/oggpy/"
 
 setup(name="oggpy",
@@ -48,10 +48,10 @@
                               include_dirs=config.vorbispy_include_dirs,
                               depends=["oggcc.h", "vorbiscc.h", "vorbispy_wrappers.h"]),
                    
-                    Extension("theorapy", ["oggcc.cc", "theorapy.cpp"],
+                    Extension("theorapy", ["oggcc.cc", "theorapy.cpp", "theora_wrappers.cc", "theoracc.cc"],
                               libraries=config.theorapy_libraries,
                               include_dirs=config.theorapy_include_dirs,
-                              depends=["oggcc.h", "theoracc.h"]),
+                              depends=["oggcc.h", "theoracc.h", "theora_wrappers.h"]),
                     
 #                    Extension("flacpy", ["flacpy.cpp"],
 #                              libraries=config.flacpy_libraries,

Modified: experimental/dholth/oggpy/theora_wrappers.cc
===================================================================
--- experimental/dholth/oggpy/theora_wrappers.cc	2004-12-12 19:08:21 UTC (rev 8375)
+++ experimental/dholth/oggpy/theora_wrappers.cc	2004-12-12 19:53:07 UTC (rev 8376)
@@ -5,8 +5,6 @@
  */
 
 #include <theora/theora.h>
-#include <string.h>
-#include <boost/version.hpp>
 #include "theora_wrappers.h"
 
 using namespace ogg;
@@ -31,7 +29,7 @@
 */
 
 
-PyObject* wtostrings (ogg::theora::yuv_image *yuv)
+PyObject* tostrings (ogg::theora::yuv_image *yuv)
 { 
     int crop_offset=0;
     int i;

Modified: experimental/dholth/oggpy/theora_wrappers.h
===================================================================
--- experimental/dholth/oggpy/theora_wrappers.h	2004-12-12 19:08:21 UTC (rev 8375)
+++ experimental/dholth/oggpy/theora_wrappers.h	2004-12-12 19:53:07 UTC (rev 8376)
@@ -13,11 +13,6 @@
 #include "theoracc.h"
 #include <boost/python.hpp>
 
-/// Return a list of all the comments in a theora comment object.
-///
-/// Less important now that we have query_index.
-// boost::python::str get_comment(ogg::theora::comment *tco);
-// "Wrapper" (w)tostrings until tested.
-PyObject* wtostrings(ogg::theora::yuv_image *yuv);
+PyObject* tostrings(ogg::theora::yuv_image *yuv);
 
 #endif

Added: experimental/dholth/oggpy/theoracc.cc
===================================================================
--- experimental/dholth/oggpy/theoracc.cc	2004-12-12 19:08:21 UTC (rev 8375)
+++ experimental/dholth/oggpy/theoracc.cc	2004-12-12 19:53:07 UTC (rev 8376)
@@ -0,0 +1,10 @@
+#include "theoracc.h"
+
+namespace ogg {
+    namespace theora {
+        /// Human-readable version of libtheora
+        const char *version_string  ( void )    { return  theora_version_string ( ); }
+        /// Computer-convenient numeric version of libtheora
+        ogg_uint32_t version_number ( void )    { return  theora_version_number ( ); }
+    };
+};

Modified: experimental/dholth/oggpy/theoracc.h
===================================================================
--- experimental/dholth/oggpy/theoracc.h	2004-12-12 19:08:21 UTC (rev 8375)
+++ experimental/dholth/oggpy/theoracc.h	2004-12-12 19:53:07 UTC (rev 8376)
@@ -182,12 +182,11 @@
                     return  theora_encode_packetout ( this->get_data(), last_p, op->get_data() ); }
         };
 
-
         /// Human-readable version of libtheora
-        const char *version_string  ( void )    { return  theora_version_string ( ); }
+        const char *version_string  ( void );
 
         /// Computer-convenient numeric version of libtheora
-        ogg_uint32_t version_number ( void )    { return  theora_version_number ( ); }
+        ogg_uint32_t version_number ( void );
     };
 };
 

Modified: experimental/dholth/oggpy/theorapy.cpp
===================================================================
--- experimental/dholth/oggpy/theorapy.cpp	2004-12-12 19:08:21 UTC (rev 8375)
+++ experimental/dholth/oggpy/theorapy.cpp	2004-12-12 19:53:07 UTC (rev 8376)
@@ -82,12 +82,12 @@
         .def_readwrite("y", &yuv_buffer::y)
         .def_readwrite("u", &yuv_buffer::u)
         .def_readwrite("v", &yuv_buffer::v)
-        // .def("tostrings", &ogg::theora::yuv_image::tostrings)
-        .def("wtostrings", &wtostrings)
+        .def("tostrings", &tostrings)
     ;
 
     def("version_number", &ogg::theora::version_number);
     def("version_string", &ogg::theora::version_string);
+
     enum_< ogg::theora::theora_errors >("theora_errors")
         .value("ocBadPacket", ogg::theora::ocBadPacket)
         .value("ocNotFormat", ogg::theora::ocNotFormat)