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

webtv channels integration port,

Browse Source 
initial code (C) martii,
initial patch from jacek
This commit is contained in:
[CST] Focus
2014-08-27 17:32:26 +04:00
parent 415d516465
commit a473fe8194
49 changed files with 1000 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/daemonc/remotecontrol.cpp
View File

@@ -38,6 +38,7 @@
#include <global.h>
#include <neutrino.h>
#include <gui/infoviewer.h>
#include <gui/movieplayer.h>
#include <driver/record.h>
#include <driver/abstime.h>
@@ -118,6 +119,7 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
//printf("[neutrino] timeout EVT_ZAP current %llx data %llx\n", current_channel_id, *(t_channel_id *)data);
if ((*(t_channel_id *)data) != current_channel_id) {
g_InfoViewer->chanready = 0;
CMoviePlayerGui::getInstance().stopPlayBack();
g_Zapit->zapTo_serviceID_NOWAIT(current_channel_id );
//g_Sectionsd->setServiceChanged(current_channel_id, false);
@@ -345,10 +347,12 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
else if (msg == NeutrinoMessages::EVT_TUNE_COMPLETE) {
t_channel_id chid = *(t_channel_id *)data;
printf("CRemoteControl::handleMsg: EVT_TUNE_COMPLETE (%016" PRIx64 ")\n", chid);
if(chid)
if(chid && !IS_WEBTV(chid))
g_Sectionsd->setServiceChanged( chid, true );
#if 0
else
g_Sectionsd->setServiceChanged( current_channel_id, true );
#endif
return messages_return::handled;
}
//else if (msg == NeutrinoMessages::EVT_ZAP_FAILED || msg == NeutrinoMessages::EVT_ZAP_SUB_FAILED)
@@ -617,6 +621,7 @@ const std::string & CRemoteControl::setSubChannel(const int numSub, const bool f
g_InfoViewer->chanready = 0;
g_RCInput->killTimer(scrambled_timer);
CMoviePlayerGui::getInstance().stopPlayBack();
g_Zapit->zapTo_subServiceID_NOWAIT( current_sub_channel_id );
// Houdini: to restart reading the private EPG when switching to a new option
//g_Sectionsd->setServiceChanged( current_sub_channel_id , true );
@@ -697,6 +702,7 @@ void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::s
g_RCInput->killTimer(scrambled_timer);
//dvbsub_pause(true);
CZapit::getInstance()->Abort();
CMoviePlayerGui::getInstance().stopPlayBack();
g_Zapit->zapTo_serviceID_NOWAIT(channel_id);
zap_completion_timeout = now + ZAP_GUARD_TIME;
@@ -736,5 +742,6 @@ void CRemoteControl::radioMode()
void CRemoteControl::tvMode()
{
printf("CRemoteControl::tvMode\n");
g_Zapit->setMode( CZapitClient::MODE_TV );
}