projects
/
aubio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
58c408d
)
src/io/source_apple_audio.c: set s->path, quiet
author
Paul Brossier
<piem@piem.org>
Mon, 21 Jul 2014 01:55:06 +0000
(20:55 -0500)
committer
Paul Brossier
<piem@piem.org>
Mon, 21 Jul 2014 01:55:06 +0000
(20:55 -0500)
src/io/source_apple_audio.c
patch
|
blob
|
history
diff --git
a/src/io/source_apple_audio.c
b/src/io/source_apple_audio.c
index
c3ed236
..
1d37198
100644
(file)
--- a/
src/io/source_apple_audio.c
+++ b/
src/io/source_apple_audio.c
@@
-60,8
+60,26
@@
aubio_source_apple_audio_t * new_aubio_source_apple_audio(char_t * path, uint_t
{
aubio_source_apple_audio_t * s = AUBIO_NEW(aubio_source_apple_audio_t);
{
aubio_source_apple_audio_t * s = AUBIO_NEW(aubio_source_apple_audio_t);
+ if (path == NULL) {
+ AUBIO_ERROR("source_apple_audio: Aborted opening null path\n");
+ goto beach;
+ }
+
+ if ( (sint_t)block_size <= 0 ) {
+ AUBIO_ERROR("source_apple_audio: Can not open %s with null or negative block_size %d\n",
+ path, block_size);
+ goto beach;
+ }
+
+ if ( (sint_t)samplerate < 0 ) {
+ AUBIO_ERROR("source_apple_audio: Can not open %s with negative samplerate %d\n",
+ path, samplerate);
+ goto beach;
+ }
+
s->block_size = block_size;
s->samplerate = samplerate;
s->block_size = block_size;
s->samplerate = samplerate;
+ s->path = path;
if ( aubio_source_apple_audio_open ( s, path ) ) {
goto beach;
if ( aubio_source_apple_audio_open ( s, path ) ) {
goto beach;
@@
-139,7
+157,7
@@
uint_t aubio_source_apple_audio_open (aubio_source_apple_audio_t *s, char_t * pa
AUBIO_ERROR("source_apple_audio: Failed opening %s, "
"error in ExtAudioFileSetProperty (%s)\n", s->path,
getPrintableOSStatusError(errorstr, err));
AUBIO_ERROR("source_apple_audio: Failed opening %s, "
"error in ExtAudioFileSetProperty (%s)\n", s->path,
getPrintableOSStatusError(errorstr, err));
-#if
1
+#if
0
// print client and format descriptions
AUBIO_DBG("Opened %s\n", s->path);
AUBIO_DBG("file/client Format.mFormatID: : %3c%c%c%c / %c%c%c%c\n",
// print client and format descriptions
AUBIO_DBG("Opened %s\n", s->path);
AUBIO_DBG("file/client Format.mFormatID: : %3c%c%c%c / %c%c%c%c\n",