driver: fix compile after include change.

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
 

src/driver/audiodec/Makefile.am

@@ -1,6 +1,7 @@
 AM_CXXFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \

src/driver/audiodec/basedec.cpp

@@ -27,12 +27,6 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-
-#include <basedec.h>
-#include <cdrdec.h>
-#include <mp3dec.h>
-#include <oggdec.h>
-#include <wavdec.h>
 #ifdef ENABLE_FLAC
 #include <flacdec.h>
 #endif
@@ -48,6 +42,12 @@
 #include <neutrino.h>
 #include <zapit/client/zapittools.h>
 
+#include "basedec.h"
+#include "cdrdec.h"
+#include "mp3dec.h"
+#include "oggdec.h"
+#include "wavdec.h"
+
 unsigned int CBaseDec::mSamplerate=0;
 
 void ShoutcastCallback(void *arg)

src/driver/audiodec/cdrdec.cpp

@@ -32,7 +32,7 @@
 
 #include <stdio.h>
 #include <unistd.h>
-#include <cdrdec.h>
+#include "cdrdec.h"
 
 CCdrDec* CCdrDec::getInstance()
 {

src/driver/audiodec/cdrdec.h

@@ -29,7 +29,7 @@
 #ifndef __CDR_DEC__
 #define __CDR_DEC__
 
-#include <driver/audiodec/wavdec.h>
+#include "wavdec.h"
 
 class CCdrDec : public CWavDec
 {

src/driver/audiodec/flacdec.h

@@ -31,9 +31,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <pthread.h>
-#include <basedec.h>
 #include <driver/audiometadata.h>
 #include <FLAC/all.h>
+#include "basedec.h"
 
 #define DECODE_SLOTS 30
 

src/driver/audiodec/mp3dec.cpp

@@ -43,7 +43,6 @@
 #include <string.h>
 #include <errno.h>
 #include <string>
-#include <driver/audiodec/mp3dec.h>
 #include <linux/soundcard.h>
 #include <assert.h>
 #include <cmath>
@@ -54,6 +53,7 @@
 #include <neutrino.h>
 #include <driver/netfile.h>
 #include <zapit/include/audio.h>
+#include "mp3dec.h"
 
 extern cAudio * audioDecoder;
 

src/driver/audiodec/mp3dec.h

@@ -42,11 +42,12 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <pthread.h>
-#include <basedec.h>
 #include <driver/audiometadata.h>
+
+#include "basedec.h"
 extern "C"
 {
-#include "driver/audiodec/tag.h"
+#include "tag.h"
 }
 
 class CMP3Dec : public CBaseDec

src/driver/audiodec/oggdec.cpp

@@ -32,7 +32,6 @@
 
 #include <endian.h>
 #include <errno.h>
-#include <oggdec.h>
 #include <linux/soundcard.h>
 #include <algorithm>
 #include <sstream>
@@ -40,6 +39,8 @@
 
 #include <zapit/include/audio.h>
 
+#include "oggdec.h"
+
 extern cAudio * audioDecoder;
 
 #define ProgName "OggDec"

src/driver/audiodec/oggdec.h

@@ -36,7 +36,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <pthread.h>
-#include <basedec.h>
 #include <driver/audiometadata.h>
 #ifdef USE_TREMOR
 #include <tremor/ogg.h>
@@ -46,6 +45,8 @@
 #include <vorbis/vorbisfile.h>
 #endif
 
+#include "basedec.h"
+
 #define DECODE_SLOTS 30
 
 class COggDec : public CBaseDec

src/driver/audiodec/tag.c

@@ -20,7 +20,7 @@
  */
 
 # ifdef HAVE_CONFIG_H
-#  include "config.h"
+#  include <config.h>
 # endif
 
 //# include "global.h"

src/driver/audiodec/vis.cpp

@@ -19,13 +19,17 @@
 
 #include <global.h>
 #include <neutrino.h>
+
 #if HAVE_COOL_HARDWARE
 #include <driver/vfd.h>
 #endif
+
 #if HAVE_TRIPLEDRAGON
 #include <driver/lcdd.h>
 #endif
+
 #include "int_fft.c"
+
 typedef signed short gint16;
 typedef int gint;
 typedef float gfloat;

src/driver/audiodec/wavdec.cpp

@@ -33,12 +33,13 @@
 #include <cstring>
 #include <errno.h>
 #include <unistd.h>
-#include <wavdec.h>
 #include <sstream>
 #include <driver/audioplay.h>
 #include <linux/soundcard.h>
 #include <zapit/include/audio.h>
 
+#include "wavdec.h"
+
 extern cAudio * audioDecoder;
 
 #define ProgName "WavDec"

src/driver/audiodec/wavdec.h

@@ -30,7 +30,7 @@
 #define __WAV_DEC__
 
 #include <stdio.h>
-#include <driver/audiodec/basedec.h>
+#include "basedec.h"
 
 class CWavDec : public CBaseDec
 {

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