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

Remove globals and use new zapit class members

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1698 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-09-18 13:35:08 +00:00
parent 0172f074b8
commit 6c6c2e9b29
15 changed files with 75 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/daemonc/remotecontrol.cpp
View File

@@ -50,10 +50,8 @@
#include <zapit/getservices.h>
extern CBouquetManager *g_bouquetManager;
extern CZapitChannel *g_current_channel;
extern uint32_t scrambled_timer;
extern t_channel_id live_channel_id; //zapit
bool sectionsd_getComponentTagsUniqueKey(const event_id_t uniqueKey, CSectionsdClient::ComponentTagList& tags);
bool sectionsd_getLinkageDescriptorsUniqueKey(const event_id_t uniqueKey, CSectionsdClient::LinkageDescriptorList& descriptors);
@@ -68,7 +66,9 @@ CSubService::CSubService(const t_original_network_id anoriginal_network_id, cons
startzeit = 0;
dauer = 0;
subservice_name = asubservice_name;
satellitePosition = g_current_channel ? g_current_channel->getSatellitePosition() : 0;
CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel();
satellitePosition = channel ? channel->getSatellitePosition() : 0;
}
CSubService::CSubService(const t_original_network_id anoriginal_network_id, const t_service_id aservice_id, const t_transport_stream_id atransport_stream_id, const time_t astartzeit, const unsigned adauer)
@@ -79,7 +79,9 @@ CSubService::CSubService(const t_original_network_id anoriginal_network_id, cons
startzeit = astartzeit;
dauer = adauer;
subservice_name = "";
satellitePosition = g_current_channel ? g_current_channel->getSatellitePosition() : 0;
CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel();
satellitePosition = channel ? channel->getSatellitePosition() : 0;
}
t_channel_id CSubService::getChannelID(void) const
@@ -91,7 +93,7 @@ t_channel_id CSubService::getChannelID(void) const
CRemoteControl::CRemoteControl()
{
current_channel_id = live_channel_id;
current_channel_id = CZapit::getInstance()->GetCurrentChannelID();;
current_sub_channel_id = 0;
current_channel_name = "";