Revert files that shouldn't have been changed in this branch...

1 files changed, 3 insertions, 28 deletions

diff --git a/drumgizmo/jackclient.cc b/drumgizmo/jackclient.cc
index a24d53a..e4af141 100644
--- a/drumgizmo/jackclient.cc
+++ b/drumgizmo/jackclient.cc
@@ -26,33 +26,20 @@
  */
 #include "jackclient.h"
 
-#include <drumgizmo.h>
-
 extern "C"
 {
-
-static int jack_process_callback(jack_nframes_t nframes, void *arg)
-{
-  return ((JackClient*)arg)->process(nframes);
-}
-
-static void jack_free_wheel_callback(int starting, void *arg)
-{
-  ((JackClient*)arg)->setFreeWheel(starting);
-}
-
+  int _wrap_jack_process(jack_nframes_t nframes, void *arg){
+    return ((JackClient*)arg)->process(nframes);}
 }  // extern "C"
 
 JackClient::JackClient()
   : refcnt(0)
-  , drumgizmo(NULL)
 {
 	jack_status_t status;
 
 	jack_client = jack_client_open("DrumGizmo", JackNullOption, &status);
 
-  jack_set_process_callback(jack_client, jack_process_callback, this);
-  jack_set_freewheel_callback(jack_client, jack_free_wheel_callback, this);
+  jack_set_process_callback(jack_client, _wrap_jack_process, this);
 
   active = false;
 }
@@ -92,18 +79,6 @@ int JackClient::process(jack_nframes_t nframes)
 	return 0;
 }
 
-void JackClient::setFreeWheel(bool freewheel)
-{
-  if(drumgizmo) {
-    drumgizmo->setFreeWheel(freewheel);
-  }
-}
-
-void JackClient::setEngine(DrumGizmo* drumgizmo)
-{
-  this->drumgizmo = drumgizmo;
-}
-
 JackClient *jackclient = NULL;
 
 JackClient *init_jack_client()