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

timeshift: unify config keywords and locales

Browse Source 
Origin commit data
------------------
Commit: 6755b49e20
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-15 (Tue, 15 Jan 2019)

Origin message was:
------------------
- timeshift: unify config keywords and locales
This commit is contained in:
vanhofen
2019-01-15 23:39:10 +01:00
parent e2f412b016
commit 3e25bc3601
10 changed files with 52 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/driver/record.cpp
View File

@@ -190,7 +190,7 @@ record_error_msg_t CRecordInstance::Start(CZapitChannel * channel)
{
time_t msg_start_time = time(0);
CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_RECORDING_START));
if ((!(autoshift && g_settings.auto_timeshift)) && g_settings.recording_startstop_msg)
if ((!(autoshift && g_settings.timeshift_auto)) && g_settings.recording_startstop_msg)
hintBox.paint();
//NI wakeup_hdd(Directory.c_str());
@@ -311,7 +311,7 @@ bool CRecordInstance::Stop(bool remove_event)
recMovieInfo->length = (end_time - start_time + 30) / 60;
CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, rec_stop_msg.c_str());
if ((!(autoshift && g_settings.auto_timeshift)) && g_settings.recording_startstop_msg)
if ((!(autoshift && g_settings.timeshift_auto)) && g_settings.recording_startstop_msg)
hintBox.paint();
printf("%s: channel %" PRIx64 " recording_id %d\n", __func__, channel_id, recording_id);
@@ -327,7 +327,7 @@ bool CRecordInstance::Stop(bool remove_event)
if (autoshift && move_ts2rec)
CMoviePlayerGui::getInstance().moveTimeshift();
else if (autoshift && g_settings.auto_delete)
else if (autoshift && g_settings.timeshift_delete)
CMoviePlayerGui::getInstance().deleteTimeshift();
if(recording_id && remove_event) {
@@ -1353,8 +1353,8 @@ int CRecordManager::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
{
if(msg == NeutrinoMessages::EVT_ZAP_COMPLETE) {
g_RCInput->killTimer (shift_timer);
if (g_settings.auto_timeshift) {
int delay = g_settings.auto_timeshift;
if (g_settings.timeshift_auto) {
int delay = g_settings.timeshift_auto;
shift_timer = g_RCInput->addTimer(delay*1000*1000, true);
g_InfoViewer->handleMsg(NeutrinoMessages::EVT_RECORDMODE, 1);
}
@@ -1403,7 +1403,7 @@ void CRecordManager::StartTimeshift()
t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
// bool tstarted = false;
/* start temporary timeshift if enabled and not running, but dont start second record */
if (g_settings.temp_timeshift) {
if (g_settings.timeshift_temp) {
if (!FindTimeshift()) {
res = StartAutoRecord();
tmode = "timeshift"; // record just started
@@ -1423,7 +1423,7 @@ void CRecordManager::StartTimeshift()
ShowMenu() moved to movieplayer.cpp
Function is called when stop key is pressed.
*/
if(g_settings.temp_timeshift && tstarted && autoshift)
if(g_settings.timeshift_temp && tstarted && autoshift)
ShowMenu();
#endif
}
@@ -2141,7 +2141,7 @@ bool CStreamRec::Stop(bool remove_event)
time_t end_time = time_monotonic();
CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, rec_stop_msg.c_str());
if ((!(autoshift && g_settings.auto_timeshift)) && g_settings.recording_startstop_msg)
if ((!(autoshift && g_settings.timeshift_auto)) && g_settings.recording_startstop_msg)
hintBox.paint();
printf("%s: Stopping...\n", __FUNCTION__);
@@ -2177,7 +2177,7 @@ record_error_msg_t CStreamRec::Record()
APIDList apid_list;
CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_RECORDING_START));
if ((!(autoshift && g_settings.auto_timeshift)) && g_settings.recording_startstop_msg)
if ((!(autoshift && g_settings.timeshift_auto)) && g_settings.recording_startstop_msg)
hintBox.paint();
printf("%s: channel %" PRIx64 " recording_id %d\n", __func__, channel_id, recording_id);