From 50b34ebaa7fa3753f9fb50fdbd8b62c004acf8f2 Mon Sep 17 00:00:00 2001
From: Harry van Haaren <harryhaaren@gmail.com>
Date: Sat, 16 Nov 2013 14:13:12 +0000
Subject: [PATCH] -Working on controller mapping event pretty name strings
 combo

---
 src/diskwriter.cxx |  4 +++-
 src/event.cxx      | 28 +++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/diskwriter.cxx b/src/diskwriter.cxx
index 9a27aaf..509c201 100644
--- a/src/diskwriter.cxx
+++ b/src/diskwriter.cxx
@@ -164,6 +164,7 @@ int DiskWriter::writeControllerFile(std::string name  ,
       
       // add metadata to binding
       const char* actionName = Event::getPrettyName( b.at(i)->action );
+      
       if ( actionName )
       {
         cJSON_AddItemToObject( binding, "action", cJSON_CreateString( actionName ) );
@@ -186,9 +187,10 @@ int DiskWriter::writeControllerFile(std::string name  ,
     
     
     //std::vector<Binding*> b = g->getMidiToAction();
+    /*
     cJSON* outputBindings = cJSON_CreateArray();
     cJSON_AddItemToObject(controllerJson, "outputBindings", outputBindings );
-    /*
+    
     for(unsigned int i = 0; i < b.size(); i++ )
     {
       // create binding
diff --git a/src/event.cxx b/src/event.cxx
index dc6d919..05afb26 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -2,24 +2,22 @@
 #include "event.hxx"
 
 // defines the pretty names of each event type
-const char* EventMasterVol::prettyName = "Master Volume";
-const char* EventMasterReturn::prettyName = "Master Return";
-const char* EventMasterInputVol::prettyName = "Input Volume";
-const char* EventMasterInputTo::prettyName = "Input To";
-const char* EventMasterInputToActive::prettyName = "Input To Active";
+const char* EventMasterVol::prettyName = "master:volume";
+const char* EventMasterReturn::prettyName = "master:return";
+const char* EventMasterInputVol::prettyName = "master:input_vol";
+const char* EventMasterInputTo::prettyName = "master:input_to";
+const char* EventMasterInputToActive::prettyName = "master:input_to_active";
 
-const char* EventTrackVol::prettyName = "Track Volume";
-const char* EventTrackSend::prettyName = "Track Send";
-const char* EventTrackSendActive::prettyName = "Track Send Active";
-const char* EventTrackRecordArm::prettyName = "Track Record Arm";
-
-const char* EventTimeBPM::prettyName = "Tempo BPM";
-const char* EventTimeTempoTap::prettyName = "Tempo Tap";
-
-const char* EventGridEvent::prettyName = "Grid Press";
-const char* EventGridLaunchScene::prettyName = "Launch Scene";
+const char* EventTrackVol::prettyName = "track:volume";
+const char* EventTrackSend::prettyName = "track:send";
+const char* EventTrackSendActive::prettyName = "track:send_active";
+const char* EventTrackRecordArm::prettyName = "track:record_arm";
 
+const char* EventTimeBPM::prettyName = "tempo_bpm";
+const char* EventTimeTempoTap::prettyName = "tempo_tap";
 
+const char* EventGridEvent::prettyName = "grid:event";
+const char* EventGridLaunchScene::prettyName = "grid:launch_scene";
 
 const char* Event::getPrettyName( int type )
 {