Merge branch 'check/next-cc'

Compiles on most platforms, starts. Not really tested.
2025-09-01 01:41:23 +02:00 · 2013-11-10 16:55:53 +01:00
parent 23d8cc6434 1e8764be2e
commit b93a372b54
114 changed files with 7292 additions and 1585 deletions
--- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
@@ -810,11 +810,14 @@ std::string CControlAPI::_GetBouquetActualEPGItem(CyhookHandler *hh, CZapitChann
 		firstEPG += hh->outPair("timeElapsed", string_printf("%d", (time(NULL) - event->startTime) / 60), true);
 		firstEPG += hh->outPair("timeTotal", string_printf("%d", event->duration / 60), true);
 		firstEPG += hh->outPair("percentage", string_printf("%d", percentage), false);
+		firstEPG += hh->outPair("eventid", string_printf("%llu", currentNextInfo.current_uniqueKey), true);

 		if (currentNextInfo.flags & CSectionsdClient::epgflags::has_next) {
 			timestr = timeString(currentNextInfo.next_zeit.startzeit);
 			secondEPG += hh->outPair("startTime", timestr, true);
 			secondEPG += hh->outPair("description", hh->outValue(currentNextInfo.next_name), false);
+			secondEPG += hh->outPair("timeTotal", string_printf("%d", currentNextInfo.next_zeit.dauer / 60), true);
+			secondEPG += hh->outPair("eventid", string_printf("%llu", currentNextInfo.next_uniqueKey), true);
 		}
 	}

--- a/src/nhttpd/web/languages/Deutsch
+++ b/src/nhttpd/web/languages/Deutsch
@@ -542,8 +542,8 @@ info.your_version=Deine Version
 info.actual_version=Aktuelle Version

 =========Remote control
-rc.key_power=Standby - Schaltet den Receiver ein bzw. aus
-rc.key_mute=Mute - Schaltet den Ton an bzw. aus
+rc.key_power=Standby
+rc.key_mute=Mute
 rc.key_1=1
 rc.key_2=2
 rc.key_3=3
@@ -554,40 +554,40 @@ rc.key_7=7
 rc.key_8=8
 rc.key_9=9
 rc.key_0=0
-rc.key_text=Text - Zeigt den Teletext an
-rc.key_favorites=Favoriten - Zeigt die Favoritenliste an
-rc.key_volumeup=Vol+ - Erhöht die Lautstärke
-rc.key_volumedown=Vol- - Verringert die Lautstärke
-rc.key_pageup=Page+ - Blättert im Menü eine Seite hoch
-rc.key_pagedown=Page- - Blättert im Menü eine Seiter runter
-rc.key_mode=TV/Radio - Wechselt zwischen TV- und Radio-Modus
-rc.key_next=Skip- - Ändert das 4:3 Anzeigeverhalten
-rc.key_previous=Skip+ - Ändert das Bildschirmformat
-rc.key_sleep=Sleep - Setzt einen Ausschalt-Timer
-rc.key_audio=Audio - Startet den Audioplayer bzw. Internetradio
-rc.key_help=Help - Startet je nach Modus verschiedene Funktionen
-rc.key_red=Rot - Öffnet das Menü 'EPG/Vorschau'
-rc.key_green=Grün - Offnet das Menü 'Ton-Optionen'
-rc.key_yellow=Gelb - Öffnet das Menü 'Bild-Optionen' (wenn verfügbar)
-rc.key_blue=Blau - Öffnet das Menü 'Erweiterungen'
-rc.key_epg=EPG - Zeigt EPG-Informationen an
-rc.key_info=Info - Zeigt die Infobar und EPG-Beschreibung an
-rc.key_ok=OK - Bestätigt Auswahl im Menüfenster
-rc.key_up=Hoch - Programmwechsel und Menünavigation
-rc.key_down=Runter - Programmwechsel und Menünavigation
-rc.key_left=Links - Programmwechsel und Menünavigation
-rc.key_right=Rechts - Programmwechsel und Menünavigation
-rc.key_setup=Menü - Öffnet bzw. schließt das Hauptmenü
-rc.key_home=Exit - Schließt das geöffnete Menüfenster
-rc.key_sat=Sat - Öffnet Satelliten- bzw. Anbieterübersicht
+rc.key_text=Text
+rc.key_favorites=Favoriten
+rc.key_volumeup=Vol+
+rc.key_volumedown=Vol-
+rc.key_pageup=Page+
+rc.key_pagedown=Page-
+rc.key_mode=TV/Radio
+rc.key_next=Skip-
+rc.key_previous=Skip+
+rc.key_sleep=Sleep
+rc.key_audio=Audio
+rc.key_help=Help
+rc.key_red=Rot
+rc.key_green=Grün
+rc.key_yellow=Gelb
+rc.key_blue=Blau
+rc.key_epg=EPG
+rc.key_info=Info
+rc.key_ok=OK
+rc.key_up=Hoch
+rc.key_down=Runter
+rc.key_left=Links
+rc.key_right=Rechts
+rc.key_setup=Menü
+rc.key_home=Exit
+rc.key_sat=Sat
 rc.key_www=
