*** NEW CODING POLICY ***

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

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index fecd0fcf4eb3b5947481d3f99cd4d30bfb40a3df..7358a7bddbaf837c41fe05b2a738833246071e1b 100644 (file)
--- a/libs/ardour/ardour/ardour.h
+++ b/libs/ardour/ardour/ardour.h
@@ -26,11 +26,13 @@
 #include <limits.h>
 #include <signal.h>
 
-#include <pbd/error.h>
-#include <pbd/failed_constructor.h>
+#include "pbd/error.h"
+#include "pbd/failed_constructor.h"
 
-#include <ardour/configuration.h>
-#include <ardour/types.h>
+#include "ardour/configuration.h"
+#include "ardour/types.h"
+
+// #include <jack/jack.h> need this to inline jack_get_microseconds
 
 namespace MIDI {
        class MachineControl;
@@ -40,9 +42,6 @@ namespace MIDI {
 namespace ARDOUR {
 
        class AudioEngine;
-       class OSC;
-
-       extern OSC* osc;
 
        static const nframes_t max_frames = JACK_MAX_FRAMES;
        extern sigc::signal<void,std::string> BootMessage;
@@ -57,7 +56,12 @@ 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();
+       }
+*/
        Change new_change ();
 
        extern Change StartChanged;
@@ -75,14 +79,14 @@ namespace ARDOUR {
        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? */
 
-extern MIDI::Port* default_mmc_port;
-extern MIDI::Port* default_mtc_port;
-extern MIDI::Port* default_midi_port;
-extern MIDI::Port *default_midi_clock_port;
+       extern MIDI::Port* default_mmc_port;
+       extern MIDI::Port* default_mtc_port;
+       extern MIDI::Port* default_midi_port;
+       extern MIDI::Port *default_midi_clock_port;
+       
+       int setup_midi ();
+}
 
 #endif /* __ardour_ardour_h__ */