Changeset 2a49114

Timestamp:

Feb 23, 2014, 9:42:00 PM (11 years ago)

Author:

Paul Brossier <piem@piem.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:

584016f

Parents:

060a3135

Message:

python/lib/aubio/slicing.py: respect source number of channels when slicing

File:

• python/lib/aubio/slicing.py (modified) (4 diffs)

python/lib/aubio/slicing.py

@@ -45 +45 @@
     while True:
         # get hopsize new samples from source
-        vec, read = s()
+        vec, read = s.do_multi()
         # if the total number of frames read will exceed the next region start
         if len(regions) and total_frames + read >= regions[0][0]:
@@ -54 +54 @@
             new_sink_path = new_sink_name(source_base_name, start_stamp, samplerate)
             # create its sink
-            g = sink(new_sink_path, samplerate)
+            g = sink(new_sink_path, samplerate, s.channels)
             # create a dictionary containing all this
             new_slice = {'start_stamp': start_stamp, 'end_stamp': end_stamp, 'sink': g}
@@ -73 +73 @@
                 if remaining > start:
                     # write remaining samples from current region
-                    g(vec[start:remaining], remaining - start)
+                    g.do_multi(vec[:,start:remaining], remaining - start)
                     #print "closing region", "remaining", remaining
                     # close this file
@@ -79 +79 @@
             elif read > start:
                 # write all the samples
-                g(vec[start:read], read - start)
+                g.do_multi(vec[:,start:read], read - start)
         total_frames += read
         if read < hopsize: break