Changeset c159aeb for src

Timestamp:

Sep 29, 2009, 7:58:03 AM (15 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:

a253fd4

Parents:

a4364b8

Message:

src/temporal: rename adesign/adsgn to a_weighting, idem for c_weighting

Location:

src

Files:

• pitch/pitchdetection.c (modified) (2 diffs)
• temporal/a_weighting.c (moved) (moved from src/temporal/adesign.c) (2 diffs)
• temporal/a_weighting.h (moved) (moved from src/temporal/adesign.h) (2 diffs)
• temporal/c_weighting.c (moved) (moved from src/temporal/cdesign.c) (2 diffs)
• temporal/c_weighting.h (moved) (moved from src/temporal/cdesign.h) (2 diffs)
• temporal/filter.h (modified) (1 diff)

src/pitch/pitchdetection.c

@@ -24 +24 @@
 #include "mathutils.h"
 #include "temporal/filter.h"
-#include "temporal/cdesign.h"
+#include "temporal/c_weighting.h"
 #include "pitch/pitchmcomb.h"
 #include "pitch/pitchyin.h"
@@ -105 +105 @@
       p->fftgrain = new_cvec(bufsize, channels);
       p->mcomb    = new_aubio_pitchmcomb(bufsize,hopsize,channels,samplerate);
-      p->filter   = new_aubio_filter_cdsgn (samplerate, channels);
+      p->filter   = new_aubio_filter_c_weighting (samplerate, channels);
       p->callback = aubio_pitchdetection_mcomb;
       break;

src/temporal/a_weighting.c

@@ -25 +25 @@
 #include "lvec.h"
 #include "temporal/filter.h"
-#include "temporal/adesign.h"
+#include "temporal/a_weighting.h"
 
-void aubio_filter_set_adsgn (aubio_filter_t * f) {
+void aubio_filter_set_a_weighting (aubio_filter_t * f) {
 
   uint_t samplerate = aubio_filter_get_samplerate (f);
@@ -153 +153 @@
 }
 
-aubio_filter_t * new_aubio_filter_adsgn (uint_t samplerate, uint_t channels) {
+aubio_filter_t * new_aubio_filter_a_weighting (uint_t samplerate, uint_t channels) {
   aubio_filter_t * f = new_aubio_filter (samplerate, 7, channels);
-  aubio_filter_set_adsgn (f);
+  aubio_filter_set_a_weighting (f);
   return f;
 }

src/temporal/a_weighting.h

@@ -64 +64 @@
 
 */
-aubio_filter_t * new_aubio_filter_adsgn (uint_t samplerate, uint_t channels);
+aubio_filter_t * new_aubio_filter_a_weighting (uint_t samplerate, uint_t channels);
 
 /** set feedback and feedforward coefficients of a A-weighting filter
@@ -71 +71 @@
 
 */
-void aubio_filter_set_adsgn (aubio_filter_t *f);
+void aubio_filter_set_a_weighting (aubio_filter_t *f);
 
 #ifdef __cplusplus

src/temporal/c_weighting.c

@@ -24 +24 @@
 #include "lvec.h"
 #include "temporal/filter.h"
-#include "temporal/cdesign.h"
+#include "temporal/c_weighting.h"
 
-void aubio_filter_set_cdsgn (aubio_filter_t * f) {
+void aubio_filter_set_c_weighting (aubio_filter_t * f) {
 
   uint_t samplerate = aubio_filter_get_samplerate (f);
@@ -129 +129 @@
 }
 
-aubio_filter_t * new_aubio_filter_cdsgn (uint_t samplerate, uint_t channels) {
+aubio_filter_t * new_aubio_filter_c_weighting (uint_t samplerate, uint_t channels) {
   aubio_filter_t * f = new_aubio_filter(samplerate, 5, channels);
-  aubio_filter_set_cdsgn (f);
+  aubio_filter_set_c_weighting (f);
   return f;
 }

src/temporal/c_weighting.h

@@ -64 +64 @@
 
 */
-aubio_filter_t * new_aubio_filter_cdsgn (uint_t samplerate, uint_t channels);
+aubio_filter_t * new_aubio_filter_c_weighting (uint_t samplerate, uint_t channels);
 
 /** set feedback and feedforward coefficients of a C-weighting filter
@@ -71 +71 @@
 
 */
-void aubio_filter_set_cdsgn (aubio_filter_t *f);
+void aubio_filter_set_c_weighting (aubio_filter_t *f);
 
 #ifdef __cplusplus

src/temporal/filter.h

@@ -53 +53 @@
 
   Some convenience functions are provided: 
-    - new_aubio_filter_adsgn() and aubio_filter_set_adsgn(),
-    - new_aubio_filter_cdsgn() and aubio_filter_set_cdsgn().
+    - new_aubio_filter_a_weighting() and aubio_filter_set_a_weighting(),
+    - new_aubio_filter_c_weighting() and aubio_filter_set_c_weighting().
  
 */