TDE
/
arts
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/arts
0
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Rename a number of old tq methods that are no longer tq specific"

Browse Source 
This reverts commit 6e637ec10f.
pull/1/head
Timothy Pearson 13 years ago
parent 6e637ec10f
commit 37b0caa758
13 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File

18
flow/audioioaix.cc
Unescape View File

@ -116,9 +116,9 @@ AudioIOAIX::AudioIOAIX()
int fd = openDevice();
if( fd >= 0 )
{
audio_status audioStatus;
memset( &audioStatus, 0, sizeof(audio_status) );
ioctl(fd, AUDIO_STATUS, &audioStatus);
audio_status audiotqStatus;
memset( &audiotqStatus, 0, sizeof(audio_status) );
ioctl(fd, AUDIO_STATUS, &audiotqStatus);
audio_buffer audioBuffer;
memset( &audioBuffer, 0, sizeof(audio_buffer) );
@ -129,14 +129,14 @@ AudioIOAIX::AudioIOAIX()
/*
* default parameters
*/
param(samplingRate) = audioStatus.srate;
param(fragmentSize) = audioStatus.bsize;
param(fragmentCount) = audioBuffer.write_buf_cap / audioStatus.bsize;
param(channels) = audioStatus.channels;
param(samplingRate) = audiotqStatus.srate;
param(fragmentSize) = audiotqStatus.bsize;
param(fragmentCount) = audioBuffer.write_buf_cap / audiotqStatus.bsize;
param(channels) = audiotqStatus.channels;
param(direction) = 2;
param(format) = ( audioStatus.bits_per_sample==8 ) ? 8
: ( ( audioStatus.flags & AUDIO_BIG_ENDIAN ) ? 17 : 16 );
param(format) = ( audiotqStatus.bits_per_sample==8 ) ? 8
: ( ( audiotqStatus.flags & AUDIO_BIG_ENDIAN ) ? 17 : 16 );
}
}

2
flow/audioiocsl.cc
Unescape View File

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

2
flow/gsl/gslengine.c
Unescape View File

@ -664,7 +664,7 @@ gsl_engine_init (gboolean run_threaded,
gsl_engine_threaded = run_threaded;
gsl_externvar_bsize = block_size;
gsl_externvar_sample_freq = sample_freq;
gsl_externvar_sub_sample_mask = sub_sample_mask << 2; /* shift out sizeof (float) alignment */
gsl_externvar_sub_sample_mask = sub_sample_mask << 2; /* shift out sizeof (float) tqalignment */
gsl_externvar_sub_sample_steps = sub_sample_mask + 1;
_gsl_tick_stamp_set_leap (block_size);

4
flow/gsl/gslieee754.h
Unescape View File

@ -26,14 +26,14 @@ extern "C" {
#endif /* __cplusplus */
/* IEEE 754 single precision floating point layout:
/* IEEE 754 single precision floating point tqlayout:
* 31 30 23 22 0
* +--------+---------------+---------------+
* | s 1bit | e[30:23] 8bit | f[22:0] 23bit |
* +--------+---------------+---------------+
* B0------------------->B1------->B2-->B3-->
*
* IEEE 754 double precision floating point layout:
* IEEE 754 double precision floating point tqlayout:
* 63 62 52 51 32 31 0
* +--------+----------------+----------------+ +---------------+
* | s 1bit | e[62:52] 11bit | f[51:32] 20bit | | f[31:0] 32bit |

10
flow/gsl/gslloader-wav.c
Unescape View File

@ -201,7 +201,7 @@ typedef struct
static GslErrorType
wav_read_data_header (gint fd,
DataHeader *header,
guint byte_alignment)
guint byte_tqalignment)
{
guint n_bytes;
@ -241,12 +241,12 @@ wav_read_data_header (gint fd,
WAV_DEBUG ("failed to seek while skipping sub-chunk");
return GSL_ERROR_IO;
}
return wav_read_data_header (fd, header, byte_alignment);
return wav_read_data_header (fd, header, byte_tqalignment);
}
if (header->data_length < 1 || header->data_length % byte_alignment != 0)
if (header->data_length < 1 || header->data_length % byte_tqalignment != 0)
{
WAV_DEBUG ("invalid data length (%u) or alignment (%u)",
header->data_length, header->data_length % byte_alignment);
WAV_DEBUG ("invalid data length (%u) or tqalignment (%u)",
header->data_length, header->data_length % byte_tqalignment);
return GSL_ERROR_FORMAT_INVALID;
}

2
flow/gsl/gslopschedule.c
Unescape View File

@ -158,7 +158,7 @@ static void
_engine_schedule_grow (EngineSchedule *sched,
guint leaf_level)
{
guint ll = 1 << g_bit_storage (leaf_level); /* power2 growth alignment, ll >= leaf_level+1 */
guint ll = 1 << g_bit_storage (leaf_level); /* power2 growth tqalignment, ll >= leaf_level+1 */
if (sched->leaf_levels < ll)
{

2
mcop/object.cc
Unescape View File

@ -1127,7 +1127,7 @@ Object_stub::Object_stub(Connection *connection, long objectID)
Object_stub::~Object_stub()
{
/*
* invalidate method lookup cache entries of this object, as it might
* tqinvalidate method lookup cache entries of this object, as it might
* happen, that another Object_stub is created just at the same position
*/
if(_lookupMethodCache)

4
soundserver/artsshell.cc
Unescape View File

@ -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;

2
soundserver/kmedia2.idl
Unescape View File

@ -1,6 +1,6 @@
/*
NEW KMedia2 layout:
NEW KMedia2 tqlayout:
===================
KMedia1 itself doesn't play anything. Instead it has a backend for every

4
soundserver/soundserver.idl
Unescape View File

@ -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

4
soundserver/soundserver_impl.cc
Unescape View File

@ -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

2
soundserver/soundserver_impl.h
Unescape View File

@ -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();

2
tests/testwrapper.cc
Unescape View File

@ -157,7 +157,7 @@ struct TestWrapper : public TestCase
d.value(6);
testEquals(1, active_d_objects);
b = d; // uses operator, not constructor. should invalidate A::cacheOK
b = d; // uses operator, not constructor. should tqinvalidate A::cacheOK
testEquals(6, b.value());
testEquals(1, active_d_objects);

Write Preview
Loading…
Cancel
Save