X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fardour.h;h=7321daf0971c6ce179ae0c14611c8eaa3ce21c58;hb=022818b4a796f52c0a91eea42e65aec0bc7bed43;hp=e1be7ad998a6a9699a426c4c988b2e56571149fd;hpb=b8e9b3f071e294488eb03f9e13adc333352909bb;p=ardour.git

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index e1be7ad998..7321daf097 100644
--- a/libs/ardour/ardour/ardour.h
+++ b/libs/ardour/ardour/ardour.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1999 Paul Davis 
+    Copyright (C) 1999 Paul Davis
 
     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
@@ -20,8 +20,10 @@
 #ifndef __ardour_ardour_h__
 #define __ardour_ardour_h__
 
-#include <limits.h>
+#include <map>
 #include <string>
+
+#include <limits.h>
 #include <signal.h>
 
 #include <pbd/error.h>
@@ -30,6 +32,8 @@
 #include <ardour/configuration.h>
 #include <ardour/types.h>
 
+// #include <jack/jack.h> need this to inline jack_get_microseconds
+
 namespace MIDI {
 	class MachineControl;
 	class Port;
@@ -38,30 +42,26 @@ namespace MIDI {
 namespace ARDOUR {
 
 	class AudioEngine;
-	class OSC;
-
-	extern OSC* osc;
 
 	static const nframes_t max_frames = JACK_MAX_FRAMES;
+	extern sigc::signal<void,std::string> BootMessage;
 
 	int init (bool with_vst, bool try_optimization);
 	int cleanup ();
 
-	int setup_midi(AudioEngine& engine);
-	
 	std::string get_ardour_revision ();
-	
-	std::string get_user_ardour_path ();
-	std::string get_system_data_path ();
-	std::string get_system_module_path ();
 
-	std::string find_config_file (std::string name);
-	std::string find_data_file (std::string name, std::string subdir = "" );
+	void find_bindings_files (std::map<std::string,std::string>&);
 
 	const layer_t max_layer = UCHAR_MAX;
 
 	microseconds_t get_microseconds ();
-
+/*	{
+        JACK has exported this functionality for a long time now 
+	but inlining this causes problems
+        return (microseconds_t) jack_get_time();
+	}
+*/
 	Change new_change ();
 
 	extern Change StartChanged;
@@ -77,13 +77,16 @@ namespace ARDOUR {
 	};
 
 	static const double SHUTTLE_FRACT_SPEED1=0.48412291827; /* derived from A1,A2 */
-}
 
-/* how do we make these be within the Ardour namespace? */
+	void setup_fpu ();
 
-extern MIDI::Port* default_mmc_port;
-extern MIDI::Port* default_mtc_port;
-extern MIDI::Port* default_midi_port;
+	extern MIDI::Port* default_mmc_port;
+	extern MIDI::Port* default_mtc_port;
+	extern MIDI::Port* default_midi_port;
+	extern MIDI::Port *default_midi_clock_port;
+	
+	int setup_midi ();
+}
 
 #endif /* __ardour_ardour_h__ */