Changeset 1ece4f8 for src

Timestamp:

Dec 17, 2013, 5:20:23 PM (11 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:

4ed0ed1

Parents:

941c9f9

Message:

src/fmat.h: clean up fmat api

Location:

src

Files:

• fmat.c (modified) (1 diff)
• fmat.h (modified) (5 diffs)

src/fmat.c

@@ -49 +49 @@
 }
 
-void fmat_write_sample(fmat_t *s, smpl_t data, uint_t channel, uint_t position) {
+void fmat_set_sample(fmat_t *s, smpl_t data, uint_t channel, uint_t position) {
   s->data[channel][position] = data;
 }
-smpl_t fmat_read_sample(fmat_t *s, uint_t channel, uint_t position) {
+
+smpl_t fmat_get_sample(fmat_t *s, uint_t channel, uint_t position) {
   return s->data[channel][position];
 }
-void fmat_put_channel(fmat_t *s, smpl_t * data, uint_t channel) {
-  s->data[channel] = data;
-}
+
 void fmat_get_channel(fmat_t *s, uint_t channel, fvec_t *output) {
   output->data = s->data[channel];
   output->length = s->length;
   return;
+}
+
+smpl_t * fmat_get_channel_data(fmat_t *s, uint_t channel) {
+  return s->data[channel];
 }
 

src/fmat.h

@@ -51 +51 @@
 */
 fmat_t * new_fmat(uint_t length, uint_t height);
+
 /** fmat_t buffer deletion function
 
@@ -57 +58 @@
 */
 void del_fmat(fmat_t *s);
+
 /** read sample value in a buffer
-
-  Note that this function is not used in the aubio library, since the same
-  result can be obtained using vec->data[channel][position]. Its purpose is to
-  access these values from wrappers, as created by swig.
 
   \param s vector to read from
@@ -68 +66 @@
 
 */
-smpl_t fmat_read_sample(fmat_t *s, uint_t channel, uint_t position);
+smpl_t fmat_get_sample(fmat_t *s, uint_t channel, uint_t position);
+
 /** write sample value in a buffer
-
-  Note that this function is not used in the aubio library, since the same
-  result can be obtained by assigning vec->data[channel][position]. Its purpose
-  is to access these values from wrappers, as created by swig.
 
   \param s vector to write to 
@@ -81 +76 @@
 
 */
-void  fmat_write_sample(fmat_t *s, smpl_t data, uint_t channel, uint_t position);
+void  fmat_set_sample(fmat_t *s, smpl_t data, uint_t channel, uint_t position);
+
 /** read channel vector from a buffer
-
-  Note that this function is not used in the aubio library, since the same
-  result can be obtained with vec->data[channel]. Its purpose is to access
-  these values from wrappers, as created by swig.
 
   \param s vector to read from
@@ -94 +86 @@
 */
 void fmat_get_channel (fmat_t *s, uint_t channel, fvec_t *output);
-/** write channel vector into a buffer
 
-  Note that this function is not used in the aubio library, since the same
-  result can be obtained by assigning vec->data[channel]. Its purpose is to
-  access these values from wrappers, as created by swig.
+/** get vector buffer from an fmat data
 
-  \param s vector to write to 
-  \param data vector of [length] values to write
-  \param channel channel to write to 
+  \param s vector to read from
+  \param channel channel to read from
 
 */
-void fmat_put_channel(fmat_t *s, smpl_t * data, uint_t channel);
+smpl_t * fmat_get_channel_data (fmat_t *s, uint_t channel);
+
 /** read data from a buffer
-
-  Note that this function is not used in the aubio library, since the same
-  result can be obtained with vec->data. Its purpose is to access these values
-  from wrappers, as created by swig.
 
   \param s vector to read from