From 015fc7b39fab97cee1875231694adce43155ceb5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 14 May 2009 00:13:27 +0000 Subject: First stage of options rework. - Split Configuration into RCConfiguration and SessionConfiguration; the first for options which are saved to .rc files and the second for options which are saved in a session file. - Move some options from the old `master' Configuration object into SessionConfiguration; this needs more refinement. - Reflect many RCConfiguration options in an expanded Edit->Preferences dialog; my intention is to remove the corresponding menu items eventually. git-svn-id: svn://localhost/ardour2/branches/3.0@5075 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/source_factory.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libs/ardour/source_factory.cc') diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index d6ce7ba033..544b04e1c7 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -26,8 +26,9 @@ #include "ardour/source_factory.h" #include "ardour/sndfilesource.h" #include "ardour/silentfilesource.h" -#include "ardour/configuration.h" +#include "ardour/rc_configuration.h" #include "ardour/smf_source.h" +#include "ardour/session.h" #ifdef HAVE_COREAUDIO #define USE_COREAUDIO_FOR_FILES @@ -246,8 +247,8 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat if (type == DataType::AUDIO) { boost::shared_ptr ret (new SndFileSource (s, path, embedded, - Config->get_native_file_data_format(), - Config->get_native_file_header_format(), + s.config.get_native_file_data_format(), + s.config.get_native_file_header_format(), rate, (destructive ? Source::Flag (SndFileSource::default_writable_flags | Source::Destructive) -- cgit v1.2.3