summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2016-03-24 11:43:28 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2016-03-24 11:43:52 +0100
commit2c86dc7a3c25e95e3c35c945f9b54ff8c0b858a1 (patch)
tree84a002d20735ecf0fc7a41359a71d8b365ecfb1e
parentdc4c80f6596c2c14b3874c63aa1a7b4d0f59d4a5 (diff)
Make jack process callback private.
-rw-r--r--drumgizmo/jackclient.cc9
-rw-r--r--drumgizmo/jackclient.h6
2 files changed, 11 insertions, 4 deletions
diff --git a/drumgizmo/jackclient.cc b/drumgizmo/jackclient.cc
index 4f14c09..e493e1b 100644
--- a/drumgizmo/jackclient.cc
+++ b/drumgizmo/jackclient.cc
@@ -52,16 +52,19 @@ JackPort::~JackPort()
// --------------------------------------------------------------------
-static int _wrap_jack_process(jack_nframes_t nframes, void* arg)
+int JackClient::wrapJackProcess(jack_nframes_t nframes, void* arg)
{
return static_cast<JackClient*>(arg)->process(nframes);
}
-JackClient::JackClient() : client{nullptr}, processes{}, is_active{false}
+JackClient::JackClient()
+ : client{nullptr}
+ , processes{}
+ , is_active{false}
{
jack_status_t status;
client = jack_client_open("DrumGizmo", JackNullOption, &status);
- jack_set_process_callback(client, _wrap_jack_process, this);
+ jack_set_process_callback(client, JackClient::wrapJackProcess, this);
}
JackClient::~JackClient()
diff --git a/drumgizmo/jackclient.h b/drumgizmo/jackclient.h
index f219ec1..82cc0ed 100644
--- a/drumgizmo/jackclient.h
+++ b/drumgizmo/jackclient.h
@@ -68,7 +68,7 @@ public:
void add(JackProcess& process);
void remove(JackProcess& process);
void activate();
- int process(jack_nframes_t num_frames);
+
std::size_t getBufferSize() const;
std::size_t getSampleRate() const;
@@ -76,4 +76,8 @@ private:
jack_client_t* client;
std::set<JackProcess*> processes;
bool is_active;
+
+ int process(jack_nframes_t num_frames);
+
+ static int wrapJackProcess(jack_nframes_t nframes, void* arg);
};