From fa91372706fa0e8a313e812aeefc41ed592ad832 Mon Sep 17 00:00:00 2001 From: max_10 Date: Sat, 3 Oct 2020 22:47:34 +0200 Subject: [PATCH] - AZBOX: deleted --- acinclude.m4 | 7 ++---- src/driver/Makefile.am | 4 --- src/driver/display.h | 2 +- src/driver/rcinput.cpp | 10 -------- src/driver/simple_display.cpp | 38 ----------------------------- src/gui/movieplayer.cpp | 12 --------- src/gui/videosettings.cpp | 2 +- src/nhttpd/tuxboxapi/controlapi.cpp | 10 -------- src/zapit/src/frontend.cpp | 2 +- src/zapit/src/zapit.cpp | 24 ++---------------- 10 files changed, 7 insertions(+), 104 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 0f4b60735..670c29114 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -453,9 +453,9 @@ _TUXBOX_APPS_LIB_PKGCONFIG($1,$2) AC_DEFUN([TUXBOX_BOXTYPE], [ AC_ARG_WITH(boxtype, - AS_HELP_STRING([--with-boxtype], [valid values: generic, azbox, tripledragon, spark, coolstream, armbox, mipsbox]), + AS_HELP_STRING([--with-boxtype], [valid values: generic, tripledragon, spark, coolstream, armbox, mipsbox]), [case "${withval}" in - generic|azbox|tripledragon|spark|coolstream|armbox|mipsbox) + generic|tripledragon|spark|coolstream|armbox|mipsbox) BOXTYPE="$withval" ;; *) @@ -520,7 +520,6 @@ AC_SUBST(BOXTYPE) AC_SUBST(BOXMODEL) AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic") -AM_CONDITIONAL(BOXTYPE_AZBOX, test "$BOXTYPE" = "azbox") AM_CONDITIONAL(BOXTYPE_TRIPLE, test "$BOXTYPE" = "tripledragon") AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark") AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream") @@ -556,8 +555,6 @@ AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo") if test "$BOXTYPE" = "generic"; then AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC]) -elif test "$BOXTYPE" = "azbox"; then - AC_DEFINE(HAVE_AZBOX_HARDWARE, 1, [building for an azbox]) elif test "$BOXTYPE" = "tripledragon"; then AC_DEFINE(HAVE_TRIPLEDRAGON, 1, [building for a tripledragon]) elif test "$BOXTYPE" = "spark"; then diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am index 1237658d5..25738ef5f 100644 --- a/src/driver/Makefile.am +++ b/src/driver/Makefile.am @@ -82,10 +82,6 @@ libneutrino_driver_a_SOURCES += \ fb_accel_sti.cpp \ simple_display.cpp endif -if BOXTYPE_AZBOX -libneutrino_driver_a_SOURCES += \ - simple_display.cpp -endif if BOXTYPE_GENERIC libneutrino_driver_a_SOURCES += \ fb_accel_glfb.cpp \ diff --git a/src/driver/display.h b/src/driver/display.h index f52c89dec..cd5dcbb5b 100644 --- a/src/driver/display.h +++ b/src/driver/display.h @@ -5,7 +5,7 @@ #if HAVE_TRIPLEDRAGON #include #endif -#if HAVE_SPARK_HARDWARE || HAVE_AZBOX_HARDWARE || HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE +#if HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #include #endif #ifdef ENABLE_GRAPHLCD diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 7f6e52d4c..3c86d080d 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -1766,16 +1766,6 @@ int CRCInput::translate(int code) return RC_forward; case 0xb0: // vuplus timer key return RC_timer; -#endif -#ifdef HAVE_AZBOX_HARDWARE - case KEY_HOME: - return RC_favorites; - case KEY_TV: - return RC_stop; - case KEY_RADIO: - return RC_record; - case KEY_PLAY: - return RC_pause; #endif default: break; diff --git a/src/driver/simple_display.cpp b/src/driver/simple_display.cpp index b446a987e..24b57029a 100644 --- a/src/driver/simple_display.cpp +++ b/src/driver/simple_display.cpp @@ -46,11 +46,6 @@ static bool usb_icon = false; static bool timer_icon = false; #endif -#if HAVE_AZBOX_HARDWARE -#define DISPLAY_DEV "/proc/vfd" -#define LED_DEV "/proc/led" -#endif - #if HAVE_GENERIC_HARDWARE #define DISPLAY_DEV "/dev/null" static bool usb_icon = false; @@ -84,16 +79,6 @@ static inline int dev_open() return fd; } -#if HAVE_AZBOX_HARDWARE -static inline int led_open() -{ - int fd = open(LED_DEV, O_RDWR); - if (fd < 0) - fprintf(stderr, "[neutrino] simple_display: open " LED_DEV ": %m\n"); - return fd; -} -#endif - static void replace_umlauts(std::string &s) { /* this is crude, it just replaces ÄÖÜ with AOU since the display can't show them anyway */ @@ -292,29 +277,6 @@ void CLCD::setled(int red, int green) } close(fd); } -#elif HAVE_AZBOX_HARDWARE -void CLCD::setled(int red, int green) -{ - static unsigned char col = '0'; /* need to remember the state. 1 == blue, 2 == red */ - int leds[3] = { -1, green, red }; - int i; - char s[3]; - int fd = led_open(); - if (fd < 0) - return; - for (i = 1; i <= 2; i++) - { - if (leds[i] == -1) /* don't touch */ - continue; - col &= ~(i); /* clear the bit... */ - if (leds[i]) - col |= i; /* ...and set it again */ - } - sprintf(s, "%c\n", col); - write(fd, s, 3); - close(fd); - //printf("CLCD::%s(%d, %d): %c\n", __func__, red, green, col); -} #else void CLCD::setled(int /*red*/, int /*green*/) { diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 0052f8c82..aaa68fc2f 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -285,14 +285,6 @@ void CMoviePlayerGui::cutNeutrino() g_Zapit->lockPlayBack(); -#ifdef HAVE_AZBOX_HARDWARE - /* we need sectionsd to get idle and zapit to release the demuxes - * and decoders so that the external player can do its work - * TODO: what about timeshift? */ - g_Sectionsd->setServiceChanged(0, false); - g_Zapit->setStandby(true); -#endif - m_ThisMode = NeutrinoModes::mode_unknown; m_LastMode = CNeutrinoApp::getInstance()->getMode(); printf("%s: last mode %d\n", __func__, m_LastMode);fflush(stdout); @@ -331,10 +323,6 @@ void CMoviePlayerGui::restoreNeutrino() #endif playing = false; -#ifdef HAVE_AZBOX_HARDWARE - g_Zapit->setStandby(false); - CZapit::getInstance()->SetVolume(CZapit::getInstance()->GetVolume()); -#endif if (isUPNP) return; diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 25d070e14..6a000f512 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -285,7 +285,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O { -1, NONEXISTANT_LOCALE, "2160p 50Hz" }, { VIDEO_STD_AUTO, NONEXISTANT_LOCALE, "Auto" } }; -#elif HAVE_SPARK_HARDWARE || HAVE_AZBOX_HARDWARE +#elif HAVE_SPARK_HARDWARE CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] = { { -1, NONEXISTANT_LOCALE, "NTSC" }, diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index 964956db2..99dbfe037 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -901,16 +901,6 @@ unsigned int revert_translate(unsigned int code) return KEY_PLAYPAUSE; case RC_forward: return KEY_FASTFORWARD; -#endif -#ifdef HAVE_AZBOX_HARDWARE - case RC_favorites: - return KEY_HOME; - case RC_stop: - return KEY_TV; - case RC_record: - return KEY_RADIO; - case RC_pause: - return KEY_PLAY; #endif default: break; diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index 50fc6f063..f42f56a86 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -826,7 +826,7 @@ uint32_t CFrontend::getBitErrorRate(void) const { uint32_t ber = 0; fop(ioctl, FE_READ_BER, &ber); - if (ber > 100000000) /* azbox minime driver has useless values around 500.000.000 */ + if (ber > 100000000) /* some drivers has useless values around 500.000.000 */ ber = 0; return ber; diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 55da7b5ed..86346f201 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -2275,15 +2275,6 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel) pcrDemux->Start(); } -#if HAVE_AZBOX_HARDWARE - /* new (> 20130917) AZbox drivers switch to radio mode if audio is started first */ - /* start video */ - if (video_pid) { - videoDecoder->Start(0, thisChannel->getPcrPid(), thisChannel->getVideoPid()); - videoDemux->Start(); - } -#endif - /* select audio output and start audio */ if (audio_pid) { SetAudioStreamType(thisChannel->getAudioChannel()->audioChannelType); @@ -2291,7 +2282,6 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel) audioDecoder->Start(); } -#if ! HAVE_AZBOX_HARDWARE /* start video */ if (video_pid) { #if HAVE_CST_HARDWARE @@ -2302,7 +2292,7 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel) videoDecoder->Start(0, pcr_pid, video_pid); #endif } -#endif + #ifdef USE_VBI if(teletext_pid) videoDecoder->StartVBI(teletext_pid); @@ -2331,16 +2321,6 @@ bool CZapit::StopPlayBack(bool send_pmt, bool blank) if (playbackStopForced) return false; -#if HAVE_AZBOX_HARDWARE - pcrDemux->Stop(); - - if (current_channel && current_channel->getVideoPid()) { - videoDemux->Stop(); - videoDecoder->Stop(standby ? false : true); - } - audioDemux->Stop(); - audioDecoder->Stop(); -#else videoDemux->Stop(); audioDemux->Stop(); pcrDemux->Stop(); @@ -2348,7 +2328,7 @@ bool CZapit::StopPlayBack(bool send_pmt, bool blank) /* hack. if standby, dont blank video -> for paused timeshift */ videoDecoder->Stop(standby ? false : blank); -#endif + #ifdef USE_VBI videoDecoder->StopVBI(); #endif