diff options
| author | David Robillard <d@drobilla.net> | 2006-07-14 03:43:32 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-07-14 03:43:32 +0000 |
| commit | 50a3102b9b533d7f8786d220f8df67421b9227c8 (patch) | |
| tree | 669f84631ba1d9a1d312e3f76b226ca938c75c0f /libs/libsndfile | |
| parent | edd841895b873b14c4aa814a80de5dc20ff30618 (diff) | |
Merge big changes (mostly Controllable) from trunk
git-svn-id: svn://localhost/ardour2/branches/midi@682 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/libsndfile')
| -rw-r--r-- | libs/libsndfile/src/sndfile.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libs/libsndfile/src/sndfile.c b/libs/libsndfile/src/sndfile.c index 47b74cfd7f..14586526e4 100644 --- a/libs/libsndfile/src/sndfile.c +++ b/libs/libsndfile/src/sndfile.c @@ -1065,20 +1065,19 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize) memcpy (data, psf->loop_info, sizeof (SF_LOOP_INFO)) ; return SF_TRUE ; - case SFC_SET_BROADCAST_INFO : - { int format = psf->sf.format & SF_FORMAT_TYPEMASK ; + case SFC_SET_BROADCAST_INFO : { + int format = psf->sf.format & SF_FORMAT_TYPEMASK ; - /* Only WAV supports the BEXT (Broadcast) chunk. */ - if (format != SF_FORMAT_WAV && format != SF_FORMAT_WAVEX) - return SF_FALSE ; - } ; + /* Only WAV supports the BEXT (Broadcast) chunk. */ + if (format != SF_FORMAT_WAV && format != SF_FORMAT_WAVEX) + return SF_FALSE ; /* Can only do this is in SFM_RDWR or SFM_WRITE modes. */ if (psf->mode == SFM_READ) return SF_FALSE ; /* If data has already been written this must fail. */ - if (psf->broadcast_info == NULL && psf->have_written) + if (psf->broadcast_info == NULL && psf->have_written) return SF_FALSE ; if (psf->broadcast_info == NULL) @@ -1089,7 +1088,9 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize) if (psf->auto_header && psf->write_header) psf->write_header (psf, SF_TRUE) ; + return SF_TRUE ; + } case SFC_GET_BROADCAST_INFO : if (datasize != sizeof (SF_BROADCAST_INFO) || data == NULL) |