diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-03-11 14:28:22 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-03-11 14:28:30 -0500 |
| commit | 89a3c781756bdc462907b9be0b3649c35121e577 (patch) | |
| tree | 21d817dd36516ffd8629dc9a91b8e11be98f741d /libs/ardour/globals.cc | |
| parent | 69dc9451a7ed03f8f21e4f1fcaf99f845e8bb8a5 (diff) | |
finish (?) infrastructure for copying configuration files from a3 to a4
Diffstat (limited to 'libs/ardour/globals.cc')
| -rw-r--r-- | libs/ardour/globals.cc | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 948d36d675..6344149359 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -132,7 +132,7 @@ PBD::Signal1<void,std::string> ARDOUR::BootMessage; PBD::Signal3<void,std::string,std::string,bool> ARDOUR::PluginScanMessage; PBD::Signal1<void,int> ARDOUR::PluginScanTimeout; PBD::Signal0<void> ARDOUR::GUIIdle; -PBD::Signal3<void,std::string,std::string,int> ARDOUR::CopyConfigurationFiles; +PBD::Signal3<bool,std::string,std::string,int> ARDOUR::CopyConfigurationFiles; namespace ARDOUR { extern void setup_enum_writer (); @@ -265,19 +265,19 @@ ARDOUR::copy_configuration_files (string const & old_dir, string const & new_dir old_name = Glib::build_filename (old_dir, "templates"); new_name = Glib::build_filename (new_dir, "templates"); - copy_files (old_name, new_name); + copy_recurse (old_name, new_name); old_name = Glib::build_filename (old_dir, "route_templates"); new_name = Glib::build_filename (new_dir, "route_templates"); - copy_files (old_name, new_name); + copy_recurse (old_name, new_name); /* presets */ old_name = Glib::build_filename (old_dir, "presets"); new_name = Glib::build_filename (new_dir, "presets"); - - copy_files (old_name, new_name); + + copy_recurse (old_name, new_name); /* presets */ @@ -319,7 +319,12 @@ maybe_copy_old_configuration_files () if (Glib::file_test (old_config_dir, Glib::FILE_TEST_IS_DIR)) { string current_config_dir = user_config_directory (); - CopyConfigurationFiles (old_config_dir, current_config_dir, version); /* EMIT SIGNAL */ + boost::optional<bool> r = CopyConfigurationFiles (old_config_dir, current_config_dir, version); /* EMIT SIGNAL */ + if (r) { + if (r.get()) { + copy_configuration_files (old_config_dir, current_config_dir, version); + } + } } } |