use new syntax for connecting to backend signals that enforces explicit connection...

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

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index d7c67998c77c70236c3207942077232cc8c11b44..aaae8ba1c9d5b1baee9661fca159e14833868878 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,12 +26,15 @@
 #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 "ardour/types.h"
 
-// #include <jack/jack.h> need this to inline jack_get_microseconds
+#include <jack/jack.h> 
 
 namespace MIDI {
        class MachineControl;
@@ -43,7 +46,7 @@ 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 ();
@@ -56,13 +59,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;
@@ -71,12 +71,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 ();