X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fardour.h;h=79b69124ac2a39a127359808e25cf5dcd5c58c4f;hb=11a68f7dd38e72c3e497569a60cb0740a33b78cf;hp=465de04127a1b013add7fe8d5e538f532bb77b08;hpb=ba0ae4818a887f39d5feac7446b09055b93fc08f;p=ardour.git

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index 465de04127..79b69124ac 100644
--- a/libs/ardour/ardour/ardour.h
+++ b/libs/ardour/ardour/ardour.h
@@ -38,8 +38,6 @@
 #include "ardour/types.h"
 #include "ardour/libardour_visibility.h"
 
-#include <jack/jack.h>
-
 namespace MIDI {
 	class MachineControl;
 	class Port;
@@ -53,6 +51,8 @@ namespace ARDOUR {
 	extern LIBARDOUR_API PBD::Signal3<void,std::string,std::string,bool> PluginScanMessage;
 	extern LIBARDOUR_API PBD::Signal1<void,int> PluginScanTimeout;
 	extern LIBARDOUR_API PBD::Signal0<void> GUIIdle;
+	extern LIBARDOUR_API PBD::Signal3<bool,std::string,std::string,int> CopyConfigurationFiles;
+	extern LIBARDOUR_API std::vector<std::string> reserved_io_names;
 
 	/**
 	 * @param with_vst true to enable VST Support
@@ -69,10 +69,8 @@ namespace ARDOUR {
 	LIBARDOUR_API void make_property_quarks ();
 
 	extern LIBARDOUR_API PBD::PropertyChange bounds_change;
-	
-	extern LIBARDOUR_API const char* const ardour_config_info;
 
-	LIBARDOUR_API void find_bindings_files (std::map<std::string,std::string>&);
+	extern LIBARDOUR_API const char* const ardour_config_info;
 
 	/* these only impact bundled installations */
 	LIBARDOUR_API std::string translation_enable_path ();
@@ -83,6 +81,14 @@ namespace ARDOUR {
 
 	LIBARDOUR_API void setup_fpu ();
 	LIBARDOUR_API std::vector<SyncSource> get_available_sync_options();
+
+	/* the @param ui_handler will be called if there are old configuration
+	 * files to be copied. It should (probably) ask the user about the
+	 * action, and return true or false depending on whether or not the
+	 * copy should take place.
+	 */
+	LIBARDOUR_API void check_for_old_configuration_files ();
+	LIBARDOUR_API int handle_old_configuration_files (boost::function<bool (std::string const&, std::string const&, int)> ui_handler);
 }
 
 #endif /* __ardour_ardour_h__ */