Browse Source

Automated conversion

aRts now compiles with TQt for Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/arts@1210526 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
tags/v3.5.13
tpearson 9 years ago
parent
commit
bf3bdf1468
100 changed files with 180 additions and 180 deletions
  1. +3
    -3
      COPYING
  2. +6
    -6
      COPYING.LIB
  3. +1
    -1
      INSTALL
  4. +1
    -1
      artsc/artsc.h
  5. +2
    -2
      artsc/artsdsp.c
  6. +2
    -2
      configure.in.in
  7. +2
    -2
      doc/TODO
  8. +1
    -1
      examples/testdhandle.cc
  9. +1
    -1
      flow/asyncschedule.h
  10. +1
    -1
      flow/audioio.h
  11. +9
    -9
      flow/audioioaix.cc
  12. +1
    -1
      flow/audioiocsl.cc
  13. +1
    -1
      flow/audiomanager_impl.cc
  14. +1
    -1
      flow/audiosubsys.h
  15. +1
    -1
      flow/bufferqueue.h
  16. +1
    -1
      flow/bus.h
  17. +1
    -1
      flow/cache.h
  18. +1
    -1
      flow/cachedwav.h
  19. +2
    -2
      flow/convert.h
  20. +1
    -1
      flow/cpuinfo.h
  21. +1
    -1
      flow/fft.h
  22. +5
    -5
      flow/gsl/gbsearcharray.h
  23. +6
    -6
      flow/gsl/gsl.3
  24. +8
    -8
      flow/gsl/gslcommon.c
  25. +1
    -1
      flow/gsl/gsldatacache.c
  26. +4
    -4
      flow/gsl/gsldatahandle-mad.c
  27. +6
    -6
      flow/gsl/gslengine.c
  28. +4
    -4
      flow/gsl/gslengine.h
  29. +2
    -2
      flow/gsl/gslfft.h
  30. +2
    -2
      flow/gsl/gslglib.h
  31. +2
    -2
      flow/gsl/gslieee754.h
  32. +5
    -5
      flow/gsl/gslloader-wav.c
  33. +11
    -11
      flow/gsl/gslmagic.c
  34. +1
    -1
      flow/gsl/gslmath.c
  35. +1
    -1
      flow/gsl/gslopschedule.c
  36. +1
    -1
      flow/gsl/gsloscillator-aux.c
  37. +2
    -2
      flow/gsl/gsloscillator.c
  38. +2
    -2
      flow/gsl/gslosctable.c
  39. +2
    -2
      flow/gsl/gslosctable.h
  40. +4
    -4
      flow/gsl/gslwaveosc.c
  41. +1
    -1
      flow/gslpp/datahandle.h
  42. +1
    -1
      flow/gslschedule.cc
  43. +1
    -1
      flow/gslschedule.h
  44. +1
    -1
      flow/pipebuffer.cc
  45. +1
    -1
      flow/pipebuffer.h
  46. +1
    -1
      flow/resample.h
  47. +1
    -1
      flow/stdsynthmodule.h
  48. +1
    -1
      flow/synth_play_wav_impl.cc
  49. +2
    -2
      flow/virtualports.cc
  50. +1
    -1
      flow/virtualports.h
  51. +1
    -1
      gmcop/giomanager.h
  52. +1
    -1
      mcop/anyref.h
  53. +1
    -1
      mcop/asyncstream.h
  54. +1
    -1
      mcop/buffer.h
  55. +1
    -1
      mcop/common.h
  56. +1
    -1
      mcop/connect.h
  57. +1
    -1
      mcop/connection.h
  58. +2
    -2
      mcop/core.idl
  59. +2
    -2
      mcop/datapacket.h
  60. +1
    -1
      mcop/debug.h
  61. +1
    -1
      mcop/delayedreturn.h
  62. +1
    -1
      mcop/dispatcher.h
  63. +1
    -1
      mcop/dynamicrequest.h
  64. +3
    -3
      mcop/dynamicskeleton.h
  65. +1
    -1
      mcop/extensionloader.h
  66. +1
    -1
      mcop/factory.h
  67. +1
    -1
      mcop/flowsystem.h
  68. +1
    -1
      mcop/idlfilereg.h
  69. +1
    -1
      mcop/ifacerepo_impl.h
  70. +1
    -1
      mcop/iomanager.h
  71. +1
    -1
      mcop/loopback.h
  72. +1
    -1
      mcop/mcopconfig.h
  73. +1
    -1
      mcop/mcoputils.cc
  74. +1
    -1
      mcop/mcoputils.h
  75. +1
    -1
      mcop/md5.h
  76. +1
    -1
      mcop/md5auth.h
  77. +1
    -1
      mcop/namedstore.h
  78. +1
    -1
      mcop/notification.h
  79. +1
    -1
      mcop/object.cc
  80. +2
    -2
      mcop/object.h
  81. +1
    -1
      mcop/objectmanager.h
  82. +1
    -1
      mcop/pool.h
  83. +1
    -1
      mcop/reference.h
  84. +1
    -1
      mcop/referenceclean.h
  85. +1
    -1
      mcop/socketconnection.h
  86. +1
    -1
      mcop/startupmanager.h
  87. +1
    -1
      mcop/tcpconnection.h
  88. +1
    -1
      mcop/tcpserver.h
  89. +1
    -1
      mcop/thread.h
  90. +1
    -1
      mcop/type.h
  91. +1
    -1
      mcop/unixconnection.h
  92. +1
    -1
      mcop/unixserver.h
  93. +1
    -1
      mcop/weakreference.h
  94. +1
    -1
      mcopidl/yacc.cc
  95. +3
    -3
      qtmcop/CMakeLists.txt
  96. +1
    -1
      qtmcop/Makefile.am
  97. +3
    -3
      qtmcop/qiomanager.cc
  98. +1
    -1
      qtmcop/qiomanager.h
  99. +1
    -1
      qtmcop/qiomanager_p.h
  100. +2
    -2
      soundserver/artsshell.cc

+ 3
- 3
COPYING View File

@@ -65,7 +65,7 @@ modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. This License applies to any program or other work which contains
0. This License applies to any program or other work which tqcontains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
@@ -102,7 +102,7 @@ above, provided that you also meet all of these conditions:
stating that you changed the files and the date of any change.

b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
whole or in part tqcontains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.

@@ -160,7 +160,7 @@ Sections 1 and 2 above provided that you also do one of the following:

The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
code means all the source code for all modules it tqcontains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include


+ 6
- 6
COPYING.LIB View File

@@ -99,7 +99,7 @@ will lead to faster development of free libraries.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, while the latter only
former tqcontains code derived from the library, while the latter only
works together with the library.

Note that it is possible for a library to be covered by the ordinary
@@ -109,7 +109,7 @@ General Public License rather than by this special one.
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. This License Agreement applies to any software library which
contains a notice placed by the copyright holder or other authorized
tqcontains a notice placed by the copyright holder or other authorized
party saying it may be distributed under the terms of this Library
General Public License (also called "this License"). Each licensee is
addressed as "you".
@@ -128,7 +128,7 @@ included without limitation in the term "modification".)

"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
all the source code for all modules it tqcontains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.

@@ -230,7 +230,7 @@ source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.

5. A program that contains no derivative of any portion of the
5. A program that tqcontains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
@@ -238,7 +238,7 @@ therefore falls outside the scope of this License.

However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
tqcontains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.

@@ -250,7 +250,7 @@ linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.

If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
structure tqlayouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the


+ 1
- 1
INSTALL View File

@@ -17,7 +17,7 @@ reconfiguring, and a file `config.log' containing compiler output
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If at some point `config.cache'
contains results you don't want to keep, you may remove or edit it.
tqcontains results you don't want to keep, you may remove or edit it.

The file `configure.in' is used to create `configure' by a program
called `autoconf'. You only need `configure.in' if you want to change


