|
@@ -310,6 +310,8 @@
|
|
|
case TUNINGACTION_PLAY: // 播放音叉
|
|
|
{
|
|
|
[self startForkPlay];
|
|
|
+ // 停止播放节拍器
|
|
|
+ [self stopPlayBeat];
|
|
|
}
|
|
|
break;
|
|
|
case TUNINGACTION_STOP: // 停止音叉
|
|
@@ -320,6 +322,8 @@
|
|
|
case TUNINGACTION_BEATPLAY:
|
|
|
{
|
|
|
[self startPlayBeat];
|
|
|
+ // 停止音叉
|
|
|
+ [self stopForkPlay];
|
|
|
}
|
|
|
break;
|
|
|
case TUNINGACTION_BEATSTOP:
|
|
@@ -411,7 +415,8 @@
|
|
|
MJWeakSelf;
|
|
|
[_forkView forkSettingAction:^(CGFloat frequence, BOOL isSure) {
|
|
|
NSLog(@"----- frequence %f", frequence);
|
|
|
-
|
|
|
+ // 停止播放节拍器
|
|
|
+ [weakSelf stopPlayBeat];
|
|
|
weakSelf.chooseFrequence = frequence;
|
|
|
if (weakSelf.bodyView.isPlaying) {
|
|
|
CGFloat changefrequence = frequence / A4_FREQUENCE_INTABLE * self.A4Frequence;
|