From d30a573372caa84510c4af63b4ea4df4085e1c15 Mon Sep 17 00:00:00 2001
From: John Stumpo <stump@jstump.com>
Date: Sun, 6 Jan 2013 00:49:15 -0500
Subject: [PATCH] MixStream: reorganize into a package

---
 .gitignore                                      | 2 +-
 src/{MixStreamCore.c => MixStream/MixStream.c}  | 0
 src/{ => MixStream}/MixStream.h                 | 0
 src/{MixStream.pyx => MixStream/_MixStream.pyx} | 2 --
 src/MixStream/__init__.py                       | 1 +
 src/{ => MixStream}/soundtouch-c.cpp            | 0
 src/{ => MixStream}/soundtouch-c.h              | 0
 src/{MixStreamVorbis.c => MixStream/vorbis.c}   | 0
 src/setup.py                                    | 5 +++--
 win32/makedeps-cross.sh                         | 2 +-
 10 files changed, 6 insertions(+), 6 deletions(-)
 rename src/{MixStreamCore.c => MixStream/MixStream.c} (100%)
 rename src/{ => MixStream}/MixStream.h (100%)
 rename src/{MixStream.pyx => MixStream/_MixStream.pyx} (98%)
 create mode 100644 src/MixStream/__init__.py
 rename src/{ => MixStream}/soundtouch-c.cpp (100%)
 rename src/{ => MixStream}/soundtouch-c.h (100%)
 rename src/{MixStreamVorbis.c => MixStream/vorbis.c} (100%)

diff --git a/.gitignore b/.gitignore
index 4085a0ea2..94c71e2c4 100644
--- 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 b/src/MixStream/MixStream.c
similarity index 100%
rename from src/MixStreamCore.c
rename to src/MixStream/MixStream.c
diff --git a/src/MixStream.h b/src/MixStream/MixStream.h
similarity index 100%
rename from src/MixStream.h
rename to src/MixStream/MixStream.h
diff --git a/src/MixStream.pyx b/src/MixStream/_MixStream.pyx
similarity index 98%
rename from src/MixStream.pyx
rename to src/MixStream/_MixStream.pyx
index eadef93e7..115d995eb 100644
--- a/src/MixStream.pyx
+++ b/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
new file mode 100644
index 000000000..dbee6a1ab
--- /dev/null
+++ b/src/MixStream/__init__.py
@@ -0,0 +1 @@
+from _MixStream import *
diff --git a/src/soundtouch-c.cpp b/src/MixStream/soundtouch-c.cpp
similarity index 100%
rename from src/soundtouch-c.cpp
rename to src/MixStream/soundtouch-c.cpp
diff --git a/src/soundtouch-c.h b/src/MixStream/soundtouch-c.h
similarity index 100%
rename from src/soundtouch-c.h
rename to src/MixStream/soundtouch-c.h
diff --git a/src/MixStreamVorbis.c b/src/MixStream/vorbis.c
similarity index 100%
rename from src/MixStreamVorbis.c
rename to src/MixStream/vorbis.c
diff --git a/src/setup.py b/src/setup.py
index ce0b54385..2f7167a2f 100755
--- 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
index 668251c01..5e34f0bf4 100755
--- 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