-rc.key_rewind=Rewind - Zurückspulen
-rc.key_play=Play -  Öffnet das Filmarchiv oder startet die Wiedergabe
-rc.key_forward=Forward - Vorspulen
-rc.key_stop=Stop - Beendet Aufnahme, Timeshift oder Wiedergabe
-rc.key_record=Record - Startet Aufnahme
-rc.key_pause=Pause - Aktiviert timeshift oder pausiert die Wiedergabe
+rc.key_rewind=Rewind
+rc.key_play=Play
+rc.key_forward=Forward
+rc.key_stop=Stop
+rc.key_record=Record
+rc.key_pause=Pause
 rc.key_games=
 rc.key_time=
-rc.key_picsize=Pic Size - Ändert das 4:3 Anzeigeverhalten
-rc.key_picmode=Pic Mode - Ändert das Bildschirmformat
+rc.key_picsize=Pic Size
+rc.key_picmode=Pic Mode
--- a/src/nhttpd/yhttpd_core/Makefile.am
+++ b/src/nhttpd/yhttpd_core/Makefile.am
@@ -11,6 +11,18 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/libconfigfile \
 	@FREETYPE_CFLAGS@

+if BOXTYPE_COOL
+if BOXMODEL_APOLLO
+AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
+else
+AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
+endif
+endif
+
+if USE_STB_HAL
+AM_CPPFLAGS += -I$(STB_HAL_INC)
+endif
+
 AM_CPPFLAGS += -fno-rtti -fno-exceptions

 noinst_LIBRARIES = libyhttpd.a
--- a/src/nhttpd/yhttpd_core/ylanguage.cpp
+++ b/src/nhttpd/yhttpd_core/ylanguage.cpp
@@ -15,6 +15,9 @@
 #include "ytypes_globals.h"
 #include "ylanguage.h"
 #include "yconnection.h"
+
+#include <global.h>
+
 //=============================================================================
 // Instance Handling - like Singelton Pattern
 //=============================================================================
@@ -24,6 +27,7 @@
 CLanguage* CLanguage::instance = NULL;
 CConfigFile* CLanguage::DefaultLanguage = NULL;
 CConfigFile* CLanguage::ConfigLanguage = NULL;
+CConfigFile* CLanguage::NeutrinoLanguage = NULL;
 std::string CLanguage::language = "";
 std::string CLanguage::language_dir = "";
 //-----------------------------------------------------------------------------
@@ -49,6 +53,7 @@ CLanguage::CLanguage(void)
 {
 	DefaultLanguage = new CConfigFile(',');
 	ConfigLanguage = new CConfigFile(',');
+	NeutrinoLanguage = new CConfigFile(',');
 	language = "";
 	language_dir =getLanguageDir();
 }
@@ -58,6 +63,7 @@ CLanguage::~CLanguage(void)
 {
 	delete DefaultLanguage;
 	delete ConfigLanguage;
+	delete NeutrinoLanguage;
 }

 //=============================================================================
@@ -67,6 +73,23 @@ void CLanguage::setLanguage(std::string _language){
 	language=_language;
 	ConfigLanguage->loadConfig(language_dir + "/" + _language);
 	DefaultLanguage->loadConfig(language_dir + "/" + HTTPD_DEFAULT_LANGUAGE);
+
+	const char * path[2] = { CONFIGDIR "/locale/", DATADIR "/neutrino/locale/"};
+	for (int i = 0; i < 2; i++)
+	{
+		std::string filename = path[i];
+		filename += g_settings.language;
+		filename += ".locale";
+
+		if(access(filename.c_str(), F_OK) == 0) {
+			NeutrinoLanguage->loadConfig(filename, ' ');
+			break;
+		}
+		else if (i == 1) {
+			// load neutrino default language (should not happen)
+			NeutrinoLanguage->loadConfig(DATADIR "/neutrino/locale/english.locale", ' ');
+		}
+	}
 }

 //-----------------------------------------------------------------------------
@@ -74,6 +97,8 @@ void CLanguage::setLanguage(std::string _language){
 //-----------------------------------------------------------------------------
 std::string CLanguage::getTranslation(std::string id){
 	std::string trans=ConfigLanguage->getString(id,"");
+	if(trans=="")
+		trans=NeutrinoLanguage->getString(id,"");
 	if(trans=="")
 		trans=DefaultLanguage->getString(id,"");
 	return trans;
--- a/src/nhttpd/yhttpd_core/ylanguage.h
+++ b/src/nhttpd/yhttpd_core/ylanguage.h
@@ -24,6 +24,7 @@ class CLanguage

 		static CConfigFile 	*DefaultLanguage;
 		static CConfigFile 	*ConfigLanguage;
+		static CConfigFile 	*NeutrinoLanguage;

 	public:
 		// Instance Handling