mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 02:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 71b9627b6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
This commit is contained in:
vanhofen
2017-05-08 23:46:54 +02:00
parent 794b2e60d4 2d4130dab8
commit a76db329fa
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/eventlist.cpp
View File

@@ -263,9 +263,10 @@ void CEventList::readEvents(const t_channel_id channel_id)
return;
}
void CEventList::getPrvNextChannelName(t_channel_id &channel_id,std::string &next_channel_name,std::string &prev_channel_name,std::string &current_channel_name, neutrino_msg_t msg){
t_bouquet_id current_bouquet_id= bouquetList->getActiveBouquetNumber();
t_channel_id channel_id_tmp = channel_id;
void CEventList::getChannelNames(t_channel_id &channel_id, std::string &current_channel_name, std::string &prev_channel_name, std::string &next_channel_name, neutrino_msg_t msg)
{
t_bouquet_id current_bouquet_id = bouquetList->getActiveBouquetNumber();
t_channel_id channel_id_tmp = channel_id;
const unsigned int channel_nr = bouquetList->Bouquets[current_bouquet_id]->channelList->getSize();
if(channel_nr < 2){
channel_id = 0;
@@ -592,7 +593,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
// maybe remove RC_rewind and RC_forward in the future?
std::string next_channel_name, prev_channel_name, current_channel_name;
t_channel_id _channel_id = channel_id;
getPrvNextChannelName(_channel_id, next_channel_name, prev_channel_name, current_channel_name, msg);
getChannelNames(_channel_id, current_channel_name, prev_channel_name, next_channel_name, msg);
if(_channel_id){
bgRightBoxPaint = false;
loop = false;
@@ -900,7 +901,7 @@ void CEventList::paintHead(t_channel_id _channel_id, std::string _channelname, s
header->paint(CC_SAVE_SCREEN_NO);
if(_channelname_prev.empty() && _channelname_next.empty()){
getPrvNextChannelName(_channel_id, _channelname_next, _channelname_prev, _channelname,0);
getChannelNames(_channel_id, _channelname, _channelname_prev, _channelname_next, 0);
}
paintBottomBox(_channelname_prev, _channelname_next);