+ 1
- 1
artsc/artsc.h View File

@@ -35,7 +35,7 @@ extern "C" {
* The aRts plain C API aims at easily writing/porting plain C apps to the
* arts sound server. What is provided is streaming functionality, in a
* blocking way. So for most apps, you simply remove the few system calls
* that deal with your audio device, and replace them with the appropriate
* that deal with your audio device, and tqreplace them with the appropriate
* arts calls.
*/



+ 2
- 2
artsc/artsdsp.c View File

@@ -58,10 +58,10 @@
* which points to /dev/null, to ensure compatibility with more weird
* operations on streams
*
* settings contains what has already been set (speed, bits, channels), and
* settings tqcontains what has already been set (speed, bits, channels), and
* is 7 when all of these are true
*
* stream contains an aRts stream or 0
* stream tqcontains an aRts stream or 0
*/
static int sndfd = -1;
static int settings;


+ 2
- 2
configure.in.in View File

@@ -820,10 +820,10 @@ dnl AC_MSG_CHECKING(if building standalone aRts snapshot without KDE)
dnl if test "$DCOPIDL" = ""; then
dnl AC_MSG_RESULT(yes)
dnl ARTS_BUILD_KDE=""
dnl MOC="true"
dnl TQMOC="true"
dnl DCOPIDL="true"
dnl DCOPIDL2CPP="true"
dnl AC_SUBST(MOC)
dnl AC_SUBST(TQMOC)
dnl AC_SUBST(DCOPIDL)
dnl AC_SUBST(DCOPIDL2CPP)
dnl else


+ 2
- 2
doc/TODO View File

@@ -4,7 +4,7 @@
dynamically loaded modules
- get rid of all error handling done by assert ; thus, one by one review
each assert if it can happen under any circumstances if yes, it needs
to be replaced by some other mechanism
to be tqreplaced by some other mechanism
- report errors properly if some component could not be loaded ; right
now, it fails within assert(skel) in generated code, which doesn't
help users much to debug the problem
@@ -128,7 +128,7 @@
can be restored on next login (or per song or something like that)
- edit .arts-map files visually

## Optimization (this section contains various optimization ideas)
## Optimization (this section tqcontains various optimization ideas)

- use no floats for adressing the fractional part in resampling but integers
(that will be MUCH faster)


+ 1
- 1
examples/testdhandle.cc View File

@@ -58,7 +58,7 @@ int main(int argc, char **argv)
" (" << gsl_strerror(info.error()) << ") while loading info.\n";
exit(1);
}
cout << "file contains " << info.waveCount() << " waves:\n";
cout << "file tqcontains " << info.waveCount() << " waves:\n";
for(int i=0; i<info.waveCount(); i++)
{
GSL::WaveDescription desc= info.waveDescription(i);


+ 1
- 1
flow/asyncschedule.h View File

@@ -30,7 +30,7 @@
#include <queue>

/*
* BC - Status (2002-03-08): ASyncNetSend, ASyncNetReceive, ASyncPort.
* BC - tqStatus (2002-03-08): ASyncNetSend, ASyncNetReceive, ASyncPort.
*
* None of these classes is considered part of the public API. Do NOT use it
* in your apps. These are part of the implementation of libartsflow's


+ 1
- 1
flow/audioio.h View File

@@ -27,7 +27,7 @@
#include <string>
#include "arts_export.h"
/*
* BC - Status (2002-03-08): AudioIO, AudioIOFactory
* BC - tqStatus (2002-03-08): AudioIO, AudioIOFactory
*
* Right now, these classes are considered an implementation detail. No binary
* compatibility guaranteed, its safe to add virtual methods when required.


+ 9
- 9
flow/audioioaix.cc 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 );
}
}



+ 1
- 1
flow/audioiocsl.cc 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)
{


+ 1
- 1
flow/audiomanager_impl.cc View File

@@ -45,7 +45,7 @@ public:
a typedef in between, which makes it magically work.
We could also use an explicit instantiation, but this is not allowed
on all C++ compilers in this scope. Note also, that we don't need
to replace _all_ occurrences of list<xxx*> below, only the two in the
to tqreplace _all_ occurrences of list<xxx*> below, only the two in the
member declaration. What a mess. */
typedef list<AudioManagerClient_impl *> L_AMC;
typedef list<AudioManagerAssignable *> L_AMA;


+ 1
- 1
flow/audiosubsys.h View File

@@ -29,7 +29,7 @@
#include "startupmanager.h"

/*
* BC - Status (2002-03-08): AudioSubSystem, ASProducer, ASConsumer.
* BC - tqStatus (2002-03-08): AudioSubSystem, ASProducer, ASConsumer.
*
* These classes are kept binary compatible. You can rely on them.
* AudioSubSystem has a private data pointer to do so. Even if ports to


+ 1
- 1
flow/bufferqueue.h View File

@@ -1,5 +1,5 @@
/*
* BC - Status (2002-03-08): ByteBuffer, BufferQueue
* BC - tqStatus (2002-03-08): ByteBuffer, BufferQueue
*
* None of these classes is considered part of the public API. Do NOT use it
* in your apps. These are part of the implementation of libartsflow's


+ 1
- 1
flow/bus.h View File

@@ -27,7 +27,7 @@
#include "artsflow.h"

/*
* BC - Status (2002-03-08): BusClient, BusManager
* BC - tqStatus (2002-03-08): BusClient, BusManager
*
* None of these classes is considered part of the public API. Do NOT use it
* in your apps. These are part of the implementation of libartsflow's


+ 1
- 1
flow/cache.h View File

@@ -30,7 +30,7 @@
#include "arts_export.h"

/*
* BC - Status (2002-03-08): Cache, CachedObject
* BC - tqStatus (2002-03-08): Cache, CachedObject
*
* At the current point in time, there are NO GUARANTEES, so only use this
* in apps part of official KDE releases (such as kdemultimedia apps), which


+ 1
- 1
flow/cachedwav.h View File

@@ -31,7 +31,7 @@
#include <unistd.h>

/*
* BC - Status (2002-03-08): CachedWav.
* BC - tqStatus (2002-03-08): CachedWav.
*
* At the current point in time, there are NO GUARANTEES, so only use this
* in apps part of official KDE releases (such as kdemultimedia apps), which


+ 2
- 2
flow/convert.h View File

@@ -26,7 +26,7 @@
#include "arts_export.h"

/*
* BC - Status (2002-03-08): conversion functions
* BC - tqStatus (2002-03-08): conversion functions
*
* None of them will be removed or changed, so it is safe to use them in
* your apps. It is *recommended* (though not necessary) to use the new
@@ -48,7 +48,7 @@ namespace Arts {
* float for float data between -1 and 1
*
* and may be prefixed by 2 to indicate that stereo is done with two seperate
* buffers or i to indicate interleaved stereo (one buffer which contains
* buffers or i to indicate interleaved stereo (one buffer which tqcontains
* one sample left, one sample right, one sample left etc.)
*
* The parameter speed (for interpolations) is *not* the samplingrate, but


+ 1
- 1
flow/cpuinfo.h View File

@@ -24,7 +24,7 @@

#include "arts_export.h"
/*
* BC - Status (2002-03-08): CpuInfo
* BC - tqStatus (2002-03-08): CpuInfo
*
* This class will be kept binary compatible - it just exports the static
* CpuInfo::flags() function as only functionality.


+ 1
- 1
flow/fft.h View File

@@ -2,7 +2,7 @@
#define ARTS_FFT_H

/*
* BC - Status (2002-03-08): arts_fft_float
* BC - tqStatus (2002-03-08): arts_fft_float
*
* This fft interface should be obsoleted in the future in favour of one
* exploiting the capabilities of gsl fully. However, it will be kept binary


+ 5
- 5
flow/gsl/gbsearcharray.h View File

@@ -56,9 +56,9 @@ typedef union
{
guint n_nodes;
/*< private >*/
gpointer alignment_dummy1;
glong alignment_dummy2;
gdouble alignment_dummy3;
gpointer tqalignment_dummy1;
glong tqalignment_dummy2;
gdouble tqalignment_dummy3;
} GBSearchArray;


