diff options
Diffstat (limited to 'soundserver')
| -rw-r--r-- | soundserver/artsshell.cc | 4 | ||||
| -rw-r--r-- | soundserver/kmedia2.idl | 2 | ||||
| -rw-r--r-- | soundserver/soundserver.idl | 4 | ||||
| -rw-r--r-- | soundserver/soundserver_impl.cc | 4 | ||||
| -rw-r--r-- | soundserver/soundserver_impl.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/soundserver/artsshell.cc b/soundserver/artsshell.cc index 59390c8..ebda656 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::RealtimeStatus rtStatus = server.realtimeStatus(); + Arts::RealtimetqStatus rttqStatus = server.realtimetqStatus(); long seconds = server.secondsUntilSuspend(); cout << "server status: "; @@ -274,7 +274,7 @@ void status(Arts::SoundServerV2 server) } cout << "real-time status: "; - switch (rtStatus) + switch (rttqStatus) { case Arts::rtRealtime: cout << "real-time" << endl; diff --git a/soundserver/kmedia2.idl b/soundserver/kmedia2.idl index cdcb101..96fd5a0 100644 --- a/soundserver/kmedia2.idl +++ b/soundserver/kmedia2.idl @@ -1,6 +1,6 @@ /* -NEW KMedia2 layout: +NEW KMedia2 tqlayout: =================== KMedia1 itself doesn't play anything. Instead it has a backend for every diff --git a/soundserver/soundserver.idl b/soundserver/soundserver.idl index 7c2cc41..8cdc2d1 100644 --- a/soundserver/soundserver.idl +++ b/soundserver/soundserver.idl @@ -163,7 +163,7 @@ interface SimpleSoundServer : PlayObjectFactory object createObject(string name); }; -enum RealtimeStatus { rtRealtime, rtNoSupport, rtNoWrapper, rtNoRealtime }; +enum RealtimetqStatus { rtRealtime, rtNoSupport, rtNoWrapper, rtNoRealtime }; /** * This is an enhanced sound server interface which can be used to @@ -171,7 +171,7 @@ enum RealtimeStatus { rtRealtime, rtNoSupport, rtNoWrapper, rtNoRealtime }; */ interface SoundServer : SimpleSoundServer { - readonly attribute RealtimeStatus realtimeStatus; + readonly attribute RealtimetqStatus realtimetqStatus; /** * 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 7c84792..b922692 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> -RealtimeStatus SoundServer_impl::realtimeStatus() { +RealtimetqStatus SoundServer_impl::realtimetqStatus() { int sched = sched_getscheduler(0); if (sched == SCHED_FIFO || sched == SCHED_RR) return rtRealtime; if (!getenv("STARTED_THROUGH_ARTSWRAPPER")) return rtNoWrapper; return rtNoRealtime; } #else -RealtimeStatus SoundServer_impl::realtimeStatus() { +RealtimetqStatus SoundServer_impl::realtimetqStatus() { return rtNoSupport; } #endif diff --git a/soundserver/soundserver_impl.h b/soundserver/soundserver_impl.h index 670b146..87ce72c 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 { - RealtimeStatus realtimeStatus(); + RealtimetqStatus realtimetqStatus(); long secondsUntilSuspend(); bool suspend(); bool suspended(); |