Merge branch 'master' into audioengine

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

diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc
index fd39aa6cd6c2a6e8bbffaacb237a25c66b8ba866..301914b0ae0b6ae70cd0f3a36d6f3f4b8d32a944 100644 (file)
--- a/libs/ardour/export_graph_builder.cc
+++ b/libs/ardour/export_graph_builder.cc
@@ -1,3 +1,23 @@
+/*
+    Copyright (C) 2008-2012 Paul Davis 
+    Author: Sakari Bergen
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include "ardour/export_graph_builder.h"
 
 #include <glibmm/miscutils.h>
@@ -34,7 +54,7 @@ ExportGraphBuilder::ExportGraphBuilder (Session const & session)
   : session (session)
   , thread_pool (hardware_concurrency())
 {
-       process_buffer_frames = session.engine().frames_per_cycle();
+       process_buffer_frames = session.engine().samples_per_cycle();
 }
 
 ExportGraphBuilder::~ExportGraphBuilder ()
@@ -109,7 +129,7 @@ ExportGraphBuilder::add_config (FileSpec const & config)
        // If the sample rate is "session rate", change it to the real value.
        // However, we need to copy it to not change the config which is saved...
        FileSpec new_config (config);
-       new_config.format.reset(new ExportFormatSpecification(*new_config.format));
+       new_config.format.reset(new ExportFormatSpecification(*new_config.format, false));
        if(new_config.format->sample_rate() == ExportFormatBase::SR_Session) {
                framecnt_t session_rate = session.nominal_frame_rate();
                new_config.format->set_sample_rate(ExportFormatBase::nearest_sample_rate(session_rate));
@@ -485,7 +505,7 @@ ExportGraphBuilder::ChannelConfig::ChannelConfig (ExportGraphBuilder & parent, F
 
        config = new_config;
 
-       framecnt_t max_frames = parent.session.engine().frames_per_cycle();
+       framecnt_t max_frames = parent.session.engine().samples_per_cycle();
        interleaver.reset (new Interleaver<Sample> ());
        interleaver->init (new_config.channel_config->get_n_chans(), max_frames);