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

Revert "- movieplayer: ask before stop temporary timeshift"

Browse Source 
This reverts commit f9c7662c73.

Conflicts:
	src/gui/movieplayer.cpp
This commit is contained in:
[CST] Focus
2014-10-01 16:09:46 +04:00
parent 02a5a5f9db
commit ed6816068c
5 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/movieplayer.cpp
View File

@@ -38,7 +38,6 @@
#include <gui/widget/helpbox.h>
#include <gui/infoclock.h>
#include <gui/plugins.h>
#include <gui/widget/messagebox.h>
#include <driver/screenshot.h>
#include <driver/volume.h>
#include <driver/abstime.h>
@@ -843,12 +842,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
if (msg == (neutrino_msg_t) g_settings.mpkey_plugin) {
g_PluginList->startPlugin_by_name(g_settings.movieplayer_plugin.c_str ());
} else if (msg == (neutrino_msg_t) g_settings.mpkey_stop) {
bool stop_it = true;
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;
playstate = CMoviePlayerGui::STOPPED;
ClearQueue();
} else if ((filelist.size() > 0 && msg == (neutrino_msg_t) CRCInput::RC_right)) {
if (filelist_it < (filelist.end() - 1)) {