mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

driver: fix compile after include change.

Browse Source
This commit is contained in:
[CST] Bas
2012-03-04 15:50:19 +08:00
parent 42a47ac8dc
commit bec26850a3
15 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/driver/Makefile.am
View File

@@ -4,14 +4,15 @@ SUBDIRS = pictureviewer audiodec
INCLUDES = \ INCLUDES = \
-I$(top_srcdir)/daemons \ -I$(top_srcdir)/daemons \
-I$(top_srcdir) \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/zapit/include \ -I$(top_srcdir)/src/zapit/include \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/libnet \ -I$(top_srcdir)/lib/libnet \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/connection \ -I$(top_srcdir)/lib/connection \
-I$(top_srcdir)/lib/libeventserver \ -I$(top_srcdir)/lib/libeventserver \
@FREETYPE_CFLAGS@ \ @FREETYPE_CFLAGS@
-I$(top_srcdir)/lib
noinst_LIBRARIES = libneutrino_driver.a libneutrino_driver_netfile.a noinst_LIBRARIES = libneutrino_driver.a libneutrino_driver_netfile.a

1
src/driver/audiodec/Makefile.am
View File

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

12
src/driver/audiodec/basedec.cpp
View File

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

2
src/driver/audiodec/cdrdec.cpp
View File

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

2
src/driver/audiodec/cdrdec.h
View File

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

2
src/driver/audiodec/flacdec.h
View File

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

2
src/driver/audiodec/mp3dec.cpp
View File

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

5
src/driver/audiodec/mp3dec.h
View File

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

3
src/driver/audiodec/oggdec.cpp
View File

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

3
src/driver/audiodec/oggdec.h
View File

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

2
src/driver/audiodec/tag.c
View File

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

4
src/driver/audiodec/vis.cpp
View File

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

3
src/driver/audiodec/wavdec.cpp
View File

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

2
src/driver/audiodec/wavdec.h
View File

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

5
src/driver/pictureviewer/Makefile.am
View File

@@ -1,11 +1,12 @@
AM_CXXFLAGS = -fno-rtti -fno-exceptions AM_CXXFLAGS = -fno-rtti -fno-exceptions
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/zapit/include \ -I$(top_srcdir)/src/zapit/include \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
@FREETYPE_CFLAGS@ \ @FREETYPE_CFLAGS@
-I$(top_srcdir)/lib
if BOXTYPE_COOL if BOXTYPE_COOL
INCLUDES += -I$(top_srcdir)/lib/libcoolstream INCLUDES += -I$(top_srcdir)/lib/libcoolstream