Changes in / [6e765ed:985d5c4]

Location:

src/io

Files:

• source.c (modified) (7 diffs)
• source.h (modified) (1 diff)

src/io/source.c

@@ -41 +41 @@
 typedef uint_t (*aubio_source_get_samplerate_t)(aubio_source_t * s);
 typedef uint_t (*aubio_source_get_channels_t)(aubio_source_t * s);
-typedef uint_t (*aubio_source_get_duration_t)(aubio_source_t * s);
 typedef uint_t (*aubio_source_seek_t)(aubio_source_t * s, uint_t seek);
 typedef uint_t (*aubio_source_close_t)(aubio_source_t * s);
@@ -52 +51 @@
   aubio_source_get_samplerate_t s_get_samplerate;
   aubio_source_get_channels_t s_get_channels;
-  aubio_source_get_duration_t s_get_duration;
   aubio_source_seek_t s_seek;
   aubio_source_close_t s_close;
@@ -67 +65 @@
     s->s_get_channels = (aubio_source_get_channels_t)(aubio_source_avcodec_get_channels);
     s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_avcodec_get_samplerate);
-    s->s_get_duration = (aubio_source_get_duration_t)(aubio_source_avcodec_get_duration);
     s->s_seek = (aubio_source_seek_t)(aubio_source_avcodec_seek);
     s->s_close = (aubio_source_close_t)(aubio_source_avcodec_close);
@@ -81 +78 @@
     s->s_get_channels = (aubio_source_get_channels_t)(aubio_source_apple_audio_get_channels);
     s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_apple_audio_get_samplerate);
-    s->s_get_duration = (aubio_source_get_duration_t)(aubio_source_apple_audio_get_duration);
     s->s_seek = (aubio_source_seek_t)(aubio_source_apple_audio_seek);
     s->s_close = (aubio_source_close_t)(aubio_source_apple_audio_close);
@@ -95 +91 @@
     s->s_get_channels = (aubio_source_get_channels_t)(aubio_source_sndfile_get_channels);
     s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_sndfile_get_samplerate);
-    s->s_get_duration = (aubio_source_get_duration_t)(aubio_source_sndfile_get_duration);
     s->s_seek = (aubio_source_seek_t)(aubio_source_sndfile_seek);
     s->s_close = (aubio_source_close_t)(aubio_source_sndfile_close);
@@ -109 +104 @@
     s->s_get_channels = (aubio_source_get_channels_t)(aubio_source_wavread_get_channels);
     s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_wavread_get_samplerate);
-    s->s_get_duration = (aubio_source_get_duration_t)(aubio_source_wavread_get_duration);
     s->s_seek = (aubio_source_seek_t)(aubio_source_wavread_seek);
     s->s_close = (aubio_source_close_t)(aubio_source_wavread_close);
@@ -148 +142 @@
 }
 
-uint_t aubio_source_get_duration(aubio_source_t *s) {
-  return s->s_get_duration((void *)s->source);
-}
-
 uint_t aubio_source_seek (aubio_source_t * s, uint_t seek ) {
   return s->s_seek((void *)s->source, seek);

src/io/source.h

@@ -150 +150 @@
 /**
 
-  get the duration of source object, in frames
-
-  \param s source object, created with ::new_aubio_source
-  \return number of frames in file
-
-*/
-uint_t aubio_source_get_duration (aubio_source_t * s);
-
-/**
-
   close source object