X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fardour.h;h=aaae8ba1c9d5b1baee9661fca159e14833868878;hb=aae367b63c9b619db1e40f27dc334c6987219481;hp=8349b6f14bba9627ac3814c5107eca1aca06e2d4;hpb=d7afe01c307e35719dc1ee41c079f81f40f009df;p=ardour.git

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index 8349b6f14b..aaae8ba1c9 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-2009 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,15 +20,21 @@
 #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/failed_constructor.h>
+#include "pbd/signals.h"
+
+#include "pbd/error.h"
+#include "pbd/failed_constructor.h"
+#include "pbd/locale_guard.h"
+
+#include "ardour/types.h"
 
-#include <ardour/configuration.h>
-#include <ardour/types.h>
+#include <jack/jack.h> 
 
 namespace MIDI {
 	class MachineControl;
@@ -38,22 +44,24 @@ namespace MIDI {
 namespace ARDOUR {
 
 	class AudioEngine;
-	class OSC;
-
-	extern OSC* osc;
 
 	static const nframes_t max_frames = JACK_MAX_FRAMES;
+	extern PBD::Signal1<void,std::string> BootMessage;
 
 	int init (bool with_vst, bool try_optimization);
+	void init_post_engine ();
 	int cleanup ();
+	bool no_auto_connect ();
 
-	int setup_midi(AudioEngine& engine);
-	
 	std::string get_ardour_revision ();
 
+	void find_bindings_files (std::map<std::string,std::string>&);
+
 	const layer_t max_layer = UCHAR_MAX;
 
-	microseconds_t get_microseconds ();
+	static inline microseconds_t get_microseconds () {
+		return (microseconds_t) jack_get_time();
+	}
 
 	Change new_change ();
 
@@ -63,22 +71,17 @@ namespace ARDOUR {
 	extern Change NameChanged;
 	extern Change BoundsChanged;
 
-	struct LocaleGuard {
-	    LocaleGuard (const char*);
-	    ~LocaleGuard ();
-	    const char* old;
-	};
-
 	static const double SHUTTLE_FRACT_SPEED1=0.48412291827; /* derived from A1,A2 */
 
 	void setup_fpu ();
-}
 
-/* how do we make these be within the Ardour namespace? */
+	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;
 
-extern MIDI::Port* default_mmc_port;
-extern MIDI::Port* default_mtc_port;
-extern MIDI::Port* default_midi_port;
+	int setup_midi ();
+}
 
 #endif /* __ardour_ardour_h__ */