Changeset 6288806

Timestamp:

Mar 23, 2017, 3:03:29 PM (8 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, sampler

Children:

5ab3c4e

Parents:

53fbd58

Message:

python/lib/aubio/cmd.py: simplify repr_res

File:

• python/lib/aubio/cmd.py (modified) (7 diffs)

python/lib/aubio/cmd.py

@@ -215 +215 @@
     def __call__(self, block):
         return self.onset(block)
-    def repr_res(self, res, frames_read, a_source):
+    def repr_res(self, res, frames_read, samplerate):
         if res[0] != 0:
-            outstr = self.time2string(self.onset.get_last(), a_source.samplerate)
+            outstr = self.time2string(self.onset.get_last(), samplerate)
             sys.stdout.write(outstr + '\n')
 
@@ -232 +232 @@
     def __call__(self, block):
         return self.pitch(block)
-    def repr_res(self, res, frames_read, a_source):
-        fmt_out = self.time2string(frames_read, a_source.samplerate)
+    def repr_res(self, res, frames_read, samplerate):
+        fmt_out = self.time2string(frames_read, samplerate)
         sys.stdout.write(fmt_out + "%.6f\n" % res[0])
 
@@ -244 +244 @@
     def __call__(self, block):
         return self.tempo(block)
-    def repr_res(self, res, frames_read, a_source):
+    def repr_res(self, res, frames_read, samplerate):
         if res[0] != 0:
-            outstr = self.time2string(self.tempo.get_last(), a_source.samplerate)
+            outstr = self.time2string(self.tempo.get_last(), samplerate)
             sys.stdout.write(outstr + '\n')
 
@@ -257 +257 @@
     def __call__(self, block):
         return self.notes(block)
-    def repr_res(self, res, frames_read, a_source):
+    def repr_res(self, res, frames_read, samplerate):
         if res[2] != 0: # note off
-            fmt_out = self.time2string(frames_read, a_source.samplerate)
+            fmt_out = self.time2string(frames_read, samplerate)
             sys.stdout.write(fmt_out + '\n')
         if res[0] != 0: # note on
             lastmidi = res[0]
             fmt_out = "%f\t" % lastmidi
-            fmt_out += self.time2string(frames_read, a_source.samplerate)
+            fmt_out += self.time2string(frames_read, samplerate)
             sys.stdout.write(fmt_out) # + '\t')
 
@@ -284 +284 @@
         fftgrain = self.pv(block)
         return self.mfcc(fftgrain)
-    def repr_res(self, res, frames_read, a_source):
-        fmt_out = self.time2string(frames_read, a_source.samplerate)
+    def repr_res(self, res, frames_read, samplerate):
+        fmt_out = self.time2string(frames_read, samplerate)
         fmt_out += ' '.join(["% 9.7f" % f for f in res.tolist()])
         sys.stdout.write(fmt_out + '\n')
@@ -309 +309 @@
         fftgrain = self.pv(block)
         return self.filterbank(fftgrain)
-    def repr_res(self, res, frames_read, a_source):
-        fmt_out = self.time2string(frames_read, a_source.samplerate)
+    def repr_res(self, res, frames_read, samplerate):
+        fmt_out = self.time2string(frames_read, samplerate)
         fmt_out += ' '.join(["% 9.7f" % f for f in res.tolist()])
         sys.stdout.write(fmt_out + '\n')
@@ -346 +346 @@
                 # print results for this block
                 if args.verbose > 0:
-                    processor.repr_res(res, frames_read, a_source)
+                    processor.repr_res(res, frames_read, a_source.samplerate)
                 # increment total number of frames read
                 frames_read += read