Mercurial > hg > soniczoomios
comparison TopButtonViewController.mm @ 46:1e266647840d
beta 2.
interpolation movement , smoothing (crap) and timbre only.
author | Robert Tubb <rt300@eecs.qmul.ac.uk> |
---|---|
date | Wed, 24 Apr 2013 17:58:08 +0100 |
parents | a1e75b94c505 |
children |
comparison
equal
deleted
inserted
replaced
45:c2fffc8ea84d | 46:1e266647840d |
---|---|
70 | 70 |
71 - (IBAction)playPressed:(id)sender { | 71 - (IBAction)playPressed:(id)sender { |
72 ((testApp *)self.theOFAppRef)->seqStartStop(true); | 72 ((testApp *)self.theOFAppRef)->seqStartStop(true); |
73 self.playButton.enabled = false; | 73 self.playButton.enabled = false; |
74 self.pauseButton.enabled = true; | 74 self.pauseButton.enabled = true; |
75 self.seqNumText.text = [NSString stringWithFormat:@"%d", ((testApp *)self.theOFAppRef)->currentSequence]; | |
75 } | 76 } |
76 | 77 |
77 - (IBAction)pausePressed:(id)sender { | 78 - (IBAction)pausePressed:(id)sender { |
78 ((testApp *)self.theOFAppRef)->seqStartStop(false); | 79 ((testApp *)self.theOFAppRef)->seqStartStop(false); |
79 self.pauseButton.enabled = false; | 80 self.pauseButton.enabled = false; |
129 ((testApp *)self.theOFAppRef)->showQuestionnaire(); | 130 ((testApp *)self.theOFAppRef)->showQuestionnaire(); |
130 } | 131 } |
131 | 132 |
132 - (IBAction)randomise:(id)sender { | 133 - (IBAction)randomise:(id)sender { |
133 ((testApp *)self.theOFAppRef)->randomise(); | 134 ((testApp *)self.theOFAppRef)->randomise(); |
135 int seqNum = ((testApp *)self.theOFAppRef)->nextSequence(); | |
136 self.seqNumText.text = [NSString stringWithFormat:@"%d", seqNum]; | |
134 } | 137 } |
135 | 138 |
136 - (IBAction)helpPressed:(id)sender { | 139 - (IBAction)helpPressed:(id)sender { |
137 ((testApp *)self.theOFAppRef)->showHelp(); | 140 ((testApp *)self.theOFAppRef)->showHelp(); |
138 | 141 |
141 - (IBAction)newUser:(id)sender { | 144 - (IBAction)newUser:(id)sender { |
142 ((testApp *)self.theOFAppRef)->setupNewUser(); | 145 ((testApp *)self.theOFAppRef)->setupNewUser(); |
143 } | 146 } |
144 | 147 |
145 - (IBAction)nextSequence:(id)sender { | 148 - (IBAction)nextSequence:(id)sender { |
146 ((testApp *)self.theOFAppRef)->nextSequence(); | 149 int seqNum = ((testApp *)self.theOFAppRef)->nextSequence(); |
150 self.seqNumText.text = [NSString stringWithFormat:@"%d", seqNum]; | |
147 } | 151 } |
148 | 152 |
149 - (IBAction)smoothSwitchChanged:(id)sender { | 153 - (IBAction)smoothSwitchChanged:(id)sender { |
150 UISwitch * smoothswitch = (UISwitch *)sender; | 154 UISwitch * smoothswitch = (UISwitch *)sender; |
151 NSLog(@"SMOOTH SWITCH %d", smoothswitch.on); | 155 NSLog(@"SMOOTH SWITCH %d", smoothswitch.on); |
177 [_smoothSwitch release]; | 181 [_smoothSwitch release]; |
178 [_smoothToggle release]; | 182 [_smoothToggle release]; |
179 [_savePresetButton release]; | 183 [_savePresetButton release]; |
180 [_lockXButton release]; | 184 [_lockXButton release]; |
181 [_lockYButton release]; | 185 [_lockYButton release]; |
186 [_seqNumText release]; | |
182 [super dealloc]; | 187 [super dealloc]; |
183 } | 188 } |
184 - (void)viewDidUnload { | 189 - (void)viewDidUnload { |
185 [self setPlayButton:nil]; | 190 [self setPlayButton:nil]; |
186 [self setPauseButton:nil]; | 191 [self setPauseButton:nil]; |
190 [self setSmoothSwitch:nil]; | 195 [self setSmoothSwitch:nil]; |
191 [self setSmoothToggle:nil]; | 196 [self setSmoothToggle:nil]; |
192 [self setSavePresetButton:nil]; | 197 [self setSavePresetButton:nil]; |
193 [self setLockXButton:nil]; | 198 [self setLockXButton:nil]; |
194 [self setLockYButton:nil]; | 199 [self setLockYButton:nil]; |
200 [self setSeqNumText:nil]; | |
195 [super viewDidUnload]; | 201 [super viewDidUnload]; |
196 } | 202 } |
197 @end | 203 @end |