mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f3872b5dd
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Bas
2014-09-26 22:26:39 +08:00
committed by [CST] Focus
parent b70c1407d5
commit 683e1c9095
10 changed files with 185 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/channellist.cpp
View File

@@ -1194,7 +1194,7 @@ void CChannelList::zapToChannel(CZapitChannel *channel, bool force)
}
selected_chid = channel->getChannelID();
g_RemoteControl->zapTo_ChannelID(selected_chid, channel->getName(), (channel->Locked() == g_settings.parentallock_defaultlocked));
g_RemoteControl->zapTo_ChannelID(selected_chid, channel->getName(), channel->number, (channel->Locked() == g_settings.parentallock_defaultlocked));
CNeutrinoApp::getInstance()->adjustToChannelID(channel->getChannelID());
}
if(new_zap_mode != 2 /* not active */) {

4
src/gui/infoviewer.cpp
View File

@@ -1358,7 +1358,7 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data)
//chanready = 1;
showSNR ();
// show failure..!
CVFD::getInstance ()->showServicename ("(" + g_RemoteControl->getCurrentChannelName () + ')');
CVFD::getInstance ()->showServicename ("(" + g_RemoteControl->getCurrentChannelName () + ')', g_RemoteControl->getCurrentChannelNumber());
printf ("zap failed!\n");
showFailure ();
CVFD::getInstance ()->showPercentOver (255);
@@ -1368,7 +1368,7 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data)
showSNR ();
if ((*(t_channel_id *) data) == channel_id) {
// show failure..!
CVFD::getInstance ()->showServicename ("(" + g_RemoteControl->getCurrentChannelName () + ')');
CVFD::getInstance ()->showServicename ("(" + g_RemoteControl->getCurrentChannelName () + ')', g_RemoteControl->getCurrentChannelNumber());
printf ("zap failed!\n");
showFailure ();
CVFD::getInstance ()->showPercentOver (255);

4
src/gui/videosettings.cpp
View File

@@ -577,7 +577,7 @@ void CVideoSettings::nextMode(void)
break;
i++;
if (i >= VIDEOMENU_VIDEOMODE_OPTION_COUNT) {
CVFD::getInstance()->showServicename(g_RemoteControl->getCurrentChannelName());
CVFD::getInstance()->showServicename(g_RemoteControl->getCurrentChannelName(), g_RemoteControl->getCurrentChannelNumber());
return;
}
}
@@ -594,7 +594,7 @@ void CVideoSettings::nextMode(void)
else
break;
}
CVFD::getInstance()->showServicename(g_RemoteControl->getCurrentChannelName());
CVFD::getInstance()->showServicename(g_RemoteControl->getCurrentChannelName(), g_RemoteControl->getCurrentChannelNumber());
//ShowHint(LOCALE_VIDEOMENU_VIDEOMODE, text, 450, 2);
}