Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-23 15:50:05 +02:00
Code Issues Releases Wiki Activity

Remove needless gAudioIO-> in member functions (AudioIO is singleton)

Browse Source
This commit is contained in:
Paul Licameli 2018-06-12 17:05:34 -04:00
parent 3353780bf9
commit fc497368a5
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/AudioIO.cpp
View File

@ -2245,7 +2245,7 @@ int AudioIO::StartStream(const TransportTracks &tracks,
int group = 0; int group = 0;
for (size_t i = 0, cnt = mPlaybackTracks.size(); i < cnt; i++) for (size_t i = 0, cnt = mPlaybackTracks.size(); i < cnt; i++)
{ {
const WaveTrack *vt = gAudioIO->mPlaybackTracks[i].get(); const WaveTrack *vt = mPlaybackTracks[i].get();
unsigned chanCnt = 1; unsigned chanCnt = 1;
if (vt->GetLinked()) if (vt->GetLinked())
@ -2464,7 +2464,7 @@ bool AudioIO::StartPortMidiStream()
return false; return false;
//wxPrintf("StartPortMidiStream: mT0 %g mTime %g\n", //wxPrintf("StartPortMidiStream: mT0 %g mTime %g\n",
// gAudioIO->mT0, gAudioIO->mTime); // mT0, mTime);
/* get midi playback device */ /* get midi playback device */
PmDeviceID playbackDevice = Pm_GetDefaultOutputDeviceID(); PmDeviceID playbackDevice = Pm_GetDefaultOutputDeviceID();
@ -4220,7 +4220,7 @@ void AudioIO::OutputEvent()
// The special event gAllNotesOff means "end of playback, send // The special event gAllNotesOff means "end of playback, send
// all notes off on all channels" // all notes off on all channels"
if (mNextEvent == &gAllNotesOff) { if (mNextEvent == &gAllNotesOff) {
bool looping = (mPlayMode == gAudioIO->PLAY_LOOPED); bool looping = (mPlayMode == PLAY_LOOPED);
AllNotesOff(looping); AllNotesOff(looping);
if (looping) { if (looping) {
// jump back to beginning of loop // jump back to beginning of loop
@ -4383,28 +4383,28 @@ bool AudioIO::SetHasSolo(bool hasSolo)
void AudioIO::FillMidiBuffers() void AudioIO::FillMidiBuffers()
{ {
// Keep track of time paused. If not paused, fill buffers. // Keep track of time paused. If not paused, fill buffers.
if (gAudioIO->IsPaused()) { if (IsPaused()) {
if (!gAudioIO->mMidiPaused) { if (!mMidiPaused) {
gAudioIO->mMidiPaused = true; mMidiPaused = true;
gAudioIO->AllNotesOff(); // to avoid hanging notes during pause AllNotesOff(); // to avoid hanging notes during pause
} }
return; return;
} }
if (gAudioIO->mMidiPaused) { if (mMidiPaused) {
gAudioIO->mMidiPaused = false; mMidiPaused = false;
} }
bool hasSolo = false; bool hasSolo = false;
auto numPlaybackTracks = gAudioIO->mPlaybackTracks.size(); auto numPlaybackTracks = mPlaybackTracks.size();
for(unsigned t = 0; t < numPlaybackTracks; t++ ) for(unsigned t = 0; t < numPlaybackTracks; t++ )
if( gAudioIO->mPlaybackTracks[t]->GetSolo() ) { if( mPlaybackTracks[t]->GetSolo() ) {
hasSolo = true; hasSolo = true;
break; break;
} }
auto numMidiPlaybackTracks = gAudioIO->mMidiPlaybackTracks.size(); auto numMidiPlaybackTracks = mMidiPlaybackTracks.size();
for(unsigned t = 0; t < numMidiPlaybackTracks; t++ ) for(unsigned t = 0; t < numMidiPlaybackTracks; t++ )
if( gAudioIO->mMidiPlaybackTracks[t]->GetSolo() ) { if( mMidiPlaybackTracks[t]->GetSolo() ) {
hasSolo = true; hasSolo = true;
break; break;
} }
@ -4428,8 +4428,8 @@ void AudioIO::FillMidiBuffers()
} }
// test for end // test for end
double realTime = gAudioIO->MidiTime() * 0.001 - double realTime = MidiTime() * 0.001 -
gAudioIO->PauseTime(); PauseTime();
realTime -= 1; // MidiTime() runs ahead 1s realTime -= 1; // MidiTime() runs ahead 1s
// XXX Is this still true now? It seems to break looping --Poke // XXX Is this still true now? It seems to break looping --Poke
@ -4447,15 +4447,15 @@ void AudioIO::FillMidiBuffers()
const double loopDelay = 0.220; const double loopDelay = 0.220;
double timeAtSpeed; double timeAtSpeed;
if (gAudioIO->mTimeTrack) if (mTimeTrack)
timeAtSpeed = gAudioIO->mTimeTrack->SolveWarpedLength(gAudioIO->mT0, realTime); timeAtSpeed = mTimeTrack->SolveWarpedLength(mT0, realTime);
else else
timeAtSpeed = realTime; timeAtSpeed = realTime;
gAudioIO->mMidiOutputComplete = mMidiOutputComplete =
(gAudioIO->mPlayMode == gAudioIO->PLAY_STRAIGHT && // PRL: what if scrubbing? (mPlayMode == PLAY_STRAIGHT && // PRL: what if scrubbing?
timeAtSpeed >= gAudioIO->mT1 + loopDelay); timeAtSpeed >= mT1 + loopDelay);
// !gAudioIO->mNextEvent); // !mNextEvent);
} }
double AudioIO::PauseTime() double AudioIO::PauseTime()