- rework recording menu and infobar style of recording icon (patch by micha-bbg) -> todo: add proper localization

*add possibility to start recording of current channel via menu
*add timeshift to menu
*add stop all recordings to menu
*change infobar style (shows number of running recordings beside recording icon)

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1627 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
striper
2011-08-26 17:55:25 +00:00
parent c05f64c116
commit 605cfe4c25
4 changed files with 139 additions and 26 deletions

View File

@@ -291,20 +291,23 @@ void CInfoViewer::showRecordIcon (const bool show)
//recordModeActive = CNeutrinoApp::getInstance ()->recordingstatus || shift_timer;
recordModeActive = CRecordManager::getInstance()->RecordingStatus() || CRecordManager::getInstance()->Timeshift();
if (recordModeActive) {
printf("CInfoViewer::showRecordIcon RecordingStatus() %d Timeshift() %d\n", CRecordManager::getInstance()->RecordingStatus(), CRecordManager::getInstance()->Timeshift());
//printf("CInfoViewer::showRecordIcon RecordingStatus() %d Timeshift() %d\n", CRecordManager::getInstance()->RecordingStatus(), CRecordManager::getInstance()->Timeshift());
int icon_w = 0,icon_h = 0;
frameBuffer->getIconSize(autoshift ? NEUTRINO_ICON_AUTO_SHIFT : NEUTRINO_ICON_REC, &icon_w, &icon_h);
int chanH = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight ();
int ChanName_X = BoxStartX + ChanWidth + SHADOW_OFFSET;
const int icon_space = 3, box_len = 300, box_pos= 12;
const int icon_space = 3, box_len = 34 + icon_w, box_pos = 12;
if (show) {
//if (!autoshift && !shift_timer)
if(!CRecordManager::getInstance()->Timeshift())
{
frameBuffer->paintBoxRel (ChanName_X + SHADOW_OFFSET, BoxStartY + box_pos + SHADOW_OFFSET, box_len, chanH, COL_INFOBAR_SHADOW_PLUS_0);
frameBuffer->paintBoxRel (ChanName_X , BoxStartY + box_pos , box_len, chanH, COL_INFOBAR_PLUS_0);
char records_msg[8];
int records = CRecordManager::getInstance()->GetRecmapSize();
snprintf(records_msg, sizeof(records_msg)-1, "%d%s", records, "x");
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString (ChanName_X +icon_w + (icon_space*2), BoxStartY + box_pos + chanH, box_len,
g_Zapit->getChannelName(rec_channel_id)/*ext_channel_name.c_str()*/, COL_INFOBAR, 0, true);
records_msg, COL_INFOBAR, 0, true);
} else {
frameBuffer->paintBackgroundBoxRel (ChanName_X , BoxStartY + box_pos, box_len + SHADOW_OFFSET, chanH + SHADOW_OFFSET);
}