diff options
Diffstat (limited to 'src/SekaijuApp.cpp')
| -rw-r--r-- | src/SekaijuApp.cpp | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/src/SekaijuApp.cpp b/src/SekaijuApp.cpp index 0b64aa2..c7f92d4 100644 --- a/src/SekaijuApp.cpp +++ b/src/SekaijuApp.cpp @@ -1646,8 +1646,7 @@ BOOL CSekaijuApp::PlayRecordProc (LPVOID pInfo) { long lOutputPort = CLIP (0, m_theMetronomeDlgStatus.m_nOutputPort, 15);
long lOutputChannel = CLIP (0, m_theMetronomeDlgStatus.m_nOutputChannel, 15);
// 最初の1小節目の強打を鳴らすためのトリック
- if (pSekaijuDoc->m_lOldTime == pSekaijuDoc->m_lNewTime &&
- lOldBeat == 0 && lOldTick == 0 && this->m_bFirstMetronome == TRUE) {
+ if (lOldBeat == 0 && lOldTick == 0 && m_bFirstMetronome == TRUE) {
lOldMeasure --;
}
m_bFirstMetronome = FALSE;
@@ -2697,6 +2696,30 @@ long CSekaijuApp::StartRecording (CDocument* pDocument) { CMainFrame* pMainFrame = (CMainFrame*)AfxGetMainWnd ();
CSekaijuDoc* pSekaijuDoc = (CSekaijuDoc*)pDocument;
long lCurTime = MIDIClock_GetTickCount (pSekaijuDoc->m_pMIDIClock);
+
+ // 履歴記録
+ MIDITrack* pMIDITrack = NULL;
+ MIDIEvent* pLastEvent = NULL;
+ MIDIEvent* pCloneEvent = NULL;
+ CHistoryUnit* pCurHistoryUnit = NULL;
+ pSekaijuDoc->AddHistoryUnit (_T("リアルタイム入力"));
+ VERIFY (pCurHistoryUnit = pSekaijuDoc->GetCurHistoryUnit ());
+ // EOTの履歴記録
+ forEachTrack (pSekaijuDoc->m_pMIDIData, pMIDITrack) {
+ pLastEvent = MIDITrack_GetLastEvent (pMIDITrack);
+ if (pLastEvent) {
+ if (MIDIEvent_IsEndofTrack (pLastEvent)) {
+ VERIFY (pCurHistoryUnit->AddHistoryRecord (HISTORYRECORD_REMOVEEVENT, pLastEvent));
+ VERIFY (pCloneEvent = pSekaijuDoc->ReplaceMIDIEvent (pLastEvent));
+ }
+ }
+ }
+ // 記録開始
+ pSekaijuDoc->SetModifiedFlag (TRUE);
+ m_theTempRecordedEventArray.RemoveAll ();
+ m_bFirstMetronome = TRUE;
+ m_bRecording = TRUE;
+ pSekaijuDoc->UpdateAllViews (NULL, SEKAIJUDOC_RECORDSTARTED | SEKAIJUDOC_MIDIEVENTCHANGED);
// 演奏中でない場合
if (!m_bPlaying) {
long lOutputPort;
@@ -2719,33 +2742,9 @@ long CSekaijuApp::StartRecording (CDocument* pDocument) { pSekaijuDoc->TimeMIDIStatus (lCurTime, m_pTempMIDIStatus); // 20090626修正
SendDifferentStatus (m_theGeneralOption.m_bPlayUpdate ? SDS_ALL : SDS_NOTE);
m_bIgnoreNoteEvent = TRUE; // 20090626修正
- pSekaijuDoc->m_lOldTime = lCurTime;
+ m_bPlaying = TRUE;
MIDIClock_Start (pSekaijuDoc->m_pMIDIClock);
- m_bPlaying = TRUE;
}
- // 履歴記録
- MIDITrack* pMIDITrack = NULL;
- MIDIEvent* pLastEvent = NULL;
- MIDIEvent* pCloneEvent = NULL;
- CHistoryUnit* pCurHistoryUnit = NULL;
- pSekaijuDoc->AddHistoryUnit (_T("リアルタイム入力"));
- VERIFY (pCurHistoryUnit = pSekaijuDoc->GetCurHistoryUnit ());
- // EOTの履歴記録
- forEachTrack (pSekaijuDoc->m_pMIDIData, pMIDITrack) {
- pLastEvent = MIDITrack_GetLastEvent (pMIDITrack);
- if (pLastEvent) {
- if (MIDIEvent_IsEndofTrack (pLastEvent)) {
- VERIFY (pCurHistoryUnit->AddHistoryRecord (HISTORYRECORD_REMOVEEVENT, pLastEvent));
- VERIFY (pCloneEvent = pSekaijuDoc->ReplaceMIDIEvent (pLastEvent));
- }
- }
- }
- // 記録開始
- pSekaijuDoc->SetModifiedFlag (TRUE);
- m_theTempRecordedEventArray.RemoveAll ();
- m_bFirstMetronome = TRUE;
- m_bRecording = TRUE;
- pSekaijuDoc->UpdateAllViews (NULL, SEKAIJUDOC_RECORDSTARTED | SEKAIJUDOC_MIDIEVENTCHANGED);
return 1;
}
|