Fixes for delete/move menu entry from different channel lists; Change list mode, if current list dont have channel, for ex. zap from history or with pzapit

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@415 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-02-25 19:23:45 +00:00
parent 7c435d821c
commit eabc0f1644
5 changed files with 72 additions and 80 deletions

View File

@@ -64,7 +64,6 @@ class CChannelList
int buttonHeight;
std::string name;
//std::vector<CChannel*> chanlist;
std::vector<CZapitChannel*> chanlist;
CZapProtection* zapProtection;
@@ -89,10 +88,10 @@ class CChannelList
public:
CChannelList(const char * const Name, bool historyMode = false, bool _vlist = false );
~CChannelList();
//void addChannel(int key, int number, const std::string& name, const t_satellite_position satellitePosition, t_channel_id ids = 0); // UTF-8
void addChannel(CZapitChannel* chan, int num = 0);
void putChannel(CZapitChannel* chan);
//void addChannel(CZapitChannel* channel, int key, int number, bool locked = false);
CZapitChannel* getChannel(int number);
CZapitChannel* getChannel(t_channel_id channel_id);
CZapitChannel* getChannelFromIndex( uint32_t index) { if (chanlist.size() > index) return chanlist[index]; else return NULL;};
@@ -105,8 +104,6 @@ class CChannelList
int getActiveChannelNumber (void) const;
t_channel_id getActiveChannel_ChannelID(void) const;
/* CChannel * getChannelFromChannelID(const t_channel_id channel_id); */
void zapTo(int pos, bool forceStoreToLastChannels = false);
void virtual_zap_mode(bool up);
bool zapTo_ChannelID(const t_channel_id channel_id);