mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: add support for CST new simple frontpanel with LED segment display. (c) focus and adjusted by me.

Browse Source 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/channellist.cpp
This commit is contained in:
[CST] Bas
2014-09-26 22:26:39 +08:00
committed by [CST] Focus
parent 331665d847
commit 5f3872b5dd
10 changed files with 185 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/daemonc/remotecontrol.cpp
View File

@@ -95,6 +95,7 @@ CRemoteControl::CRemoteControl()
current_channel_id = CZapit::getInstance()->GetCurrentChannelID();;
current_sub_channel_id = 0;
current_channel_name = "";
current_channel_num = -1;
zap_completion_timeout = 0;
@@ -151,10 +152,11 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
is_video_started = true;
if (channel) {
current_channel_name = channel->getName();
current_channel_num = channel->number;
if (channel->Locked() != g_settings.parentallock_defaultlocked)
stopvideo();
}
CVFD::getInstance()->showServicename(current_channel_name); // UTF-8
CVFD::getInstance()->showServicename(current_channel_name, current_channel_num); // UTF-8
current_channel_id = new_id;
current_EPGid = 0;
@@ -291,7 +293,7 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
if ((*(t_channel_id *)data) == ((msg == NeutrinoMessages::EVT_ZAP_COMPLETE) ? current_channel_id : current_sub_channel_id))
{
CVFD::getInstance()->showServicename(current_channel_name); // UTF-8
CVFD::getInstance()->showServicename(current_channel_name, current_channel_num); // UTF-8
g_Zapit->getPIDS( current_PIDs );
//tuxtxt
#if 1
@@ -320,7 +322,7 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
if ((*(t_channel_id *)data) == current_channel_id)
{
needs_nvods = true;
CVFD::getInstance()->showServicename(std::string("[") + current_channel_name + ']'); // UTF-8
CVFD::getInstance()->showServicename(std::string("[") + current_channel_name + ']', current_channel_num); // UTF-8
if ( current_EPGid != 0)
{
getNVODs();
@@ -670,10 +672,11 @@ const std::string & CRemoteControl::subChannelDown(void)
}
}
void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::string & channame, const bool start_video) // UTF-8
void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::string & channame, int channum, const bool start_video) // UTF-8
{
current_channel_id = channel_id;
current_channel_name = channame;
current_channel_num = channum;
//printf("zapTo_ChannelID: start_video: %d\n", start_video);
if (start_video)
startvideo();

4
src/daemonc/remotecontrol.h
View File

@@ -74,6 +74,7 @@ class CRemoteControl
//unsigned int current_programm_timer;
uint64_t zap_completion_timeout;
std::string current_channel_name;
int current_channel_num;
t_channel_id current_sub_channel_id;
void getNVODs();
@@ -101,7 +102,7 @@ public:
bool is_video_started;
CRemoteControl();
void zapTo_ChannelID(const t_channel_id channel_id, const std::string & channame, const bool start_video = true); // UTF-8
void zapTo_ChannelID(const t_channel_id channel_id, const std::string & channame, int channum, const bool start_video = true); // UTF-8
void startvideo();
void stopvideo();
void queryAPIDs();
@@ -116,6 +117,7 @@ public:
int handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data);
inline const std::string & getCurrentChannelName(void) const { return current_channel_name; }
inline const int & getCurrentChannelNumber(void) const { return current_channel_num; }
};