[xiph-commits] r7248 - in trunk/py-ogg2: . src

[arc at dactyl.lonelymoon.com]

Author: arc
Date: Wed Jul 21 14:20:19 2004
New Revision: 7248

Removed:
trunk/py-ogg2/pysrc/
Modified:
trunk/py-ogg2/setup.py
trunk/py-ogg2/src/_ogg2module.c
Log:
This is an inconsistant commit.  Don't try to compile.

I'm only committing because svn is requiring me to do so before moving
files to their new locations.



Modified: trunk/py-ogg2/setup.py
===================================================================
--- trunk/py-ogg2/setup.py	2004-07-21 20:38:56 UTC (rev 7247)
+++ trunk/py-ogg2/setup.py	2004-07-21 21:20:18 UTC (rev 7248)
@@ -40,13 +40,13 @@
ogg_lib_dir = data['ogg_lib_dir']
ogg_libs = string.split(data['ogg_libs'])

-_ogg2module = Extension(name='_ogg2',
-                       sources=['src/_ogg2module.c',
-                                'src/pyoggpacket.c',
-                                'src/pyoggstreamstate.c',
-                                'src/pyoggpage.c',
-                                'src/pyoggpackbuff.c',
-                                'src/pyoggsyncstate.c',
+_ogg2module = Extension(name='ogg2',
+                       sources=['src/module.c',
+                                'src/packet.c',
+                                'src/streamstate.c',
+                                'src/page.c',
+                                'src/packbuff.c',
+                                'src/syncstate.c',
'src/general.c'],
define_macros = [('VERSION_MAJOR', VERSION_MAJOR),
('VERSION_MINOR', VERSION_MINOR),
@@ -67,4 +67,4 @@
packages = ['ogg2'],
package_dir = {'ogg2' : 'pysrc'},
ext_package = 'ogg2',
-        ext_modules = [_ogg2module])
+        ext_modules = [_ogg2module] )

Modified: trunk/py-ogg2/src/_ogg2module.c
===================================================================
--- trunk/py-ogg2/src/_ogg2module.c	2004-07-21 20:38:56 UTC (rev 7247)
+++ trunk/py-ogg2/src/_ogg2module.c	2004-07-21 21:20:18 UTC (rev 7248)
@@ -24,7 +24,7 @@
static char docstring[] = "";

void
-init_ogg2(void)
+initogg2(void)
{
PyObject *module, *dict, *Py_module_info;

@@ -34,7 +34,7 @@
PyOggStreamState_Type.ob_type = &PyType_Type;
PyOggSyncState_Type.ob_type = &PyType_Type;

-  module = Py_InitModule("_ogg2", Ogg_methods);
+  module = Py_InitModule("ogg2", Ogg_methods);
dict = PyModule_GetDict(module);

PyOgg_Error = PyErr_NewException("ogg2.OggError", NULL, NULL);
@@ -56,5 +56,5 @@
PyModule_AddIntConstant(module, "Ogg_Discont", OGG_DISCONT);

if (PyErr_Occurred())
-    PyErr_SetString(PyExc_ImportError, "_ogg2: init failed");
+    PyErr_SetString(PyExc_ImportError, "ogg2: init failed");
}