Changeset 5e9c68a for python

Timestamp:

Aug 9, 2005, 7:56:21 PM (19 years ago)

Author:

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

a29ad46

Parents:

28d8c4a

Message:

rename file_ to aubio_sndfile, protect aubio_pitdetection_{mode,type} enumerators

Location:

python

Files:

• aubio/aubioclass.py (modified) (3 diffs)
• aubiopitch (modified) (2 diffs)

python/aubio/aubioclass.py

@@ -30 +30 @@
     def __init__(self,filename,model=None):
         if (model!=None):
-            self.file = new_file_wo(model.file,filename)
+            self.file = new_aubio_sndfile_wo(model.file,filename)
         else:
-            self.file = new_file_ro(filename)
-    def __del__(self):
-        del_file(self.file)
+            self.file = new_aubio_sndfile_ro(filename)
+    def __del__(self):
+        del_aubio_sndfile(self.file)
     def info(self):
-        file_info(self.file)
+        aubio_sndfile_info(self.file)
     def samplerate(self):
-        return aubio_file_samplerate(self.file)
+        return aubio_sndfile_samplerate(self.file)
     def channels(self):
-        return aubio_file_channels(self.file)
+        return aubio_sndfile_channels(self.file)
     def read(self,nfram,vecread):
-        return file_read(self.file,nfram,vecread())
+        return aubio_sndfile_read(self.file,nfram,vecread())
     def write(self,nfram,vecwrite):
-        return file_write(self.file,nfram,vecwrite())
+        return aubio_sndfile_write(self.file,nfram,vecwrite())
 
 class pvoc:
@@ -205 +205 @@
     return mylist
 
-def getpitch(filein,mode=aubio_mcomb,bufsize=1024,hopsize=512,omode=aubio_freq,
+def getpitch(filein,mode=aubio_pitch_mcomb,bufsize=1024,hopsize=512,omode=aubio_pitchm_freq,
         samplerate=44100.,silence=-70):
     frameread = 0
@@ -228 +228 @@
 
 class pitchdetection:
-    def __init__(self,mode=aubio_mcomb,bufsize=2048,hopsize=1024,
-        channels=1,samplerate=44100.,omode=aubio_freq):
+    def __init__(self,mode=aubio_pitch_mcomb,bufsize=2048,hopsize=1024,
+        channels=1,samplerate=44100.,omode=aubio_pitchm_freq):
         self.pitchp = new_aubio_pitchdetection(bufsize,hopsize,channels,
                 samplerate,mode,omode)

python/aubiopitch

@@ -14 +14 @@
         nvalue = parser.rargs[0]
         if   nvalue == 'mcomb' :
-                 setattr(parser.values, option.dest, aubio_mcomb)
+                 setattr(parser.values, option.dest, aubio_pitch_mcomb)
         elif nvalue == 'yin'           :
-                 setattr(parser.values, option.dest, aubio_yin)
+                 setattr(parser.values, option.dest, aubio_pitch_yin)
         elif nvalue == 'fcomb'         :
-                 setattr(parser.values, option.dest, aubio_fcomb)
+                 setattr(parser.values, option.dest, aubio_pitch_fcomb)
         elif nvalue == 'schmitt'      :
-                 setattr(parser.values, option.dest, aubio_schmitt)
+                 setattr(parser.values, option.dest, aubio_pitch_schmitt)
 
 
@@ -30 +30 @@
                           help="input sound file")
         parser.add_option("-m","--mode", action="callback", 
-                          callback=check_mode, dest="mode", default=aubio_mcomb,
+                          callback=check_mode, dest="mode", default=aubio_pitch_mcomb,
                           help="pitch detection mode [default=mcomb] \
                           mcomb|yin|fcomb|schmitt")