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

Revert "- movieplayer: ask before stop temporary timeshift"

Browse Source 
This reverts commit 3ee1d987a2.

Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ed6816068c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-10-01 16:09:46 +04:00
parent 511f4ba3c5
commit 0aee7a5f08
5 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -1886,7 +1886,6 @@ 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

@@ -1882,7 +1882,6 @@ 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!

8
src/gui/movieplayer.cpp
View File

@@ -38,7 +38,6 @@
#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>
@@ -843,12 +842,7 @@ void CMoviePlayerGui::PlayFileLoop(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) {
bool stop_it = true; playstate = CMoviePlayerGui::STOPPED;
if ((timeshift != TSHIFT_MODE_OFF) && (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;
ClearQueue(); ClearQueue();
} else if ((filelist.size() > 0 && msg == (neutrino_msg_t) CRCInput::RC_right)) { } else if ((filelist.size() > 0 && msg == (neutrino_msg_t) CRCInput::RC_right)) {
if (filelist_it < (filelist.end() - 1)) { if (filelist_it < (filelist.end() - 1)) {

1
src/system/locals.h
View File

@@ -1909,7 +1909,6 @@ 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

@@ -1909,7 +1909,6 @@ 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",