Changes in python/lib/aubio/slicing.py [2c8ada6:f9400d0]

File:

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

python/lib/aubio/slicing.py

@@ -5 +5 @@
 
 _max_timestamp = 1e120
-
 
 def slice_source_at_stamps(source_file, timestamps, timestamps_end=None,
@@ -74 +73 @@
     """
 
-    if not timestamps:
+    if timestamps is None or len(timestamps) == 0:
         raise ValueError("no timestamps given")
 
@@ -91 +90 @@
 
     regions = list(zip(timestamps, timestamps_end))
+    #print regions
 
     source_base_name, _ = os.path.splitext(os.path.basename(source_file))
@@ -98 +98 @@
         source_base_name = os.path.join(output_dir, source_base_name)
 
-    def _new_sink_name(source_base_name, timestamp, samplerate):
-        # create name based on a timestamp in samples, converted in seconds
+    def new_sink_name(source_base_name, timestamp, samplerate):
+        """ create a sink based on a timestamp in samples, converted in seconds """
         timestamp_seconds = timestamp / float(samplerate)
         return source_base_name + "_%011.6f" % timestamp_seconds + '.wav'
@@ -114 +114 @@
         vec, read = _source.do_multi()
         # if the total number of frames read will exceed the next region start
-        while regions and total_frames + read >= regions[0][0]:
+        while len(regions) and total_frames + read >= regions[0][0]:
+            #print "getting", regions[0], "at", total_frames
             # get next region
             start_stamp, end_stamp = regions.pop(0)
             # create a name for the sink
-            new_sink_path = _new_sink_name(source_base_name, start_stamp,
-                                           samplerate)
+            new_sink_path = new_sink_name(source_base_name, start_stamp, samplerate)
             # create its sink
             _sink = sink(new_sink_path, samplerate, _source.channels)
             # create a dictionary containing all this
-            new_slice = {'start_stamp': start_stamp, 'end_stamp': end_stamp,
-                         'sink': _sink}
+            new_slice = {'start_stamp': start_stamp, 'end_stamp': end_stamp, 'sink': _sink}
             # append the dictionary to the current list of slices
             slices.append(new_slice)
@@ -136 +135 @@
             # number of samples yet to written be until end of region
             remaining = end_stamp - total_frames + 1
+            #print current_slice, remaining, start
             # not enough frames remaining, time to split
             if remaining < read:
@@ -141 +141 @@
                     # write remaining samples from current region
                     _sink.do_multi(vec[:, start:remaining], remaining - start)
+                    #print("closing region", "remaining", remaining)
                     # close this file
                     _sink.close()
@@ -149 +150 @@
         # remove old slices
         slices = list(filter(lambda s: s['end_stamp'] > total_frames,
-                             slices))
+            slices))
         if read < hopsize:
             break