DummyBackend: fix midi event mux+sorting

[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 299bb1cefd098a9f7b577d68b073f7e7882dafc5..52edd55c638d199cc6a8415e402497aaca84be8c 100644 (file)
--- a/libs/backends/jack/jack_audiobackend.h
+++ b/libs/backends/jack/jack_audiobackend.h
@@ -41,7 +41,7 @@ class JACKSession;
 
 class JACKAudioBackend : public AudioBackend {
   public:
-    JACKAudioBackend (AudioEngine& e, boost::shared_ptr<JackConnection>);
+    JACKAudioBackend (AudioEngine& e, AudioBackendInfo& info, boost::shared_ptr<JackConnection>);
     ~JACKAudioBackend ();
     
     /* AUDIOBACKEND API */
@@ -68,7 +68,6 @@ class JACKAudioBackend : public AudioBackend {
     int set_device_name (const std::string&);
     int set_sample_rate (float);
     int set_buffer_size (uint32_t);
-    int set_sample_format (SampleFormat);
     int set_interleaved (bool yn);
     int set_input_channels (uint32_t);
     int set_output_channels (uint32_t);
@@ -78,7 +77,6 @@ class JACKAudioBackend : public AudioBackend {
     std::string  device_name () const;
     float        sample_rate () const;
     uint32_t     buffer_size () const;
-    SampleFormat sample_format () const;
     bool         interleaved () const;
     uint32_t     input_channels () const;
     uint32_t     output_channels () const;
@@ -92,7 +90,7 @@ class JACKAudioBackend : public AudioBackend {
     int stop ();
     int freewheel (bool);
 
-    float cpu_load() const;
+    float dsp_load() const;
 
     pframes_t sample_time ();
     pframes_t sample_time_at_cycle_start ();