diff options
| -rw-r--r-- | flow/audioioaix.cc | 18 | ||||
| -rw-r--r-- | flow/audioiocsl.cc | 2 | ||||
| -rw-r--r-- | soundserver/artsshell.cc | 4 | ||||
| -rw-r--r-- | soundserver/soundserver.idl | 4 | ||||
| -rw-r--r-- | soundserver/soundserver_impl.cc | 4 | ||||
| -rw-r--r-- | soundserver/soundserver_impl.h | 2 |
6 files changed, 17 insertions, 17 deletions
diff --git a/flow/audioioaix.cc b/flow/audioioaix.cc index 2e77685..b5c288b 100644 --- a/flow/audioioaix.cc +++ b/flow/audioioaix.cc @@ -116,9 +116,9 @@ AudioIOAIX::AudioIOAIX() int fd = openDevice(); if( fd >= 0 ) { - audio_status audiotqStatus; - memset( &audiotqStatus, 0, sizeof(audio_status) ); - ioctl(fd, AUDIO_STATUS, &audiotqStatus); + audio_status audioStatus; + memset( &audioStatus, 0, sizeof(audio_status) ); + ioctl(fd, AUDIO_STATUS, &audioStatus); audio_buffer audioBuffer; memset( &audioBuffer, 0, sizeof(audio_buffer) ); @@ -129,14 +129,14 @@ AudioIOAIX::AudioIOAIX() /* * default parameters */ - param(samplingRate) = audiotqStatus.srate; - param(fragmentSize) = audiotqStatus.bsize; - param(fragmentCount) = audioBuffer.write_buf_cap / audiotqStatus.bsize; - param(channels) = audiotqStatus.channels; + param(samplingRate) = audioStatus.srate; + param(fragmentSize) = audioStatus.bsize; + param(fragmentCount) = audioBuffer.write_buf_cap / audioStatus.bsize; + param(channels) = audioStatus.channels; param(direction) = 2; - param(format) = ( audiotqStatus.bits_per_sample==8 ) ? 8 - : ( ( audiotqStatus.flags & AUDIO_BIG_ENDIAN ) ? 17 : 16 ); + param(format) = ( audioStatus.bits_per_sample==8 ) ? 8 + : ( ( audioStatus.flags & AUDIO_BIG_ENDIAN ) ? 17 : 16 ); } } diff --git a/flow/audioiocsl.cc b/flow/audioiocsl.cc index e5532a2..7f3d5dd 100644 --- a/flow/audioiocsl.cc +++ b/flow/audioiocsl.cc @@ -470,7 +470,7 @@ void AudioIOCSL::setParam(AudioParam p, int& value) int AudioIOCSL::getParam(AudioParam p) { CslErrorType error; - CslPcmtqStatus status; + CslPcmStatus status; switch(p) { diff --git a/soundserver/artsshell.cc b/soundserver/artsshell.cc index ebda656..59390c8 100644 --- a/soundserver/artsshell.cc +++ b/soundserver/artsshell.cc @@ -254,7 +254,7 @@ int suspend(Arts::SoundServer server) // Display server status information void status(Arts::SoundServerV2 server) { - Arts::RealtimetqStatus rttqStatus = server.realtimetqStatus(); + Arts::RealtimeStatus rtStatus = server.realtimeStatus(); long seconds = server.secondsUntilSuspend(); cout << "server status: "; @@ -274,7 +274,7 @@ void status(Arts::SoundServerV2 server) } cout << "real-time status: "; - switch (rttqStatus) + switch (rtStatus) { case Arts::rtRealtime: cout << "real-time" << endl; diff --git a/soundserver/soundserver.idl b/soundserver/soundserver.idl index 8cdc2d1..7c2cc41 100644 --- a/soundserver/soundserver.idl +++ b/soundserver/soundserver.idl @@ -163,7 +163,7 @@ interface SimpleSoundServer : PlayObjectFactory object createObject(string name); }; -enum RealtimetqStatus { rtRealtime, rtNoSupport, rtNoWrapper, rtNoRealtime }; +enum RealtimeStatus { rtRealtime, rtNoSupport, rtNoWrapper, rtNoRealtime }; /** * This is an enhanced sound server interface which can be used to @@ -171,7 +171,7 @@ enum RealtimetqStatus { rtRealtime, rtNoSupport, rtNoWrapper, rtNoRealtime }; */ interface SoundServer : SimpleSoundServer { - readonly attribute RealtimetqStatus realtimetqStatus; + readonly attribute RealtimeStatus realtimeStatus; /** * Returns how many seconds you have to wait _now_ for the soundserver diff --git a/soundserver/soundserver_impl.cc b/soundserver/soundserver_impl.cc index b922692..7c84792 100644 --- a/soundserver/soundserver_impl.cc +++ b/soundserver/soundserver_impl.cc @@ -39,14 +39,14 @@ using namespace Arts; #ifdef HAVE_REALTIME_SCHED #include <sched.h> -RealtimetqStatus SoundServer_impl::realtimetqStatus() { +RealtimeStatus SoundServer_impl::realtimeStatus() { int sched = sched_getscheduler(0); if (sched == SCHED_FIFO || sched == SCHED_RR) return rtRealtime; if (!getenv("STARTED_THROUGH_ARTSWRAPPER")) return rtNoWrapper; return rtNoRealtime; } #else -RealtimetqStatus SoundServer_impl::realtimetqStatus() { +RealtimeStatus SoundServer_impl::realtimeStatus() { return rtNoSupport; } #endif diff --git a/soundserver/soundserver_impl.h b/soundserver/soundserver_impl.h index 87ce72c..670b146 100644 --- a/soundserver/soundserver_impl.h +++ b/soundserver/soundserver_impl.h @@ -35,7 +35,7 @@ namespace Arts { class SoundServer_impl : virtual public SoundServer_skel, public SimpleSoundServer_impl { - RealtimetqStatus realtimetqStatus(); + RealtimeStatus realtimeStatus(); long secondsUntilSuspend(); bool suspend(); bool suspended(); |