diff options
author | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-10-07 02:20:29 +0000 |
---|---|---|
committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-10-07 02:20:29 +0000 |
commit | f16b2037025918e32c5fd90527f76e1102e5ecb9 (patch) | |
tree | 0da3b7a29d13b5b826b291ccb2f2676d2e227b40 /muse2/muse/audioprefetch.cpp | |
parent | 42039e7f7f215f6008829d8c6be591c998f1228c (diff) |
(hopefully) final huge namespace update.
Diffstat (limited to 'muse2/muse/audioprefetch.cpp')
-rw-r--r-- | muse2/muse/audioprefetch.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/muse2/muse/audioprefetch.cpp b/muse2/muse/audioprefetch.cpp index cfdbb213..e72b8a8c 100644 --- a/muse2/muse/audioprefetch.cpp +++ b/muse2/muse/audioprefetch.cpp @@ -104,9 +104,9 @@ void AudioPrefetch::processMsg1(const void* m) const PrefetchMsg* msg = (PrefetchMsg*)m; switch(msg->id) { case PREFETCH_TICK: - if (audio->isRecording()) { + if (MusEGlobal::audio->isRecording()) { //puts("writeTick"); - audio->writeTick(); + MusEGlobal::audio->writeTick(); } // Indicate do not seek file before each read. // Changed by Tim. p3.3.17 @@ -180,11 +180,11 @@ void AudioPrefetch::prefetch(bool doSeek) printf("AudioPrefetch::prefetch: invalid write position\n"); return; } - if (song->loop() && !audio->bounce() && !extSyncFlag.value()) { - const Pos& loop = song->rPos(); + if (MusEGlobal::song->loop() && !MusEGlobal::audio->bounce() && !MusEGlobal::extSyncFlag.value()) { + const MusECore::Pos& loop = MusEGlobal::song->rPos(); unsigned n = loop.frame() - writePos; if (n < MusEGlobal::segmentSize) { - unsigned lpos = song->lPos().frame(); + unsigned lpos = MusEGlobal::song->lPos().frame(); // adjust loop start so we get exact loop len if (n > lpos) n = 0; @@ -192,9 +192,9 @@ void AudioPrefetch::prefetch(bool doSeek) writePos = lpos - n; } } - WaveTrackList* tl = song->waves(); - for (iWaveTrack it = tl->begin(); it != tl->end(); ++it) { - WaveTrack* track = *it; + MusECore::WaveTrackList* tl = MusEGlobal::song->waves(); + for (MusECore::iWaveTrack it = tl->begin(); it != tl->end(); ++it) { + MusECore::WaveTrack* track = *it; // p3.3.29 // Save time. Don't bother if track is off. Track On/Off not designed for rapid repeated response (but mute is). if(track->off()) @@ -245,9 +245,9 @@ void AudioPrefetch::seek(unsigned seekTo) } writePos = seekTo; - WaveTrackList* tl = song->waves(); - for (iWaveTrack it = tl->begin(); it != tl->end(); ++it) { - WaveTrack* track = *it; + MusECore::WaveTrackList* tl = MusEGlobal::song->waves(); + for (MusECore::iWaveTrack it = tl->begin(); it != tl->end(); ++it) { + MusECore::WaveTrack* track = *it; track->clearPrefetchFifo(); } |