Fix broken whitespace. I'd apologize for the compile times if it was my fault :D

[ardour.git] / libs / ardour / ardour / ardour.h

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index 7358a7bddbaf837c41fe05b2a738833246071e1b..51101a50ad66af423a71cebdf125cd0f52d3bb01 100644 (file)
--- 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
@@ -26,13 +26,16 @@
 #include <limits.h>
 #include <signal.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 <jack/jack.h> need this to inline jack_get_microseconds
+#include <jack/jack.h>
 
 namespace MIDI {
        class MachineControl;
@@ -43,49 +46,30 @@ namespace ARDOUR {
 
        class AudioEngine;
 
-       static const nframes_t max_frames = JACK_MAX_FRAMES;
-       extern sigc::signal<void,std::string> BootMessage;
+       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 ();
+       void make_property_quarks ();
+
+       extern PBD::PropertyChange bounds_change;
 
-       std::string get_ardour_revision ();
+       extern const char* const ardour_config_info;
 
        void find_bindings_files (std::map<std::string,std::string>&);
 
+       std::string translation_kill_path ();
+       bool translations_are_disabled ();
+
        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();
+       static inline microseconds_t get_microseconds () {
+               return (microseconds_t) jack_get_time();
        }
-*/
-       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;
-       };
-
-       static const double SHUTTLE_FRACT_SPEED1=0.48412291827; /* derived from A1,A2 */
 
        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_midi_clock_port;
-       
-       int setup_midi ();
 }
 
 #endif /* __ardour_ardour_h__ */