v;
+
if(currentTP){
current_channel = CZapit::getInstance()->GetCurrentChannelID();
current_channel=(current_channel>>16);
@@ -1649,6 +1556,12 @@ void CControlAPI::SendChannelList(CyhookHandler *hh, bool currentTP)
for (; !(cit.EndOfChannels()); cit++) {
CZapitChannel * channel = *cit;
if(!currentTP || (channel->channel_id >>16) == current_channel){
+
+ size_t pos = std::find(v.begin(), v.end(), channel->channel_id) - v.begin();
+ if( pos < v.size() )
+ continue;
+ v.push_back(channel->channel_id);
+
hh->printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS " %s\n", channel->channel_id, channel->getName().c_str());
}
}
@@ -1718,7 +1631,7 @@ void CControlAPI::SendAllCurrentVAPid(CyhookHandler *hh)
{
strncpy( pids.APIDs[j].desc, _getISO639Description( pids.APIDs[j].desc ),DESC_MAX_LEN );
}
- hh->printf("%05u %s %s\n",pids.APIDs[j].pid,pids.APIDs[j].desc,pids.APIDs[j].is_ac3 ? " (AC3)": " ");
+ hh->printf("%05u %s %s\n",pids.APIDs[j].pid,pids.APIDs[j].desc,pids.APIDs[j].is_ac3 ? " (AC3)": pids.APIDs[j].desc,pids.APIDs[j].is_aac ? "(AAC)" : pids.APIDs[j].desc,pids.APIDs[j].is_eac3 ? "(EAC3)" : " ");
}
eit_not_ok=false;
break;
@@ -1735,7 +1648,7 @@ void CControlAPI::SendAllCurrentVAPid(CyhookHandler *hh)
{
strncpy( pids.APIDs[i].desc, _getISO639Description( pids.APIDs[i].desc ),DESC_MAX_LEN );
}
- hh->printf("%05u %s %s\n",it->pid,pids.APIDs[i].desc,pids.APIDs[i].is_ac3 ? " (AC3)": " ");
+ hh->printf("%05u %s %s\n",it->pid,pids.APIDs[i].desc,pids.APIDs[i].is_ac3 ? " (AC3)": pids.APIDs[i].desc,pids.APIDs[i].is_aac ? "(AAC)" : pids.APIDs[i].desc,pids.APIDs[i].is_eac3 ? "(EAC3)" : " ");
i++;
}
}
diff --git a/src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp b/src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
index 9c9d6d9bb..bf23dc0f6 100644
--- a/src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
@@ -119,6 +119,7 @@ CNeutrinoAPI::CNeutrinoAPI()
EventServer = new CEventServer;
EventServer->registerEvent2( NeutrinoMessages::SHUTDOWN, CEventServer::INITID_HTTPD, "/tmp/neutrino.sock");
+ EventServer->registerEvent2( NeutrinoMessages::REBOOT, CEventServer::INITID_HTTPD, "/tmp/neutrino.sock");
EventServer->registerEvent2( NeutrinoMessages::STANDBY_ON, CEventServer::INITID_HTTPD, "/tmp/neutrino.sock");
EventServer->registerEvent2( NeutrinoMessages::STANDBY_OFF, CEventServer::INITID_HTTPD, "/tmp/neutrino.sock");
EventServer->registerEvent2( NeutrinoMessages::STANDBY_TOGGLE, CEventServer::INITID_HTTPD, "/tmp/neutrino.sock");
@@ -258,6 +259,7 @@ bool CNeutrinoAPI::GetStreamInfo(int bitInfo[10])
bool CNeutrinoAPI::GetChannelEvents(void)
{
+ eList.clear();
CEitManager::getInstance()->getChannelEvents(eList);
CChannelEventList::iterator eventIterator;
diff --git a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
index 8824c9342..0673b132b 100644
--- a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
@@ -600,7 +600,7 @@ std::string CNeutrinoYParser::func_get_audio_pids_as_dropdown(CyhookHandler *,
{
strcpy( pids.APIDs[j].desc, _getISO639Description( pids.APIDs[j].desc ) );
}
- yresult += string_printf("\r\n",idx_as_id ? j : pids.APIDs[j].pid,std::string(pids.APIDs[j].desc).c_str(),pids.APIDs[j].is_ac3 ? " (AC3)": " ");
+ yresult += string_printf("\r\n",idx_as_id ? j : pids.APIDs[j].pid,std::string(pids.APIDs[j].desc).c_str(),pids.APIDs[j].is_ac3 ? " (AC3)": pids.APIDs[j].is_aac ? "(AAC)" : pids.APIDs[j].is_eac3 ? "(EAC3)" : " ");
}
eit_not_ok=false;
break;
@@ -617,7 +617,7 @@ std::string CNeutrinoYParser::func_get_audio_pids_as_dropdown(CyhookHandler *,
{
strcpy( pids.APIDs[i].desc, _getISO639Description( pids.APIDs[i].desc ) );
}
- yresult += string_printf("\r\n",idx_as_id ? i : it->pid,pids.APIDs[i].desc,pids.APIDs[i].is_ac3 ? " (AC3)": " ");
+ yresult += string_printf("\r\n",idx_as_id ? i : it->pid,pids.APIDs[i].desc,pids.APIDs[i].is_ac3 ? " (AC3)": pids.APIDs[i].is_aac ? "(AAC)" : pids.APIDs[i].is_eac3 ? "(EAC3)" : " ");
i++;
}
}
@@ -729,7 +729,8 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
break;
}
- boxname += (g_info.delivery_system == DVB_S || (system_rev == 1)) ? " SAT":" CABLE";
+ if (system_rev != 9) // don't add delivery_system for Tank
+ boxname += (g_info.delivery_system == DVB_S || (system_rev == 1)) ? " SAT":" CABLE";
return boxname;
}
//-------------------------------------------------------------------------
diff --git a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.h b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.h
index b32f99c32..6b934c37d 100644
--- a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.h
+++ b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.h
@@ -43,7 +43,6 @@ private:
std::string func_get_audio_pids_as_dropdown(CyhookHandler *hh, std::string para);
std::string func_unmount_get_list(CyhookHandler *hh, std::string para);
std::string func_get_partition_list(CyhookHandler *hh, std::string para);
- std::string func_get_boxtype(CyhookHandler *hh, std::string para);
std::string func_get_current_stream_info(CyhookHandler *hh, std::string para);
std::string func_get_timer_list(CyhookHandler *hh, std::string para);
std::string func_set_timer_form(CyhookHandler *hh, std::string para);
@@ -65,6 +64,9 @@ public:
virtual std::string getHookVersion(void) {return std::string("$Revision$");}
virtual THandleStatus Hook_SendResponse(CyhookHandler *hh);
virtual THandleStatus Hook_ReadConfig(CConfigFile *Config, CStringList &ConfigList);
+
+ // func TUXBOX
+ std::string func_get_boxtype(CyhookHandler *hh, std::string para);
};
#endif /*__nhttpd_neutrinoyparser_h__*/
diff --git a/src/nhttpd/tuxboxapi/dbox/Makefile.am b/src/nhttpd/tuxboxapi/dbox/Makefile.am
index 5e7aed6f5..6c341a62a 100644
--- a/src/nhttpd/tuxboxapi/dbox/Makefile.am
+++ b/src/nhttpd/tuxboxapi/dbox/Makefile.am
@@ -1,6 +1,6 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions
-INCLUDES = \
+AM_CPPFLAGS += \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/src/zapit/include \
-I$(top_srcdir)/src \
diff --git a/src/nhttpd/web/Y_Blocks.txt b/src/nhttpd/web/Y_Blocks.txt
index 8dab68a26..e604de86b 100644
--- a/src/nhttpd/web/Y_Blocks.txt
+++ b/src/nhttpd/web/Y_Blocks.txt
@@ -430,7 +430,7 @@ start-block~frame_boxcontrol
{=var-set:work=
{=if-equal:{=var-get:startpage=}~bouquets~Y_Boxcontrol_Bouquets.yhtm
~
- {=if-equal:{=var-get:startpage=}~control~Y_Tools_Boxcontrol.yhtm~Y_blank.yhtm=}
+ {=if-equal:{=var-get:startpage=}~control~Y_Tools_Boxcontrol.yhtm~Y_blank.htm=}
=}=}
{=include-block:Y_Blocks.txt;frame_secondary=}
end-block~frame_boxcontrol
@@ -508,11 +508,12 @@ start-block~remote
{=if-equal:{=var-get:boxtype=}~CST Zee CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~
{=if-equal:{=var-get:boxtype=}~CST Neo Twin SAT~ {=include-block:Y_Blocks.txt;rc_cst_v4=}~
{=if-equal:{=var-get:boxtype=}~CST Neo Twin CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v4=}~
- {=if-equal:{=var-get:boxtype=}~CST Tank SAT~ {=include-block:Y_Blocks.txt;rc_cst_v5=}~
- {=if-equal:{=var-get:boxtype=}~CST Tank CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v5=}~
+ {=if-equal:{=var-get:boxtype=}~CST Tank~ {=include-block:Y_Blocks.txt;rc_cst_v5=}~
+ {=if-equal:{=var-get:boxtype=}~CST Trinity SAT~ {=include-block:Y_Blocks.txt;rc_cst_v6=}~
+ {=if-equal:{=var-get:boxtype=}~CST Trinity CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v6=}~
{=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=}
- =}=}=}=}=}=}=}=}
+ =}=}=}=}=}=}=}=}=}
=}=}
~
{=if-equal:{=var-get:yfbtype=}~-2~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~
@@ -522,9 +523,10 @@ start-block~remote
{=if-equal:{=var-get:yfbtype=}~3~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~
{=if-equal:{=var-get:yfbtype=}~4~ {=include-block:Y_Blocks.txt;rc_cst_v4=}~
{=if-equal:{=var-get:yfbtype=}~5~ {=include-block:Y_Blocks.txt;rc_cst_v5=}~
+ {=if-equal:{=var-get:yfbtype=}~6~ {=include-block:Y_Blocks.txt;rc_cst_v6=}~
{=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=}
- =}=}=}=}=}=}=}
+ =}=}=}=}=}=}=}=}
=}
end-block~remote
@@ -789,6 +791,72 @@ start-block~rc_cst_v5
end-block~rc_cst_v5
+# ------- Remote CST V6 (TRINITY)
+start-block~rc_cst_v6
+
+
+end-block~rc_cst_v6
+
# ------- Remote d-Box Nokia old
start-block~rc_dbox_nokia_old
diff --git a/src/nhttpd/web/Y_Settings_yWeb.yhtm b/src/nhttpd/web/Y_Settings_yWeb.yhtm
index 17a0991e8..bf3a914ab 100644
--- a/src/nhttpd/web/Y_Settings_yWeb.yhtm
+++ b/src/nhttpd/web/Y_Settings_yWeb.yhtm
@@ -20,6 +20,7 @@ function do_init(){
case "3": // cst zee/neo2
case "4": // cst neo twin
case "5": // cst tank
+ case "6": // cst trinity
sel=(sel*1+val*1);
break;
default:
@@ -97,6 +98,7 @@ function do_init(){
+
diff --git a/src/nhttpd/web/Y_Tools_Boxcontrol.yhtm b/src/nhttpd/web/Y_Tools_Boxcontrol.yhtm
index d4b1b6fec..1e98c9d64 100644
--- a/src/nhttpd/web/Y_Tools_Boxcontrol.yhtm
+++ b/src/nhttpd/web/Y_Tools_Boxcontrol.yhtm
@@ -45,8 +45,10 @@ function goUrl(_url){
+{=comment:disable non-working rec on/off buttons~
+=}
|
diff --git a/src/nhttpd/web/images/Makefile.am b/src/nhttpd/web/images/Makefile.am
index 0b4d21667..a2c2c2015 100644
--- a/src/nhttpd/web/images/Makefile.am
+++ b/src/nhttpd/web/images/Makefile.am
@@ -69,6 +69,7 @@ install_DATA = accept.png \
rc_cst_v3.jpg \
rc_cst_v4.jpg \
rc_cst_v5.jpg \
+ rc_cst_v6.jpg \
rc_dbox_nokia_old.jpg \
rc_dbox_philips.jpg \
record.gif \
diff --git a/src/nhttpd/web/images/rc_cst_v6.jpg b/src/nhttpd/web/images/rc_cst_v6.jpg
new file mode 100644
index 000000000..5a2b296ec
Binary files /dev/null and b/src/nhttpd/web/images/rc_cst_v6.jpg differ
diff --git a/src/nhttpd/yhttpd_core/Makefile.am b/src/nhttpd/yhttpd_core/Makefile.am
index de0679d2b..1a0a81aaa 100644
--- a/src/nhttpd/yhttpd_core/Makefile.am
+++ b/src/nhttpd/yhttpd_core/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(srcdir) \
-I$(top_builddir) \
-I$(top_srcdir) \
@@ -11,7 +11,7 @@ INCLUDES = \
-I$(top_srcdir)/lib/libconfigfile \
@FREETYPE_CFLAGS@
-AM_CPPFLAGS = -fno-rtti -fno-exceptions
+AM_CPPFLAGS += -fno-rtti -fno-exceptions
noinst_LIBRARIES = libyhttpd.a
diff --git a/src/nhttpd/yhttpd_mods/Makefile.am b/src/nhttpd/yhttpd_mods/Makefile.am
index 6f7f05823..fc85656f3 100644
--- a/src/nhttpd/yhttpd_mods/Makefile.am
+++ b/src/nhttpd/yhttpd_mods/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/src/zapit/include \
@@ -10,7 +10,7 @@ INCLUDES = \
-I$(top_srcdir)/lib/libconfigfile \
@FREETYPE_CFLAGS@
-AM_CPPFLAGS = -fno-rtti -fno-exceptions
+AM_CPPFLAGS += -fno-rtti -fno-exceptions
noinst_LIBRARIES = libyhttpdmods.a
diff --git a/src/rcsim.c b/src/rcsim.c
index 94e184f94..c274f6c4b 100644
--- a/src/rcsim.c
+++ b/src/rcsim.c
@@ -68,17 +68,12 @@ enum initiators
};
#endif
-enum { // not defined in input.h but used like that, at least in 2.4.22
- KEY_RELEASED = 0,
- KEY_PRESSED,
- KEY_AUTOREPEAT
-};
-
#include "rcsim.h"
void usage(char *n){
unsigned int keynum = sizeof(keyname)/sizeof(struct key);
unsigned int i;
+#ifdef HAVE_DBOX_HARDWARE
printf ("rcsim v1.1\nUsage: %s [