diff options
| author | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-09-09 03:49:53 +0000 |
|---|---|---|
| committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-09-09 03:49:53 +0000 |
| commit | ad72332d2cbd0d22e5d49d9fd60c985e563b17d0 (patch) | |
| tree | 11f22bb42664eb9e8aa2527ec175d20dd09a0390 /muse2/muse/driver | |
| parent | d3e8a1b4c98cb3ba8b73f367ea88ad23f8dbca66 (diff) | |
namespace work (part deux)
Diffstat (limited to 'muse2/muse/driver')
| -rw-r--r-- | muse2/muse/driver/dummyaudio.cpp | 4 | ||||
| -rw-r--r-- | muse2/muse/driver/jack.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/muse2/muse/driver/dummyaudio.cpp b/muse2/muse/driver/dummyaudio.cpp index 77b08252..4466e293 100644 --- a/muse2/muse/driver/dummyaudio.cpp +++ b/muse2/muse/driver/dummyaudio.cpp @@ -140,7 +140,7 @@ class DummyAudioDevice : public AudioDevice { return _framePos; } virtual unsigned frameTime() const { - return lrint(curTime() * MusEGlobal::sampleRate); + return lrint(MusEUtil::curTime() * MusEGlobal::sampleRate); } virtual bool isRealtime() { return realtimeFlag; } //virtual int realtimePriority() const { return 40; } @@ -221,7 +221,7 @@ DummyAudioDevice::DummyAudioDevice() realtimeFlag = false; seekflag = false; state = Audio::STOP; - //startTime = curTime(); + //startTime = MusEUtil::curTime(); _framePos = 0; playPos = 0; cmdQueue.clear(); diff --git a/muse2/muse/driver/jack.cpp b/muse2/muse/driver/jack.cpp index f99e07b9..31179ea3 100644 --- a/muse2/muse/driver/jack.cpp +++ b/muse2/muse/driver/jack.cpp @@ -1868,11 +1868,11 @@ bool JackAudioDevice::dummySync(int state) //timespec ts = { 0, (1000000000 * MusEGlobal::segmentSize) / MusEGlobal::sampleRate }; // In nanoseconds. unsigned int sl = (1000000 * MusEGlobal::segmentSize) / MusEGlobal::sampleRate; // In microseconds. - double ct = curTime(); + double ct = MusEUtil::curTime(); // Wait for a default maximum of 5 seconds. // Similar to how Jack is supposed to wait a default of 2 seconds for slow clients. // TODO: Make this timeout a 'settings' option so it can be applied both to Jack and here. - while((curTime() - ct) < 5.0) + while((MusEUtil::curTime() - ct) < 5.0) { // Is MusE audio ready to roll? if(audio->sync(state, dummyPos)) |