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

neutrino.cpp: add signal OnBeforeRestart

Browse Source 
This allows to handle events inside from objects with
matching slots and events without explicit
calls in neutrino.cpp.

Used here general for stopping of thread in timer object.
In some cases it could be necessary to stop timer thread
otherwise it is possible that restart is blocked here.
This happens here automatically, without separate instances
of timer objects.

Conflicts:
	src/neutrino.h
This commit is contained in:
Thilo Graf
2014-10-16 14:05:30 +02:00
parent 1f81228d7b
commit 8f621ef472
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/neutrino.cpp
View File

@@ -3869,6 +3869,9 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
return menu_return::RETURN_EXIT_ALL; return menu_return::RETURN_EXIT_ALL;
} }
else if(actionKey=="restart") { else if(actionKey=="restart") {
//usage of slots from any classes
OnBeforeRestart();
if (recordingstatus) if (recordingstatus)
DisplayErrorMessage(g_Locale->getText(LOCALE_SERVICEMENU_RESTART_REFUSED_RECORDING)); DisplayErrorMessage(g_Locale->getText(LOCALE_SERVICEMENU_RESTART_REFUSED_RECORDING));
else { else {

6
src/neutrino.h
View File

@@ -39,7 +39,7 @@
#include "gui/personalize.h" #include "gui/personalize.h"
#include "gui/user_menue.h" #include "gui/user_menue.h"
#include <timerdclient/timerdtypes.h> #include <timerdclient/timerdtypes.h>
#include <sigc++/signal.h>
#include <string> #include <string>
#define ANNOUNCETIME (1 * 60) #define ANNOUNCETIME (1 * 60)
@@ -57,7 +57,7 @@ class CFrameBuffer;
class CConfigFile; class CConfigFile;
class CScanSettings; class CScanSettings;
class CNeutrinoApp : public CMenuTarget, CChangeObserver class CNeutrinoApp : public CMenuTarget, CChangeObserver, sigc::trackable
{ {
public: public:
enum enum
@@ -228,6 +228,8 @@ public:
void stopPlayBack(bool lock = false); void stopPlayBack(bool lock = false);
bool adjustToChannelID(const t_channel_id channel_id); bool adjustToChannelID(const t_channel_id channel_id);
void screensaver(bool); void screensaver(bool);
//signal/event handler before restart of neutrino gui
sigc::signal<bool> OnBeforeRestart;
}; };
#endif #endif