From bec26850a334491b55548966a5463d85e92d2d3d Mon Sep 17 00:00:00 2001 From: "[CST] Bas" Date: Sun, 4 Mar 2012 15:50:19 +0800 Subject: [PATCH] driver: fix compile after include change. --- src/driver/Makefile.am | 5 +++-- src/driver/audiodec/Makefile.am | 7 ++++--- src/driver/audiodec/basedec.cpp | 12 ++++++------ src/driver/audiodec/cdrdec.cpp | 2 +- src/driver/audiodec/cdrdec.h | 2 +- src/driver/audiodec/flacdec.h | 2 +- src/driver/audiodec/mp3dec.cpp | 2 +- src/driver/audiodec/mp3dec.h | 5 +++-- src/driver/audiodec/oggdec.cpp | 3 ++- src/driver/audiodec/oggdec.h | 3 ++- src/driver/audiodec/tag.c | 2 +- src/driver/audiodec/vis.cpp | 4 ++++ src/driver/audiodec/wavdec.cpp | 3 ++- src/driver/audiodec/wavdec.h | 2 +- src/driver/pictureviewer/Makefile.am | 5 +++-- 15 files changed, 35 insertions(+), 24 deletions(-) diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am index e7feb5544..316c4d6e5 100644 --- a/src/driver/Makefile.am +++ b/src/driver/Makefile.am @@ -4,14 +4,15 @@ SUBDIRS = pictureviewer audiodec INCLUDES = \ -I$(top_srcdir)/daemons \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/zapit/include \ + -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/libnet \ -I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/connection \ -I$(top_srcdir)/lib/libeventserver \ - @FREETYPE_CFLAGS@ \ - -I$(top_srcdir)/lib + @FREETYPE_CFLAGS@ noinst_LIBRARIES = libneutrino_driver.a libneutrino_driver_netfile.a diff --git a/src/driver/audiodec/Makefile.am b/src/driver/audiodec/Makefile.am index 523b2fabf..aff9c84cb 100644 --- a/src/driver/audiodec/Makefile.am +++ b/src/driver/audiodec/Makefile.am @@ -1,12 +1,13 @@ AM_CXXFLAGS = -fno-rtti -fno-exceptions INCLUDES = \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/lib \ + -I$(top_srcdir)/lib \ -I$(top_srcdir)/src/zapit/include \ -I$(top_srcdir)/lib/libconfigfile \ - @FREETYPE_CFLAGS@ \ - @VORBISIDEC_CFLAGS@ + @FREETYPE_CFLAGS@ \ + @VORBISIDEC_CFLAGS@ if BOXTYPE_COOL INCLUDES += -I$(top_srcdir)/lib/libcoolstream diff --git a/src/driver/audiodec/basedec.cpp b/src/driver/audiodec/basedec.cpp index 931c2d416..abf076fc1 100644 --- a/src/driver/audiodec/basedec.cpp +++ b/src/driver/audiodec/basedec.cpp @@ -27,12 +27,6 @@ #ifdef HAVE_CONFIG_H #include #endif - -#include -#include -#include -#include -#include #ifdef ENABLE_FLAC #include #endif @@ -48,6 +42,12 @@ #include #include +#include "basedec.h" +#include "cdrdec.h" +#include "mp3dec.h" +#include "oggdec.h" +#include "wavdec.h" + unsigned int CBaseDec::mSamplerate=0; void ShoutcastCallback(void *arg) diff --git a/src/driver/audiodec/cdrdec.cpp b/src/driver/audiodec/cdrdec.cpp index 1d483d4ee..8ba63bcb5 100644 --- a/src/driver/audiodec/cdrdec.cpp +++ b/src/driver/audiodec/cdrdec.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include "cdrdec.h" CCdrDec* CCdrDec::getInstance() { diff --git a/src/driver/audiodec/cdrdec.h b/src/driver/audiodec/cdrdec.h index 65217aa3e..64e0250e1 100644 --- a/src/driver/audiodec/cdrdec.h +++ b/src/driver/audiodec/cdrdec.h @@ -29,7 +29,7 @@ #ifndef __CDR_DEC__ #define __CDR_DEC__ -#include +#include "wavdec.h" class CCdrDec : public CWavDec { diff --git a/src/driver/audiodec/flacdec.h b/src/driver/audiodec/flacdec.h index 8d92617b4..269432676 100644 --- a/src/driver/audiodec/flacdec.h +++ b/src/driver/audiodec/flacdec.h @@ -31,9 +31,9 @@ #include #include #include -#include #include #include +#include "basedec.h" #define DECODE_SLOTS 30 diff --git a/src/driver/audiodec/mp3dec.cpp b/src/driver/audiodec/mp3dec.cpp index 77f7a1a6b..dacd390ec 100644 --- a/src/driver/audiodec/mp3dec.cpp +++ b/src/driver/audiodec/mp3dec.cpp @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -54,6 +53,7 @@ #include #include #include +#include "mp3dec.h" extern cAudio * audioDecoder; diff --git a/src/driver/audiodec/mp3dec.h b/src/driver/audiodec/mp3dec.h index b18924a9d..cafdc4f9c 100644 --- a/src/driver/audiodec/mp3dec.h +++ b/src/driver/audiodec/mp3dec.h @@ -42,11 +42,12 @@ #include #include #include -#include #include + +#include "basedec.h" extern "C" { -#include "driver/audiodec/tag.h" +#include "tag.h" } class CMP3Dec : public CBaseDec diff --git a/src/driver/audiodec/oggdec.cpp b/src/driver/audiodec/oggdec.cpp index a494abd37..b431a3e02 100644 --- a/src/driver/audiodec/oggdec.cpp +++ b/src/driver/audiodec/oggdec.cpp @@ -32,7 +32,6 @@ #include #include -#include #include #include #include @@ -40,6 +39,8 @@ #include +#include "oggdec.h" + extern cAudio * audioDecoder; #define ProgName "OggDec" diff --git a/src/driver/audiodec/oggdec.h b/src/driver/audiodec/oggdec.h index e08189bf3..f3948d3d4 100644 --- a/src/driver/audiodec/oggdec.h +++ b/src/driver/audiodec/oggdec.h @@ -36,7 +36,6 @@ #include #include #include -#include #include #ifdef USE_TREMOR #include @@ -46,6 +45,8 @@ #include #endif +#include "basedec.h" + #define DECODE_SLOTS 30 class COggDec : public CBaseDec diff --git a/src/driver/audiodec/tag.c b/src/driver/audiodec/tag.c index 1aeefd20a..e3efe9834 100644 --- a/src/driver/audiodec/tag.c +++ b/src/driver/audiodec/tag.c @@ -20,7 +20,7 @@ */ # ifdef HAVE_CONFIG_H -# include "config.h" +# include # endif //# include "global.h" diff --git a/src/driver/audiodec/vis.cpp b/src/driver/audiodec/vis.cpp index f2311a848..179d817a1 100644 --- a/src/driver/audiodec/vis.cpp +++ b/src/driver/audiodec/vis.cpp @@ -19,13 +19,17 @@ #include #include + #if HAVE_COOL_HARDWARE #include #endif + #if HAVE_TRIPLEDRAGON #include #endif + #include "int_fft.c" + typedef signed short gint16; typedef int gint; typedef float gfloat; diff --git a/src/driver/audiodec/wavdec.cpp b/src/driver/audiodec/wavdec.cpp index dc01cf882..a34c5d862 100644 --- a/src/driver/audiodec/wavdec.cpp +++ b/src/driver/audiodec/wavdec.cpp @@ -33,12 +33,13 @@ #include #include #include -#include #include #include #include #include +#include "wavdec.h" + extern cAudio * audioDecoder; #define ProgName "WavDec" diff --git a/src/driver/audiodec/wavdec.h b/src/driver/audiodec/wavdec.h index 5a9a9fadb..f8f4ccb58 100644 --- a/src/driver/audiodec/wavdec.h +++ b/src/driver/audiodec/wavdec.h @@ -30,7 +30,7 @@ #define __WAV_DEC__ #include -#include +#include "basedec.h" class CWavDec : public CBaseDec { diff --git a/src/driver/pictureviewer/Makefile.am b/src/driver/pictureviewer/Makefile.am index 5805e8f37..f9dced63d 100644 --- a/src/driver/pictureviewer/Makefile.am +++ b/src/driver/pictureviewer/Makefile.am @@ -1,11 +1,12 @@ AM_CXXFLAGS = -fno-rtti -fno-exceptions INCLUDES = \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/zapit/include \ + -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/libconfigfile \ - @FREETYPE_CFLAGS@ \ - -I$(top_srcdir)/lib + @FREETYPE_CFLAGS@ if BOXTYPE_COOL INCLUDES += -I$(top_srcdir)/lib/libcoolstream