Changeset ffd10fb for src

Timestamp:

Oct 3, 2016, 8:46:46 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, yinfft+

Children:

54eba9d

Parents:

61a1e5d

Message:

src/notes/notes.h: add _{get,set}_silence methods

Location:

src/notes

Files:

• notes.c (modified) (3 diffs)
• notes.h (modified) (1 diff)

src/notes/notes.c

@@ -25 +25 @@
 #include "notes/notes.h"
 
+#define DEFAULT_NOTES_SILENCE -50.
+
 struct _aubio_notes_t {
 
@@ -91 +93 @@
   o->newnote = 0.;
 
-  o->silence_threshold = -90.;
+  aubio_notes_set_silence(o, DEFAULT_NOTES_SILENCE);
 
   return o;
@@ -98 +100 @@
   del_aubio_notes(o);
   return NULL;
+}
+
+uint_t aubio_notes_set_silence(aubio_notes_t *o, smpl_t silence)
+{
+  uint_t err = AUBIO_OK;
+  if (aubio_pitch_set_silence(o->pitch, silence) != AUBIO_OK) {
+    err = AUBIO_FAIL;
+  }
+  if (aubio_onset_set_silence(o->onset, silence) != AUBIO_OK) {
+    err = AUBIO_FAIL;
+  }
+  return err;
+}
+
+smpl_t aubio_notes_get_silence(const aubio_notes_t *o)
+{
+  return aubio_pitch_get_silence(o->pitch);
 }
 

src/notes/notes.h

@@ -52 +52 @@
 
   \param o note detection object as returned by new_aubio_notes()
-  \param in input signal of size [hop_size]
-  \param out output notes of size [3] ? FIXME
+  \param input input signal of size [hop_size]
+  \param output output notes, fvec of length 3
+
+  The notes output is a vector of length 3 containing:
+   - 0. the midi note value, or 0 if no note was found
+   - 1. the note velocity
+   - 2. the midi note to turn off
 
 */
 void aubio_notes_do (aubio_notes_t *o, const fvec_t * input, fvec_t * output);
+
+/** set notes detection silence threshold
+
+  \param o notes detection object as returned by new_aubio_notes()
+  \param silence new silence detection threshold
+
+*/
+uint_t aubio_notes_set_silence(aubio_notes_t * o, smpl_t silence);
+
+/** get notes detection silence threshold
+
+  \param o notes detection object as returned by new_aubio_notes()
+
+  \return current silence threshold
+
+*/
+smpl_t aubio_notes_get_silence(const aubio_notes_t * o);
 
 #ifdef __cplusplus