summaryrefslogtreecommitdiffstats
path: root/mpeglib/lib
diff options
context:
space:
mode:
Diffstat (limited to 'mpeglib/lib')
-rw-r--r--mpeglib/lib/CMakeLists.txt2
-rw-r--r--mpeglib/lib/decoder/decoderPlugin.h4
-rw-r--r--mpeglib/lib/decoder/mpgPlugin.h4
-rw-r--r--mpeglib/lib/decoder/nukePlugin.h4
-rw-r--r--mpeglib/lib/decoder/splayPlugin.h4
-rw-r--r--mpeglib/lib/decoder/tplayPlugin.h4
-rw-r--r--mpeglib/lib/frame/IOFrameQueue.h4
-rw-r--r--mpeglib/lib/frame/audioFrame.h4
-rw-r--r--mpeglib/lib/frame/audioFrameQueue.h4
-rw-r--r--mpeglib/lib/frame/framer.h4
-rw-r--r--mpeglib/lib/frame/pcmFrame.h4
-rw-r--r--mpeglib/lib/input/inputPlugin.h4
-rw-r--r--mpeglib/lib/output/outPlugin.h4
-rw-r--r--mpeglib/lib/output/outputStream.h4
-rw-r--r--mpeglib/lib/output/pluginInfo.h4
-rw-r--r--mpeglib/lib/splay/mpegAudioFrame.h4
-rw-r--r--mpeglib/lib/splay/splayDecoder.h4
-rw-r--r--mpeglib/lib/util/abstract/abs_thread.h2
-rw-r--r--mpeglib/lib/util/audio/audioIO_BeOS.cpp2
-rw-r--r--mpeglib/lib/util/audio/dspWrapper.h4
-rw-r--r--mpeglib/lib/util/timeWrapper.h4
-rw-r--r--mpeglib/lib/yuv/yuvPlugin.h4
22 files changed, 41 insertions, 41 deletions
diff --git a/mpeglib/lib/CMakeLists.txt b/mpeglib/lib/CMakeLists.txt
index ad500d03..7b3dab41 100644
--- a/mpeglib/lib/CMakeLists.txt
+++ b/mpeglib/lib/CMakeLists.txt
@@ -63,7 +63,7 @@ tde_add_library( mpeg SHARED
mcop kmedia2_idl soundserver_idl artsflow_idl artsmodules-shared
X11 ${XEXT_LIBRARIES} m ${XV_LIBRARIES} ${DGA_LIBRARIES} ${XVIDMODE_LIBRARIES}
${CDPARANOIA_LIBRARIES} ${OGG_LIBRARIES} ${VORBIS_LIBRARIES} ${VORBISFILE_LIBRARIES}
- pthread
+ ${CMAKE_THREAD_LIBS_INIT}
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/mpeglib/lib/decoder/decoderPlugin.h b/mpeglib/lib/decoder/decoderPlugin.h
index b616ed51..1737b7b6 100644
--- a/mpeglib/lib/decoder/decoderPlugin.h
+++ b/mpeglib/lib/decoder/decoderPlugin.h
@@ -26,7 +26,7 @@
#include "../output/outPlugin.h"
#include "../util/timeWrapper.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
/**
Note: streamstate can be "or'ed" for the waitStreamState call
@@ -75,7 +75,7 @@
*/
-class KDE_EXPORT DecoderPlugin {
+class TDE_EXPORT DecoderPlugin {
public:
diff --git a/mpeglib/lib/decoder/mpgPlugin.h b/mpeglib/lib/decoder/mpgPlugin.h
index 79d986cc..8077ddde 100644
--- a/mpeglib/lib/decoder/mpgPlugin.h
+++ b/mpeglib/lib/decoder/mpgPlugin.h
@@ -16,7 +16,7 @@
#define __MPGPLUGIN_H
#include "../decoder/decoderPlugin.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
#define _INSERT_NO 0
#define _INSERT_VIDEO 1
@@ -28,7 +28,7 @@ class MpegSystemStream;
class MpegStreamPlayer;
class MpegVideoLength;
-class KDE_EXPORT MpgPlugin : public DecoderPlugin {
+class TDE_EXPORT MpgPlugin : public DecoderPlugin {
MpegSystemHeader* mpegSystemHeader;
MpegSystemStream* mpegSystemStream;
diff --git a/mpeglib/lib/decoder/nukePlugin.h b/mpeglib/lib/decoder/nukePlugin.h
index a7df2495..7a5a16a3 100644
--- a/mpeglib/lib/decoder/nukePlugin.h
+++ b/mpeglib/lib/decoder/nukePlugin.h
@@ -16,9 +16,9 @@
#include "../decoder/decoderPlugin.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
-class KDE_EXPORT NukePlugin : public DecoderPlugin {
+class TDE_EXPORT NukePlugin : public DecoderPlugin {
public:
diff --git a/mpeglib/lib/decoder/splayPlugin.h b/mpeglib/lib/decoder/splayPlugin.h
index d7eed4ec..cc230874 100644
--- a/mpeglib/lib/decoder/splayPlugin.h
+++ b/mpeglib/lib/decoder/splayPlugin.h
@@ -15,7 +15,7 @@
#define __SPLAYPLUGIN_H
#include "../decoder/decoderPlugin.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
class SplayDecoder;
class MpegAudioFrame;
@@ -25,7 +25,7 @@ class PCMFrame;
class FileAccessWrapper;
class MpegAudioInfo;
-class KDE_EXPORT SplayPlugin : public DecoderPlugin {
+class TDE_EXPORT SplayPlugin : public DecoderPlugin {
int lnoLength;
int lfirst;
diff --git a/mpeglib/lib/decoder/tplayPlugin.h b/mpeglib/lib/decoder/tplayPlugin.h
index daa0de74..530e1e44 100644
--- a/mpeglib/lib/decoder/tplayPlugin.h
+++ b/mpeglib/lib/decoder/tplayPlugin.h
@@ -15,13 +15,13 @@
#define __TPLAYPLUGIN_H
#include "../decoder/decoderPlugin.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
/**
The tplayPlugin is ugly and needs a rewrite.
Im not sure if you can make mutiple instances of it
*/
-class KDE_EXPORT TplayPlugin : public DecoderPlugin {
+class TDE_EXPORT TplayPlugin : public DecoderPlugin {
struct info_struct* info;
class TimeStamp* startStamp;
diff --git a/mpeglib/lib/frame/IOFrameQueue.h b/mpeglib/lib/frame/IOFrameQueue.h
index d56f25aa..e21f9157 100644
--- a/mpeglib/lib/frame/IOFrameQueue.h
+++ b/mpeglib/lib/frame/IOFrameQueue.h
@@ -16,7 +16,7 @@
#define __IOFRAMEQUEUE_H
#include "frameQueue.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
/**
This class can store up to <size> frames.
@@ -31,7 +31,7 @@
*/
-class KDE_EXPORT IOFrameQueue {
+class TDE_EXPORT IOFrameQueue {
public:
diff --git a/mpeglib/lib/frame/audioFrame.h b/mpeglib/lib/frame/audioFrame.h
index b1c586c3..c9707326 100644
--- a/mpeglib/lib/frame/audioFrame.h
+++ b/mpeglib/lib/frame/audioFrame.h
@@ -29,12 +29,12 @@
#include "frame.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
#define SCALFACTOR SHRT_MAX
#define MP3FRAMESIZE (2*2*2*32*18)
-class KDE_EXPORT AudioFrame : public Frame {
+class TDE_EXPORT AudioFrame : public Frame {
int stereo;
int frequencyHZ;
diff --git a/mpeglib/lib/frame/audioFrameQueue.h b/mpeglib/lib/frame/audioFrameQueue.h
index 7e7a01c0..fe133e68 100644
--- a/mpeglib/lib/frame/audioFrameQueue.h
+++ b/mpeglib/lib/frame/audioFrameQueue.h
@@ -19,7 +19,7 @@
#include "floatFrame.h"
#include "pcmFrame.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
/**
This class solves the problem that we produce audioFrames
@@ -28,7 +28,7 @@
This class can convert from packets back to a stream.
*/
-class KDE_EXPORT AudioFrameQueue : public IOFrameQueue {
+class TDE_EXPORT AudioFrameQueue : public IOFrameQueue {
int frameType;
int len;
diff --git a/mpeglib/lib/frame/framer.h b/mpeglib/lib/frame/framer.h
index 51c4b26e..b90df946 100644
--- a/mpeglib/lib/frame/framer.h
+++ b/mpeglib/lib/frame/framer.h
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#define FRAME_NEED 0
#define FRAME_WORK 1
@@ -70,7 +70,7 @@
-class KDE_EXPORT Framer {
+class TDE_EXPORT Framer {
// this is our destination buffer for the output frame
// this buffer must be able to store the maximum size
diff --git a/mpeglib/lib/frame/pcmFrame.h b/mpeglib/lib/frame/pcmFrame.h
index a19941bc..029f0eab 100644
--- a/mpeglib/lib/frame/pcmFrame.h
+++ b/mpeglib/lib/frame/pcmFrame.h
@@ -17,10 +17,10 @@
#include "audioFrame.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
// this format has a sampleSize of 16, signed, endian==machine
-class KDE_EXPORT PCMFrame : public AudioFrame {
+class TDE_EXPORT PCMFrame : public AudioFrame {
short int* data;
int len;
diff --git a/mpeglib/lib/input/inputPlugin.h b/mpeglib/lib/input/inputPlugin.h
index 5ac68307..f6b65f34 100644
--- a/mpeglib/lib/input/inputPlugin.h
+++ b/mpeglib/lib/input/inputPlugin.h
@@ -25,11 +25,11 @@
#include <string.h>
#include "inputDetector.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
#define _INPUT_THREADSAFE 1
-class KDE_EXPORT InputPlugin {
+class TDE_EXPORT InputPlugin {
public:
InputPlugin();
diff --git a/mpeglib/lib/output/outPlugin.h b/mpeglib/lib/output/outPlugin.h
index b70620a6..b606d444 100644
--- a/mpeglib/lib/output/outPlugin.h
+++ b/mpeglib/lib/output/outPlugin.h
@@ -18,7 +18,7 @@
#include "dspX11OutputStream.h"
#include "artsOutputStream.h"
#include "threadSafeOutputStream.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
#define _OUTPUT_LOCAL 1
#define _OUTPUT_EMPTY 2
@@ -27,7 +27,7 @@
#define _OUTPUT_THREADSAFE 1
-class KDE_EXPORT OutPlugin {
+class TDE_EXPORT OutPlugin {
public:
OutPlugin();
diff --git a/mpeglib/lib/output/outputStream.h b/mpeglib/lib/output/outputStream.h
index 9ef538fd..ae856976 100644
--- a/mpeglib/lib/output/outputStream.h
+++ b/mpeglib/lib/output/outputStream.h
@@ -20,7 +20,7 @@
#include "pluginInfo.h"
#include "../util/render/pictureArray.h"
#include "../util/abstract/abs_thread.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
#define _OUTPUT_WAIT_METHOD_BLOCK 1
#define _OUTPUT_WAIT_METHOD_POLL 2
@@ -76,7 +76,7 @@
-class KDE_EXPORT OutputStream {
+class TDE_EXPORT OutputStream {
int audioState;
int videoState;
diff --git a/mpeglib/lib/output/pluginInfo.h b/mpeglib/lib/output/pluginInfo.h
index 7026fce9..585ef7ba 100644
--- a/mpeglib/lib/output/pluginInfo.h
+++ b/mpeglib/lib/output/pluginInfo.h
@@ -16,7 +16,7 @@
#define __PLUGININFO_H
#include "../util/dynBuffer.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
/**
Here we have the base class for all additional information
@@ -26,7 +26,7 @@
*/
-class KDE_EXPORT PluginInfo {
+class TDE_EXPORT PluginInfo {
int sec;
DynBuffer* musicName;
diff --git a/mpeglib/lib/splay/mpegAudioFrame.h b/mpeglib/lib/splay/mpegAudioFrame.h
index 8b4f6c4f..911307cd 100644
--- a/mpeglib/lib/splay/mpegAudioFrame.h
+++ b/mpeglib/lib/splay/mpegAudioFrame.h
@@ -17,7 +17,7 @@
#include "mpegAudioHeader.h"
#include "../frame/framer.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
/*
Here we are framing from raw to mpeg audio.
@@ -26,7 +26,7 @@
-class KDE_EXPORT MpegAudioFrame : public Framer {
+class TDE_EXPORT MpegAudioFrame : public Framer {
// max size of buffer is:
// header: 4
diff --git a/mpeglib/lib/splay/splayDecoder.h b/mpeglib/lib/splay/splayDecoder.h
index acbfdbfc..d91faa33 100644
--- a/mpeglib/lib/splay/splayDecoder.h
+++ b/mpeglib/lib/splay/splayDecoder.h
@@ -29,7 +29,7 @@
#include "../frame/audioFrame.h"
#include "dump.h"
#include <string.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
class Mpegtoraw;
class MpegAudioStream;
@@ -46,7 +46,7 @@ class MpegAudioHeader;
-class KDE_EXPORT SplayDecoder {
+class TDE_EXPORT SplayDecoder {
MpegAudioStream* stream;
MpegAudioHeader* header;
diff --git a/mpeglib/lib/util/abstract/abs_thread.h b/mpeglib/lib/util/abstract/abs_thread.h
index 0da7e2a0..f65445d8 100644
--- a/mpeglib/lib/util/abstract/abs_thread.h
+++ b/mpeglib/lib/util/abstract/abs_thread.h
@@ -83,7 +83,7 @@ typedef SDL_mutex* abs_thread_mutex_t;
typedef SDL_cond* abs_thread_cond_t;
typedef SDL_Thread* abs_thread_t;
-// TQT_SIGNAL FUNCTIONS
+// SIGNAL FUNCTIONS
// note we have _no_ cond attribut (not needed)
int abs_thread_cond_init(abs_thread_cond_t* cond);
int abs_thread_cond_destroy(abs_thread_cond_t *cond);
diff --git a/mpeglib/lib/util/audio/audioIO_BeOS.cpp b/mpeglib/lib/util/audio/audioIO_BeOS.cpp
index ff73cd57..3c221f0e 100644
--- a/mpeglib/lib/util/audio/audioIO_BeOS.cpp
+++ b/mpeglib/lib/util/audio/audioIO_BeOS.cpp
@@ -145,7 +145,7 @@ int audioRead(char *buffer, int count)
bool stream_func(void *arg, char *buf, size_t count, void *header)
{
audioRead(buf, count);
- return TRUE;
+ return true;
}
void audioOpen() {
diff --git a/mpeglib/lib/util/audio/dspWrapper.h b/mpeglib/lib/util/audio/dspWrapper.h
index f323096d..6a6fd5be 100644
--- a/mpeglib/lib/util/audio/dspWrapper.h
+++ b/mpeglib/lib/util/audio/dspWrapper.h
@@ -18,7 +18,7 @@
class AudioFrame;
class PCMFrame;
class FloatFrame;
-#include <kdemacros.h>
+#include <tdemacros.h>
/**
This class wraps the platform specific /dev/dsp implementation.
@@ -32,7 +32,7 @@ class FloatFrame;
But a caller can do it in both orders.
*/
-class KDE_EXPORT DSPWrapper {
+class TDE_EXPORT DSPWrapper {
int lopenDevice;
int lopenMixer;
diff --git a/mpeglib/lib/util/timeWrapper.h b/mpeglib/lib/util/timeWrapper.h
index 608d5bd0..435b86db 100644
--- a/mpeglib/lib/util/timeWrapper.h
+++ b/mpeglib/lib/util/timeWrapper.h
@@ -23,14 +23,14 @@
#include <strings.h>
#endif
-#include <kdemacros.h>
+#include <tdemacros.h>
typedef struct timeval_s {
long tv_sec; /* seconds */
long tv_usec; /* microseconds */
} timeval_t;
-class KDE_EXPORT TimeWrapper {
+class TDE_EXPORT TimeWrapper {
public:
TimeWrapper();
diff --git a/mpeglib/lib/yuv/yuvPlugin.h b/mpeglib/lib/yuv/yuvPlugin.h
index 4a5dc72b..238b01f6 100644
--- a/mpeglib/lib/yuv/yuvPlugin.h
+++ b/mpeglib/lib/yuv/yuvPlugin.h
@@ -18,9 +18,9 @@
#define __YUVPLUGIN_H
#include "../decoder/decoderPlugin.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
-class KDE_EXPORT YUVPlugin : public DecoderPlugin {
+class TDE_EXPORT YUVPlugin : public DecoderPlugin {
int lCalcLength;
int nWidth;
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-20 08:13:55 +0000