AZBOX: deleted

Origin commit data
------------------
Commit: 2578ac1817
Author: max_10 <max_10@gmx.de>
Date: 2020-10-03 (Sat, 03 Oct 2020)

Origin message was:
------------------
- AZBOX: deleted

src/driver/Makefile.am

@@ -78,10 +78,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 \

src/driver/display.h

@@ -5,7 +5,7 @@
 #if HAVE_TRIPLEDRAGON
 #include <driver/lcdd.h>
 #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 <driver/simple_display.h>
 #endif
 #ifdef ENABLE_GRAPHLCD

src/driver/rcinput.cpp

@@ -1768,16 +1768,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;

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*/)
 {

src/gui/movieplayer.cpp

@@ -284,14 +284,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);
@@ -330,10 +322,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;

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"		},

src/nhttpd/tuxboxapi/controlapi.cpp

@@ -910,16 +910,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;

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