mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/channellist.cpp: adapt for new GetRecordMode() mask

Browse Source
This commit is contained in:
[CST] Focus
2012-08-07 12:08:13 +04:00
parent d87c9b8b4c
commit a76d37d072
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/channellist.cpp
View File

@@ -615,7 +615,7 @@ int CChannelList::show()
} }
} }
else if( msg == CRCInput::RC_stop ) { //stopp recording else if( msg == CRCInput::RC_stop ) { //stopp recording
if(CRecordManager::getInstance()->RecordingStatus()) if(CRecordManager::getInstance()->RecordingStatus(chanlist[selected]->channel_id))
{ {
if (CRecordManager::getInstance()->AskToStop(chanlist[selected]->channel_id)) if (CRecordManager::getInstance()->AskToStop(chanlist[selected]->channel_id))
{ {
@@ -1747,6 +1747,7 @@ void CChannelList::paintItem(int pos)
if (pos == 0) if (pos == 0)
{ {
/* FIXME move to calcSize() ? */
int w_max, w_min, h; int w_max, w_min, h;
ChannelList_Rec = 0; ChannelList_Rec = 0;
int recmode_icon_max = CRecordManager::RECMODE_REC, recmode_icon_min = CRecordManager::RECMODE_TSHIFT; int recmode_icon_max = CRecordManager::RECMODE_REC, recmode_icon_min = CRecordManager::RECMODE_TSHIFT;
@@ -1763,11 +1764,11 @@ void CChannelList::paintItem(int pos)
for (uint32_t i = 0; i < chanlist.size(); i++) for (uint32_t i = 0; i < chanlist.size(); i++)
{ {
rec_mode = CRecordManager::getInstance()->GetRecordMode(chanlist[i]->channel_id); rec_mode = CRecordManager::getInstance()->GetRecordMode(chanlist[i]->channel_id);
if (rec_mode == recmode_icon_max) if (rec_mode & recmode_icon_max)
{ {
ChannelList_Rec = w_max; ChannelList_Rec = w_max;
break; break;
} else if (rec_mode == recmode_icon_min) } else if (rec_mode & recmode_icon_min)
ChannelList_Rec = w_min; ChannelList_Rec = w_min;
} }
if (ChannelList_Rec > 0) if (ChannelList_Rec > 0)
@@ -1779,9 +1780,9 @@ void CChannelList::paintItem(int pos)
//set recording icon //set recording icon
const char * rec_icon = ""; const char * rec_icon = "";
if (rec_mode == CRecordManager::RECMODE_REC) if (rec_mode & CRecordManager::RECMODE_REC)
rec_icon = NEUTRINO_ICON_REC; rec_icon = NEUTRINO_ICON_REC;
else if (rec_mode == CRecordManager::RECMODE_TSHIFT) else if (rec_mode & CRecordManager::RECMODE_TSHIFT)
rec_icon = NEUTRINO_ICON_AUTO_SHIFT; rec_icon = NEUTRINO_ICON_AUTO_SHIFT;
//calculating icons //calculating icons
@@ -1797,7 +1798,6 @@ void CChannelList::paintItem(int pos)
r_icon_x = r_icon_x - s_icon_w; r_icon_x = r_icon_x - s_icon_w;
//paint recording icon //paint recording icon
//bool do_rec = CRecordManager::getInstance()->RecordingStatus(chanlist[curr]->channel_id);
if (rec_mode != CRecordManager::RECMODE_OFF) if (rec_mode != CRecordManager::RECMODE_OFF)
frameBuffer->paintIcon(rec_icon, r_icon_x - r_icon_w, ypos, fheight);//ypos + (fheight - 16)/2); frameBuffer->paintIcon(rec_icon, r_icon_x - r_icon_w, ypos, fheight);//ypos + (fheight - 16)/2);