summaryrefslogtreecommitdiffstats
path: root/mpeglib/lib
diff options
context:
space:
mode:
Diffstat (limited to 'mpeglib/lib')
-rw-r--r--mpeglib/lib/CMakeLists.txt4
-rw-r--r--mpeglib/lib/Makefile.am2
-rw-r--r--mpeglib/lib/decoder/decoderPlugin.h2
-rw-r--r--mpeglib/lib/decoder/mpgPlugin.h2
-rw-r--r--mpeglib/lib/decoder/nukePlugin.h2
-rw-r--r--mpeglib/lib/decoder/splayPlugin.h2
-rw-r--r--mpeglib/lib/decoder/tplayPlugin.h2
-rw-r--r--mpeglib/lib/dummy.cpp6
-rw-r--r--mpeglib/lib/frame/IOFrameQueue.h2
-rw-r--r--mpeglib/lib/frame/audioFrame.h2
-rw-r--r--mpeglib/lib/frame/audioFrameQueue.h2
-rw-r--r--mpeglib/lib/frame/framer.h2
-rw-r--r--mpeglib/lib/frame/pcmFrame.h2
-rw-r--r--mpeglib/lib/input/inputPlugin.h2
-rw-r--r--mpeglib/lib/mpegplay/slice.h2
-rw-r--r--mpeglib/lib/output/outPlugin.h2
-rw-r--r--mpeglib/lib/output/outputStream.h2
-rw-r--r--mpeglib/lib/output/pluginInfo.h2
-rw-r--r--mpeglib/lib/splay/mpegAudioFrame.h2
-rw-r--r--mpeglib/lib/splay/splayDecoder.h2
-rw-r--r--mpeglib/lib/util/abstract/abs_thread.h2
-rw-r--r--mpeglib/lib/util/audio/dspWrapper.h2
-rw-r--r--mpeglib/lib/util/timeWrapper.h2
-rw-r--r--mpeglib/lib/yuv/yuvPlugin.h2
24 files changed, 26 insertions, 28 deletions
diff --git a/mpeglib/lib/CMakeLists.txt b/mpeglib/lib/CMakeLists.txt
index a2e324fe..ad500d03 100644
--- a/mpeglib/lib/CMakeLists.txt
+++ b/mpeglib/lib/CMakeLists.txt
@@ -37,7 +37,7 @@ link_directories(
##### mpeg-lib (library) ########################
tde_add_library( mpeg SHARED
- SOURCES dummy.cpp
+ SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
RELEASE ${MPEGLIB_VERSION}
EMBED
mpeg_mpgplayer-static
@@ -66,3 +66,5 @@ tde_add_library( mpeg SHARED
pthread
DESTINATION ${LIB_INSTALL_DIR}
)
+
+configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY )
diff --git a/mpeglib/lib/Makefile.am b/mpeglib/lib/Makefile.am
index 3c6d115e..142f302f 100644
--- a/mpeglib/lib/Makefile.am
+++ b/mpeglib/lib/Makefile.am
@@ -23,6 +23,8 @@ THIS_EXTRALIBS = mpgplayer/libmpgplayer.la \
frame/libframe.la \
yuv/libyuvPlugin.la
+dummy.cpp:
+ echo > dummy.cpp
lib_LTLIBRARIES = libmpeg.la
diff --git a/mpeglib/lib/decoder/decoderPlugin.h b/mpeglib/lib/decoder/decoderPlugin.h
index b616ed51..a25bee60 100644
--- a/mpeglib/lib/decoder/decoderPlugin.h
+++ b/mpeglib/lib/decoder/decoderPlugin.h
@@ -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..d2c57f01 100644
--- a/mpeglib/lib/decoder/mpgPlugin.h
+++ b/mpeglib/lib/decoder/mpgPlugin.h
@@ -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..9898bd02 100644
--- a/mpeglib/lib/decoder/nukePlugin.h
+++ b/mpeglib/lib/decoder/nukePlugin.h
@@ -18,7 +18,7 @@
#include "../decoder/decoderPlugin.h"
#include <kdemacros.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..4bb0d9f9 100644
--- a/mpeglib/lib/decoder/splayPlugin.h
+++ b/mpeglib/lib/decoder/splayPlugin.h
@@ -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..90c6f6d2 100644
--- a/mpeglib/lib/decoder/tplayPlugin.h
+++ b/mpeglib/lib/decoder/tplayPlugin.h
@@ -21,7 +21,7 @@
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/dummy.cpp b/mpeglib/lib/dummy.cpp
deleted file mode 100644
index 94bd1cb7..00000000
--- a/mpeglib/lib/dummy.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-static int dummy() {
- return 0;
-}
diff --git a/mpeglib/lib/frame/IOFrameQueue.h b/mpeglib/lib/frame/IOFrameQueue.h
index d56f25aa..652977b6 100644
--- a/mpeglib/lib/frame/IOFrameQueue.h
+++ b/mpeglib/lib/frame/IOFrameQueue.h
@@ -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..853a5391 100644
--- a/mpeglib/lib/frame/audioFrame.h
+++ b/mpeglib/lib/frame/audioFrame.h
@@ -34,7 +34,7 @@
#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..63f8bd57 100644
--- a/mpeglib/lib/frame/audioFrameQueue.h
+++ b/mpeglib/lib/frame/audioFrameQueue.h
@@ -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..2c1081ba 100644
--- a/mpeglib/lib/frame/framer.h
+++ b/mpeglib/lib/frame/framer.h
@@ -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..f031519f 100644
--- a/mpeglib/lib/frame/pcmFrame.h
+++ b/mpeglib/lib/frame/pcmFrame.h
@@ -20,7 +20,7 @@
#include <kdemacros.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..7ccc5501 100644
--- a/mpeglib/lib/input/inputPlugin.h
+++ b/mpeglib/lib/input/inputPlugin.h
@@ -29,7 +29,7 @@
#define _INPUT_THREADSAFE 1
-class KDE_EXPORT InputPlugin {
+class TDE_EXPORT InputPlugin {
public:
InputPlugin();
diff --git a/mpeglib/lib/mpegplay/slice.h b/mpeglib/lib/mpegplay/slice.h
index 13556155..10689d34 100644
--- a/mpeglib/lib/mpegplay/slice.h
+++ b/mpeglib/lib/mpegplay/slice.h
@@ -38,7 +38,7 @@ class Slice {
/* Slice structure. */
- unsigned int vert_pos; /*Qt::Vertical position of slice. */
+ unsigned int vert_pos; /* Vertical position of slice. */
unsigned int quant_scale; /* Quantization scale. */
MpegExtension* mpegExtension; /* Extra bit slice info. */
diff --git a/mpeglib/lib/output/outPlugin.h b/mpeglib/lib/output/outPlugin.h
index b70620a6..72b49edf 100644
--- a/mpeglib/lib/output/outPlugin.h
+++ b/mpeglib/lib/output/outPlugin.h
@@ -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..b2d1a2fb 100644
--- a/mpeglib/lib/output/outputStream.h
+++ b/mpeglib/lib/output/outputStream.h
@@ -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..1d9e5409 100644
--- a/mpeglib/lib/output/pluginInfo.h
+++ b/mpeglib/lib/output/pluginInfo.h
@@ -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..100579fb 100644
--- a/mpeglib/lib/splay/mpegAudioFrame.h
+++ b/mpeglib/lib/splay/mpegAudioFrame.h
@@ -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..6767336d 100644
--- a/mpeglib/lib/splay/splayDecoder.h
+++ b/mpeglib/lib/splay/splayDecoder.h
@@ -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/dspWrapper.h b/mpeglib/lib/util/audio/dspWrapper.h
index f323096d..8fc21cdf 100644
--- a/mpeglib/lib/util/audio/dspWrapper.h
+++ b/mpeglib/lib/util/audio/dspWrapper.h
@@ -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..f8c2c8a3 100644
--- a/mpeglib/lib/util/timeWrapper.h
+++ b/mpeglib/lib/util/timeWrapper.h
@@ -30,7 +30,7 @@ typedef struct timeval_s {
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..6cc33d7e 100644
--- a/mpeglib/lib/yuv/yuvPlugin.h
+++ b/mpeglib/lib/yuv/yuvPlugin.h
@@ -20,7 +20,7 @@
#include "../decoder/decoderPlugin.h"
#include <kdemacros.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.25.1) at 2024-05-18 15:07:55 +0000