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

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index 293d346823..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
@@ -15,24 +15,24 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #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>
-#include <pbd/lockmonitor.h>
 #include <pbd/failed_constructor.h>
 
 #include <ardour/configuration.h>
 #include <ardour/types.h>
 
-using namespace PBD;
+// #include <jack/jack.h> need this to inline jack_get_microseconds
 
 namespace MIDI {
 	class MachineControl;
@@ -43,17 +43,25 @@ namespace ARDOUR {
 
 	class AudioEngine;
 
-	static const jack_nframes_t max_frames = JACK_MAX_FRAMES;
+	static const nframes_t max_frames = JACK_MAX_FRAMES;
+	extern sigc::signal<void,std::string> BootMessage;
 
-	int init (AudioEngine&, bool with_vst, bool try_optimization, void (*sighandler)(int,siginfo_t*,void*) = 0);
+	int init (bool with_vst, bool try_optimization);
 	int cleanup ();
-	std::string find_config_file (std::string name);
-	std::string find_data_file (std::string name, std::string subdir = "" );
 
-	const layer_t max_layer = UCHAR_MAX;
+	std::string get_ardour_revision ();
 
-	id_t new_id();
+	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;
@@ -68,13 +76,17 @@ namespace ARDOUR {
 	    const char* old;
 	};
 
-};
+	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__ */