debug flag for MTC; make ardour/timecode.h simply include the "authoritative" one...

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

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index 892df2eb50764fd045d6f4c9999668804d21dd5c..a1b3d06f6218736d8a7ffe0fcccbf7d0010feb0a 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
@@ -28,10 +28,11 @@
 
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
+#include "pbd/locale_guard.h"
 
 #include "ardour/types.h"
 
-// #include <jack/jack.h> need this to inline jack_get_microseconds
+#include <jack/jack.h> 
 
 namespace MIDI {
        class MachineControl;
@@ -46,6 +47,7 @@ namespace ARDOUR {
        extern sigc::signal<void,std::string> BootMessage;
 
        int init (bool with_vst, bool try_optimization);
+       void init_post_engine ();
        int cleanup ();
        bool no_auto_connect ();
 
@@ -55,13 +57,10 @@ namespace ARDOUR {
 
        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;
@@ -70,12 +69,6 @@ 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 ();
@@ -84,7 +77,7 @@ namespace ARDOUR {
        extern MIDI::Port* default_mtc_port;
        extern MIDI::Port* default_midi_port;
        extern MIDI::Port *default_midi_clock_port;
-       
+
        int setup_midi ();
 }