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

Revert "- infoviewer: allow to disable pip with RC_help if g_settings.show_ecm_pos is off (thx to mirz)"

Browse Source 
This reverts commit cb75525bc1
because many testing code was commited by mistake


Origin commit data
------------------
Commit: ed28f6d569
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-13 (Sun, 13 Jan 2019)
This commit is contained in:
vanhofen
2019-01-13 20:45:57 +01:00
parent cb75525bc1
commit d353be062f
8 changed files with 27 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/driver/record.cpp
View File

@@ -134,7 +134,6 @@ CRecordInstance::CRecordInstance(const CTimerd::RecordingInfo * const eventinfo,
Directory = dir;
autoshift = timeshift;
move_ts2rec = false;
numpids = 0;
cMovieInfo = new CMovieInfo();
@@ -325,9 +324,7 @@ bool CRecordInstance::Stop(bool remove_event)
CCamManager::getInstance()->Stop(channel_id, CCamManager::RECORD);
if (autoshift && move_ts2rec)
CMoviePlayerGui::getInstance().moveTimeshift();
else if (autoshift && g_settings.auto_delete)
if (autoshift && g_settings.auto_delete)
CMoviePlayerGui::getInstance().deleteTimeshift();
if(recording_id && remove_event) {
@@ -1515,15 +1512,6 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey )
{
StartTimeshift();
return menu_return::RETURN_EXIT_ALL;
} else if(actionKey == "Timeshift2Record")
{
for (recmap_iterator_t it = recmap.begin(); it != recmap.end(); it++)
{
CRecordInstance *inst = it->second;
if (inst->Timeshift())
inst->move_ts2rec = !inst->move_ts2rec;
}
return menu_return::RETURN_REPAINT;
} else if(actionKey == "Stop_record")
{
if (!CRecordManager::getInstance()->RecordingStatus())
@@ -1565,33 +1553,17 @@ bool CRecordManager::ShowMenu(void)
//bool status_rec = rec_mode & RECMODE_REC;
//record item
iteml = new CMenuForwarder(LOCALE_RECORDINGMENU_MULTIMENU_REC_AKT, true /*!status_rec*/, NULL, this, "Record", CRCInput::RC_red);
iteml = new CMenuForwarder(LOCALE_RECORDINGMENU_MULTIMENU_REC_AKT, true /*!status_rec*/, NULL,
this, "Record", CRCInput::RC_red);
//if no recordings are running, set the focus to the record menu item
menu.addItem(iteml, rec_count == 0 ? true: false);
//timeshift item
if (!status_ts)
{
iteml = new CMenuForwarder(LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT, true /*!status_ts*/, NULL, this, "Timeshift", CRCInput::RC_yellow);
}
else
{
iteml = new CMenuForwarder(LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT2RECORD, true, NULL, this, "Timeshift2Record", CRCInput::RC_yellow);
for (recmap_iterator_t it = recmap.begin(); it != recmap.end(); it++)
{
CRecordInstance *inst = it->second;
if (inst->Timeshift())
{
if (inst->move_ts2rec)
iteml->iconName_Info_right = NEUTRINO_ICON_MARKER_DIALOG_OK;
else
iteml->iconName_Info_right = NEUTRINO_ICON_MARKER_DIALOG_OFF;
}
}
}
iteml = new CMenuForwarder(LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT, !status_ts, NULL,
this, "Timeshift", CRCInput::RC_yellow);
menu.addItem(iteml, false);
if (rec_count > 0)
if(rec_count > 0)
{
menu.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MAINMENU_RECORDING_STOP));
mutex.lock();
@@ -1615,8 +1587,7 @@ bool CRecordManager::ShowMenu(void)
//define stop key if only one record is running, otherwise define shortcuts
neutrino_msg_t rc_key = CRCInput::convertDigitToKey(shortcut++);
const char * btn_icon = NEUTRINO_ICON_BUTTON_OKAY;
if (rec_count == 1)
{
if (rec_count == 1){
rc_key = CRCInput::RC_stop;
btn_icon = NEUTRINO_ICON_BUTTON_STOP;
}
@@ -1629,10 +1600,11 @@ bool CRecordManager::ShowMenu(void)
if (i >= RECORD_MAX_COUNT)
break;
}
if (i > 1) //menu item "stopp all records"
if(i > 1) //menu item "stopp all records"
{
menu.addItem(GenericMenuSeparatorLine);
iteml = new CMenuForwarder(LOCALE_RECORDINGMENU_MULTIMENU_STOP_ALL, true, NULL, this, "StopAll", CRCInput::RC_stop);
iteml = new CMenuForwarder(LOCALE_RECORDINGMENU_MULTIMENU_STOP_ALL, true, NULL,
this, "StopAll", CRCInput::RC_stop);
iteml->setItemButton(NEUTRINO_ICON_BUTTON_STOP, true);
//if more than one recording is running, set the focus to menu item 'stopp all records'