X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fardour%2Fardour.h;h=2c92bbc92ac3cceb32ccd6a49d14f3bb1911f9a6;hb=9925ab554e65ac31a41eff1fa03a9c12aad1973e;hp=c0dfea9a950e9edccc885a363dcbdc933feaf728;hpb=fe13d08874f08b723df53116e5655c3d229a657e;p=ardour.git

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index c0dfea9a95..2c92bbc92a 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
@@ -15,21 +15,27 @@
     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/failed_constructor.h>
+#include "pbd/signals.h"
+
+#include "pbd/error.h"
+#include "pbd/failed_constructor.h"
+#include "pbd/locale_guard.h"
+#include "pbd/stateful.h"
 
-#include <ardour/configuration.h>
-#include <ardour/types.h>
+#include "ardour/types.h"
+
+#include <jack/jack.h> 
 
 namespace MIDI {
 	class MachineControl;
@@ -39,48 +45,32 @@ namespace MIDI {
 namespace ARDOUR {
 
 	class AudioEngine;
-	class OSC;
-
-	extern OSC* osc;
 
-	static const jack_nframes_t max_frames = JACK_MAX_FRAMES;
+	extern PBD::Signal1<void,std::string> BootMessage;
 
-	int init (AudioEngine&, bool with_vst, bool try_optimization);
+	int init (bool with_vst, bool try_optimization);
+	void init_post_engine ();
 	int cleanup ();
+	bool no_auto_connect ();
+	void make_property_quarks ();
+        
+	extern PBD::PropertyChange bounds_change;
 
-	
-	std::string get_user_ardour_path ();
-	std::string get_system_data_path ();
-	std::string get_system_module_path ();
+	extern const char* const ardour_config_info;
 
-	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;
+        std::string translation_kill_path ();
+        bool translations_are_disabled ();
 
-	id_t new_id();
-
-	Change new_change ();
-
-	extern Change StartChanged;
-	extern Change LengthChanged;
-	extern Change PositionChanged;
-	extern Change NameChanged;
-	extern Change BoundsChanged;
-
-	struct LocaleGuard {
-	    LocaleGuard (const char*);
-	    ~LocaleGuard ();
-	    const char* old;
-	};
-
-};
+	const layer_t max_layer = UCHAR_MAX;
 
-/* how do we make these be within the Ardour namespace? */
+	static inline microseconds_t get_microseconds () {
+		return (microseconds_t) jack_get_time();
+	}
 
-extern MIDI::Port* default_mmc_port;
-extern MIDI::Port* default_mtc_port;
-extern MIDI::Port* default_midi_port;
+	void setup_fpu ();
+}
 
 #endif /* __ardour_ardour_h__ */