comparison 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.
author Robert Tubb <rt300@eecs.qmul.ac.uk>
date Mon, 22 Apr 2013 18:32:34 +0100
parents df7c08faf541
children 1e266647840d
comparison
equal deleted inserted replaced
43:b91a1859829a 44:a1e75b94c505
83 - (IBAction)savePressed:(id)sender { 83 - (IBAction)savePressed:(id)sender {
84 cout << "SAVE PRESET\n"; 84 cout << "SAVE PRESET\n";
85 presetManager.showNameDialog(); 85 presetManager.showNameDialog();
86 } 86 }
87 87
88 // this is crap
88 - (IBAction)lockSequencePressed:(id)sender { 89 - (IBAction)lockSequencePressed:(id)sender {
89 UIBarButtonItem *button = (UIBarButtonItem *)sender; 90 UIBarButtonItem *button = (UIBarButtonItem *)sender;
90 if([button.title isEqualToString:@"Lock X"]){ 91 if([button.title isEqualToString:@"Lock X"]){
91 ((testApp *)self.theOFAppRef)->lockSequencerPressed(true); 92 ((testApp *)self.theOFAppRef)->lockSequencerPressed(true);
92 button.title = @"Unlock X"; 93 button.title = @"Unlock X";
94 // if other one is locked , ulock it
95 if([self.lockYButton.title isEqualToString:@"Unlock Y"]){
96 ((testApp *)self.theOFAppRef)->lockSynthPressed(false);
97 self.lockYButton.title = @"Lock Y";
98 }
93 }else if([button.title isEqualToString:@"Unlock X"]){ 99 }else if([button.title isEqualToString:@"Unlock X"]){
94 ((testApp *)self.theOFAppRef)->lockSequencerPressed(false); 100 ((testApp *)self.theOFAppRef)->lockSequencerPressed(false);
95 button.title = @"Lock X"; 101 button.title = @"Lock X";
96 }else{ 102 }else{
97 NSLog(@"button title error"); 103 NSLog(@"button title error");
101 - (IBAction)lockSynthPressed:(id)sender { 107 - (IBAction)lockSynthPressed:(id)sender {
102 UIBarButtonItem *button = (UIBarButtonItem *)sender; 108 UIBarButtonItem *button = (UIBarButtonItem *)sender;
103 if([button.title isEqualToString:@"Lock Y"]){ 109 if([button.title isEqualToString:@"Lock Y"]){
104 ((testApp *)self.theOFAppRef)->lockSynthPressed(true); 110 ((testApp *)self.theOFAppRef)->lockSynthPressed(true);
105 button.title = @"Unlock Y"; 111 button.title = @"Unlock Y";
112 // if other one is locked , ulock it
113 if([self.lockXButton.title isEqualToString:@"Unlock X"]){
114 ((testApp *)self.theOFAppRef)->lockSequencerPressed(false);
115 self.lockXButton.title = @"Lock X";
116 }
117
106 }else if([button.title isEqualToString:@"Unlock Y"]){ 118 }else if([button.title isEqualToString:@"Unlock Y"]){
107 ((testApp *)self.theOFAppRef)->lockSynthPressed(false); 119 ((testApp *)self.theOFAppRef)->lockSynthPressed(false);
108 button.title = @"Lock Y"; 120 button.title = @"Lock Y";
109 }else{ 121 }else{
110 NSLog(@"button title error"); 122 NSLog(@"button title error");
163 [_newUserButton release]; 175 [_newUserButton release];
164 [_smoothText release]; 176 [_smoothText release];
165 [_smoothSwitch release]; 177 [_smoothSwitch release];
166 [_smoothToggle release]; 178 [_smoothToggle release];
167 [_savePresetButton release]; 179 [_savePresetButton release];
180 [_lockXButton release];
181 [_lockYButton release];
168 [super dealloc]; 182 [super dealloc];
169 } 183 }
170 - (void)viewDidUnload { 184 - (void)viewDidUnload {
171 [self setPlayButton:nil]; 185 [self setPlayButton:nil];
172 [self setPauseButton:nil]; 186 [self setPauseButton:nil];
174 [self setNewUserButton:nil]; 188 [self setNewUserButton:nil];
175 [self setSmoothText:nil]; 189 [self setSmoothText:nil];
176 [self setSmoothSwitch:nil]; 190 [self setSmoothSwitch:nil];
177 [self setSmoothToggle:nil]; 191 [self setSmoothToggle:nil];
178 [self setSavePresetButton:nil]; 192 [self setSavePresetButton:nil];
193 [self setLockXButton:nil];
194 [self setLockYButton:nil];
179 [super viewDidUnload]; 195 [super viewDidUnload];
180 } 196 }
181 @end 197 @end