Sphinxad moved to a separate library

Author: bambocher

.gitignore

@@ -10,6 +10,7 @@ __pycache__
 *.lat
 *.pyc
 *.log
+sphinxbase/ad.py
 sphinxbase/sphinxbase.py
 pocketsphinx/pocketsphinx.py
 *_wrap.c

Makefile

@@ -196,7 +196,7 @@ test_py3_x64: clean
 
 clean:
 	rm -rf build *.egg-info tests/*.{htk,lat}
-	rm -rf sphinxbase/sphinxbase.py
+	rm -rf sphinxbase/{ad,sphinxbase}.py
 	rm -rf pocketsphinx/pocketsphinx.py
 	rm -rf {sphinxbase,pocketsphinx}/*.{so,pyd}
 	rm -rf {sphinxbase,pocketsphinx,tests}/*.pyc

setup.py

@@ -23,9 +23,11 @@
 
 libpocketsphinx = glob('deps/pocketsphinx/src/libpocketsphinx/*.c')
 
+ad_sources = ['swig/sphinxbase/ad.i']
+
 sb_sources = (
     libsphinxbase +
-    ['swig/sphinxbase/sphinxbase.i']
+    ['deps/sphinxbase/swig/sphinxbase.i']
 )
 
 ps_sources = (
@@ -49,7 +51,7 @@
 ]
 
 if sys.platform.startswith('win'):
-    sb_sources.append('deps/sphinxbase/src/libsphinxad/ad_win32.c')
+    ad_sources.append('deps/sphinxbase/src/libsphinxad/ad_win32.c')
     sb_include_dirs.append('deps/sphinxbase/include/win32')
     libraries.append('winmm')
     extra_compile_args.extend([
@@ -66,7 +68,7 @@
     ])
     extra_link_args.append('/ignore:4197')
 elif sys.platform.startswith('darwin'):
-    sb_sources.append('deps/sphinxbase/src/libsphinxad/ad_openal.c')
+    ad_sources.append('deps/sphinxbase/src/libsphinxad/ad_openal.c')
     sb_include_dirs.extend([
         '/System/Library/Frameworks/OpenAL.framework/Versions/A/Headers',
         'deps/sphinxbase/include/android'
@@ -80,7 +82,7 @@
         '-Wno-logical-op-parentheses'
     ])
 elif sys.platform.startswith('linux'):
-    sb_sources.append('deps/sphinxbase/src/libsphinxad/ad_pulse.c')
+    ad_sources.append('deps/sphinxbase/src/libsphinxad/ad_pulse.c')
     sb_include_dirs.append('deps/sphinxbase/include/android')
     libraries.extend(['pulse', 'pulse-simple'])
     extra_compile_args.extend([
@@ -130,13 +132,23 @@
     download_url='https://pypi.python.org/pypi/pocketsphinx',
     packages=['sphinxbase', 'pocketsphinx'],
     ext_modules=[
+        Extension(
+            name='sphinxbase._ad',
+            sources=ad_sources,
+            swig_opts=sb_swig_opts,
+            include_dirs=sb_include_dirs,
+            extra_objects=extra_objects,
+            libraries=libraries,
+            define_macros=define_macros,
+            extra_compile_args=extra_compile_args,
+            extra_link_args=extra_link_args,
+        ),
         Extension(
             name='sphinxbase._sphinxbase',
             sources=sb_sources,
             swig_opts=sb_swig_opts,
             include_dirs=sb_include_dirs,
             extra_objects=extra_objects,
-            libraries=libraries,
             define_macros=define_macros,
             extra_compile_args=extra_compile_args,
             extra_link_args=extra_link_args,
@@ -147,7 +159,6 @@
             swig_opts=ps_swig_opts,
             include_dirs=sb_include_dirs + ps_include_dirs,
             extra_objects=extra_objects,
-            libraries=libraries,
             define_macros=define_macros,
             extra_compile_args=extra_compile_args,
             extra_link_args=extra_link_args

sphinxbase/__init__.py

@@ -29,4 +29,5 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+from .ad import *
 from .sphinxbase import *

swig/sphinxbase/ad.i

@@ -35,6 +35,20 @@
  *
  */
 
+%module ad
+
+%include pybuffer.i
+%include typemaps.i
+
+%begin %{
+    #include <Python.h>
+    #include <sphinxbase/ad.h>
+
+    typedef ad_rec_t Ad;
+%}
+
+typedef struct {} Ad;
+
 %extend Ad {
     Ad(int *errcode) {
         Ad *ad = ad_open();