mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 08:51:10 +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

4
src/gui/eventlist.cpp
View File

@@ -51,12 +51,12 @@
#include <gui/widget/stringinput.h>
extern CBouquetList * bouquetList;
extern t_channel_id live_channel_id;
#include <zapit/client/zapitclient.h> /* CZapitClient::Utf8_to_Latin1 */
#include <driver/screen_max.h>
#include <zapit/client/zapittools.h>
#include <zapit/zapit.h>
#include <algorithm>
extern CPictureViewer * g_PicViewer;
@@ -936,7 +936,7 @@ int CEventListHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*
channelList = CNeutrinoApp::getInstance()->channelList;
//e->exec(channelList->getActiveChannel_ChannelID(), channelList->getActiveChannelName()); // UTF-8
//e->exec(g_Zapit->getCurrentServiceID(), channelList->getActiveChannelName()); // UTF-8
e->exec(live_channel_id, channelList->getActiveChannelName()); // UTF-8
e->exec(CZapit::getInstance()->GetCurrentChannelID(), channelList->getActiveChannelName()); // UTF-8
delete e;
return res;