diff options
Diffstat (limited to 'mpeglib')
41 files changed, 71 insertions, 73 deletions
diff --git a/mpeglib/ConfigureChecks.cmake b/mpeglib/ConfigureChecks.cmake index 254eb03d..c411b689 100644 --- a/mpeglib/ConfigureChecks.cmake +++ b/mpeglib/ConfigureChecks.cmake @@ -34,7 +34,7 @@ pkg_search_module( XEXT xext ) check_include_file( "X11/extensions/XShm.h" X11_SHARED_MEM ) -check_include_file( "X11/extensions/xf86dga1.h" X11_DGA2 ) +check_include_file( "X11/extensions/Xxf86dga.h" X11_DGA2 ) if( X11_DGA2 ) set( DGA_LIBRARIES Xxf86dga ) endif( ) diff --git a/mpeglib/example/yaf/yafcore/buffer.h b/mpeglib/example/yaf/yafcore/buffer.h index 7c1a3d5c..ae008d6c 100644 --- a/mpeglib/example/yaf/yafcore/buffer.h +++ b/mpeglib/example/yaf/yafcore/buffer.h @@ -22,9 +22,9 @@ extern "C" { #include <string.h> #include <stdio.h> } -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT Buffer { +class TDE_EXPORT Buffer { char* msg; int nSize; diff --git a/mpeglib/example/yaf/yafcore/commandTable.h b/mpeglib/example/yaf/yafcore/commandTable.h index 75dd4325..679913cc 100644 --- a/mpeglib/example/yaf/yafcore/commandTable.h +++ b/mpeglib/example/yaf/yafcore/commandTable.h @@ -21,7 +21,7 @@ extern"C" { #include <stdio.h> } -#include <kdemacros.h> +#include <tdemacros.h> #define _CT_START 40 @@ -47,7 +47,7 @@ struct CommandDescriptionStruct { typedef struct CommandDescriptionStruct CommandDescription; -class KDE_EXPORT CommandTable { +class TDE_EXPORT CommandTable { int nCommandDesc; CommandDescription commandDesc[50]; diff --git a/mpeglib/example/yaf/yafcore/inputDecoder.h b/mpeglib/example/yaf/yafcore/inputDecoder.h index 0a5623a0..aa22337d 100644 --- a/mpeglib/example/yaf/yafcore/inputDecoder.h +++ b/mpeglib/example/yaf/yafcore/inputDecoder.h @@ -19,7 +19,7 @@ #include "outputInterface.h" #include <strings.h> -#include <kdemacros.h> +#include <tdemacros.h> #define _DECODER_STATUS_IDLE 1 #define _DECODER_STATUS_WORKING 2 @@ -29,7 +29,7 @@ class CommandTable; class CommandTableYAF; class CommandLine; -class KDE_EXPORT InputDecoder { +class TDE_EXPORT InputDecoder { int status; CommandTable* commandTable; diff --git a/mpeglib/example/yaf/yafcore/inputInterface.h b/mpeglib/example/yaf/yafcore/inputInterface.h index f3ea0065..2f2ffd44 100644 --- a/mpeglib/example/yaf/yafcore/inputInterface.h +++ b/mpeglib/example/yaf/yafcore/inputInterface.h @@ -18,7 +18,7 @@ #include "buffer.h" #include <fstream> -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { #include <unistd.h> @@ -37,7 +37,7 @@ extern "C" { class MultiReader; -class KDE_EXPORT InputInterface { +class TDE_EXPORT InputInterface { int currentCommandNumber; diff --git a/mpeglib/example/yaf/yafcore/outputInterface.h b/mpeglib/example/yaf/yafcore/outputInterface.h index 0a24fd92..616c1eb7 100644 --- a/mpeglib/example/yaf/yafcore/outputInterface.h +++ b/mpeglib/example/yaf/yafcore/outputInterface.h @@ -21,14 +21,14 @@ #include <pthread.h> #include <fstream> #include "buffer.h" -#include <kdemacros.h> +#include <tdemacros.h> // uncomment this for debugging the output stream // (written to file outstream.dbg) //#define _DEBUG_OUTPUT -class KDE_EXPORT OutputInterface { +class TDE_EXPORT OutputInterface { int protocolSyntax; int nr; diff --git a/mpeglib/example/yaf/yafcore/yaf_control.h b/mpeglib/example/yaf/yafcore/yaf_control.h index 890a1bb8..14cf921f 100644 --- a/mpeglib/example/yaf/yafcore/yaf_control.h +++ b/mpeglib/example/yaf/yafcore/yaf_control.h @@ -13,13 +13,13 @@ #include <unistd.h> #include <fcntl.h> #include <stdio.h> -#include <kdemacros.h> +#include <tdemacros.h> // prototypes //extern "C" void control_xplayer(); -KDE_EXPORT void yaf_control(InputInterface* input, +TDE_EXPORT void yaf_control(InputInterface* input, OutputInterface* output, InputDecoder* decoder); diff --git a/mpeglib/example/yaf/yafxplayer/inputDecoderYAF.h b/mpeglib/example/yaf/yafxplayer/inputDecoderYAF.h index 2002dc58..1abc4452 100644 --- a/mpeglib/example/yaf/yafxplayer/inputDecoderYAF.h +++ b/mpeglib/example/yaf/yafxplayer/inputDecoderYAF.h @@ -20,10 +20,10 @@ #include "inputDecoderXPlayer.h" #include "yafOutputStream.h" -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT InputDecoderYAF : public InputDecoderXPlayer { +class TDE_EXPORT InputDecoderYAF : public InputDecoderXPlayer { DecoderPlugin* plugin; YafOutputStream* output; diff --git a/mpeglib/example/yaf/yafxplayer/yafOutputStream.h b/mpeglib/example/yaf/yafxplayer/yafOutputStream.h index bb7df423..70e26974 100644 --- a/mpeglib/example/yaf/yafxplayer/yafOutputStream.h +++ b/mpeglib/example/yaf/yafxplayer/yafOutputStream.h @@ -41,7 +41,7 @@ #include <unistd.h> #include <sys/types.h> #include <sys/socket.h> -#include <kdemacros.h> +#include <tdemacros.h> // If you get compile errors when using mpeglib // simply remove the yaf dependencies @@ -49,7 +49,7 @@ -class KDE_EXPORT YafOutputStream : public OutputStream { +class TDE_EXPORT YafOutputStream : public OutputStream { long bytes; diff --git a/mpeglib/lib/CMakeLists.txt b/mpeglib/lib/CMakeLists.txt index a2e324fe..7b3dab41 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 @@ -63,6 +63,8 @@ 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} ) + +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..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/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..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/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..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/huffmantable.cpp b/mpeglib/lib/splay/huffmantable.cpp index 223e6069..16fde4af 100644 --- a/mpeglib/lib/splay/huffmantable.cpp +++ b/mpeglib/lib/splay/huffmantable.cpp @@ -2,7 +2,7 @@ (C) 1997 by Jung woo-jae */ -// Huffmantable.cc +// Huffmantable.cpp // It contains initialized huffman table for MPEG layer 3 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/mpeglayer1.cpp b/mpeglib/lib/splay/mpeglayer1.cpp index 2d939d9d..ec5ef907 100644 --- a/mpeglib/lib/splay/mpeglayer1.cpp +++ b/mpeglib/lib/splay/mpeglayer1.cpp @@ -2,7 +2,7 @@ (C) 1997 by Jung woo-jae */ -// Mpeglayer1.cc +// Mpeglayer1.cpp // It's for MPEG Layer 1 diff --git a/mpeglib/lib/splay/mpeglayer2.cpp b/mpeglib/lib/splay/mpeglayer2.cpp index 1b907a07..a5a809b6 100644 --- a/mpeglib/lib/splay/mpeglayer2.cpp +++ b/mpeglib/lib/splay/mpeglayer2.cpp @@ -2,7 +2,7 @@ (C) 1997 by Jung woo-jae */ -// Mpeglayer2.cc +// Mpeglayer2.cpp // It's for MPEG Layer 2 diff --git a/mpeglib/lib/splay/mpeglayer3.cpp b/mpeglib/lib/splay/mpeglayer3.cpp index 3abed128..3752859a 100644 --- a/mpeglib/lib/splay/mpeglayer3.cpp +++ b/mpeglib/lib/splay/mpeglayer3.cpp @@ -2,7 +2,7 @@ (C) 1997 by Jung woo-jae */ -// Mpeglayer3.cc +// Mpeglayer3.cpp // It's for MPEG Layer 3 // I've made array of superior functions for speed. // Extend TO_FOUR_THIRDS to negative. diff --git a/mpeglib/lib/splay/mpegtable.cpp b/mpeglib/lib/splay/mpegtable.cpp index be539ddd..f602166e 100644 --- a/mpeglib/lib/splay/mpegtable.cpp +++ b/mpeglib/lib/splay/mpegtable.cpp @@ -2,7 +2,7 @@ (C) 1997 by Jung woo-jae */ -// Mpegtable.cc +// Mpegtable.cpp // It has tables for MPEG layer 1, 2 and a part of layer 3 diff --git a/mpeglib/lib/splay/mpegtoraw.cpp b/mpeglib/lib/splay/mpegtoraw.cpp index 93143bbe..d114eba9 100644 --- a/mpeglib/lib/splay/mpegtoraw.cpp +++ b/mpeglib/lib/splay/mpegtoraw.cpp @@ -2,7 +2,7 @@ (C) 1997 by Jung woo-jae */ -// Mpegtoraw.cc +// Mpegtoraw.cpp // Server which get mpeg format and put raw format. 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/render/x11/xinit.h b/mpeglib/lib/util/render/x11/xinit.h index c42c290f..fe6c09b9 100644 --- a/mpeglib/lib/util/render/x11/xinit.h +++ b/mpeglib/lib/util/render/x11/xinit.h @@ -38,7 +38,7 @@ #endif #ifdef X11_DGA2 -#include <X11/extensions/xf86dga.h> +#include <X11/extensions/Xxf86dga.h> #endif #define ERR_XI_FAILURE 0xFF 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; |