fix visual focus indication in IOSelector; import pays attention to audio file embedd...

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

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index 28c5f07fce4419166fed504d0f63e4e8f43036ac..4a7182ad7a976edd78d5f5538427c09c4bab88ba 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,12 +39,16 @@ namespace MIDI {
 namespace ARDOUR {
 
        class AudioEngine;
+       class OSC;
 
-       static const jack_nframes_t max_frames = JACK_MAX_FRAMES;
+       extern OSC* osc;
 
-       int init (AudioEngine&, bool with_vst, bool try_optimization, void (*sighandler)(int,siginfo_t*,void*) = 0);
-       int cleanup ();
+       static const nframes_t max_frames = JACK_MAX_FRAMES;
 
+       int init (bool with_vst, bool try_optimization);
+       int cleanup ();
+       
+       std::string get_ardour_revision ();
        
        std::string get_user_ardour_path ();
        std::string get_system_data_path ();
@@ -58,7 +59,7 @@ namespace ARDOUR {
 
        const layer_t max_layer = UCHAR_MAX;
 
-       id_t new_id();
+       microseconds_t get_microseconds ();
 
        Change new_change ();
 
@@ -74,7 +75,8 @@ namespace ARDOUR {
            const char* old;
        };
 
-};
+       static const double SHUTTLE_FRACT_SPEED1=0.48412291827; /* derived from A1,A2 */
+}
 
 /* how do we make these be within the Ardour namespace? */