Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-16 08:09:32 +02:00
Code Issues Releases Wiki Activity

Removed Windows debugging commands accidentally left in. Play-at-speed should now work on NoteTracks if EXPERIMENTAL_MIDI_OUT is defined.

Browse Source
This commit is contained in:
rbdannenberg 2010-10-06 04:55:14 +00:00
parent 0d84a2d934
commit f52bafbf05
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nyquist/nyquist.lsp
View File

@ -1043,7 +1043,7 @@ Your id please: ")
(actual-dur (get-duration duration))) (actual-dur (get-duration duration)))
(setf min-dur (+ t1 t2 t4 0.002)) (setf min-dur (+ t1 t2 t4 0.002))
(cond ((< actual-dur min-dur) (cond ((< actual-dur min-dur)
(setf ratio (/ t1 (+ t1 t4))) (setf ratio (/ t1 (float (+ t1 t4))))
(setf t1 (* ratio actual-dur)) (setf t1 (* ratio actual-dur))
(setf t2 (- actual-dur t1)) (setf t2 (- actual-dur t1))
(setf t3 0.0) (setf t3 0.0)

5
src/AudioIO.cpp
View File

@ -1424,7 +1424,6 @@ void AudioIO::SetMeters(Meter *inputMeter, Meter *outputMeter)
void AudioIO::StopStream() void AudioIO::StopStream()
{ {
_RPT0(_CRT_WARN, "StopStream");
if( mPortStreamV19 == NULL if( mPortStreamV19 == NULL
#ifdef EXPERIMENTAL_MIDI_OUT #ifdef EXPERIMENTAL_MIDI_OUT
&& mMidiStream == NULL && mMidiStream == NULL
@ -1681,8 +1680,6 @@ bool AudioIO::IsStreamActive()
else isActive = false; else isActive = false;
#ifdef EXPERIMENTAL_MIDI_OUT #ifdef EXPERIMENTAL_MIDI_OUT
_RPT2(_CRT_WARN, "mMidiStreamActive %d, mMidiOutputComplete %d\n",
mMidiStreamActive, mMidiOutputComplete);
if( mMidiStreamActive && !mMidiOutputComplete ) if( mMidiStreamActive && !mMidiOutputComplete )
isActive = true; isActive = true;
#endif #endif
@ -2084,8 +2081,6 @@ MidiThread::ExitCode MidiThread::Entry()
// position at mT1 before shutting down the stream. // position at mT1 before shutting down the stream.
double timeAtSpeed = (realTime - gAudioIO->mT0) * double timeAtSpeed = (realTime - gAudioIO->mT0) *
gAudioIO->mMidiPlaySpeed + gAudioIO->mT0; gAudioIO->mMidiPlaySpeed + gAudioIO->mT0;
_RPT2(_CRT_WARN, "realTime %g, timeAtSpeed %g\n",
realTime, timeAtSpeed);
gAudioIO->mMidiOutputComplete = gAudioIO->mMidiOutputComplete =
(!gAudioIO->mPlayLooped && timeAtSpeed >= gAudioIO->mT1 + 0.220); (!gAudioIO->mPlayLooped && timeAtSpeed >= gAudioIO->mT1 + 0.220);

1
src/TrackPanel.cpp
View File

@ -872,7 +872,6 @@ void TrackPanel::OnTimer()
AudacityProject *p = GetProject(); AudacityProject *p = GetProject();
static int rptcnt = 0; static int rptcnt = 0;
_RPT1(_CRT_WARN, "OnTimer %d\n", rptcnt++);
if ((p->GetAudioIOToken() > 0) && if ((p->GetAudioIOToken() > 0) &&
gAudioIO->IsStreamActive(p->GetAudioIOToken())) gAudioIO->IsStreamActive(p->GetAudioIOToken()))
{ {