MixStream: reorganize into a package

fofix · Jan 6, 2013 · d30a573 · d30a573
1 parent a6e9f83
commit d30a573
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,7 @@ src/*.idb
 src/build
 src/pypitch/_pypitch.cpp
 src/cmgl.c
-src/MixStream.c
+src/MixStream/_MixStream.c
 src/VideoPlayer.c
 gstreamer/*
 data/library.zip

diff --git a/src/MixStreamCore.c → src/MixStream/MixStream.c b/src/MixStreamCore.c → src/MixStream/MixStream.c
diff --git a/src/MixStream.h → src/MixStream/MixStream.h b/src/MixStream.h → src/MixStream/MixStream.h
diff --git a/src/MixStream.pyx → src/MixStream/_MixStream.pyx b/src/MixStream.pyx → src/MixStream/_MixStream.pyx
@@ -21,8 +21,6 @@
 # MA  02110-1301, USA.                                              #
 #####################################################################
 
-# First a thin wrapper around VideoPlayer from VideoPlayerCore.c...
-
 cdef extern from "MixStream.h":
     ctypedef struct CMixStream "MixStream":
         pass

diff --git a/src/MixStream/__init__.py b/src/MixStream/__init__.py
@@ -0,0 +1 @@
+from _MixStream import *
diff --git a/src/soundtouch-c.cpp → src/MixStream/soundtouch-c.cpp b/src/soundtouch-c.cpp → src/MixStream/soundtouch-c.cpp
diff --git a/src/soundtouch-c.h → src/MixStream/soundtouch-c.h b/src/soundtouch-c.h → src/MixStream/soundtouch-c.h
diff --git a/src/MixStreamVorbis.c → src/MixStream/vorbis.c b/src/MixStreamVorbis.c → src/MixStream/vorbis.c
diff --git a/src/setup.py b/src/setup.py
@@ -317,7 +317,7 @@ def def_split(x):
     # Other systems: we ask pkg-config.
     gl_info = pc_info('gl')
     # And build our own soundtouch-c.
-    extra_soundtouch_src = ['soundtouch-c.cpp']
+    extra_soundtouch_src = ['MixStream/soundtouch-c.cpp']
 # Build a similar info record for the numpy headers.
 numpy_info = {'include_dirs': [np.get_include()]}
 
@@ -433,7 +433,8 @@ def run(self):
                        'pypitch/AnalyzerInput.cpp']),
     Extension('VideoPlayer', ['VideoPlayer.pyx', 'VideoPlayerCore.c'],
               **combine_info(gl_info, ogg_info, theoradec_info, glib_info, swscale_info)),
-    Extension('MixStream', ['MixStream.pyx', 'MixStreamCore.c', 'MixStreamVorbis.c'] + extra_soundtouch_src,
+    Extension('MixStream._MixStream',
+              ['MixStream/_MixStream.pyx', 'MixStream/MixStream.c', 'MixStream/vorbis.c'] + extra_soundtouch_src,
               **combine_info(vorbisfile_info, soundtouch_info, glib_info, gthread_info, sdl_info, sdl_mixer_info)),
   ],
   'cmdclass': {'build_ext': build_ext, 'install': install, 'msgfmt': msgfmt, 'xgettext': xgettext},

diff --git a/win32/makedeps-cross.sh b/win32/makedeps-cross.sh
@@ -332,7 +332,7 @@ fi
 # is that we need a bridge into the MinGW-compiled C++ code that is
 # SoundTouch that we can link to with MSVC.
 if test ! -f "$PREFIX"/build-stamps/soundtouch-c; then
-  $CROSS_GXX -g -O2 -W -Wall `pkg-config --cflags glib-2.0 soundtouch` -fno-exceptions -fno-rtti -c -o soundtouch-c.o ../src/soundtouch-c.cpp
+  $CROSS_GXX -g -O2 -W -Wall `pkg-config --cflags glib-2.0 soundtouch` -fno-exceptions -fno-rtti -c -o soundtouch-c.o ../src/MixStream/soundtouch-c.cpp
   rm -f "$PREFIX"/lib/soundtouch-c.lib
   $CROSS_AR cru "$PREFIX"/lib/soundtouch-c.lib soundtouch-c.o
   $CROSS_RANLIB "$PREFIX"/lib/soundtouch-c.lib