diff TopButtonViewController.mm @ 44:a1e75b94c505

Snap to eval points. Double tap to go to preset (doesn't quite work yet). Coloured locks. Changed Question 2. Fixed some leaks.

--- a/TopButtonViewController.mm	Fri Apr 19 18:50:04 2013 +0100
+++ b/TopButtonViewController.mm	Mon Apr 22 18:32:34 2013 +0100
@@ -85,11 +85,17 @@
     presetManager.showNameDialog();
 }
 
+// this is crap
 - (IBAction)lockSequencePressed:(id)sender {
     UIBarButtonItem *button = (UIBarButtonItem *)sender;
     if([button.title isEqualToString:@"Lock X"]){
         ((testApp *)self.theOFAppRef)->lockSequencerPressed(true);
         button.title = @"Unlock X";
+        // if other one is locked , ulock it
+        if([self.lockYButton.title isEqualToString:@"Unlock Y"]){
+            ((testApp *)self.theOFAppRef)->lockSynthPressed(false);
+            self.lockYButton.title = @"Lock Y";
+        }
     }else if([button.title isEqualToString:@"Unlock X"]){
         ((testApp *)self.theOFAppRef)->lockSequencerPressed(false);
         button.title = @"Lock X";
@@ -103,6 +109,12 @@
     if([button.title isEqualToString:@"Lock Y"]){
         ((testApp *)self.theOFAppRef)->lockSynthPressed(true);
         button.title = @"Unlock Y";
+        // if other one is locked , ulock it
+        if([self.lockXButton.title isEqualToString:@"Unlock X"]){
+            ((testApp *)self.theOFAppRef)->lockSequencerPressed(false);
+            self.lockXButton.title = @"Lock X";
+        }
+        
     }else if([button.title isEqualToString:@"Unlock Y"]){
         ((testApp *)self.theOFAppRef)->lockSynthPressed(false);
         button.title = @"Lock Y";
@@ -165,6 +177,8 @@
     [_smoothSwitch release];
     [_smoothToggle release];
     [_savePresetButton release];
+    [_lockXButton release];
+    [_lockYButton release];
     [super dealloc];
 }
 - (void)viewDidUnload {
@@ -176,6 +190,8 @@
     [self setSmoothSwitch:nil];
     [self setSmoothToggle:nil];
     [self setSavePresetButton:nil];
+    [self setLockXButton:nil];
+    [self setLockYButton:nil];
     [super viewDidUnload];
 }
 @end