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 293d34682395735d5ecdb280a12c3ff8d81df8c7..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,11 +39,20 @@ 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 ();
+
+       
+       std::string get_user_ardour_path ();
+       std::string get_system_data_path ();
+       std::string get_system_module_path ();
+
        std::string find_config_file (std::string name);
        std::string find_data_file (std::string name, std::string subdir = "" );