diff options
| author | Sakari Bergen <sakari.bergen@beatwaves.net> | 2008-12-29 19:50:19 +0000 |
|---|---|---|
| committer | Sakari Bergen <sakari.bergen@beatwaves.net> | 2008-12-29 19:50:19 +0000 |
| commit | 3d239bb9d59f555d08fd9362e9ce50de1255c633 (patch) | |
| tree | 8346d16f52cdbf54d92268d6f64f60a3cdc1d925 /libs/ardour/export_file_io.cc | |
| parent | 22d73333c62957ec9d3ecfb47849c4e2048e2e3f (diff) | |
Fix some compiling warnings and errors in OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@4358 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/export_file_io.cc')
| -rw-r--r-- | libs/ardour/export_file_io.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/libs/ardour/export_file_io.cc b/libs/ardour/export_file_io.cc index d4aa1870ba..793b1dbea4 100644 --- a/libs/ardour/export_file_io.cc +++ b/libs/ardour/export_file_io.cc @@ -400,8 +400,6 @@ ExportFileFactory::create_sndfile (FormatPtr format, unsigned int channels, ustr typedef boost::shared_ptr<SndfileWriter<int> > IntWriterPtr; typedef boost::shared_ptr<SndfileWriter<float> > FloatWriterPtr; - FilePair ret; - int real_format = format->format_id() | format->sample_format() | format->endianness(); uint32_t data_width = sndfile_data_width (real_format); @@ -422,14 +420,13 @@ ExportFileFactory::create_sndfile (FormatPtr format, unsigned int channels, ustr return std::make_pair (boost::static_pointer_cast<FloatSink> (sfc), boost::static_pointer_cast<ExportFileWriter> (sfw)); - } else { - - FloatConverterPtr sfc = FloatConverterPtr (new SampleFormatConverter<float> (channels, format->dither_type(), data_width)); - FloatWriterPtr sfw = FloatWriterPtr (new SndfileWriter<float> (channels, format->sample_rate(), real_format, filename)); - sfc->pipe_to (sfw); - - return std::make_pair (boost::static_pointer_cast<FloatSink> (sfc), boost::static_pointer_cast<ExportFileWriter> (sfw));; } + + FloatConverterPtr sfc = FloatConverterPtr (new SampleFormatConverter<float> (channels, format->dither_type(), data_width)); + FloatWriterPtr sfw = FloatWriterPtr (new SndfileWriter<float> (channels, format->sample_rate(), real_format, filename)); + sfc->pipe_to (sfw); + + return std::make_pair (boost::static_pointer_cast<FloatSink> (sfc), boost::static_pointer_cast<ExportFileWriter> (sfw)); } bool |