diff options
author | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-10-07 04:23:17 +0000 |
---|---|---|
committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-10-07 04:23:17 +0000 |
commit | 5367067f7a36dce8a362dcc000d41ac581bffdfe (patch) | |
tree | 0407ed68b4470749820b5bc6fb06d43388a83e97 /muse2/muse/audioprefetch.cpp | |
parent | f16b2037025918e32c5fd90527f76e1102e5ecb9 (diff) |
clean residual namespace work. fix python control build.
Diffstat (limited to 'muse2/muse/audioprefetch.cpp')
-rw-r--r-- | muse2/muse/audioprefetch.cpp | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/muse2/muse/audioprefetch.cpp b/muse2/muse/audioprefetch.cpp index e72b8a8c..9406911f 100644 --- a/muse2/muse/audioprefetch.cpp +++ b/muse2/muse/audioprefetch.cpp @@ -33,6 +33,12 @@ #include "audio.h" #include "sync.h" +namespace MusEGlobal { +MusECore::AudioPrefetch* audioPrefetch; +} + +namespace MusECore { + // Added by Tim. p3.3.20 //#define AUDIOPREFETCH_DEBUG @@ -47,8 +53,6 @@ struct PrefetchMsg : public ThreadMsg { int pos; }; -AudioPrefetch* audioPrefetch; - //--------------------------------------------------------- // AudioPrefetch //--------------------------------------------------------- @@ -82,7 +86,7 @@ static void readMsgP(void* p, void*) void AudioPrefetch::start(int priority) { clearPollFd(); - addPollFd(toThreadFdr, POLLIN, ::readMsgP, this, 0); + addPollFd(toThreadFdr, POLLIN, MusECore::readMsgP, this, 0); //Thread::start(); Thread::start(priority); } @@ -181,7 +185,7 @@ void AudioPrefetch::prefetch(bool doSeek) return; } if (MusEGlobal::song->loop() && !MusEGlobal::audio->bounce() && !MusEGlobal::extSyncFlag.value()) { - const MusECore::Pos& loop = MusEGlobal::song->rPos(); + const Pos& loop = MusEGlobal::song->rPos(); unsigned n = loop.frame() - writePos; if (n < MusEGlobal::segmentSize) { unsigned lpos = MusEGlobal::song->lPos().frame(); @@ -192,9 +196,9 @@ void AudioPrefetch::prefetch(bool doSeek) writePos = lpos - n; } } - MusECore::WaveTrackList* tl = MusEGlobal::song->waves(); - for (MusECore::iWaveTrack it = tl->begin(); it != tl->end(); ++it) { - MusECore::WaveTrack* track = *it; + WaveTrackList* tl = MusEGlobal::song->waves(); + for (iWaveTrack it = tl->begin(); it != tl->end(); ++it) { + 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 +249,9 @@ void AudioPrefetch::seek(unsigned seekTo) } writePos = seekTo; - MusECore::WaveTrackList* tl = MusEGlobal::song->waves(); - for (MusECore::iWaveTrack it = tl->begin(); it != tl->end(); ++it) { - MusECore::WaveTrack* track = *it; + WaveTrackList* tl = MusEGlobal::song->waves(); + for (iWaveTrack it = tl->begin(); it != tl->end(); ++it) { + WaveTrack* track = *it; track->clearPrefetchFifo(); } @@ -275,3 +279,5 @@ void AudioPrefetch::seek(unsigned seekTo) --seekCount; } +} // namespace MusECore + |