mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 00:11:08 +02:00
neutrino: add support for CST new simple frontpanel with LED segment display. (c) focus and adjusted by me.
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:
@@ -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 */) {
|
||||
|
Reference in New Issue
Block a user