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

- sleeptimer: allow only one instance

Browse Source 
* remove unneeded includes
This commit is contained in:
svenhoefer
2013-05-14 22:20:40 +02:00
parent a5857e9d5b
commit 07da9cecdc
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/sleeptimer.cpp
View File

@@ -4,13 +4,6 @@
Copyright (C) 2001 Steffen Hehn 'McClean' Copyright (C) 2001 Steffen Hehn 'McClean'
Homepage: http://dbox.cyberphoria.org/ Homepage: http://dbox.cyberphoria.org/
Kommentar:
Diese GUI wurde von Grund auf neu programmiert und sollte nun vom
Aufbau und auch den Ausbaumoeglichkeiten gut aussehen. Neutrino basiert
auf der Client-Server Idee, diese GUI ist also von der direkten DBox-
Steuerung getrennt. Diese wird dann von Daemons uebernommen.
License: GPL License: GPL
@@ -35,22 +28,30 @@
#include <gui/sleeptimer.h> #include <gui/sleeptimer.h>
#include <gui/widget/hintbox.h>
#include <gui/widget/messagebox.h>
#include <gui/widget/stringinput.h> #include <gui/widget/stringinput.h>
#include <timerdclient/timerdclient.h> #include <timerdclient/timerdclient.h>
#include <global.h> #include <global.h>
#include <daemonc/remotecontrol.h>
#include <daemonc/remotecontrol.h>
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
#include <stdlib.h> #include <stdlib.h>
bool CSleepTimerWidget::is_running = false;
int CSleepTimerWidget::exec(CMenuTarget* parent, const std::string &actionKey) int CSleepTimerWidget::exec(CMenuTarget* parent, const std::string &actionKey)
{ {
int res = menu_return::RETURN_REPAINT; int res = menu_return::RETURN_REPAINT;
if (is_running)
{
printf("[CSleepTimerWidget] %s: another instance is already running.\n", __FUNCTION__);
return res;
}
is_running = true;
int shutdown_min = 0; int shutdown_min = 0;
char value[16]; char value[16];
CStringInput *inbox; CStringInput *inbox;
@@ -88,7 +89,10 @@ int CSleepTimerWidget::exec(CMenuTarget* parent, const std::string &actionKey)
/* exit pressed, cancel timer setup */ /* exit pressed, cancel timer setup */
if(ret == menu_return::RETURN_EXIT_REPAINT) if(ret == menu_return::RETURN_EXIT_REPAINT)
{
is_running = false;
return res; return res;
}
int new_val = atoi(value); int new_val = atoi(value);
if(permanent) { if(permanent) {
@@ -107,5 +111,8 @@ int CSleepTimerWidget::exec(CMenuTarget* parent, const std::string &actionKey)
else // set the sleeptimer to actual time + shutdown mins and announce 1 min before else // set the sleeptimer to actual time + shutdown mins and announce 1 min before
g_Timerd->setSleeptimer(time(NULL) + ((shutdown_min -1) * 60),time(NULL) + shutdown_min * 60,0); g_Timerd->setSleeptimer(time(NULL) + ((shutdown_min -1) * 60),time(NULL) + shutdown_min * 60,0);
} }
is_running = false;
return res; return res;
} }

7
src/gui/sleeptimer.h
View File

@@ -27,8 +27,11 @@
class CSleepTimerWidget: public CMenuTarget class CSleepTimerWidget: public CMenuTarget
{ {
public: private:
int exec(CMenuTarget* parent, const std::string & actionKey); static bool is_running;
public:
int exec(CMenuTarget* parent, const std::string & actionKey);
}; };