comparison testApp.mm @ 8:e2c6cfe8c6b7

JSON logs and presets.

 
 extern Grid theGridView;
 extern PresetManager presetManager;
 extern EventLogger eventLogger;
 extern Frequencer frequencer;
+extern IViewController *iViewController;
 //DeviceID3523537000
 //--------------------------------------------------------------
 void testApp::setup(){
-	ofSetOrientation(OF_ORIENTATION_90_LEFT);
 
 	ofBackground( 0, 0, 0 );
     ofEnableAlphaBlending();
 
 	// open an outgoing connection to HOST:PORT

     freqIndexes.push_back(0);
     freqIndexes.push_back(4);
     freqIndexes.push_back(6);
     freqIndexes.push_back(7);
     freqIndexes.push_back(8);
-    
-    keyboard = new ofxiPhoneKeyboard(500,380,320,32);
-	keyboard->setVisible(false);
-	keyboard->setBgColor(255, 255, 255, 255);
-	keyboard->setFontColor(0,0,0, 255);
-	keyboard->setFontSize(26);
-    
-    ofxiPhoneSetOrientation( OF_ORIENTATION_90_RIGHT );
+
+    ofxiPhoneDeviceType device = ofxiPhoneGetDeviceType();
+    cout << "Device: " << device << '\n';
+    
+    ofxiPhoneSetOrientation( OF_ORIENTATION_DEFAULT ); // TODO orientation CRAP
+
+    
+    //NSString * q = @"Why the hell did you do that? Are you mad?";
+    //[iViewController showQuestionPrompt:q];
     
 //-----------------
     // the number if libpd ticks per buffer,
 	// used to compute the audio buffer len: tpb * blocksize (always 64)
 	int ticksPerBuffer = 8;	// 8 * 64 = buffer len of 512

     {
         
         if(((ofxUIButton *)e.widget)->getValue()){
             cout << "SAVE PRESET\n";
             stringstream n;
-            double timemsd = [NSDate timeIntervalSinceReferenceDate];
-            long long timems = (long long)(timemsd*1000);
-            n << "P" << timems;
+            //double timemsd = [NSDate timeIntervalSinceReferenceDate];
+            //long long timems = (long long)(timemsd*1000);
+            //n << "P" << timems;
             string name = n.str();
-            
-            presetManager.addPreset(theGridView.getCoord(),name);
-            eventLogger.logEvent(SAVE_PRESET, theGridView.getCoord());
+    
+            [iViewController showPresetNamePrompt:32];
+
         }
         /*
         if(!keyboard->isKeyboardShowing()){
 			keyboard->openKeyboard();
 			keyboard->setVisible(true);

             eventLogger.logEvent(SET_MIN_ZOOM);
         }
     }else if(e.widget->getName() == "ZOOM MAX")
     {
         if(((ofxUIButton *)e.widget)->getValue()){
-        cout << "ZOOM MAX\n";
+            cout << "ZOOM MAX\n";
             theGridView.setMaxZoom();
             eventLogger.logEvent(SET_MAX_ZOOM);
-            //eventLogger.printAll();
+
         }
     }else{
         cout << "GUI error :  unknown event recieved\n";
     }
     

     for(int i=0; i < 16; i++){
         seqSteps.addFloat(round(steps[i])); // rounding here??
     }
     
     core.pd.sendList("fromOF", seqSteps);
-    //core.pd.sendMessage("fromOF", "msg", seqSteps);
-    
-    // implement synth param calculations here?
-    // oscshape,  filt type , cut off, envelope, mod freq (fm for sine, ? for pulse, sync for saw) 
-    // oscillators:
+
     sendOscShape(sliderVals[5]);
     sendFiltType(sliderVals[6]);
     sendFiltFreq(sliderVals[7]);
     sendEnvShape(sliderVals[8]);
     sendModFreq(sliderVals[9]);
     
 }
+//--------------------------------------------------------------
 #pragma mark STANDARD OF FUNCTIONS
 //--------------------------------------------------------------
 void testApp::update(){
 	//we do a heartbeat on iOS as the phone will shut down the network connection to save power
 	//this keeps the network alive as it thinks it is being used.

 }
 
 //--------------------------------------------------------------
 void testApp::deviceOrientationChanged(int newOrientation){
     cout << "orientation: " << newOrientation;
-    keyboard->updateOrientation(); // takes ages , only applies to text box
+    //keyboard->updateOrientation(); // takes ages , only applies to text box
     if(newOrientation == 4){
         ofxiPhoneSetOrientation( OF_ORIENTATION_90_RIGHT );
     }else if(newOrientation == 3){
         ofxiPhoneSetOrientation( OF_ORIENTATION_90_LEFT );
     }

     y2 = y1;
     y1 = y0;
     
     return y0;
 }
-
+//---------------------------------------------------------------
 void testApp::sendOscShape(int ctrlin){
     
     static int numpoints = 5;
     static int numcontrols = 5;
     //float values[points][controls] =

         core.pd.sendList("fromOF", toPD);
         //cout << ctrlName[i] << "sending" << ctrlout[i] << "\n";
     }
     
 }
+//---------------------------------------------------------------
 void testApp::sendFiltType(int ctrlin){
     static int numpoints = 3;
     static int numcontrols = 4;
     //float values[points][controls] =
     float ctrlout[numcontrols];

         
         core.pd.sendList("fromOF", toPD);
         //cout << ctrlName[i] << "sending" << ctrlout[i] << "\n";
     }
 }
+//---------------------------------------------------------------
 void testApp::sendFiltFreq(int ctrlin){
     List toPD;
     
     toPD.addSymbol("filtFreq");
     toPD.addFloat(ctrlin); 
     
     core.pd.sendList("fromOF", toPD);
 }
+//---------------------------------------------------------------
 void testApp::sendEnvShape(int ctrlin){
     static int numpoints = 5;
     static int numcontrols = 3;
     //float values[points][controls] =
     float ctrlout[numcontrols];

         
         core.pd.sendList("fromOF", toPD);
         //cout << ctrlName[i] << "sending" << ctrlout[i] << "\n";
     }
 }
+//---------------------------------------------------------------
 void testApp::sendModFreq(int ctrlin){
     float fm = ctrlin/127.;
     List toPD;
     
     toPD.addSymbol("FMFreq");
     toPD.addFloat(fm); // rounding here??
     
     core.pd.sendList("fromOF", toPD);
 }
+//---------------------------------------------------------------