Remove globals and use new zapit class members

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

View File

@@ -46,7 +46,6 @@
#include <gui/bouquetlist.h>
extern CBouquetList * bouquetList; /* neutrino.cpp */
extern t_channel_id live_channel_id;
extern CBouquetManager *g_bouquetManager;
//
// -- Add current channel to Favorites-Bouquet
@@ -88,8 +87,7 @@ int CFavorites::addChannelToFavorites(bool show_list)
}
}
//channel_id = g_Zapit->getCurrentServiceID();
channel_id = live_channel_id;
channel_id = CZapit::getInstance()->GetCurrentChannelID();;
if(!g_bouquetManager->existsChannelInBouquet(bouquet_id, channel_id)) {
CZapit::getInstance()->addChannelToBouquet(bouquet_id, channel_id);