Browse Source

Rename old tq methods that no longer need a unique name

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
bdff7895a8

+ 9
- 9
flow/audioioaix.cc View File

@@ -116,9 +116,9 @@ AudioIOAIX::AudioIOAIX()
116 116
 	int fd = openDevice();
117 117
 	if( fd >= 0 )
118 118
 	{
119
-		audio_status audiotqStatus;
120
-		memset( &audiotqStatus, 0, sizeof(audio_status) );
121
-		ioctl(fd, AUDIO_STATUS, &audiotqStatus);
119
+		audio_status audioStatus;
120
+		memset( &audioStatus, 0, sizeof(audio_status) );
121
+		ioctl(fd, AUDIO_STATUS, &audioStatus);
122 122
 
123 123
 		audio_buffer audioBuffer;
124 124
 		memset( &audioBuffer, 0, sizeof(audio_buffer) );
@@ -129,14 +129,14 @@ AudioIOAIX::AudioIOAIX()
129 129
 		/*
130 130
 		 * default parameters
131 131
 		 */
132
-		param(samplingRate)  = audiotqStatus.srate;
133
-		param(fragmentSize)  = audiotqStatus.bsize;
134
-		param(fragmentCount) = audioBuffer.write_buf_cap / audiotqStatus.bsize;
135
-		param(channels)      = audiotqStatus.channels;
132
+		param(samplingRate)  = audioStatus.srate;
133
+		param(fragmentSize)  = audioStatus.bsize;
134
+		param(fragmentCount) = audioBuffer.write_buf_cap / audioStatus.bsize;
135
+		param(channels)      = audioStatus.channels;
136 136
 		param(direction)     = 2;
137 137
 
138
-		param(format)        = ( audiotqStatus.bits_per_sample==8 ) ? 8
139
-			: ( ( audiotqStatus.flags & AUDIO_BIG_ENDIAN ) ? 17 : 16 );
138
+		param(format)        = ( audioStatus.bits_per_sample==8 ) ? 8
139
+			: ( ( audioStatus.flags & AUDIO_BIG_ENDIAN ) ? 17 : 16 );
140 140
 	}
141 141
 }
142 142
 

+ 1
- 1
flow/audioiocsl.cc View File

@@ -470,7 +470,7 @@ void AudioIOCSL::setParam(AudioParam p, int& value)
470 470
 int AudioIOCSL::getParam(AudioParam p)
471 471
 {
472 472
     CslErrorType error;
473
-	CslPcmtqStatus status;
473
+	CslPcmStatus status;
474 474
 
475 475
 	switch(p)
476 476
 	{

+ 2
- 2
soundserver/artsshell.cc View File

@@ -254,7 +254,7 @@ int suspend(Arts::SoundServer server)
254 254
 // Display server status information
255 255
 void status(Arts::SoundServerV2 server)
256 256
 {
257
-	Arts::RealtimetqStatus rttqStatus = server.realtimetqStatus();
257
+	Arts::RealtimeStatus rtStatus = server.realtimeStatus();
258 258
 	long seconds = server.secondsUntilSuspend();
259 259
 
260 260
 	cout << "server status: ";
@@ -274,7 +274,7 @@ void status(Arts::SoundServerV2 server)
274 274
 	}
275 275
 
276 276
 	cout << "real-time status: ";
277
-	switch (rttqStatus)
277
+	switch (rtStatus)
278 278
 	{
279 279
 	  case Arts::rtRealtime:
280 280
 		  cout << "real-time" << endl;

+ 2
- 2
soundserver/soundserver.idl View File

@@ -163,7 +163,7 @@ interface SimpleSoundServer : PlayObjectFactory
163 163
 	object createObject(string name);
164 164
 };
165 165
 
166
-enum RealtimetqStatus { rtRealtime, rtNoSupport, rtNoWrapper, rtNoRealtime };
166
+enum RealtimeStatus { rtRealtime, rtNoSupport, rtNoWrapper, rtNoRealtime };
167 167
 
168 168
 /**
169 169
  * This is an enhanced sound server interface which can be used to
@@ -171,7 +171,7 @@ enum RealtimetqStatus { rtRealtime, rtNoSupport, rtNoWrapper, rtNoRealtime };
171 171
  */
172 172
 interface SoundServer : SimpleSoundServer
173 173
 {
174
-	readonly attribute RealtimetqStatus realtimetqStatus;
174
+	readonly attribute RealtimeStatus realtimeStatus;
175 175
 
176 176
 	/**
177 177
 	 * Returns how many seconds you have to wait _now_ for the soundserver

+ 2
- 2
soundserver/soundserver_impl.cc View File

@@ -39,14 +39,14 @@ using namespace Arts;
39 39
 
40 40
 #ifdef HAVE_REALTIME_SCHED
41 41
 #include <sched.h>
42
-RealtimetqStatus SoundServer_impl::realtimetqStatus() {
42
+RealtimeStatus SoundServer_impl::realtimeStatus() {
43 43
 	int sched = sched_getscheduler(0);
44 44
 	if (sched == SCHED_FIFO || sched == SCHED_RR) return rtRealtime;
45 45
 	if (!getenv("STARTED_THROUGH_ARTSWRAPPER")) return rtNoWrapper;
46 46
 	return rtNoRealtime;
47 47
 }
48 48
 #else
49
-RealtimetqStatus SoundServer_impl::realtimetqStatus() {
49
+RealtimeStatus SoundServer_impl::realtimeStatus() {
50 50
 	return rtNoSupport;
51 51
 }
52 52
 #endif

+ 1
- 1
soundserver/soundserver_impl.h View File

@@ -35,7 +35,7 @@ namespace Arts {
35 35
 	class SoundServer_impl : virtual public SoundServer_skel,
36 36
 							 public SimpleSoundServer_impl
37 37
 	{
38
-		RealtimetqStatus realtimetqStatus();
38
+		RealtimeStatus realtimeStatus();
39 39
 		long secondsUntilSuspend();
40 40
 		bool suspend();
41 41
 		bool suspended();

Loading…
Cancel
Save