merge 5674:5682 and 5689-5694 from mixbus branch

[ardour.git] / libs / ardour / session_export.cc

diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc
index db11c6127695ff9a762ce430e4458c7227d1c6ba..e7c2596fe16f9c9ebd4f01207ae3405855deaaab 100644 (file)
--- 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;