Large nasty commit in the form of a 5000 line patch chock-full of completely

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

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index 28c5f07fce4419166fed504d0f63e4e8f43036ac..c0dfea9a950e9edccc885a363dcbdc933feaf728 100644 (file)
--- a/libs/ardour/ardour/ardour.h
+++ b/libs/ardour/ardour/ardour.h
@@ -26,14 +26,11 @@
 #include <signal.h>
 
 #include <pbd/error.h>
-#include <pbd/lockmonitor.h>
 #include <pbd/failed_constructor.h>
 
 #include <ardour/configuration.h>
 #include <ardour/types.h>
 
-using namespace PBD;
-
 namespace MIDI {
        class MachineControl;
        class Port;
@@ -42,10 +39,13 @@ namespace MIDI {
 namespace ARDOUR {
 
        class AudioEngine;
+       class OSC;
+
+       extern OSC* osc;
 
        static const jack_nframes_t max_frames = JACK_MAX_FRAMES;
 
-       int init (AudioEngine&, bool with_vst, bool try_optimization, void (*sighandler)(int,siginfo_t*,void*) = 0);
+       int init (AudioEngine&, bool with_vst, bool try_optimization);
        int cleanup ();