1 |
commit: 14bbc6a2259790692bec61a3d886a887e4752a02 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 1 10:17:23 2015 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 1 10:17:23 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14bbc6a2 |
7 |
|
8 |
media-libs/aubio: remove old. |
9 |
|
10 |
Package-Manager: portage-2.2.23 |
11 |
|
12 |
media-libs/aubio/Manifest | 2 - |
13 |
media-libs/aubio/aubio-0.3.2-r2.ebuild | 96 ------ |
14 |
media-libs/aubio/aubio-0.4.0-r1.ebuild | 104 ------- |
15 |
media-libs/aubio/files/aubio-0.3.2-multilib.patch | 11 - |
16 |
.../aubio/files/aubio-0.3.2-numarray-gnuplot.patch | 332 --------------------- |
17 |
5 files changed, 545 deletions(-) |
18 |
|
19 |
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest |
20 |
index 158e49c..d8ae92a 100644 |
21 |
--- a/media-libs/aubio/Manifest |
22 |
+++ b/media-libs/aubio/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST aubio-0.3.2.tar.gz 609006 SHA256 dc1387b048610a6141f523c27314b7a60bd299c3d6789c372445ddc6511512cd SHA512 b3d8445716c0cde02ee1e7b036864598ec7562d8a938a61f644c384d80e95601abcb6e713cdaab7b2613f6f4f27db1cfafa7c23824c61f504e83d11fefdee8fc WHIRLPOOL eeb732702bbb1682d32fde5cce4d17ae402292e1c19dac2e45600b268c955310683712952be8a1f72c08255c8c75c5beff9a127ab5b296883a64a4b5d9cb949a |
25 |
-DIST aubio-0.4.0.tar.bz2 277613 SHA256 49de9a06c819d4c4e0a9198a95eac374a1650083aef16c397004258bac2d33a2 SHA512 4f04ca8a873e45b6cdf84e3fb6028d9ad0abc0300daf83b1f7b08021355b1449f9c8d3a9b617bd479668e6b2c0c63c3ce69d61baeb6b0f621a84e850dedce8b6 WHIRLPOOL 432c0f555d21190838b573b90a68f625b267a399380ac79cb8687e8d2de53db1dff8c9ab235db446b315a98d9df729d45db7360b825e0ad37d6924b09788b1b9 |
26 |
DIST aubio-0.4.1.tar.bz2 288136 SHA256 25d7df0a9cd6366fda764a803424caddf5fb819fc75b42a7a03e1e6f8eb3c695 SHA512 f36800f1a0cbe72509e05d15d79759ed25975e92701804597ed4c9d93e27d5e7b908e0aa65819ce763882945123ea174a0825c7aacf9f9494f56d72de5b8308c WHIRLPOOL ea410de8ca5d81c8b6ff2f98a2353601a48435649e3c5931e41f9e7f4ccb8f9a8faf2156a3632de223638f1e91d608c5a77660fa00633a591488498c5e37fec6 |
27 |
|
28 |
diff --git a/media-libs/aubio/aubio-0.3.2-r2.ebuild b/media-libs/aubio/aubio-0.3.2-r2.ebuild |
29 |
deleted file mode 100644 |
30 |
index 539474b..0000000 |
31 |
--- a/media-libs/aubio/aubio-0.3.2-r2.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,96 +0,0 @@ |
34 |
-# Copyright 1999-2014 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
-# $Id$ |
37 |
- |
38 |
-EAPI=3 |
39 |
- |
40 |
-PYTHON_DEPEND="2:2.6" |
41 |
- |
42 |
-inherit autotools eutils python |
43 |
- |
44 |
-DESCRIPTION="Library for audio labelling" |
45 |
-HOMEPAGE="http://aubio.piem.org" |
46 |
-SRC_URI="http://aubio.piem.org/pub/${P}.tar.gz" |
47 |
- |
48 |
-LICENSE="GPL-2" |
49 |
-SLOT="0" |
50 |
-KEYWORDS="amd64 ~ppc ppc64 sparc x86" |
51 |
-IUSE="alsa doc examples jack lash static-libs" |
52 |
- |
53 |
-RDEPEND="sci-libs/fftw:3.0 |
54 |
- media-libs/libsndfile |
55 |
- media-libs/libsamplerate |
56 |
- alsa? ( media-libs/alsa-lib ) |
57 |
- jack? ( media-sound/jack-audio-connection-kit ) |
58 |
- lash? ( media-sound/lash )" |
59 |
-DEPEND="${RDEPEND} |
60 |
- >=dev-lang/swig-1.3.0 |
61 |
- virtual/pkgconfig |
62 |
- doc? ( app-doc/doxygen virtual/latex-base )" |
63 |
- |
64 |
-pkg_setup() { |
65 |
- DOCS=( AUTHORS ChangeLog README TODO ) |
66 |
- |
67 |
- python_set_active_version 2 |
68 |
- python_pkg_setup |
69 |
-} |
70 |
- |
71 |
-src_prepare() { |
72 |
- # disable automagic puredata wrt #369835 |
73 |
- sed -i -e '/AC_CHECK_HEADER/s:m_pd.h:dIsAbLe&:' configure.ac || die |
74 |
- |
75 |
- epatch \ |
76 |
- "${FILESDIR}"/${P}-multilib.patch \ |
77 |
- "${FILESDIR}"/${P}-numarray-gnuplot.patch |
78 |
- |
79 |
- eautoreconf |
80 |
-} |
81 |
- |
82 |
-src_configure() { |
83 |
- econf \ |
84 |
- $(use_enable static-libs static) \ |
85 |
- $(use_enable jack) \ |
86 |
- $(use_enable alsa) \ |
87 |
- $(use_enable lash) |
88 |
-} |
89 |
- |
90 |
-src_compile() { |
91 |
- default |
92 |
- |
93 |
- if use doc; then |
94 |
- export VARTEXFONTS="${T}/fonts" |
95 |
- cd "${S}"/doc |
96 |
- doxygen user.cfg |
97 |
- doxygen devel.cfg |
98 |
- doxygen examples.cfg |
99 |
- fi |
100 |
-} |
101 |
- |
102 |
-src_install() { |
103 |
- # `default` would be enough here if python.eclass supported EAPI=4 |
104 |
- emake DESTDIR="${D}" install || die |
105 |
- dodoc "${DOCS[@]}" |
106 |
- |
107 |
- doman doc/*.1 |
108 |
- if use doc; then |
109 |
- mv doc/user/html doc/user/user |
110 |
- dohtml -r doc/user/user |
111 |
- mv doc/devel/html doc/devel/devel |
112 |
- dohtml -r doc/devel/devel |
113 |
- mv doc/examples/html doc/examples/examples |
114 |
- dohtml -r doc/examples/examples |
115 |
- fi |
116 |
- |
117 |
- if use examples; then |
118 |
- # install dist_noinst_SCRIPTS from Makefile.am |
119 |
- insinto /usr/share/doc/${PF}/examples |
120 |
- doins python/aubio{compare-onset,plot-notes,filter-notes,web.py} || die |
121 |
- docinto examples |
122 |
- newdoc python/README README.examples |
123 |
- fi |
124 |
- |
125 |
- find "${ED}"usr -name '*.la' -exec rm -f {} + |
126 |
-} |
127 |
- |
128 |
-pkg_postinst() { python_mod_optimize aubio; } |
129 |
-pkg_postrm() { python_mod_cleanup aubio; } |
130 |
|
131 |
diff --git a/media-libs/aubio/aubio-0.4.0-r1.ebuild b/media-libs/aubio/aubio-0.4.0-r1.ebuild |
132 |
deleted file mode 100644 |
133 |
index 669b939..0000000 |
134 |
--- a/media-libs/aubio/aubio-0.4.0-r1.ebuild |
135 |
+++ /dev/null |
136 |
@@ -1,104 +0,0 @@ |
137 |
-# Copyright 1999-2015 Gentoo Foundation |
138 |
-# Distributed under the terms of the GNU General Public License v2 |
139 |
-# $Id$ |
140 |
- |
141 |
-EAPI=5 |
142 |
- |
143 |
-DISTUTILS_OPTIONAL=1 |
144 |
-PYTHON_COMPAT=( python2_7 ) |
145 |
-PYTHON_REQ_USE='threads(+)' |
146 |
- |
147 |
-inherit distutils-r1 waf-utils multilib |
148 |
- |
149 |
-DESCRIPTION="Library for audio labelling" |
150 |
-HOMEPAGE="http://aubio.org/" |
151 |
-SRC_URI="http://aubio.org//pub/${P}.tar.bz2" |
152 |
- |
153 |
-LICENSE="GPL-3" |
154 |
-SLOT="0" |
155 |
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" |
156 |
-IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python" |
157 |
- |
158 |
-RDEPEND=" |
159 |
- ffmpeg? ( virtual/ffmpeg ) |
160 |
- fftw? ( sci-libs/fftw:3.0 ) |
161 |
- jack? ( media-sound/jack-audio-connection-kit ) |
162 |
- libsamplerate? ( media-libs/libsamplerate ) |
163 |
- python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} ) |
164 |
- sndfile? ( media-libs/libsndfile )" |
165 |
-DEPEND="${RDEPEND} |
166 |
- ${PYTHON_DEPS} |
167 |
- virtual/pkgconfig |
168 |
- app-text/txt2man |
169 |
- doc? ( app-doc/doxygen )" |
170 |
-REQUIRED_USE=${PYTHON_REQUIRED_USE} |
171 |
- |
172 |
-DOCS=( AUTHORS ChangeLog README.md ) |
173 |
-PYTHON_SRC_DIR="${S}/python" |
174 |
- |
175 |
-src_prepare() { |
176 |
- sed -i -e "s:\/lib:\/$(get_libdir):" src/wscript_build || die |
177 |
- sed -i -e "s:doxygen:doxygen_disabled:" wscript || die |
178 |
-} |
179 |
- |
180 |
-src_configure() { |
181 |
- python_setup |
182 |
- waf-utils_src_configure \ |
183 |
- --enable-complex \ |
184 |
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \ |
185 |
- $(use_enable double-precision double) \ |
186 |
- $(use_enable fftw fftw3f) \ |
187 |
- $(use_enable fftw fftw3) \ |
188 |
- $(use_enable ffmpeg avcodec) \ |
189 |
- $(use_enable jack) \ |
190 |
- $(use_enable libsamplerate samplerate) \ |
191 |
- $(use_enable sndfile) |
192 |
- |
193 |
- if use python ; then |
194 |
- cd "${PYTHON_SRC_DIR}" || die |
195 |
- distutils-r1_src_configure |
196 |
- fi |
197 |
-} |
198 |
- |
199 |
-src_compile() { |
200 |
- waf-utils_src_compile --notests |
201 |
- |
202 |
- if use doc; then |
203 |
- cd "${S}"/doc || die |
204 |
- doxygen full.cfg || die |
205 |
- fi |
206 |
- |
207 |
- if use python ; then |
208 |
- cd "${PYTHON_SRC_DIR}" || die |
209 |
- distutils-r1_src_compile |
210 |
- fi |
211 |
-} |
212 |
- |
213 |
-src_test() { |
214 |
- waf-utils_src_compile --alltests |
215 |
- |
216 |
- if use python ; then |
217 |
- cd "${PYTHON_SRC_DIR}" || die |
218 |
- distutils-r1_src_test |
219 |
- fi |
220 |
-} |
221 |
- |
222 |
-src_install() { |
223 |
- waf-utils_src_install |
224 |
- |
225 |
- if use python ; then |
226 |
- cd "${PYTHON_SRC_DIR}" || die |
227 |
- DOCS="" distutils-r1_src_install |
228 |
- newdoc README README.python |
229 |
- fi |
230 |
- |
231 |
- if use doc; then |
232 |
- dohtml -r doc/full/html/. |
233 |
- dodoc doc/*.txt |
234 |
- fi |
235 |
- |
236 |
- if use examples; then |
237 |
- # install dist_noinst_SCRIPTS from Makefile.am |
238 |
- dodoc -r examples |
239 |
- fi |
240 |
-} |
241 |
|
242 |
diff --git a/media-libs/aubio/files/aubio-0.3.2-multilib.patch b/media-libs/aubio/files/aubio-0.3.2-multilib.patch |
243 |
deleted file mode 100644 |
244 |
index 7464fad..0000000 |
245 |
--- a/media-libs/aubio/files/aubio-0.3.2-multilib.patch |
246 |
+++ /dev/null |
247 |
@@ -1,11 +0,0 @@ |
248 |
---- python/aubio/Makefile.am |
249 |
-+++ python/aubio/Makefile.am |
250 |
-@@ -68,7 +68,7 @@ |
251 |
- -L$(top_builddir)/ext -laubioext \ |
252 |
- -L$(top_builddir)/src -laubio |
253 |
- |
254 |
--pkgpython_LTLIBRARIES = _aubiowrapper.la |
255 |
-+pkgpyexec_LTLIBRARIES = _aubiowrapper.la |
256 |
- |
257 |
- _aubiowrapper_la_LDFLAGS = -module -avoid-version $(AUBIO_LDFLAGS) |
258 |
- _aubiowrapper_la_SOURCES = aubio_wrap.c |
259 |
|
260 |
diff --git a/media-libs/aubio/files/aubio-0.3.2-numarray-gnuplot.patch b/media-libs/aubio/files/aubio-0.3.2-numarray-gnuplot.patch |
261 |
deleted file mode 100644 |
262 |
index 48d1e76..0000000 |
263 |
--- a/media-libs/aubio/files/aubio-0.3.2-numarray-gnuplot.patch |
264 |
+++ /dev/null |
265 |
@@ -1,332 +0,0 @@ |
266 |
-http://pkgs.fedoraproject.org/gitweb/?p=aubio.git;a=tree |
267 |
- |
268 |
---- python/aubio/aubioclass.py |
269 |
-+++ python/aubio/aubioclass.py |
270 |
-@@ -42,8 +42,10 @@ |
271 |
- self.file = new_aubio_sndfile_wo(model.file,filename) |
272 |
- else: |
273 |
- self.file = new_aubio_sndfile_ro(filename) |
274 |
-+ if self.file == None: |
275 |
-+ raise(ValueError, "failed opening file %s" % filename) |
276 |
- def __del__(self): |
277 |
-- del_aubio_sndfile(self.file) |
278 |
-+ if self.file != None: del_aubio_sndfile(self.file) |
279 |
- def info(self): |
280 |
- aubio_sndfile_info(self.file) |
281 |
- def samplerate(self): |
282 |
-@@ -126,7 +128,7 @@ |
283 |
- channels=1,samplerate=44100.,omode=aubio_pitchm_freq,yinthresh=0.1): |
284 |
- self.pitchp = new_aubio_pitchdetection(bufsize,hopsize,channels, |
285 |
- samplerate,mode,omode) |
286 |
-- aubio_pitchdetection_set_yinthresh(self.pitchp,yinthresh) |
287 |
-+ aubio_pitchdetection_set_yinthresh(self.pitchp,yinthresh) |
288 |
- #self.filt = filter(srate,"adsgn") |
289 |
- def __del__(self): |
290 |
- del_aubio_pitchdetection(self.pitchp) |
291 |
---- python/aubio/bench/onset.py |
292 |
-+++ python/aubio/bench/onset.py |
293 |
-@@ -111,7 +111,7 @@ |
294 |
- for i in self.vlist: |
295 |
- gd.append(i['GD']) |
296 |
- fp.append(i['FP']) |
297 |
-- d.append(Gnuplot.Data(fp, gd, with='linespoints', |
298 |
-+ d.append(Gnuplot.Data(fp, gd, with_='linespoints', |
299 |
- title="%s %s" % (plottitle,i['mode']) )) |
300 |
- |
301 |
- def plotplotroc(self,d,outplot=0,extension='ps'): |
302 |
-@@ -147,7 +147,7 @@ |
303 |
- for i in self.vlist: |
304 |
- x.append(i['prec']) |
305 |
- y.append(i['recl']) |
306 |
-- d.append(Gnuplot.Data(x, y, with='linespoints', |
307 |
-+ d.append(Gnuplot.Data(x, y, with_='linespoints', |
308 |
- title="%s %s" % (plottitle,i['mode']) )) |
309 |
- |
310 |
- def plotplotpr(self,d,outplot=0,extension='ps'): |
311 |
-@@ -172,7 +172,7 @@ |
312 |
- for i in self.vlist: |
313 |
- x.append(i['thres']) |
314 |
- y.append(i['dist']) |
315 |
-- d.append(Gnuplot.Data(x, y, with='linespoints', |
316 |
-+ d.append(Gnuplot.Data(x, y, with_='linespoints', |
317 |
- title="%s %s" % (plottitle,i['mode']) )) |
318 |
- |
319 |
- def plotplotfmeas(self,d,outplot="",extension='ps', title="F-measure"): |
320 |
-@@ -205,7 +205,7 @@ |
321 |
- for i in self.vlist: |
322 |
- x.append(i[var]) |
323 |
- y.append(i['dist']) |
324 |
-- d.append(Gnuplot.Data(x, y, with='linespoints', |
325 |
-+ d.append(Gnuplot.Data(x, y, with_='linespoints', |
326 |
- title="%s %s" % (plottitle,i['mode']) )) |
327 |
- |
328 |
- def plotplotfmeasvar(self,d,var,outplot="",extension='ps', title="F-measure"): |
329 |
-@@ -244,7 +244,7 @@ |
330 |
- total = v['Torig'] |
331 |
- for i in range(len(per)): per[i] /= total/100. |
332 |
- |
333 |
-- d.append(Gnuplot.Data(val, per, with='fsteps', |
334 |
-+ d.append(Gnuplot.Data(val, per, with_='fsteps', |
335 |
- title="%s %s" % (plottitle,v['mode']) )) |
336 |
- #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (mean,smean)) |
337 |
- #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (amean,samean)) |
338 |
-@@ -275,7 +275,7 @@ |
339 |
- total = v['Torig'] |
340 |
- for i in range(len(per)): per[i] /= total/100. |
341 |
- |
342 |
-- d.append(Gnuplot.Data(val, per, with='fsteps', |
343 |
-+ d.append(Gnuplot.Data(val, per, with_='fsteps', |
344 |
- title="%s %s" % (plottitle,v['mode']) )) |
345 |
- #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (mean,smean)) |
346 |
- #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (amean,samean)) |
347 |
---- python/aubio/gnuplot.py |
348 |
-+++ python/aubio/gnuplot.py |
349 |
-@@ -23,7 +23,7 @@ |
350 |
- |
351 |
- def audio_to_array(filename): |
352 |
- import aubio.aubioclass |
353 |
-- import numarray |
354 |
-+ from numpy import arange |
355 |
- hopsize = 2048 |
356 |
- filei = aubio.aubioclass.sndfile(filename) |
357 |
- framestep = 1/(filei.samplerate()+0.) |
358 |
-@@ -39,7 +39,7 @@ |
359 |
- while (curpos < readsize): |
360 |
- data.append(myvec.get(curpos,i)) |
361 |
- curpos+=1 |
362 |
-- time = numarray.arange(len(data))*framestep |
363 |
-+ time = arange(len(data))*framestep |
364 |
- return time,data |
365 |
- |
366 |
- def plot_audio(filenames, g, options): |
367 |
-@@ -143,29 +143,29 @@ |
368 |
- |
369 |
- def downsample_audio(time,data,maxpoints=10000): |
370 |
- """ resample audio data to last only maxpoints """ |
371 |
-- import numarray |
372 |
-+ from numpy import array, resize |
373 |
- length = len(time) |
374 |
- downsample = length/maxpoints |
375 |
- if downsample == 0: downsample = 1 |
376 |
-- x = numarray.array(time).resize(length)[0:-1:downsample] |
377 |
-- y = numarray.array(data).resize(length)[0:-1:downsample] |
378 |
-+ x = resize(array(time),length)[0:-1:downsample] |
379 |
-+ y = resize(array(data),length)[0:-1:downsample] |
380 |
- return x,y |
381 |
- |
382 |
- def make_audio_plot(time,data,maxpoints=10000): |
383 |
- """ create gnuplot plot from an audio file """ |
384 |
- import Gnuplot, Gnuplot.funcutils |
385 |
- x,y = downsample_audio(time,data,maxpoints=maxpoints) |
386 |
-- return Gnuplot.Data(x,y,with='lines') |
387 |
-+ return Gnuplot.Data(x,y,with_='lines') |
388 |
- |
389 |
- def make_audio_envelope(time,data,maxpoints=10000): |
390 |
- """ create gnuplot plot from an audio file """ |
391 |
-- import numarray |
392 |
-+ from numpy import array |
393 |
- import Gnuplot, Gnuplot.funcutils |
394 |
- bufsize = 500 |
395 |
-- x = [i.mean() for i in numarray.array(time).resize(len(time)/bufsize,bufsize)] |
396 |
-- y = [i.mean() for i in numarray.array(data).resize(len(time)/bufsize,bufsize)] |
397 |
-+ x = [i.mean() for i in resize(array(time), (len(time)/bufsize,bufsize))] |
398 |
-+ y = [i.mean() for i in resize(array(data), (len(time)/bufsize,bufsize))] |
399 |
- x,y = downsample_audio(x,y,maxpoints=maxpoints) |
400 |
-- return Gnuplot.Data(x,y,with='lines') |
401 |
-+ return Gnuplot.Data(x,y,with_='lines') |
402 |
- |
403 |
- def gnuplot_addargs(parser): |
404 |
- """ add common gnuplot argument to OptParser object """ |
405 |
---- python/aubio/onsetcompare.py |
406 |
-+++ python/aubio/onsetcompare.py |
407 |
-@@ -106,7 +106,7 @@ |
408 |
- return orig, missed, merged, expc, bad, doubled, l, labs |
409 |
- |
410 |
- def notes_roc (la, lb, eps): |
411 |
-- from numarray import transpose, add, resize |
412 |
-+ from numpy import transpose, add, resize |
413 |
- """ creates a matrix of size len(la)*len(lb) then look for hit and miss |
414 |
- in it within eps tolerance windows """ |
415 |
- gdn,fpw,fpg,fpa,fdo,fdp = 0,0,0,0,0,0 |
416 |
---- python/aubio/task/beat.py |
417 |
-+++ python/aubio/task/beat.py |
418 |
-@@ -247,7 +247,7 @@ |
419 |
- |
420 |
- def plot(self,oplots,results): |
421 |
- import Gnuplot |
422 |
-- oplots.append(Gnuplot.Data(results,with='linespoints',title="auto")) |
423 |
-+ oplots.append(Gnuplot.Data(results,with_='linespoints',title="auto")) |
424 |
- |
425 |
- def plotplot(self,wplot,oplots,outplot=None,extension=None,xsize=1.,ysize=1.,spectro=False): |
426 |
- import Gnuplot |
427 |
-@@ -258,5 +258,5 @@ |
428 |
- #f = make_audio_plot(time,data) |
429 |
- |
430 |
- g = gnuplot_create(outplot=outplot, extension=extension) |
431 |
-- oplots = [Gnuplot.Data(self.gettruth(),with='linespoints',title="orig")] + oplots |
432 |
-+ oplots = [Gnuplot.Data(self.gettruth(),with_='linespoints',title="orig")] + oplots |
433 |
- g.plot(*oplots) |
434 |
---- python/aubio/task/notes.py |
435 |
-+++ python/aubio/task/notes.py |
436 |
-@@ -92,18 +92,17 @@ |
437 |
- return now, onset, freq, ifreq |
438 |
- |
439 |
- def plot(self,now,onset,freq,ifreq,oplots): |
440 |
-- import numarray |
441 |
- import Gnuplot |
442 |
- |
443 |
-- oplots.append(Gnuplot.Data(now,freq,with='lines', |
444 |
-+ oplots.append(Gnuplot.Data(now,freq,with_='lines', |
445 |
- title=self.params.pitchmode)) |
446 |
-- oplots.append(Gnuplot.Data(now,ifreq,with='lines', |
447 |
-+ oplots.append(Gnuplot.Data(now,ifreq,with_='lines', |
448 |
- title=self.params.pitchmode)) |
449 |
- |
450 |
- temponsets = [] |
451 |
- for i in onset: |
452 |
- temponsets.append(i*1000) |
453 |
-- oplots.append(Gnuplot.Data(now,temponsets,with='impulses', |
454 |
-+ oplots.append(Gnuplot.Data(now,temponsets,with_='impulses', |
455 |
- title=self.params.pitchmode)) |
456 |
- |
457 |
- def plotplot(self,wplot,oplots,outplot=None,multiplot = 0): |
458 |
-@@ -117,10 +116,10 @@ |
459 |
- # check if ground truth exists |
460 |
- #timet,pitcht = self.gettruth() |
461 |
- #if timet and pitcht: |
462 |
-- # oplots = [Gnuplot.Data(timet,pitcht,with='lines', |
463 |
-+ # oplots = [Gnuplot.Data(timet,pitcht,with_='lines', |
464 |
- # title='ground truth')] + oplots |
465 |
- |
466 |
-- t = Gnuplot.Data(0,0,with='impulses') |
467 |
-+ t = Gnuplot.Data(0,0,with_='impulses') |
468 |
- |
469 |
- g = gnuplot_init(outplot) |
470 |
- g('set title \'%s\'' % (re.sub('.*/','',self.input))) |
471 |
---- python/aubio/task/onset.py |
472 |
-+++ python/aubio/task/onset.py |
473 |
-@@ -92,7 +92,7 @@ |
474 |
- import Gnuplot, Gnuplot.funcutils |
475 |
- import aubio.txtfile |
476 |
- import os.path |
477 |
-- import numarray |
478 |
-+ from numpy import arange, array, ones |
479 |
- from aubio.onsetcompare import onset_roc |
480 |
- |
481 |
- x1,y1,y1p = [],[],[] |
482 |
-@@ -102,8 +102,8 @@ |
483 |
- self.lenofunc = len(ofunc) |
484 |
- self.maxofunc = max(ofunc) |
485 |
- # onset detection function |
486 |
-- downtime = numarray.arange(len(ofunc))*self.params.step |
487 |
-- oplot.append(Gnuplot.Data(downtime,ofunc,with='lines',title=self.params.onsetmode)) |
488 |
-+ downtime = arange(len(ofunc))*self.params.step |
489 |
-+ oplot.append(Gnuplot.Data(downtime,ofunc,with_='lines',title=self.params.onsetmode)) |
490 |
- |
491 |
- # detected onsets |
492 |
- if not nplot: |
493 |
-@@ -111,11 +111,11 @@ |
494 |
- x1.append(i[0]*self.params.step) |
495 |
- y1.append(self.maxofunc) |
496 |
- y1p.append(-self.maxofunc) |
497 |
-- #x1 = numarray.array(onsets)*self.params.step |
498 |
-- #y1 = self.maxofunc*numarray.ones(len(onsets)) |
499 |
-+ #x1 = array(onsets)*self.params.step |
500 |
-+ #y1 = self.maxofunc*ones(len(onsets)) |
501 |
- if x1: |
502 |
-- oplot.append(Gnuplot.Data(x1,y1,with='impulses')) |
503 |
-- wplot.append(Gnuplot.Data(x1,y1p,with='impulses')) |
504 |
-+ oplot.append(Gnuplot.Data(x1,y1,with_='impulses')) |
505 |
-+ wplot.append(Gnuplot.Data(x1,y1p,with_='impulses')) |
506 |
- |
507 |
- oplots.append((oplot,self.params.onsetmode,self.maxofunc)) |
508 |
- |
509 |
-@@ -126,9 +126,9 @@ |
510 |
- self.title = "" #"(no ground truth)" |
511 |
- else: |
512 |
- t_onsets = aubio.txtfile.read_datafile(datafile) |
513 |
-- x2 = numarray.array(t_onsets).resize(len(t_onsets)) |
514 |
-- y2 = self.maxofunc*numarray.ones(len(t_onsets)) |
515 |
-- wplot.append(Gnuplot.Data(x2,y2,with='impulses')) |
516 |
-+ x2 = array(t_onsets).resize(len(t_onsets)) |
517 |
-+ y2 = self.maxofunc*ones(len(t_onsets)) |
518 |
-+ wplot.append(Gnuplot.Data(x2,y2,with_='impulses')) |
519 |
- |
520 |
- tol = 0.050 |
521 |
- |
522 |
---- python/aubio/task/pitch.py |
523 |
-+++ python/aubio/task/pitch.py |
524 |
-@@ -156,7 +156,7 @@ |
525 |
- |
526 |
- time = [ (i+self.params.pitchdelay)*self.params.step for i in range(len(pitch)) ] |
527 |
- pitch = [aubio_freqtomidi(i) for i in pitch] |
528 |
-- oplots.append(Gnuplot.Data(time,pitch,with='lines', |
529 |
-+ oplots.append(Gnuplot.Data(time,pitch,with_='lines', |
530 |
- title=self.params.pitchmode)) |
531 |
- titles.append(self.params.pitchmode) |
532 |
- |
533 |
-@@ -170,7 +170,7 @@ |
534 |
- if truth: |
535 |
- timet,pitcht = self.gettruth() |
536 |
- if timet and pitcht: |
537 |
-- oplots = [Gnuplot.Data(timet,pitcht,with='lines', |
538 |
-+ oplots = [Gnuplot.Data(timet,pitcht,with_='lines', |
539 |
- title='ground truth')] + oplots |
540 |
- |
541 |
- g = gnuplot_create(outplot=outplot, extension=extension) |
542 |
---- python/aubiofilter-notes |
543 |
-+++ python/aubiofilter-notes |
544 |
-@@ -78,7 +78,7 @@ |
545 |
- |
546 |
- from aubio import notefilter,txtfile,gnuplot |
547 |
- """ load midi and raw data """ |
548 |
-- from numarray import array |
549 |
-+ from numpy import array |
550 |
- notelist = array(txtfile.read_datafile(input)) |
551 |
- """ filter it out """ |
552 |
- notelist_filtered = notefilter.segraw_onsets4(notelist,winlength,eps) |
553 |
---- python/aubionotes |
554 |
-+++ python/aubionotes |
555 |
-@@ -4,7 +4,6 @@ |
556 |
- |
557 |
- import aubio.aubioclass |
558 |
- import aubio.median |
559 |
-- #from numarray import around |
560 |
- from math import floor |
561 |
- hopsize = 512 |
562 |
- bufsize = 4096 |
563 |
---- python/aubioplot-notes |
564 |
-+++ python/aubioplot-notes |
565 |
-@@ -18,7 +18,7 @@ |
566 |
- def main (sysargs) : |
567 |
- from aubio.txtfile import read_datafile |
568 |
- from aubio.gnuplot import plotnote,plotnote_do |
569 |
-- from numarray import array |
570 |
-+ from numpy import array |
571 |
- filein,fileout = parse_args(sysargs) |
572 |
- #print 'checking', fileerr, 'against', fileorg |
573 |
- """ load midi and raw data """ |
574 |
---- python/aubioweb.py |
575 |
-+++ python/aubioweb.py |
576 |
-@@ -11,7 +11,7 @@ |
577 |
- sndfile-programs (sndfile-info) |
578 |
- vorbis-tools (oggenc) |
579 |
- python-gnuplot |
580 |
--python-numarray |
581 |
-+python-numpy |
582 |
- |
583 |
- Try the command line tools in aubio/python to test your installation. |
584 |
- |
585 |
---- python/aubio/plot/keyboard.py |
586 |
-+++ python/aubio/plot/keyboard.py |
587 |
-@@ -30,8 +30,8 @@ |
588 |
- yb = [y0+(y1-y0)*2/3. for i in range(len(xb))] |
589 |
- ybdelta = [(y1-y0)*1/3. for i in range(len(xb))] |
590 |
- |
591 |
-- whites = Gnuplot.Data(xw,yw,xwdelta,ywdelta,with = 'boxxyerrorbars') |
592 |
-- blacks = Gnuplot.Data(xb,yb,xbdelta,ybdelta,with = 'boxxyerrorbars fill solid') |
593 |
-+ whites = Gnuplot.Data(xw,yw,xwdelta,ywdelta,with_ = 'boxxyerrorbars') |
594 |
-+ blacks = Gnuplot.Data(xb,yb,xbdelta,ybdelta,with_ = 'boxxyerrorbars fill solid') |
595 |
- |
596 |
- return blacks,whites |
597 |
- |