Changeset 70762c5 for python/lib

Timestamp:

Sep 14, 2017, 1:17:54 PM (7 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

Children:

8a3acad

Parents:

b24c909

Message:

python/lib/aubio/cmd.py: add some doc, prefix unused variables with _

File:

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

python/lib/aubio/cmd.py

@@ -119 +119 @@
     # quiet subcommand
     subparser = subparsers.add_parser('quiet',
-            help='')
+            help='extract timestamps of quiet and loud regions')
     parser_add_input(subparser)
     parser_add_hop_size(subparser)
@@ -210 +210 @@
     return "%f\t" % (1000. * n_frames / float(samplerate))
 
-def samples2samples(n_frames, samplerate):
+def samples2samples(n_frames, _samplerate):
     return "%d\t" % n_frames
 
@@ -272 +272 @@
     def __call__(self, block):
         return self.onset(block)
-    def repr_res(self, res, frames_read, samplerate):
+    def repr_res(self, res, _frames_read, samplerate):
         if res[0] != 0:
             outstr = self.time2string(self.onset.get_last(), samplerate)
@@ -303 +303 @@
     def __call__(self, block):
         return self.tempo(block)
-    def repr_res(self, res, frames_read, samplerate):
+    def repr_res(self, res, _frames_read, samplerate):
         if res[0] != 0:
             outstr = self.time2string(self.tempo.get_last(), samplerate)
@@ -312 +312 @@
         super(process_tempo, self).__init__(args)
         self.beat_locations = []
-    def repr_res(self, res, frames_read, samplerate):
+    def repr_res(self, res, _frames_read, samplerate):
         if res[0] != 0:
             self.beat_locations.append(self.tempo.get_last_s())
@@ -401 +401 @@
         valid_opts = ['hop_size', 'silence']
         self.parse_options(args, valid_opts)
-        self.issilence = None
         self.wassilence = 1
 
@@ -410 +409 @@
     def __call__(self, block):
         if aubio.silence_detection(block, self.silence) == 1:
-            if self.wassilence == 1:
-                self.issilence = 1
-            else:
-                self.issilence = 2
-            self.wassilence = 1
+            if self.wassilence != 1:
+                self.wassilence = 1
+                return 2 # newly found silence
+            return 1 # silence again
         else:
-            if self.wassilence == 0:
-                self.issilence = 0
-            else:
-                self.issilence = -1
-            self.wassilence = 0
+            if self.wassilence != 0:
+                self.wassilence = 0
+                return -1 # newly found noise
+            return 0 # noise again
 
     def repr_res(self, res, frames_read, samplerate):
         fmt_out = None
-        if self.issilence == -1:
+        if res == -1:
             fmt_out = "NOISY: "
-        if self.issilence == 2:
+        if res == 2:
             fmt_out = "QUIET: "
         if fmt_out is not None: