diff --git a/configure.ac b/configure.ac index b7381895f..213872075 100644 --- a/configure.ac +++ b/configure.ac @@ -22,14 +22,6 @@ AC_ARG_WITH([tremor-static], [AS_HELP_STRING([--with-tremor-static], [TREMOR_STATIC="$withval"], [TREMOR_STATIC=no]) -if test "$BOXTYPE" != "tripledragon"; then -echo "BOXTYPE: $BOXTYPE" - TUXBOX_APPS_DVB - if test "$BOXTYPE" != "coolstream"; then - TUXBOX_APPS_DRIVER - TUXBOX_APPS_LIB_PKGCONFIG(TUXBOX,tuxbox) - fi -fi if test "$BOXTYPE" = "tripledragon"; then TUXBOX_APPS_LIB_PKGCONFIG(DIRECTFB, directfb) fi diff --git a/src/driver/aviaext.cpp b/src/driver/aviaext.cpp index 8873ad96b..22a51e7c0 100644 --- a/src/driver/aviaext.cpp +++ b/src/driver/aviaext.cpp @@ -30,7 +30,7 @@ #include #include #include -#if HAVE_DVB_API_VERSION >= 3 +#if 1 #include #include diff --git a/src/driver/pictureviewer/jpeg.cpp b/src/driver/pictureviewer/jpeg.cpp index af21304ea..33aae72cf 100644 --- a/src/driver/pictureviewer/jpeg.cpp +++ b/src/driver/pictureviewer/jpeg.cpp @@ -218,7 +218,7 @@ int fh_jpeg_load_local(const char *filename,unsigned char **buffer,int* x,int* y int fh_jpeg_load(const char *filename,unsigned char **buffer,int* x,int* y) { int ret=FH_ERROR_FILE; -#if HAVE_DVB_API_VERSION >= 3 +#if 1 if(!g_settings.picviewer_decode_server_ip.empty()) ret=fh_jpeg_load_via_server(filename, *buffer, *x, *y); if(ret!=FH_ERROR_OK) @@ -270,7 +270,7 @@ int fh_jpeg_getsize(const char *filename,int *x,int *y, int wanted_width, int wa jpeg_start_decompress(ciptr); px=ciptr->output_width; py=ciptr->output_height; c=ciptr->output_components; -#if HAVE_DVB_API_VERSION >= 3 +#if 1 if(!g_settings.picviewer_decode_server_ip.empty()) { // jpeg server resizes pic to desired size diff --git a/src/driver/pig.cpp b/src/driver/pig.cpp index fef53170f..40e9ceebb 100644 --- a/src/driver/pig.cpp +++ b/src/driver/pig.cpp @@ -139,7 +139,7 @@ void CPIG::pigclose () void CPIG::_set_window (int x, int y, int w, int h) { -#if HAVE_DVB_API_VERSION >= 3 +#if 1 // -- Modul interne Routine struct v4l2_crop crop; struct v4l2_format coord; @@ -273,7 +273,7 @@ void CPIG::show (int x, int y, int w, int h) void CPIG::show (void) { if ( fd >= 0 ) { -#if HAVE_DVB_API_VERSION >= 3 +#if 1 int pigmode = 1; int err; err = ioctl(fd, VIDIOC_OVERLAY, &pigmode); @@ -288,7 +288,7 @@ void CPIG::show (void) void CPIG::hide (void) { if ( fd >= 0 ) { -#if HAVE_DVB_API_VERSION >= 3 +#if 1 int pigmode = 0; int err; err = ioctl(fd, VIDIOC_OVERLAY, &pigmode); diff --git a/src/driver/pig.h b/src/driver/pig.h index 48f044420..c88cda236 100644 --- a/src/driver/pig.h +++ b/src/driver/pig.h @@ -34,7 +34,7 @@ using namespace std; -#if HAVE_DVB_API_VERSION >= 3 +#if 1 #include #define PIG_DEV "/dev/v4l/video" // PigNr will be appended! diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index f48869390..c60e68c90 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -1373,17 +1373,9 @@ const char * CRCInput::getSpecialKeyName(const unsigned int key) case RC_standby: return "standby"; case RC_home: -#if HAVE_DVB_API_VERSION == 1 - return "lame"; -#else return "home"; -#endif case RC_setup: -#if HAVE_DVB_API_VERSION == 1 - return "dream"; -#else return "setup"; -#endif case RC_red: return "red button"; case RC_green: diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h index dd91f5227..48b9d8a67 100644 --- a/src/driver/rcinput.h +++ b/src/driver/rcinput.h @@ -243,11 +243,7 @@ class CRCInput inline int getFileHandle(void) /* used for plugins (i.e. games) only */ { -#if HAVE_DVB_API_VERSION == 1 - return fd_gamerc; -#else return fd_rc[0]; -#endif } void stopInput(); void restartInput(); diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 08c767326..f0d780d73 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -83,7 +83,7 @@ #include #endif -#if HAVE_DVB_API_VERSION >= 3 +#if 1 #include #include #include diff --git a/src/gui/motorcontrol.cpp b/src/gui/motorcontrol.cpp index a76f23cdf..dbd4fcd47 100644 --- a/src/gui/motorcontrol.cpp +++ b/src/gui/motorcontrol.cpp @@ -668,12 +668,7 @@ void CMotorControl::startSatFind(void) break; case 0: printf("[motorcontrol] starting satfind...\n"); -#if HAVE_DVB_API_VERSION >= 3 if (execlp("/bin/satfind", "satfind", NULL) < 0) -#else - //if (execlp("/bin/satfind", "satfind", "--tune", NULL) < 0) - if (execlp("/bin/satfind", "satfind", NULL) < 0) -#endif printf("[motorcontrol] execlp satfind failed.\n"); break; } /* switch */ diff --git a/src/gui/movieplayer.h b/src/gui/movieplayer.h index 94941b0cd..c41c7060a 100644 --- a/src/gui/movieplayer.h +++ b/src/gui/movieplayer.h @@ -34,7 +34,6 @@ #include #include -#if HAVE_DVB_API_VERSION >= 1 #include "driver/framebuffer.h" #include "gui/filebrowser.h" #include "gui/bookmarkmanager.h" @@ -150,5 +149,3 @@ class CAPIDSelectExec : public CMenuTarget }; #endif - -#endif diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 9ad2a1f29..239aa748f 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -211,10 +211,7 @@ int g_channel_list_changed; void stop_daemons(bool stopall = true); // uncomment if you want to have a "test" menue entry (rasc) -#if HAVE_DVB_API_VERSION >= 3 //#define __EXPERIMENTAL_CODE__ -#endif - #ifdef __EXPERIMENTAL_CODE__ #include "gui/ch_mosaic.h" #endif diff --git a/src/sectionsd/sectionsd.cpp b/src/sectionsd/sectionsd.cpp index 5ec1419f0..fdb412ec4 100644 --- a/src/sectionsd/sectionsd.cpp +++ b/src/sectionsd/sectionsd.cpp @@ -5688,7 +5688,7 @@ fe_modulation_t getModulation(const uint8_t modulation) case 0x05: return QAM_256; default: -#if HAVE_DVB_API_VERSION >= 3 +#if 1 return QAM_AUTO; #else // i do not know how to do it correctly for old API -- seife diff --git a/src/system/settings.cpp b/src/system/settings.cpp index 8c290bcff..9696ae1a7 100644 --- a/src/system/settings.cpp +++ b/src/system/settings.cpp @@ -105,7 +105,7 @@ bool CScanSettings::loadSettings(const char * const fileName, const delivery_sys TP_mod = configfile.getInt32("TP_mod", 3); strcpy(TP_freq, configfile.getString("TP_freq", "10100000").c_str()); strcpy(TP_rate, configfile.getString("TP_rate", "27500000").c_str()); -#if HAVE_DVB_API_VERSION >= 3 +#if 1 if(TP_fec == 4) TP_fec = 5; #endif scanSectionsd = configfile.getInt32("scanSectionsd", 0); diff --git a/src/system/settings.h b/src/system/settings.h index 9c863d114..6a417fe39 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -405,7 +405,7 @@ struct SNeutrinoSettings #define FILESYSTEM_ENCODING_TO_UTF8_STRING(a) (g_settings.filesystem_is_utf8 ? (a) : Latin1_to_UTF8(a)) -#if HAVE_DVB_API_VERSION == 1 +#if 0 #define MISC_SETTING_FILES_COUNT 7 #else #define MISC_SETTING_FILES_COUNT 4