mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 08:51:04 +02:00
neutrino multirec: manage recordings also with channellist
- Now you can start or stopping recordings from selected channel in channellist.
- Current running recordings are marked with rec-icon in the channellist
- add button icons for 'record' an 'stop'
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1719 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Branch: ni/coolstream
Commit: b9940103a2
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-10-01 (Sat, 01 Oct 2011)
Origin message was:
------------------
*neutrino multirec: manage recordings also with channellist
- Now you can start or stopping recordings from selected channel in channellist.
- Current running recordings are marked with rec-icon in the channellist
- add button icons for 'record' an 'stop'
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1719 e54a6e83-5905-42d5-8d5c-058d10e6a962
------------------
This commit was generated by Migit
This commit is contained in:
@@ -25,6 +25,9 @@ install_DATA = \
|
||||
border_lr.png \
|
||||
border_ul.png \
|
||||
bosanski.png \
|
||||
btn_record_active_16x16.png \
|
||||
btn_record_inactive_16x16.png \
|
||||
btn_stop_16x16.png \
|
||||
ca.png \
|
||||
ca2.png \
|
||||
ca2_gray.png \
|
||||
@@ -84,6 +87,7 @@ install_DATA = \
|
||||
mainmenue.png \
|
||||
mounted.png \
|
||||
movie.png \
|
||||
movieplayer.raw \
|
||||
mp_b-skip.png \
|
||||
mp_f-skip.png \
|
||||
mp_pause.png \
|
||||
|
BIN
data/icons/btn_record_active_16x16.png
Normal file
BIN
data/icons/btn_record_active_16x16.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 834 B |
BIN
data/icons/btn_record_inactive_16x16.png
Normal file
BIN
data/icons/btn_record_inactive_16x16.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 753 B |
BIN
data/icons/btn_stop_16x16.png
Normal file
BIN
data/icons/btn_stop_16x16.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 605 B |
@@ -578,6 +578,25 @@ int CChannelList::show()
|
||||
} else
|
||||
loop=false;
|
||||
}
|
||||
else if( msg == CRCInput::RC_record) { //start direct recording from channellist
|
||||
if(!CRecordManager::getInstance()->RecordingStatus(chanlist[selected]->channel_id))
|
||||
{
|
||||
printf("[neutrino channellist] start direct recording...\n");
|
||||
CRecordManager::getInstance()->Record(chanlist[selected]->channel_id);
|
||||
loop = false;
|
||||
}
|
||||
|
||||
}
|
||||
else if( msg == CRCInput::RC_stop ) { //stopp recording
|
||||
if(CRecordManager::getInstance()->RecordingStatus())
|
||||
{
|
||||
if (CRecordManager::getInstance()->AskToStop(chanlist[selected]->channel_id))
|
||||
{
|
||||
CRecordManager::getInstance()->Stop(chanlist[selected]->channel_id);
|
||||
paint();
|
||||
}
|
||||
}
|
||||
}
|
||||
else if ((msg == CRCInput::RC_red) || (msg == CRCInput::RC_epg)) {
|
||||
hide();
|
||||
|
||||
@@ -1793,10 +1812,26 @@ void CChannelList::paintItem(int pos)
|
||||
} else {
|
||||
p_event = &chan->currentEvent;
|
||||
}
|
||||
|
||||
|
||||
//calculating icons
|
||||
int icon_x = (x+width-15-2) - RADIUS_LARGE/2;
|
||||
int r_icon_h=0; int r_icon_w=0; int s_icon_h=0; int s_icon_w=0;
|
||||
frameBuffer->getIconSize(NEUTRINO_ICON_SCRAMBLED, &s_icon_w, &s_icon_h);
|
||||
frameBuffer->getIconSize(NEUTRINO_ICON_REC, &r_icon_w, &r_icon_h);
|
||||
int r_icon_x = icon_x;
|
||||
|
||||
//paint scramble icon
|
||||
if(chan->scrambled)
|
||||
frameBuffer->paintIcon(NEUTRINO_ICON_SCRAMBLED, x+width- 15 - 28, ypos, fheight);//ypos + (fheight - 16)/2);
|
||||
if (frameBuffer->paintIcon(NEUTRINO_ICON_SCRAMBLED, icon_x - s_icon_w, ypos, fheight))//ypos + (fheight - 16)/2);
|
||||
r_icon_x = r_icon_x - s_icon_w;
|
||||
|
||||
//paint recording icon
|
||||
if (CRecordManager::getInstance()->RecordingStatus(chanlist[curr]->channel_id))
|
||||
frameBuffer->paintIcon(NEUTRINO_ICON_REC, r_icon_x - r_icon_w, ypos, fheight);//ypos + (fheight - 16)/2);
|
||||
|
||||
int icon_space = r_icon_w+s_icon_w;
|
||||
|
||||
//number
|
||||
int numpos = x+5+numwidth- g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getRenderWidth(tmp);
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->RenderString(numpos,ypos+fheight, numwidth+5, tmp, color, fheight);
|
||||
|
||||
@@ -1816,7 +1851,8 @@ void CChannelList::paintItem(int pos)
|
||||
|
||||
int max_desc_len = width - numwidth - prg_offset - ch_name_len - 15 - 20; // 15 = scrollbar, 20 = spaces
|
||||
if (chan->scrambled || (g_settings.channellist_extended ||g_settings.channellist_epgtext_align_right))
|
||||
max_desc_len -= 28; /* do we need space for the lock icon? */
|
||||
max_desc_len -= icon_space; /* do we need space for the lock/rec icon? */
|
||||
|
||||
if (max_desc_len < 0)
|
||||
max_desc_len = 0;
|
||||
if ((int) ch_desc_len > max_desc_len)
|
||||
|
@@ -59,6 +59,10 @@
|
||||
#define NEUTRINO_ICON_BUTTON_DOWN_SMALL "down_small"
|
||||
#define NEUTRINO_ICON_BUTTON_LEFT "left"
|
||||
|
||||
#define NEUTRINO_ICON_BUTTON_RECORD_ACTIVE_16 "btn_record_active_16x16"
|
||||
#define NEUTRINO_ICON_BUTTON_RECORD_INACTIVE_16 "btn_record_inactive_16x16"
|
||||
#define NEUTRINO_ICON_BUTTON_STOP_16 "btn_stop_16x16"
|
||||
|
||||
#define NEUTRINO_ICON_BUTTON_PLUS "plus"
|
||||
#define NEUTRINO_ICON_BUTTON_MINUS "minus"
|
||||
|
||||
|
Reference in New Issue
Block a user