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

Switch to new record code

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1577 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-07-21 11:10:04 +00:00
parent f677b002da
commit 5bed15f645
1 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/daemonc/remotecontrol.cpp
View File

@@ -38,15 +38,12 @@
#include <global.h> #include <global.h>
#include <neutrino.h> #include <neutrino.h>
#include <gui/infoviewer.h> #include <gui/infoviewer.h>
#include <driver/vcrcontrol.h>
#include <driver/encoding.h> #include <driver/encoding.h>
#include <driver/record.h>
#include "libdvbsub/dvbsub.h" #include "libdvbsub/dvbsub.h"
#include "libtuxtxt/teletext.h" #include "libtuxtxt/teletext.h"
//FIXME: auto-timeshift
extern bool autoshift;
extern uint32_t shift_timer;
extern uint32_t scrambled_timer; extern uint32_t scrambled_timer;
extern t_channel_id live_channel_id; //zapit extern t_channel_id live_channel_id; //zapit
@@ -226,8 +223,7 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
if ( needs_nvods ) if ( needs_nvods )
getNVODs(); getNVODs();
if ( current_programm_timer != 0 ) g_RCInput->killTimer( current_programm_timer );
g_RCInput->killTimer( current_programm_timer );
time_t end_program= info_CN->current_zeit.startzeit+ info_CN->current_zeit.dauer; time_t end_program= info_CN->current_zeit.startzeit+ info_CN->current_zeit.dauer;
current_programm_timer = g_RCInput->addTimer( &end_program ); current_programm_timer = g_RCInput->addTimer( &end_program );
@@ -255,8 +251,7 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
// timer setzen // timer setzen
if ( current_programm_timer != 0 ) g_RCInput->killTimer( current_programm_timer );
g_RCInput->killTimer( current_programm_timer );
time_t end_program= info_CN->next_zeit.startzeit; time_t end_program= info_CN->next_zeit.startzeit;
current_programm_timer = g_RCInput->addTimer( &end_program ); current_programm_timer = g_RCInput->addTimer( &end_program );
@@ -595,10 +590,7 @@ const std::string & CRemoteControl::setSubChannel(const int numSub, const bool f
selected_subchannel = numSub; selected_subchannel = numSub;
current_sub_channel_id = subChannels[numSub].getChannelID(); current_sub_channel_id = subChannels[numSub].getChannelID();
g_InfoViewer->chanready = 0; g_InfoViewer->chanready = 0;
if(scrambled_timer) { g_RCInput->killTimer(scrambled_timer);
g_RCInput->killTimer(scrambled_timer);
scrambled_timer = 0;
}
g_Zapit->zapTo_subServiceID_NOWAIT( current_sub_channel_id ); g_Zapit->zapTo_subServiceID_NOWAIT( current_sub_channel_id );
// Houdini: to restart reading the private EPG when switching to a new option // Houdini: to restart reading the private EPG when switching to a new option
@@ -676,14 +668,10 @@ void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::s
if ( zap_completion_timeout < now ) if ( zap_completion_timeout < now )
{ {
g_InfoViewer->chanready = 0; g_InfoViewer->chanready = 0;
if(autoshift) {
stopAutoRecord(); CRecordManager::getInstance()->StopAutoRecord();
CNeutrinoApp::getInstance ()->recordingstatus = 0;
} g_RCInput->killTimer(scrambled_timer);
if(scrambled_timer) {
g_RCInput->killTimer(scrambled_timer);
scrambled_timer = 0;
}
//dvbsub_pause(true); //dvbsub_pause(true);
abort_zapit = 1; abort_zapit = 1;
g_Zapit->zapTo_serviceID_NOWAIT(channel_id); g_Zapit->zapTo_serviceID_NOWAIT(channel_id);
@@ -691,11 +679,7 @@ void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::s
abort_zapit = 0; abort_zapit = 0;
zap_completion_timeout = now + 2 * (int64_t) 1000000; zap_completion_timeout = now + 2 * (int64_t) 1000000;
if ( current_programm_timer != 0 ) g_RCInput->killTimer( current_programm_timer );
{
g_RCInput->killTimer( current_programm_timer );
current_programm_timer = 0;
}
} }
} }