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

- movieplayer: ask before stop temporary timeshift

Browse Source
This commit is contained in:
svenhoefer
2014-08-19 12:56:29 +02:00
committed by [CST] Focus
parent 2c3952cf42
commit f9c7662c73
5 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -1777,6 +1777,7 @@ recordingmenu.multimenu.info_stop_all %d von %d Aufnahmen werden beendet.
recordingmenu.multimenu.rec_akt Aufnahme aktueller Kanal recordingmenu.multimenu.rec_akt Aufnahme aktueller Kanal
recordingmenu.multimenu.stop_all Alle Aufnahmen beenden recordingmenu.multimenu.stop_all Alle Aufnahmen beenden
recordingmenu.multimenu.timeshift Timeshift recordingmenu.multimenu.timeshift Timeshift
recordingmenu.multimenu.timeshift.stop Zeitversetztes Fernsehen beenden?
recordingmenu.off aus recordingmenu.off aus
recordingmenu.record_is_not_running Keine laufende Aufnahme verfügbar! recordingmenu.record_is_not_running Keine laufende Aufnahme verfügbar!
recordingmenu.record_is_running Aufnahme läuft! recordingmenu.record_is_running Aufnahme läuft!

1
data/locale/english.locale
View File

@@ -1777,6 +1777,7 @@ recordingmenu.multimenu.info_stop_all %d of %d recordings will be stopped.
recordingmenu.multimenu.rec_akt record current channel recordingmenu.multimenu.rec_akt record current channel
recordingmenu.multimenu.stop_all stop all recordings recordingmenu.multimenu.stop_all stop all recordings
recordingmenu.multimenu.timeshift Timeshift recordingmenu.multimenu.timeshift Timeshift
recordingmenu.multimenu.timeshift.stop Stop timeshift?
recordingmenu.off off recordingmenu.off off
recordingmenu.record_is_not_running No record is running! recordingmenu.record_is_not_running No record is running!
recordingmenu.record_is_running Record is running! recordingmenu.record_is_running Record is running!

7
src/gui/movieplayer.cpp
View File

@@ -38,6 +38,7 @@
#include <gui/widget/helpbox.h> #include <gui/widget/helpbox.h>
#include <gui/infoclock.h> #include <gui/infoclock.h>
#include <gui/plugins.h> #include <gui/plugins.h>
#include <gui/widget/messagebox.h>
#include <driver/screenshot.h> #include <driver/screenshot.h>
#include <driver/volume.h> #include <driver/volume.h>
#include <driver/abstime.h> #include <driver/abstime.h>
@@ -647,7 +648,11 @@ void CMoviePlayerGui::PlayFile(void)
if (msg == (neutrino_msg_t) g_settings.mpkey_plugin) { if (msg == (neutrino_msg_t) g_settings.mpkey_plugin) {
g_PluginList->startPlugin_by_name(g_settings.movieplayer_plugin.c_str ()); g_PluginList->startPlugin_by_name(g_settings.movieplayer_plugin.c_str ());
} else if (msg == (neutrino_msg_t) g_settings.mpkey_stop) { } else if (msg == (neutrino_msg_t) g_settings.mpkey_stop) {
playstate = CMoviePlayerGui::STOPPED; bool stop_it = true;
if ((timeshift) && (g_settings.temp_timeshift))
stop_it = (ShowMsg(LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT, LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT_STOP, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NULL, 450, 30, false) != CMessageBox::mbrYes);
if (stop_it)
playstate = CMoviePlayerGui::STOPPED;
if ((duration - position) > 600000) if ((duration - position) > 600000)
makeScreenShot(true); makeScreenShot(true);
} else if (msg == (neutrino_msg_t) g_settings.mpkey_play) { } else if (msg == (neutrino_msg_t) g_settings.mpkey_play) {

1
src/system/locals.h
View File

@@ -1804,6 +1804,7 @@ typedef enum
LOCALE_RECORDINGMENU_MULTIMENU_REC_AKT, LOCALE_RECORDINGMENU_MULTIMENU_REC_AKT,
LOCALE_RECORDINGMENU_MULTIMENU_STOP_ALL, LOCALE_RECORDINGMENU_MULTIMENU_STOP_ALL,
LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT, LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT,
LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT_STOP,
LOCALE_RECORDINGMENU_OFF, LOCALE_RECORDINGMENU_OFF,
LOCALE_RECORDINGMENU_RECORD_IS_NOT_RUNNING, LOCALE_RECORDINGMENU_RECORD_IS_NOT_RUNNING,
LOCALE_RECORDINGMENU_RECORD_IS_RUNNING, LOCALE_RECORDINGMENU_RECORD_IS_RUNNING,

1
src/system/locals_intern.h
View File

@@ -1804,6 +1804,7 @@ const char * locale_real_names[] =
"recordingmenu.multimenu.rec_akt", "recordingmenu.multimenu.rec_akt",
"recordingmenu.multimenu.stop_all", "recordingmenu.multimenu.stop_all",
"recordingmenu.multimenu.timeshift", "recordingmenu.multimenu.timeshift",
"recordingmenu.multimenu.timeshift.stop",
"recordingmenu.off", "recordingmenu.off",
"recordingmenu.record_is_not_running", "recordingmenu.record_is_not_running",
"recordingmenu.record_is_running", "recordingmenu.record_is_running",