use XML state to store processors in mixer (strips) and fixup crash caused by missing...

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

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index 45b45ecd06f717d1b5264a7adfb19d555384bf20..8349b6f14bba9627ac3814c5107eca1aca06e2d4 100644 (file)
--- a/libs/ardour/ardour/ardour.h
+++ b/libs/ardour/ardour/ardour.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_ardour_h__
@@ -26,14 +25,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,22 +38,22 @@ namespace MIDI {
 namespace ARDOUR {
 
        class AudioEngine;
+       class OSC;
+
+       extern OSC* osc;
 
-       static const jack_nframes_t max_frames = JACK_MAX_FRAMES;
+       static const 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 (bool with_vst, bool try_optimization);
        int cleanup ();
 
+       int setup_midi(AudioEngine& engine);
        
-       std::string get_user_ardour_path ();
-       std::string get_system_ardour_path ();
-
-       std::string find_config_file (std::string name);
-       std::string find_data_file (std::string name, std::string subdir = "" );
+       std::string get_ardour_revision ();
 
        const layer_t max_layer = UCHAR_MAX;
 
-       id_t new_id();
+       microseconds_t get_microseconds ();
 
        Change new_change ();
 
@@ -73,7 +69,10 @@ namespace ARDOUR {
            const char* old;
        };
 
-};
+       static const double SHUTTLE_FRACT_SPEED1=0.48412291827; /* derived from A1,A2 */
+
+       void setup_fpu ();
+}
 
 /* how do we make these be within the Ardour namespace? */