mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

- record: differentiate between timeshift and record in AskToStop() function

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-07-25 00:44:37 +02:00
committed by Thilo Graf
parent ab393b0439
commit fcc1a18203
5 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -2334,6 +2334,7 @@ settings.restore_warn Alle Settings werden ersetzt.\nDie Box wird neu gestartet.
shoutcast.dev_id SHOUTcast Dev ID shoutcast.dev_id SHOUTcast Dev ID
shoutcast.enabled SHOUTcast-Unterstützung shoutcast.enabled SHOUTcast-Unterstützung
shutdown.recording_query Aufnahme läuft. Trotzdem beenden? 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? 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.announce Die Box wird in 1 Min. in Standby-Betrieb gehen.\nStandby-Betrieb abbrechen?
sleeptimerbox.hint1 Ausschaltzeit in Minuten (000 = aus) sleeptimerbox.hint1 Ausschaltzeit in Minuten (000 = aus)

1
data/locale/english.locale
View File

@@ -2334,6 +2334,7 @@ settings.restore_warn This will replace all settings and reboot\nContinue ?
shoutcast.dev_id SHOUTcast Dev ID shoutcast.dev_id SHOUTcast Dev ID
shoutcast.enabled SHOUTcast support shoutcast.enabled SHOUTcast support
shutdown.recording_query You really want to to stop record ? 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 ? shutdowntimer.announce Box will shutdown in 1 min.\nCancel Shutdown ?
sleeptimerbox.announce Box will standby in 1 min.\nCancel Standby ? sleeptimerbox.announce Box will standby in 1 min.\nCancel Standby ?
sleeptimerbox.hint1 Shutdown time in minutes (000 = off) sleeptimerbox.hint1 Shutdown time in minutes (000 = off)

2
src/driver/record.cpp
View File

@@ -1590,7 +1590,7 @@ bool CRecordManager::AskToStop(const t_channel_id channel_id, const int recid)
if(inst == NULL) if(inst == NULL)
return false; 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) { CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 30) == CMsgBox::mbrYes) {
mutex.lock(); mutex.lock();
if (recid) if (recid)

1
src/system/locals.h
View File

@@ -2361,6 +2361,7 @@ typedef enum
LOCALE_SHOUTCAST_DEV_ID, LOCALE_SHOUTCAST_DEV_ID,
LOCALE_SHOUTCAST_ENABLED, LOCALE_SHOUTCAST_ENABLED,
LOCALE_SHUTDOWN_RECORDING_QUERY, LOCALE_SHUTDOWN_RECORDING_QUERY,
LOCALE_SHUTDOWN_TIMESHIFT_QUERY,
LOCALE_SHUTDOWNTIMER_ANNOUNCE, LOCALE_SHUTDOWNTIMER_ANNOUNCE,
LOCALE_SLEEPTIMERBOX_ANNOUNCE, LOCALE_SLEEPTIMERBOX_ANNOUNCE,
LOCALE_SLEEPTIMERBOX_HINT1, LOCALE_SLEEPTIMERBOX_HINT1,

1
src/system/locals_intern.h
View File

@@ -2361,6 +2361,7 @@ const char * locale_real_names[] =
"shoutcast.dev_id", "shoutcast.dev_id",
"shoutcast.enabled", "shoutcast.enabled",
"shutdown.recording_query", "shutdown.recording_query",
"shutdown.timeshift_query",
"shutdowntimer.announce", "shutdowntimer.announce",
"sleeptimerbox.announce", "sleeptimerbox.announce",
"sleeptimerbox.hint1", "sleeptimerbox.hint1",