mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'check/cst-next'

Browse Source 
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-01-26 17:26:26 +01:00
parent ba282cf8c4 7189a98486
commit 2263c8bd2e
106 changed files with 6374 additions and 5374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/daemonc/remotecontrol.cpp
View File

@@ -670,9 +670,6 @@ const std::string & CRemoteControl::subChannelDown(void)
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();
@@ -698,7 +695,9 @@ void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::s
{
g_InfoViewer->chanready = 0;
CRecordManager::getInstance()->StopAutoRecord();
CRecordManager::getInstance()->StopAutoTimer();
if (channel_id != current_channel_id)
CRecordManager::getInstance()->StopAutoRecord();
g_RCInput->killTimer(scrambled_timer);
//dvbsub_pause(true);
@@ -709,9 +708,12 @@ void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::s
g_Zapit->zapTo_serviceID_NOWAIT(channel_id);
zap_completion_timeout = now + ZAP_GUARD_TIME;
//g_Sectionsd->setServiceChanged( current_channel_id, false );
//g_Sectionsd->setServiceChanged( channel_id, false );
// g_RCInput->killTimer( current_programm_timer );
}
current_channel_id = channel_id;
current_channel_name = channame;
current_channel_num = channum;
}
void CRemoteControl::startvideo()