diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-01 15:33:23 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-01 15:33:23 +0000 |
| commit | a0d4c9b392d021218f5a0e1b79d0011f7191134c (patch) | |
| tree | 0ef3e66e19869e5f25507db488e93903c03726f2 /libs/ardour/session_export.cc | |
| parent | 49a9fa20a56c6f5607e7bcf209985a67972c3f31 (diff) | |
merge 5674:5682 and 5689-5694 from mixbus branch
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5695 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_export.cc')
| -rw-r--r-- | libs/ardour/session_export.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc index db11c61276..e7c2596fe1 100644 --- a/libs/ardour/session_export.cc +++ b/libs/ardour/session_export.cc @@ -88,6 +88,7 @@ AudioExportSpecification::~AudioExportSpecification () void AudioExportSpecification::init () { + memset (&sfinfo, 0, sizeof (sfinfo)); src_state = 0; pos = 0; total_frames = 0; @@ -169,7 +170,7 @@ AudioExportSpecification::prepare (nframes_t blocksize, nframes_t frate) return -1; } - if ((data_width = sndfile_data_width(format)) == 0) { + if (((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_OGG) && (data_width = sndfile_data_width(format)) == 0) { error << _("Bad data width size. Report me!") << endmsg; return -1; } @@ -197,7 +198,7 @@ AudioExportSpecification::prepare (nframes_t blocksize, nframes_t frate) } /* XXX make sure we have enough disk space for the output */ - + if ((out = sf_open (path.c_str(), SFM_WRITE, &sfinfo)) == 0) { sf_error_str (0, errbuf, sizeof (errbuf) - 1); error << string_compose(_("Export: cannot open output file \"%1\" (%2)"), path, errbuf) << endmsg; |