diff testApp.mm @ 47:0d3a993405e4

trying rto stop duplictae symbols

--- a/testApp.mm	Wed Apr 24 17:58:08 2013 +0100
+++ b/testApp.mm	Wed May 01 16:47:11 2013 +0100
@@ -163,6 +163,12 @@
     usernameAlertViewController = [[UsernameAlertViewController alloc] init];
     [usernameAlertViewController setAppRef:(id)this];
     
+    
+    //////
+
+    
+    /////////
+    
     setAllGUISliders(theGridView.getParams());
     
 }
@@ -173,7 +179,7 @@
     // MIDI
     
     midiChannel = 7;
-    midiOffset = 0;
+    midiOffset = 12;
 	
 	// enables the network midi session between iOS and Mac OSX on a
 	// local wifi network
@@ -393,6 +399,10 @@
 //--------------------------------------------------------------
 // called from BottomTabViewController iOS segmented thing, also timed session controller
 void testApp::interfaceSelected(int which){
+    if(whichInterfaceShowing == HELP){
+        // hide the help
+        [helpViewController hide:(id) this];
+    }
     switch (which){
         case 0: // slider
             //SLIDER
@@ -424,64 +434,7 @@
     eventLogger.logEvent(SWAP_VIEW,theGridView.getCoord(),theGridView.getScale(), which);
 }
 //--------------------------------------------------------------
-//--------------------------------------------------------------
-void testApp::setupSliderGui(){
-//SLIDER not used
-    float length = SLIDER_GUI_WIDTH - (OFX_UI_GLOBAL_WIDGET_SPACING*2);
-    
-    
-    //float dim = 42;
-    
-    // make this iphone size...?
-    int height = 480;
 
-    float dim = (height-10.0*OFX_UI_GLOBAL_WIDGET_SPACING)/10.0;
-    // LEFT GUI
-    sliderGUI = new ofxUICanvas(10,160,SLIDER_GUI_WIDTH,getHeight());
-    
-    // Uh.. loop this
-    for(int i = 1; i<=10;i++){
-        
-        ofxUISlider *slider;
-        slider = (ofxUISlider *)sliderGUI->addWidgetDown(new ofxUISlider(length,dim,0.0,127,64,sliderParamNames[i-1]));
-        slider->setDrawPadding(true);
-        slider->setDrawPaddingOutline(true);
-        if(i <= 5){
-            slider->setColorFill(ofColor(0,0,255));
-            slider->setColorFillHighlight(ofColor(0,0,255));
-        }else{
-            slider->setColorFill(ofColor(255,0,0));
-            slider->setColorFillHighlight(ofColor(255,0,0));
-        }
-        
-        sliders.push_back(slider);
-    }
-    
-    
-    
-    ofAddListener(sliderGUI->newGUIEvent, this, &testApp::sliderGUIEvent);
-    
-}
-//--------------------------------------------------------------
-void testApp::sliderGUIEvent(ofxUIEventArgs &e){
-    //SLIDER not used
-    if(whichInterfaceShowing == ZOOMER){
-        cout << "GUI ERROR";
-        return;
-    }
-    
-    // "normal" parameter changes
-    for(int i = 1; i<=10;i++){
-        
-        if(e.widget->getName() == sliderParamNames[i-1])
-        {
-            //cout << "param change: " << p;
-            ofxUISlider *slider = (ofxUISlider *) e.widget;
-            sliderMoved(i-1,slider->getScaledValue()); // internal array 0 indexed
-        }
-    }
-    
-}
 
 //--------------------------------------------------------------
 void testApp::sliderMoved(int which, float value){
@@ -1563,7 +1516,6 @@
         int ctl_val = msg.value;
         if(ctl_num - midiOffset >= 0 && ctl_num - midiOffset < sliderVals.size()){
             sliderVals[ctl_num] = (int)ctl_val;
-            sliders[ctl_num]->setValue(ctl_val);
             theGridView.setParams(sliderVals);
         }
     }