Changeset 77494e7 for python

Timestamp:

Dec 12, 2004, 1:25:19 AM (19 years ago)

Author:

Paul Brossier <piem@altern.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

e6d4ccb

Parents:

205da86

Message:

bumping to 0.1.8

Location:

python

Files:

• aubio/Makefile.am (modified) (1 diff)
• aubio/Makefile.in (modified) (7 diffs)
• aubiocut (modified) (1 diff)

python/aubio/Makefile.am

@@ -1 @@
-EXTRA_DIST = __init__.py onsetcompare.py aubioclass.py gnuplot.py\
-        median.py txtfile.py
-
 pkgpython_PYTHON = __init__.py onsetcompare.py\
         gnuplot.py median.py txtfile.py aubioclass.py
+        
+nodist_pkgpython_PYTHON = aubiowrapper.py _aubiowrapper.so
 
-clean:
-        rm -f *.pyc
+CLEANFILES = *.pyc *.so *.o aubio_wrap.c aubiowrapper.py 
 
-distclean: clean
+all: _aubiowrapper.so
+
+SWIG = swig
+# removed -Wall -Wmissing-prototypes -Wmissing-declarations 
+SWCFLAGS = -DJACK_SUPPORT -Werror -Wno-char-subscripts -Wno-unknown-pragmas -I/usr/include/python2.3 -I../../src -I../../ext -I/usr/include
+SWLDFLAGS = -shared -L../../ext/.libs -laubioext -L../../src/.libs -laubio
+
+aubio_wrap.c:
+        $(SWIG) -outdir . -o aubio_wrap.c -python ../../swig/aubio.i
+
+_aubiowrapper.so: aubio_wrap.c
+        $(CC)   $(SWCFLAGS) -c aubio_wrap.c
+        $(CC)   $(SWLDFLAGS) aubio_wrap.o -o _aubiowrapper.so

python/aubio/Makefile.in

@@ -152 +152 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-EXTRA_DIST = __init__.py onsetcompare.py aubioclass.py gnuplot.py\
-        median.py txtfile.py
-
-
 pkgpython_PYTHON = __init__.py onsetcompare.py\
         gnuplot.py median.py txtfile.py aubioclass.py
 
+
+nodist_pkgpython_PYTHON = aubiowrapper.py _aubiowrapper.so
+
+CLEANFILES = *.pyc *.so *.o aubio_wrap.c aubiowrapper.py 
+
+SWIG = swig
+# removed -Wall -Wmissing-prototypes -Wmissing-declarations 
+SWCFLAGS = -DJACK_SUPPORT -Werror -Wno-char-subscripts -Wno-unknown-pragmas -I/usr/include/python2.3 -I../../src -I../../ext -I/usr/include
+SWLDFLAGS = -shared -L../../ext/.libs -laubioext -L../../src/.libs -laubio
 subdir = python/aubio
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -185 +190 @@
         -rm -f libtool
 uninstall-info-am:
+nodist_pkgpythonPYTHON_INSTALL = $(INSTALL_DATA)
+install-nodist_pkgpythonPYTHON: $(nodist_pkgpython_PYTHON)
+        @$(NORMAL_INSTALL)
+        $(mkinstalldirs) $(DESTDIR)$(pkgpythondir)
+        @list='$(nodist_pkgpython_PYTHON)'; dlist=''; for p in $$list; do\
+          if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
+          if test -f $$b$$p; then \
+            d=`echo "$$p" | sed -e 's,^.*/,,'`; \
+            dlist="$$dlist $$d"; \
+            echo " $(nodist_pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d"; \
+            $(nodist_pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d; \
+          else :; fi; \
+        done; \
+        PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(pkgpythondir) $$dlist
+
+uninstall-nodist_pkgpythonPYTHON:
+        @$(NORMAL_UNINSTALL)
+        list='$(nodist_pkgpython_PYTHON)'; for p in $$list; do \
+          d=`echo "$$p" | sed -e 's,^.*/,,'`; \
+          rm -f $(DESTDIR)$(pkgpythondir)/$$d; \
+          rm -f $(DESTDIR)$(pkgpythondir)/$${d}c; \
+          rm -f $(DESTDIR)$(pkgpythondir)/$${d}o; \
+        done
 pkgpythonPYTHON_INSTALL = $(INSTALL_DATA)
 install-pkgpythonPYTHON: $(pkgpython_PYTHON)
@@ -251 +279 @@
 
 installdirs:
-        $(mkinstalldirs) $(DESTDIR)$(pkgpythondir)
+        $(mkinstalldirs) $(DESTDIR)$(pkgpythondir) $(DESTDIR)$(pkgpythondir)
 install: install-am
 install-exec: install-exec-am
@@ -269 +297 @@
 
 clean-generic:
+        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
@@ -292 +321 @@
 info-am:
 
-install-data-am: install-pkgpythonPYTHON
+install-data-am: install-nodist_pkgpythonPYTHON install-pkgpythonPYTHON
 
 install-exec-am:
@@ -318 +347 @@
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pkgpythonPYTHON
+uninstall-am: uninstall-info-am uninstall-nodist_pkgpythonPYTHON \
+        uninstall-pkgpythonPYTHON
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
@@ -324 +354 @@
         dvi-am info info-am install install-am install-data \
         install-data-am install-exec install-exec-am install-info \
-        install-info-am install-man install-pkgpythonPYTHON \
-        install-strip installcheck installcheck-am installdirs \
-        maintainer-clean maintainer-clean-generic mostlyclean \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        uninstall uninstall-am uninstall-info-am \
+        install-info-am install-man install-nodist_pkgpythonPYTHON \
+        install-pkgpythonPYTHON install-strip installcheck \
+        installcheck-am installdirs maintainer-clean \
+        maintainer-clean-generic mostlyclean mostlyclean-generic \
+        mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+        uninstall-info-am uninstall-nodist_pkgpythonPYTHON \
         uninstall-pkgpythonPYTHON
 
 
-clean:
-        rm -f *.pyc
-
-distclean: clean
+all: _aubiowrapper.so
+
+aubio_wrap.c:
+        $(SWIG) -outdir . -o aubio_wrap.c -python ../../swig/aubio.i
+
+_aubiowrapper.so: aubio_wrap.c
+        $(CC)   $(SWCFLAGS) -c aubio_wrap.c
+        $(CC)   $(SWLDFLAGS) aubio_wrap.o -o _aubiowrapper.so
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

python/aubiocut

@@ -61 +61 @@
                     fromcross = 0
                     while (zerocross < readsize):
-                        mycopy.set(myvec.get(zerocross,0),fromcross,0)
+                        for i in range(channels):
+                                mycopy.set(myvec.get(zerocross,i),fromcross,i)
                         fromcross += 1
                         zerocross += 1