Merge branch 'windows+cc' into cairocanvas

[ardour.git] / libs / backends / jack / jack_audiobackend.h

diff --git a/libs/backends/jack/jack_audiobackend.h b/libs/backends/jack/jack_audiobackend.h
index 3c48be5eadc180410ecfc9c6f147b1a66b8bf452..d5378247c320194838f4c4107b3fe4e37575b9d5 100644 (file)
--- a/libs/backends/jack/jack_audiobackend.h
+++ b/libs/backends/jack/jack_audiobackend.h
@@ -89,12 +89,10 @@ class JACKAudioBackend : public AudioBackend {
     std::string control_app_name () const;
     void launch_control_app ();
 
-    int _start (bool for_latency_measurement);
     int stop ();
-    int pause ();
     int freewheel (bool);
 
-    float cpu_load() const;
+    float dsp_load() const;
 
     pframes_t sample_time ();
     pframes_t sample_time_at_cycle_start ();
@@ -127,7 +125,7 @@ class JACKAudioBackend : public AudioBackend {
 
     int         set_port_name (PortHandle, const std::string&);
     std::string get_port_name (PortHandle) const;
-    PortHandle* get_port_by_name (const std::string&) const;
+    PortHandle  get_port_by_name (const std::string&) const;
 
     int get_ports (const std::string& port_name_pattern, DataType type, PortFlags flags, std::vector<std::string>&) const;
 
@@ -183,6 +181,10 @@ class JACKAudioBackend : public AudioBackend {
 
     void* get_buffer (PortHandle, pframes_t);
 
+    /* transport sync */
+
+    bool speed_and_position (double& sp, framepos_t& pos);
+
   private:
     boost::shared_ptr<JackConnection>  _jack_connection;
     bool            _running;
@@ -269,6 +271,9 @@ class JACKAudioBackend : public AudioBackend {
     */
 
     JACKSession* _session;
+
+  protected:
+    int _start (bool for_latency_measurement);
 };
 
 } // namespace