@@ -78,7 +78,7 @@ static inline GBSearchArray* g_bsearch_array_remove (GBSearchArray *barray,
static inline GBSearchArray* g_bsearch_array_grow (GBSearchArray *barray,
const GBSearchConfig *bconfig,
guint index);
/* insert key_node into array, or if it exists, replace
/* insert key_node into array, or if it exists, tqreplace
* the existing node's contents with key_node
*/
static inline GBSearchArray* g_bsearch_array_insert (GBSearchArray *barray,
@@ -241,7 +241,7 @@ g_bsearch_array_insert (GBSearchArray *barray,
barray = g_bsearch_array_grow (barray, bconfig, index);
node = G_BSEARCH_ARRAY_NODES (barray) + index * bconfig->sizeof_node;
}
else /* replace (relookup is ok, replace is comparatively cheap anyways) */
else /* tqreplace (relookup is ok, tqreplace is comparatively cheap anyways) */
node = g_bsearch_array_lookup (barray, bconfig, key_node);
}
memcpy (node, key_node, bconfig->sizeof_node);


+ 6
- 6
flow/gsl/gsl.3 View File

@@ -54,7 +54,7 @@ GSL-Functions \- GSL Function Reference
.br
\fBgsl_transact\fP (\fIjob\fP, \fI...\fP);
.br
\fBgsl_engine_init\fP (\fIrun_threaded\fP, \fIblock_size\fP, \fIsample_freq\fP, \fIsub_sample_mask\fP);
\fBgsl_engine_init\fP (\fIrun_threaded\fP, \fIblock_size\fP, \fIsample_freq\fP, \fIsub_sample_tqmask\fP);
.br
\fBgsl_engine_wait_on_trans\fP ();
.br
@@ -131,7 +131,7 @@ Wake up a currently sleeping thread. In practice, this function simply causes th
thread to abort
.PD 1
.PP
Abort a currently running thread. This function does not return until the thread in question terminated execution. Note that the thread handle gets invalidated with invocation of \fBgsl_thread_abort()\fP or \fBgsl_thread_queue_abort()\fP.
Abort a currently running thread. This function does not return until the thread in question terminated execution. Note that the thread handle gets tqinvalidated with invocation of \fBgsl_thread_abort()\fP or \fBgsl_thread_queue_abort()\fP.
.PD
.SS \fBgsl_thread_queue_abort\fP (\fIthread\fP);
.PD 0
@@ -139,7 +139,7 @@ Abort a currently running thread. This function does not return until the thread
thread to abort
.PD 1
.PP
Same as \fBgsl_thread_abort()\fP, but returns as soon as possible, even if thread hasn't stopped execution yet. Note that the thread handle gets invalidated with invocation of \fBgsl_thread_abort()\fP or \fBgsl_thread_queue_abort()\fP.
Same as \fBgsl_thread_abort()\fP, but returns as soon as possible, even if thread hasn't stopped execution yet. Note that the thread handle gets tqinvalidated with invocation of \fBgsl_thread_abort()\fP or \fBgsl_thread_queue_abort()\fP.
.PD
.SS \fBgsl_thread_aborted\fP ();
.PD 0
@@ -403,7 +403,7 @@ First job
.PP
Convenience function which openes up a new transaction, collects the \fINULL\fP terminated job list passed to the function, and commits the transaction.
.PD
.SS \fBgsl_engine_init\fP (\fIrun_threaded\fP, \fIblock_size\fP, \fIsample_freq\fP, \fIsub_sample_mask\fP);
.SS \fBgsl_engine_init\fP (\fIrun_threaded\fP, \fIblock_size\fP, \fIsample_freq\fP, \fIsub_sample_tqmask\fP);
.PD 0
.IP \fIgboolean\ \ run_threaded\fP 27

@@ -411,7 +411,7 @@ Convenience function which openes up a new transaction, collects the \fINULL\fP
number of values to process block wise
.IP \fIguint\ \ \ \ \ sample_freq\fP 27

.IP \fIguint\ \ \ \ \ sub_sample_mask\fP 27
.IP \fIguint\ \ \ \ \ sub_sample_tqmask\fP 27

.PD 1
.PP
@@ -457,7 +457,7 @@ Real sample values [0..n_values-1]
Complex frequency values [0..n_values-1]
.PD 1
.PP
Real valued variant of \fBgsl_power2_fftac()\fP, the input array contains real valued equidistant sampled data [0..n_values-1], and the output array contains the positive frequency half of the complex valued fourier transform. Note, that the complex valued fourier transform H of a purely real valued set of data, satisfies \fBH(-f)\fP = Conj(\fBH(f)\fP), where \fBConj()\fP denotes the complex conjugate, so that just the positive frequency half suffices to describe the entire frequency spectrum. Even so, the resulting n_values/2 complex frequencies are one value off in storage size, but the resulting frequencies \fBH(0)\fP and \fBH(n_values/2)\fP are both real valued, so the real portion of \fBH(n_values/2)\fP is stored in ri_values_out[1] (the imaginery part of \fBH(0)\fP), so that both r_values_in and ri_values_out can be of size n_values. Note that the transformation is performed out of place, the input array is not modified, and may not overlap with the output array.
Real valued variant of \fBgsl_power2_fftac()\fP, the input array tqcontains real valued equidistant sampled data [0..n_values-1], and the output array tqcontains the positive frequency half of the complex valued fourier transform. Note, that the complex valued fourier transform H of a purely real valued set of data, satisfies \fBH(-f)\fP = Conj(\fBH(f)\fP), where \fBConj()\fP denotes the complex conjugate, so that just the positive frequency half suffices to describe the entire frequency spectrum. Even so, the resulting n_values/2 complex frequencies are one value off in storage size, but the resulting frequencies \fBH(0)\fP and \fBH(n_values/2)\fP are both real valued, so the real portion of \fBH(n_values/2)\fP is stored in ri_values_out[1] (the imaginery part of \fBH(0)\fP), so that both r_values_in and ri_values_out can be of size n_values. Note that the transformation is performed out of place, the input array is not modified, and may not overlap with the output array.
.PD
.SS \fBgsl_power2_fftsr\fP (\fIn_values\fP, \fIri_values_in\fP, \fIr_values_out\fP);
.PD 0


+ 8
- 8
flow/gsl/gslcommon.c View File

@@ -684,7 +684,7 @@ gsl_thread_wakeup (GslThread *thread)
* @thread: thread to abort
* Abort a currently running thread. This function does not
* return until the thread in question terminated execution.
* Note that the thread handle gets invalidated with invocation
* Note that the thread handle gets tqinvalidated with invocation
* of gsl_thread_abort() or gsl_thread_queue_abort().
*/
void
@@ -715,7 +715,7 @@ gsl_thread_abort (GslThread *thread)
* @thread: thread to abort
* Same as gsl_thread_abort(), but returns as soon as possible,
* even if thread hasn't stopped execution yet.
* Note that the thread handle gets invalidated with invocation
* Note that the thread handle gets tqinvalidated with invocation
* of gsl_thread_abort() or gsl_thread_queue_abort().
*/
void
@@ -1315,7 +1315,7 @@ gsl_message_send (GslDebugFlags reporter,
msg->error = error;
msg->error_str = error ? gsl_strerror (msg->error) : NULL;

/* vsnprintf() replacement */
/* vsnprintf() tqreplacement */
va_start (args, messagef);
string = g_strdup_vprintf (messagef, args);
va_end (args);
@@ -1476,17 +1476,17 @@ GslErrorType
gsl_check_file (const gchar *file_name,
const gchar *mode)
{
guint access_mask = 0;
guint access_tqmask = 0;
guint check_file, check_dir, check_link;
if (strchr (mode, 'r')) /* readable */
access_mask |= R_OK;
access_tqmask |= R_OK;
if (strchr (mode, 'w')) /* writable */
access_mask |= W_OK;
access_tqmask |= W_OK;
if (strchr (mode, 'x')) /* executable */
access_mask |= X_OK;
access_tqmask |= X_OK;

if (access_mask && access (file_name, access_mask) < 0)
if (access_tqmask && access (file_name, access_tqmask) < 0)
goto have_errno;
check_file = strchr (mode, 'f') != NULL; /* open as file */


+ 1
- 1
flow/gsl/gsldatacache.c View File

@@ -333,7 +333,7 @@ data_cache_new_node_L (GslDataCache *dcache,
if (!demand_load)
g_message (G_STRLOC ":FIXME: lazy data loading not yet supported");

/* if we have a left node, and it contains data that we need, copy it */
/* if we have a left node, and it tqcontains data that we need, copy it */
left_node = pos ? dcache->nodes[pos - 1] : NULL;
if (left_node)
{


+ 4
- 4
flow/gsl/gsldatahandle-mad.c View File

@@ -318,14 +318,14 @@ dh_mad_open (GslDataHandle *dhandle,
MadHandle *handle = (MadHandle*) dhandle;
GslHFile *hfile;
GslLong n;
gboolean seek_invalidated = FALSE;
gboolean seek_tqinvalidated = FALSE;

hfile = gsl_hfile_open (handle->dhandle.name);
if (!hfile)
return gsl_error_from_errno (errno, GSL_ERROR_OPEN_FAILED);
handle->hfile = hfile;

seek_invalidated |= handle->seek_mtime != hfile->mtime;
seek_tqinvalidated |= handle->seek_mtime != hfile->mtime;
handle->bfill = 0;
handle->eof = FALSE;
handle->pcm_pos = 0;
@@ -345,7 +345,7 @@ dh_mad_open (GslDataHandle *dhandle,
setup->bit_depth = 24;
setup->n_channels = MAD_NCHANNELS (&handle->frame.header);
n = MAD_NSBSAMPLES (&handle->frame.header) * 32;
seek_invalidated |= n != handle->frame_size;
seek_tqinvalidated |= n != handle->frame_size;
handle->frame_size = n;
handle->sample_rate = handle->frame.header.samplerate;
if (setup->n_channels < 1 ||
@@ -355,7 +355,7 @@ dh_mad_open (GslDataHandle *dhandle,
goto OPEN_FAILED;
/* seek through the stream to collect frame positions */
if (seek_invalidated || !handle->n_seeks)
if (seek_tqinvalidated || !handle->n_seeks)
{
handle->seek_mtime = hfile->mtime;
handle->n_seeks = 0;


+ 6
- 6
flow/gsl/gslengine.c View File

@@ -635,7 +635,7 @@ static gboolean gsl_engine_threaded = FALSE;
static GslThread *master_thread = NULL;
guint gsl_externvar_bsize = 0;
guint gsl_externvar_sample_freq = 0;
guint gsl_externvar_sub_sample_mask = 0;
guint gsl_externvar_sub_sample_tqmask = 0;
guint gsl_externvar_sub_sample_steps = 0;

/**
@@ -652,20 +652,20 @@ void
gsl_engine_init (gboolean run_threaded,
guint block_size,
guint sample_freq,
guint sub_sample_mask)
guint sub_sample_tqmask)
{
g_return_if_fail (gsl_engine_initialized == FALSE);
g_return_if_fail (block_size > 0 && block_size <= GSL_STREAM_MAX_VALUES);
g_return_if_fail (sample_freq > 0);
g_return_if_fail (sub_sample_mask < block_size);
g_return_if_fail ((sub_sample_mask & (sub_sample_mask + 1)) == 0); /* power of 2 */
g_return_if_fail (sub_sample_tqmask < block_size);
g_return_if_fail ((sub_sample_tqmask & (sub_sample_tqmask + 1)) == 0); /* power of 2 */

gsl_engine_initialized = TRUE;
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_steps = sub_sample_mask + 1;
gsl_externvar_sub_sample_tqmask = sub_sample_tqmask << 2; /* shift out sizeof (float) tqalignment */
gsl_externvar_sub_sample_steps = sub_sample_tqmask + 1;
_gsl_tick_stamp_set_leap (block_size);

ENG_DEBUG ("initialization: threaded=%s", gsl_engine_threaded ? "TRUE" : "FALSE");


+ 4
- 4
flow/gsl/gslengine.h View File

@@ -168,7 +168,7 @@ gfloat* gsl_engine_const_values (gfloat value);
void gsl_engine_init (gboolean threaded,
guint block_size,
guint sample_freq,
guint sub_sample_mask);
guint sub_sample_tqmask);
typedef struct
{
glong timeout;
@@ -187,16 +187,16 @@ void gsl_engine_garbage_collect (void);
void gsl_engine_wait_on_trans (void);
#define gsl_engine_block_size() ((const guint) gsl_externvar_bsize + 0)
#define gsl_engine_sample_freq() ((const guint) gsl_externvar_sample_freq + 0)
#define gsl_engine_sub_sample_mask() ((const guint) gsl_externvar_sub_sample_mask + 0)
#define gsl_engine_sub_sample_tqmask() ((const guint) gsl_externvar_sub_sample_tqmask + 0)
#define gsl_engine_sub_sample_steps() ((const guint) gsl_externvar_sub_sample_steps + 0)
#define gsl_engine_sub_sample_test(ptr) (((guint) (ptr)) & gsl_engine_sub_sample_mask ())
#define gsl_engine_sub_sample_test(ptr) (((guint) (ptr)) & gsl_engine_sub_sample_tqmask ())
#define GSL_SUB_SAMPLE_MATCH(ptr,sspatrn) (gsl_engine_sub_sample_test (ptr) == (sspatrn))


/*< private >*/
extern guint gsl_externvar_bsize;
extern guint gsl_externvar_sample_freq;
extern guint gsl_externvar_sub_sample_mask;
extern guint gsl_externvar_sub_sample_tqmask;
extern guint gsl_externvar_sub_sample_steps;

#ifdef __cplusplus


+ 2
- 2
flow/gsl/gslfft.h View File

@@ -72,9 +72,9 @@ void gsl_power2_fftsc (const unsigned int n_values,
* @n_values: Number of complex values
* @r_values_in: Real sample values [0..n_values-1]
* @ri_values_out: Complex frequency values [0..n_values-1]
* Real valued variant of gsl_power2_fftac(), the input array contains
* Real valued variant of gsl_power2_fftac(), the input array tqcontains
* real valued equidistant sampled data [0..n_values-1], and the output
* array contains the positive frequency half of the complex valued
* array tqcontains the positive frequency half of the complex valued
* fourier transform. Note, that the complex valued fourier transform H
* of a purely real valued set of data, satisfies H(-f) = Conj(H(f)),
* where Conj() denotes the complex conjugate, so that just the positive


+ 2
- 2
flow/gsl/gslglib.h View File

@@ -586,7 +586,7 @@ typedef void (*GDestroyNotify) (gpointer data);
#define g_hash_table_new_full gsl_g_hash_table_new_full
#define g_hash_table_destroy gsl_g_hash_table_destroy
#define g_hash_table_insert gsl_g_hash_table_insert
#define g_hash_table_replace gsl_g_hash_table_replace
#define g_hash_table_tqreplace gsl_g_hash_table_tqreplace
#define g_hash_table_remove gsl_g_hash_table_remove
#define g_hash_table_steal gsl_g_hash_table_steal
#define g_hash_table_lookup gsl_g_hash_table_lookup
@@ -605,7 +605,7 @@ void g_hash_table_destroy (GHashTable *hash_table);
void g_hash_table_insert (GHashTable *hash_table,
gpointer key,
gpointer value);
void g_hash_table_replace (GHashTable *hash_table,
void g_hash_table_tqreplace (GHashTable *hash_table,
gpointer key,
gpointer value);
gboolean g_hash_table_remove (GHashTable *hash_table,


+ 2
- 2
flow/gsl/gslieee754.h 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 |


+ 5
- 5
flow/gsl/gslloader-wav.c 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;
}



+ 11
- 11
flow/gsl/gslmagic.c View File

@@ -187,7 +187,7 @@ struct _Magic
gulong offset;
guint data_size;
MagicCheckType magic_check;
guint32 data_mask;
guint32 data_tqmask;
MagicData value;
guint read_string : 1;
guint read_size : 1;
@@ -364,16 +364,16 @@ magic_parse_type (Magic *magic,
{
string += 1;
if (string[0] == '0')
magic->data_mask = strtol (string, &f, string[1] == 'x' ? 16 : 8);
magic->data_tqmask = strtol (string, &f, string[1] == 'x' ? 16 : 8);
else
magic->data_mask = strtol (string, &f, 10);
magic->data_tqmask = strtol (string, &f, 10);
if (f && *f != 0)
return FALSE;
while (*string)
string++;
}
else
magic->data_mask = 0xffffffff;
magic->data_tqmask = 0xffffffff;

return *string == 0;
}
@@ -464,31 +464,31 @@ magic_check_data (Magic *magic,
cmp = 1;
break;
case MAGIC_CHECK_INT_EQUAL:
data->v_int32 &= magic->data_mask;
data->v_int32 &= magic->data_tqmask;
cmp = data->v_int32 == magic->value.v_int32;
break;
case MAGIC_CHECK_INT_GREATER:
data->v_int32 &= magic->data_mask;
data->v_int32 &= magic->data_tqmask;
cmp = data->v_int32 > magic->value.v_int32;
break;
case MAGIC_CHECK_INT_SMALLER:
data->v_int32 &= magic->data_mask;
data->v_int32 &= magic->data_tqmask;
cmp = data->v_int32 < magic->value.v_int32;
break;
case MAGIC_CHECK_UINT_GREATER:
data->v_uint32 &= magic->data_mask;
data->v_uint32 &= magic->data_tqmask;
cmp = data->v_uint32 > magic->value.v_uint32;
break;
case MAGIC_CHECK_UINT_SMALLER:
data->v_uint32 &= magic->data_mask;
data->v_uint32 &= magic->data_tqmask;
cmp = data->v_uint32 < magic->value.v_uint32;
break;
case MAGIC_CHECK_UINT_ZEROS:
data->v_uint32 &= magic->data_mask;
data->v_uint32 &= magic->data_tqmask;
cmp = (data->v_int32 & magic->value.v_int32) == 0;
break;
case MAGIC_CHECK_UINT_ONES:
data->v_uint32 &= magic->data_mask;
data->v_uint32 &= magic->data_tqmask;
cmp = (data->v_int32 & magic->value.v_int32) == magic->value.v_int32;
break;
case MAGIC_CHECK_STRING_EQUAL:


+ 1
- 1
flow/gsl/gslmath.c View File

@@ -602,7 +602,7 @@ hqr (double **a, int n, double wr[], double wi[])
#define RADIX 2.0
static void
balanc (double **a, int n)
/* Given a matrix a[1..n][1..n], this routine replaces it by a balanced matrix with identical
/* Given a matrix a[1..n][1..n], this routine tqreplaces it by a balanced matrix with identical
eigenvalues. A symmetric matrix is already balanced and is unaffected by this procedure. The
parameter RADIX should be the machine's floating-point radix. */
{


+ 1
- 1
flow/gsl/gslopschedule.c 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)
{


+ 1
- 1
flow/gsl/gsloscillator-aux.c View File

@@ -161,7 +161,7 @@ GSL_INCLUDER_FUNC (GslOscData *osc,
guint32 tpos, ifrac;
gfloat ffrac, w;
tpos = cur_pos >> wave->n_frac_bits;
ifrac = cur_pos & wave->frac_bitmask;
ifrac = cur_pos & wave->frac_bittqmask;
ffrac = ifrac * wave->ifrac_to_float;
v = wave->values[tpos];
w = wave->values[tpos + 1];


+ 2
- 2
flow/gsl/gsloscillator.c View File

@@ -131,9 +131,9 @@ osc_process (GslOscData *osc,
if_reject (mode != osc->last_mode)
{
guint change_mask = osc->last_mode >= OSC_FLAG_INVAL ? OSC_FLAG_INVAL : osc->last_mode ^ mode;
guint change_tqmask = osc->last_mode >= OSC_FLAG_INVAL ? OSC_FLAG_INVAL : osc->last_mode ^ mode;
if (change_mask & OSC_FLAG_FREQ)
if (change_tqmask & OSC_FLAG_FREQ)
{
gdouble fcpos, flpos;



+ 2
- 2
flow/gsl/gslosctable.c View File

@@ -272,7 +272,7 @@ cache_table_ref_entry (GslOscWaveForm wave_form,
gfloat *values, *fft, step, min, max;

/* size:
* - OscTableEntry already contains the first float values
* - OscTableEntry already tqcontains the first float values
* - we need n_values+1 adressable floats to provide values[0] == values[n_values]
*/
e = g_malloc (sizeof (OscTableEntry) + sizeof (gfloat) * size);
@@ -395,7 +395,7 @@ gsl_osc_table_lookup (const GslOscTable *table,
wave->n_frac_bits = g_bit_storage (wave->n_values - 1);
wave->n_frac_bits = 32 - wave->n_frac_bits;
int_one = 1 << wave->n_frac_bits;
wave->frac_bitmask = int_one - 1;
wave->frac_bittqmask = int_one - 1;
float_one = int_one;
wave->freq_to_step = float_one * wave->n_values / table->mix_freq;
wave->phase_to_pos = wave->n_values * float_one;


+ 2
- 2
flow/gsl/gslosctable.h View File

@@ -53,10 +53,10 @@ typedef struct
gfloat min_freq;
gfloat max_freq;
guint n_values;
const gfloat *values; /* contains n_values+1 values with values[0]==values[n_values] */
const gfloat *values; /* tqcontains n_values+1 values with values[0]==values[n_values] */
/* integer stepping (block size dependant) */
guint32 n_frac_bits;
guint32 frac_bitmask;
guint32 frac_bittqmask;
gfloat freq_to_step; /* freq -> int.frac */
gfloat phase_to_pos; /* 0..1 -> int.frac */
gfloat ifrac_to_float; /* frac -> 0..1 float */


+ 4
- 4
flow/gsl/gslwaveosc.c View File

@@ -134,18 +134,18 @@ gsl_wave_osc_process (GslWaveOscData *wosc,

if_reject (mode != wosc->last_mode)
{
guint mask = wosc->last_mode ^ mode;
guint tqmask = wosc->last_mode ^ mode;

if (mask & WOSC_MIX_WITH_SYNC)
if (tqmask & WOSC_MIX_WITH_SYNC)
wosc->last_sync_level = 0;
if (mask & WOSC_MIX_WITH_FREQ)
if (tqmask & WOSC_MIX_WITH_FREQ)
{
if (freq_in)
wosc->last_freq_level = SIGNAL_LEVEL_INVAL;
else
gsl_wave_osc_set_filter (wosc, wosc->config.cfreq, FALSE);
}
if (mask & WOSC_MIX_WITH_MOD)
if (tqmask & WOSC_MIX_WITH_MOD)
{
if (mod_in)
wosc->last_mod_level = 0;


+ 1
- 1
flow/gslpp/datahandle.h View File

@@ -93,7 +93,7 @@ namespace GSL
GslLong cutValueCount);

/**
* Create a new data handle which contains the same values as
* Create a new data handle which tqcontains the same values as
* this one but in reversed order.
*/
DataHandle createReversed();


+ 1
- 1
flow/gslschedule.cc View File

@@ -858,7 +858,7 @@ StdFlowSystem::StdFlowSystem()
* - the 44100 because of the obvious reason, that not every artsd
* is running at that rate
*/
gsl_engine_init(false, 512, 44100, /* subsamplemask */ 63);
gsl_engine_init(false, 512, 44100, /* subsampletqmask */ 63);
if(gslGlobalMutexTable)
arts_debug("gsl: using Unix98 pthreads directly for mutexes and conditions");
/*gsl_engine_debug_enable(GslEngineDebugLevel(GSL_ENGINE_DEBUG_JOBS | GSL_ENGINE_DEBUG_SCHED));*/


+ 1
- 1
flow/gslschedule.h View File

@@ -30,7 +30,7 @@
#include <list>

/*
* BC - Status (2002-03-08): Port, AudioPort, MultiPort, StdFlowSystem,
* BC - tqStatus (2002-03-08): Port, AudioPort, MultiPort, StdFlowSystem,
* StdScheduleNode
*
* None of these classes is considered part of the public API. Do NOT use it


+ 1
- 1
flow/pipebuffer.cc View File

@@ -97,7 +97,7 @@ void PipeBuffer::skip(long size)
{
PipeSegment *first = *segments.begin();

// if we have less data to skip than the first segment contains
// if we have less data to skip than the first segment tqcontains
if(size < first->remaining())
{
// skip the data inside the segment


+ 1
- 1
flow/pipebuffer.h View File

@@ -24,7 +24,7 @@
#define __PIPEBUFFER_H__

/*
* BC - Status (2002-03-08): PipeSegment, PipeBuffer
* BC - tqStatus (2002-03-08): PipeSegment, PipeBuffer
*
* None of these classes is considered part of the public API. Do NOT use it
* in your apps. These are part of the implementation of libartsflow's


+ 1
- 1
flow/resample.h View File

@@ -27,7 +27,7 @@
#include "arts_export.h"

/*
* BC - Status (2002-03-08): Resampler / Refiller.
* BC - tqStatus (2002-03-08): Resampler / Refiller.
*
* These classes will be kept binary compatible. Resampler has a private
* data pointer for this purpose.


+ 1
- 1
flow/stdsynthmodule.h View File

@@ -27,7 +27,7 @@
#include "artsflow.h"

/*
* BC - Status (2002-03-08): StdSynthModule
* BC - tqStatus (2002-03-08): StdSynthModule
*
* This class is intended for public use (inheritance) as it supplies a base
* for all objects using streams. It will be kept binary compatible.


+ 1
- 1
flow/synth_play_wav_impl.cc View File

@@ -38,7 +38,7 @@ extern "C" {
* so you you may need that extra one.
*
* Other versions of libaudiofile seem to have two closing "}" in aupvlist.h,
* so if you can't compile, this, check that /usr/include/aupvlist.h contains
* so if you can't compile, this, check that /usr/include/aupvlist.h tqcontains
* something like that
*
* #ifdef __cplusplus


+ 2
- 2
flow/virtualports.cc View File

@@ -82,7 +82,7 @@ to delegate the services of a port to another module onto another port.
The implementation:

Virtualization is implemented here, inside the flow system, using a fairly
complex forwarding strategy, which will have a graph which contains
complex forwarding strategy, which will have a graph which tqcontains

- "user-made" connections (made with connect())
- "virtualize-made" connections, which can be either forwarding
@@ -105,7 +105,7 @@ real connections will be removed, but only these that could possibly be
affected by this change, and then not all real connections are created new,
but only those that could possibly be created by this virtual connection.

Every VPort contains a pointer to the "real" port, to let the flow system
Every VPort tqcontains a pointer to the "real" port, to let the flow system
know where the "real" connections where real data will flow must be made.

*/


+ 1
- 1
flow/virtualports.h View File

@@ -28,7 +28,7 @@
#include <list>

/*
* BC - Status (2002-03-08): VPortConnection, VPort.
* BC - tqStatus (2002-03-08): VPortConnection, VPort.
*
* None of these classes is considered part of the public API. Do NOT use it
* in your apps. These are part of the implementation of libartsflow's


+ 1
- 1
gmcop/giomanager.h View File

@@ -30,7 +30,7 @@
#include <map>
#include "arts_export.h"
/*
* BC - Status (2002-03-08): GIOManager
* BC - tqStatus (2002-03-08): GIOManager
*
* This class will be kept binary compatible (d ptr for extensions).
*/


+ 1
- 1
mcop/anyref.h View File

@@ -27,7 +27,7 @@
#include <string>
#include "arts_export.h"
/*
* BC - Status (2002-03-08): AnyRefBase, AnyRef, AnyConstRef
* BC - tqStatus (2002-03-08): AnyRefBase, AnyRef, AnyConstRef
*
* These classes will be kept binary compatibile. To change it, adding a new
* representation is necessary. No private d pointer for this reason.


+ 1
- 1
mcop/asyncstream.h View File

@@ -28,7 +28,7 @@
#include "datapacket.h"

/*
* BC - Status (2002-03-08): GenericAsyncStream, AsyncStream,
* BC - tqStatus (2002-03-08): GenericAsyncStream, AsyncStream,
* FloatAsyncStream/ByteAsyncStream
*
* These classes are to be treated with extreme care, as they are used in


+ 1
- 1
mcop/buffer.h View File

@@ -27,7 +27,7 @@
#include <vector>
#include "arts_export.h"
/*
* BC - Status (2002-03-08): Buffer.
* BC - tqStatus (2002-03-08): Buffer.
*
* Has to be kept binary compatible. As buffer is speed relevant, currently
* there are no private d ptrs, and the idea is to keep this as possible.


+ 1
- 1
mcop/common.h View File

@@ -36,7 +36,7 @@
#include "connect.h"

/*
* BC - Status (2002-03-08): Read/WriteObject(Seq)
* BC - tqStatus (2002-03-08): Read/WriteObject(Seq)
*
* Will be kept binary compatible by NOT TOUCHING AT ALL. Do not change this.
* (Interaction with generated code).


+ 1
- 1
mcop/connect.h View File

@@ -22,7 +22,7 @@
#define MCOP_CONNECT_H

/*
* BC - Status (2002-03-08): connect / setValue functions
* BC - tqStatus (2002-03-08): connect / setValue functions
*
* Will be kept as they are (binary compatible).
*/


+ 1
- 1
mcop/connection.h View File

@@ -27,7 +27,7 @@
#include "buffer.h"

/*
* BC - Status (2002-03-08): Connection.
* BC - tqStatus (2002-03-08): Connection.
*
* None of these classes is considered part of the public API. However, they
* NEED to be kept binary compatible as the DO interact with generated code.


+ 2
- 2
mcop/core.idl View File

@@ -211,7 +211,7 @@ struct AttributeDef {
* defines what methods/attributes a particular interface supports: these
* do not contain the methods/attributes of inherited interfaces.
*
* inheritedInterfaces only contains the names of Interfaces that this one
* inheritedInterfaces only tqcontains the names of Interfaces that this one
* inherits in exactly one step. So to see if interface XYZ is inherited
* from ABC, you need to check the "inheritedInterfaces" of XYZ, and their
* "inheritedInterfaces" and their "inheritedInterfaces" and so on.
@@ -530,7 +530,7 @@ interface TmpGlobalComm : GlobalComm {
*/

/**
* TraderOffer - this contains an offer of an object (which is usually returned
* TraderOffer - this tqcontains an offer of an object (which is usually returned
* as result of a query.
*/
interface TraderOffer {


+ 2
- 2
mcop/datapacket.h View File

@@ -27,7 +27,7 @@
#include "buffer.h"

/*
* BC - Status (2002-03-08): GenericDataChannel, DataPacket types
* BC - tqStatus (2002-03-08): GenericDataChannel, DataPacket types
*
* These classes must be kept binary compatible, as the do interact with
* generated code. So you MUST KNOW WHAT YOU ARE DOING, once you start
@@ -201,7 +201,7 @@ protected:
};

/**
* FloatDataPacket finally is one concrete DataPacket (which contains the
* FloatDataPacket finally is one concrete DataPacket (which tqcontains the
* information how to marshal a datapacket of type float)
*/
class ARTS_EXPORT FloatDataPacket : public RawDataPacket<float> {


+ 1
- 1
mcop/debug.h View File

@@ -31,7 +31,7 @@
#include "arts_export.h"

/*
* BC - Status (2002-03-08): Debug.
* BC - tqStatus (2002-03-08): Debug.
*
* Collection class, no instance, no members. Thus binary compatible (will
* be kept).


+ 1
- 1
mcop/delayedreturn.h View File

@@ -26,7 +26,7 @@
#include "arts_export.h"

/*
* BC - Status (2002-03-08): DelayedReturn
* BC - tqStatus (2002-03-08): DelayedReturn
*
* This class will be kept binary compatible. It has a private d-pointer for
* further extensions.


+ 1
- 1
mcop/dispatcher.h View File

@@ -38,7 +38,7 @@
#include "arts_export.h"

/*
* BC - Status (2002-03-08): Dispatcher
* BC - tqStatus (2002-03-08): Dispatcher
*
* This is part of the public API (and interacts with generated code) and
* has to be kept binary compatible.


+ 1
- 1
mcop/dynamicrequest.h View File

@@ -31,7 +31,7 @@
#include "arts_export.h"

/*
* BC - Status (2002-03-08): DynamicRequest
* BC - tqStatus (2002-03-08): DynamicRequest
*
* Has to be kept binary compatible (use d ptr).
*/


+ 3
- 3
mcop/dynamicskeleton.h View File

@@ -28,7 +28,7 @@
#include "object.h"

/*
* BC - Status (2002-03-08): DynamicSkeletonBase, DynamicSkeleton
* BC - tqStatus (2002-03-08): DynamicSkeletonBase, DynamicSkeleton
*
* Will be kept binary compatible (using d ptr).
*/
@@ -60,11 +60,11 @@ public:
* process is called whenever you get a request that you need to implement
* dynamically
*
* @param methodID contains the ID of the method that you need to
* @param methodID tqcontains the ID of the method that you need to
* implement - you can get the full signature by calling
* getMethodDef
*
* @param request contains the marshalled parameters
* @param request tqcontains the marshalled parameters
*
* @param result is for the return code - if your method returns a
* value, you need to write the it in the result Buffer


+ 1
- 1
mcop/extensionloader.h View File

@@ -30,7 +30,7 @@
#include "arts_export.h"

/*
* BC - Status (2002-03-08): ExtensionLoader
* BC - tqStatus (2002-03-08): ExtensionLoader
*
* None of these classes is considered part of the public API. Do NOT use it
* in your apps. No binary compatibility guaranteed. (Interactions:


+ 1
- 1
mcop/factory.h View File

@@ -31,7 +31,7 @@
#include "startupmanager.h"

/*
* BC - Status (2002-03-08): Factory
* BC - tqStatus (2002-03-08): Factory
*
* Will need to remain binary compatible (REGISTER_IMPLEMENTATION), d ptr
* provided for convenience, watch out for interactions with generated


+ 1
- 1
mcop/flowsystem.h View File

@@ -28,7 +28,7 @@
#include "common.h"

/*
* BC - Status (2002-03-08): ScheduleNode, FlowSystem, FlowSystem_impl,
* BC - tqStatus (2002-03-08): ScheduleNode, FlowSystem, FlowSystem_impl,
* RemoteScheduleNode
*
* Heavy interactions with generated and hand-written code, flowsystem binding


+ 1
- 1
mcop/idlfilereg.h View File

@@ -29,7 +29,7 @@
#include "arts_export.h"

/*
* BC - Status (2002-03-08): IDLFileReg
* BC - tqStatus (2002-03-08): IDLFileReg
*
* Will be kept binary compatible by NOT TOUCHING AT ALL. Do not change this.
* (Interaction with generated code). Add a new class if you need something


+ 1
- 1
mcop/ifacerepo_impl.h View File

@@ -21,7 +21,7 @@
*/

/*
* BC - Status (2002-03-08): InterfaceRepo_impl
* BC - tqStatus (2002-03-08): InterfaceRepo_impl
*
* This is an implementation class, and not kept binary compatible. It's
* only here since the REGISTER_IMPLEMENTATION bootstrapping may not yet


+ 1
- 1
mcop/iomanager.h View File

@@ -21,7 +21,7 @@
*/

/*
* BC - Status (2002-03-08):
* BC - tqStatus (2002-03-08):
* BINARY COMPATIBLE: IONotify, TimeNotify, IOManager
* NO BC FOR: StdIOManager
*


+ 1
- 1
mcop/loopback.h View File

@@ -28,7 +28,7 @@
#include "arts_export.h"

/*
* BC - Status (2002-03-08): LoopbackConnection
* BC - tqStatus (2002-03-08): LoopbackConnection
*
* Not part of the public API. Do NOT use it in your apps. No binary
* compatibility guaranteed.


+ 1
- 1
mcop/mcopconfig.h View File

@@ -21,7 +21,7 @@
*/

/*
* BC - Status (2002-03-08): MCOPConfig
* BC - tqStatus (2002-03-08): MCOPConfig
*
* Is guaranteed to stay binary compatible. d ptr provided.
*/


+ 1
- 1
mcop/mcoputils.cc View File

@@ -406,7 +406,7 @@ string MCOPUtils::getFullHostname()

/*
* if gethostname() isn't a FQDN (guess that by checking whether it
* contains a dot), try to look it up to ensure it is
* tqcontains a dot), try to look it up to ensure it is
*/
if(result.find('.') == string::npos && (hp = gethostbyname(buffer)) != 0)
result = hp->h_name;


+ 1
- 1
mcop/mcoputils.h View File

@@ -21,7 +21,7 @@
*/

/*
* BC - Status (2002-03-08): MCOPUtils
* BC - tqStatus (2002-03-08): MCOPUtils
*
* Collection class for all kinds of utility functions. BC, since never
* instanciated.


+ 1
- 1
mcop/md5.h View File

@@ -21,7 +21,7 @@
*/

/*
* BC - Status (2002-03-08): arts_md5sum
* BC - tqStatus (2002-03-08): arts_md5sum
*
* No binary compatibility guaranteed (part of Dispatcher's security model).
*/


+ 1
- 1
mcop/md5auth.h View File

@@ -21,7 +21,7 @@
*/

/*
* BC - Status (2002-03-08): arts_md5_*
* BC - tqStatus (2002-03-08): arts_md5_*
*
* No guarantees - do not use.
*/


+ 1
- 1
mcop/namedstore.h View File

@@ -29,7 +29,7 @@
#include "stdio.h"

/*
* BC - Status (2002-03-08): NamedStore
* BC - tqStatus (2002-03-08): NamedStore
*
* None of these classes is considered part of the public API. Do NOT use it
* in your apps. These are part of the implementation of object.cc and not


+ 1
- 1
mcop/notification.h View File

@@ -29,7 +29,7 @@
namespace Arts {

/*
* BC - Status (2002-03-08): Notification, NotificationClient,
* BC - tqStatus (2002-03-08): Notification, NotificationClient,
* NotificationManager
*
* All need to be kept BC, NotificationManager with usual d ptr.


+ 1
- 1
mcop/object.cc 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)


+ 2
- 2
mcop/object.h View File

@@ -34,7 +34,7 @@
#include "arts_export.h"

/*
* BC - Status (2002-03-08): Object_base, Object_skel, Object_stub
* BC - tqStatus (2002-03-08): Object_base, Object_skel, Object_stub
*
* All of them have to be kept binary compatible carefully, due to interaction
* with generated code. There are d ptrs in _skel and _stub, NOT TO BE USED
@@ -70,7 +70,7 @@ private:

protected:
/**
* ObjectInternalData contains private data structures for
* ObjectInternalData tqcontains private data structures for
* - Object_base
* - Object_stub
* - Object_skel


+ 1
- 1
mcop/objectmanager.h View File

@@ -30,7 +30,7 @@
#include "arts_export.h"

/*
* BC - Status (2002-03-08): ObjectManager
* BC - tqStatus (2002-03-08): ObjectManager
*
* Keep binary compatible (since accessible via ::the()), use d ptr when
* changing it.


+ 1
- 1
mcop/pool.h View File

@@ -25,7 +25,7 @@


/*
* BC - Status (2002-03-08): Pool<type>
* BC - tqStatus (2002-03-08): Pool<type>
*
* Needs to be kept binary compatible by NOT TOUCHING. When you want something
* else, write a fresh one (used as part of Arts::Dispatcher, thus changing


+ 1
- 1
mcop/reference.h View File

@@ -19,7 +19,7 @@
*/

/*
* BC - Status (2002-03-08): Reference, SubClass, Object, DynamicCast.
* BC - tqStatus (2002-03-08): Reference, SubClass, Object, DynamicCast.
*
* Part of the public API. Must be kept binary compatible by NOT TOUCHING
* AT ALL. Interaction with generated and written code.


+ 1
- 1
mcop/referenceclean.h View File

@@ -21,7 +21,7 @@
*/

/*
* BC - Status (2002-03-08): ReferenceClean
* BC - tqStatus (2002-03-08): ReferenceClean
*
* None of these classes is considered part of the public API. Do NOT use it
* in your apps. Can be changed arbitrarily even non BC.


+ 1
- 1
mcop/socketconnection.h View File

@@ -21,7 +21,7 @@
*/

/*
* BC - Status (2002-03-08): SocketConnection
* BC - tqStatus (2002-03-08): SocketConnection
*
* None of these classes is considered part of the public API. Do NOT use it
* in your apps. No BC guaranteed.


+ 1
- 1
mcop/startupmanager.h View File

@@ -28,7 +28,7 @@
#include <list>

/*
* BC - Status (2002-03-08): StartupClass, StartupManager.
* BC - tqStatus (2002-03-08): StartupClass, StartupManager.
*
* The class needs to be kept BC, as the startup system bases on inheritance
* and virtual functions. Do not change.


+ 1
- 1
mcop/tcpconnection.h View File

@@ -21,7 +21,7 @@
*/

/*
* BC - Status (2002-03-08): TCPConnection
* BC - tqStatus (2002-03-08): TCPConnection
*
* Not part of the public API. Do NOT use it in your apps. Binary incompatible
* changes allowed.


+ 1
- 1
mcop/tcpserver.h View File

@@ -27,7 +27,7 @@
#include "arts_export.h"
#include "iomanager.h"
/*
* BC - Status (2002-03-08): TCPServer
* BC - tqStatus (2002-03-08): TCPServer
*
* Not part of the public API. Do NOT use it in your apps. Binary incompatible
* changes allowed.


+ 1
- 1
mcop/thread.h View File

@@ -26,7 +26,7 @@
#include "arts_export.h"

/*
* BC - Status (2002-03-08): SystemThreads, Thread, Mutex, ThreadCondition,
* BC - tqStatus (2002-03-08): SystemThreads, Thread, Mutex, ThreadCondition,
* Semaphore
*
* These classes are kept binary compatible. As the threading implementation


+ 1
- 1
mcop/type.h View File

@@ -27,7 +27,7 @@
#include "buffer.h"

/*
* BC - Status (2002-03-08): Type
* BC - tqStatus (2002-03-08): Type
*
* Keep binary compatible. DO NOT TOUCH, DO NOT CHANGE.
*/


+ 1
- 1
mcop/unixconnection.h View File

@@ -21,7 +21,7 @@
*/

/*
* BC - Status (2002-03-08): UnixConnection
* BC - tqStatus (2002-03-08): UnixConnection
*
* Not part of the public API. Do NOT use it in your apps. Can change, even
* binary incompatible.


+ 1
- 1
mcop/unixserver.h View File

@@ -21,7 +21,7 @@
*/

/*
* BC - Status (2002-03-08): UnixServer
* BC - tqStatus (2002-03-08): UnixServer
*
* Not part of the public API. Do NOT use it in your apps. Can change, even
* binary incompatible.


+ 1
- 1
mcop/weakreference.h View File

@@ -21,7 +21,7 @@
*/

/*
* BC - Status (2002-03-08): WeakReference(Base)
* BC - tqStatus (2002-03-08): WeakReference(Base)
*
* Has to be kept binary compatible by not touching it. Add a new class if
* you need something else.


+ 1
- 1
mcopidl/yacc.cc View File

@@ -414,7 +414,7 @@ static const short yycheck[] = { 0,
#endif

/* Note: there must be only one dollar sign in this file.
It is replaced by the list of actions, each action
It is tqreplaced by the list of actions, each action
as one case of the switch. */

#define yyerrok (yyerrstatus = 0)


+ 3
- 3
qtmcop/CMakeLists.txt View File

@@ -35,13 +35,13 @@ install( FILES
##### qtmcop ##############################

add_custom_command(
OUTPUT qiomanager_p.moc
COMMAND tmoc ${CMAKE_CURRENT_SOURCE_DIR}/qiomanager_p.h -o qiomanager_p.moc
OUTPUT qiomanager_p.tqmoc
COMMAND tqmoc ${CMAKE_CURRENT_SOURCE_DIR}/qiomanager_p.h -o qiomanager_p.tqmoc
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qiomanager_p.h
)

tde_add_library( qtmcop SHARED
SOURCES qiomanager.cc qiomanager_p.moc
SOURCES qiomanager.cc qiomanager_p.tqmoc
VERSION 1.0.0
LINK mcop-shared ${TQT_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}


+ 1
- 1
qtmcop/Makefile.am View File

@@ -8,7 +8,7 @@ libqtmcop_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIB_QT)
libqtmcop_la_LDFLAGS = -no-undefined -version-info 1:0 $(KDE_RPATH) \
$(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(USER_LDFLAGS) $(X_LDFLAGS) $(LDFLAGS_AS_NEEDED)

METASOURCES = qiomanager_p.moc
METASOURCES = qiomanager_p.tqmoc

artsincludedir = $(includedir)/arts
artsinclude_HEADERS = qiomanager.h

+ 3
- 3
qtmcop/qiomanager.cc View File

@@ -156,9 +156,9 @@ void QIOManager::processOneEvent(bool blocking)
else
{
if(blocking)
qApp->processOneEvent();
tqApp->processOneEvent();
else
qApp->processEvents(0);
tqApp->processEvents(0);
}
}

@@ -296,4 +296,4 @@ void QIOManager::setBlocking(bool blocking)
qioBlocking = blocking;
}

#include "qiomanager_p.moc"
#include "qiomanager_p.tqmoc"

+ 1
- 1
qtmcop/qiomanager.h View File

@@ -21,7 +21,7 @@
*/

/*
* BC - Status (2002-03-08): QIOManager.
* BC - tqStatus (2002-03-08): QIOManager.
*
* QIOManager is kept binary compatible.
*/


+ 1
- 1
qtmcop/qiomanager_p.h View File

@@ -21,7 +21,7 @@
*/

/*
* BC - Status (2002-03-08): QIOWatch, QTimeWatch.
* BC - tqStatus (2002-03-08): QIOWatch, QTimeWatch.
*
* These classes provide implementation details and not meant to be used
* in any way.


+ 2
- 2
soundserver/artsshell.cc 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;


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save