From 5395e59ef2f8b01a6c95356d94d333e1e863b5fa Mon Sep 17 00:00:00 2001
From: Harry van Haaren <harryhaaren@gmail.com>
Date: Sat, 2 Nov 2013 00:41:19 +0000
Subject: [PATCH] -Updated default location of .ctlr files

---
 src/gui.cxx  | 7 ++++---
 src/jack.cxx | 6 +++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/gui.cxx b/src/gui.cxx
index 1081981..50b89f2 100644
--- a/src/gui.cxx
+++ b/src/gui.cxx
@@ -300,9 +300,10 @@ Gui::Gui() :
   audioEditor = new AudioEditor();
   
   // default controller for testing
-  LUPPP_NOTE("Adding APC40 Controller cb");
-  //GenericMIDI* c = new GenericMIDI( "akai_apc.ctlr" );
-  GenericMIDI* c = new GenericMIDI();
+  stringstream s;
+  s << getenv("HOME") << "/.config/openAV/luppp/controllers/akai_apc.ctlr";
+  GenericMIDI* c = new GenericMIDI( s.str().c_str() );
+  //GenericMIDI* c = new GenericMIDI();
   
   std::vector<Binding*> b = c->getMidiToAction();
   for(unsigned int i =0; i < b.size(); i++ )
diff --git a/src/jack.cxx b/src/jack.cxx
index 590dd79..2eada77 100644
--- a/src/jack.cxx
+++ b/src/jack.cxx
@@ -120,11 +120,13 @@ Jack::Jack() :
                           JackPortIsOutput,
                           0 );
   
+  /*
   masterMidiInput  = jack_port_register( client,
                           "midi_in",
                           JACK_DEFAULT_MIDI_TYPE,
                           JackPortIsInput,
                           0 );
+  */
   
   masterVol = 0.0f;
   returnVol = 1.0f;
@@ -270,7 +272,7 @@ int Jack::process (jack_nframes_t nframes)
   buffers.audio[Buffers::JACK_SIDECHAIN_KEY]   = (float*)jack_port_get_buffer(sidechainKeyOutput,nframes);
   buffers.audio[Buffers::JACK_SIDECHAIN_SIGNAL]=(float*)jack_port_get_buffer(sidechainSignalOutput,nframes);
   
-  buffers.midi [Buffers::MASTER_MIDI_INPUT]   = (void*) jack_port_get_buffer( masterMidiInput, nframes );
+  //buffers.midi [Buffers::MASTER_MIDI_INPUT]   = (void*) jack_port_get_buffer( masterMidiInput, nframes );
   
   memset( buffers.audio[Buffers::JACK_MASTER_OUT_L] , 0, sizeof(float) * nframes );
   memset( buffers.audio[Buffers::JACK_MASTER_OUT_R] , 0, sizeof(float) * nframes );
@@ -291,6 +293,7 @@ int Jack::process (jack_nframes_t nframes)
   handleDspEvents();
   
   /// process incoming MIDI
+  /*
   jack_midi_event_t in_event;
   int masterMidiInputIndex = 0;
   int event_count = (int) jack_midi_get_event_count( buffers.midi[Buffers::MASTER_MIDI_INPUT] );
@@ -305,6 +308,7 @@ int Jack::process (jack_nframes_t nframes)
     
     masterMidiInputIndex++;
   }
+  */
   
   
   /// update "time" from JACK master, or write master?