From b8f877bc8ff1144b0a24549b1c705ccffb028495 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 25 Jul 2018 00:44:37 +0200 Subject: [PATCH] record: differentiate between timeshift and record in AskToStop() function Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/337a2ba37e115e898c93f5104b4f981e0f92f4e4 Author: vanhofen Date: 2018-07-25 (Wed, 25 Jul 2018) Origin message was: ------------------ - record: differentiate between timeshift and record in AskToStop() function --- data/locale/deutsch.locale | 1 + data/locale/english.locale | 1 + src/driver/record.cpp | 2 +- src/system/locals.h | 1 + src/system/locals_intern.h | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 93dd91ee6..8043d78a4 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -2565,6 +2565,7 @@ settings.restore_warn Alle Settings werden ersetzt.\nDie Box wird neu gestartet. shoutcast.dev_id SHOUTcast Dev ID shoutcast.enabled SHOUTcast-Unterstützung shutdown.recording_query Aufnahme läuft. Trotzdem beenden? +shutdown.timeshift_query Timeshift läuft. Trotzdem beenden? shutdowntimer.announce Die Box wird in 1 Min. heruntergefahren.\nShutdown abbrechen? sleeptimerbox.announce Die Box wird in 1 Min. in Standby-Betrieb gehen.\nStandby-Betrieb abbrechen? sleeptimerbox.hint1 Ausschaltzeit in Minuten (000 = aus) diff --git a/data/locale/english.locale b/data/locale/english.locale index 5dd127085..a67bd7209 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -2565,6 +2565,7 @@ settings.restore_warn This will replace all settings and reboot\nContinue ? shoutcast.dev_id SHOUTcast Dev ID shoutcast.enabled SHOUTcast support shutdown.recording_query You really want to to stop record ? +shutdown.timeshift_query You really want to to stop timeshift ? shutdowntimer.announce Box will shutdown in 1 min.\nCancel Shutdown ? sleeptimerbox.announce Box will standby in 1 min.\nCancel Standby ? sleeptimerbox.hint1 Shutdown time in minutes (000 = off) diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 0b931a92e..5cff3f458 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -1648,7 +1648,7 @@ bool CRecordManager::AskToStop(const t_channel_id channel_id, const int recid) if(inst == NULL) return false; - if(ShowMsg(LOCALE_SHUTDOWN_RECORDING_QUERY, title.c_str(), + if(ShowMsg(FindTimeshift() ? LOCALE_SHUTDOWN_TIMESHIFT_QUERY : LOCALE_SHUTDOWN_RECORDING_QUERY, title.c_str(), CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 30) == CMsgBox::mbrYes) { mutex.lock(); if (recid) diff --git a/src/system/locals.h b/src/system/locals.h index d35f7db3f..7f9973a87 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -2592,6 +2592,7 @@ typedef enum LOCALE_SHOUTCAST_DEV_ID, LOCALE_SHOUTCAST_ENABLED, LOCALE_SHUTDOWN_RECORDING_QUERY, + LOCALE_SHUTDOWN_TIMESHIFT_QUERY, LOCALE_SHUTDOWNTIMER_ANNOUNCE, LOCALE_SLEEPTIMERBOX_ANNOUNCE, LOCALE_SLEEPTIMERBOX_HINT1, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 3a5aae78b..2de0260e8 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -2592,6 +2592,7 @@ const char * locale_real_names[] = "shoutcast.dev_id", "shoutcast.enabled", "shutdown.recording_query", + "shutdown.timeshift_query", "shutdowntimer.announce", "sleeptimerbox.announce", "sleeptimerbox.hint1",