summaryrefslogtreecommitdiff
path: root/server/streamdev-server.h
diff options
context:
space:
mode:
authorFrank Schmirler <vdr@schmirler.de>2011-03-07 23:06:27 +0100
committerFrank Schmirler <vdr@schmirler.de>2011-03-07 23:06:27 +0100
commit1a933d6cc9344bd7e7ded82eb775cc0c61ed0ae3 (patch)
tree3331bcd0608de5e0903cde00cfb23064e27b380f /server/streamdev-server.h
parent2cb0ba6cf128f9263ff5d1d4695546dab84da768 (diff)
parentc06970123cd68bd1b2f2695326596430d236f230 (diff)
downloadvdr-plugin-streamdev-1a933d6cc9344bd7e7ded82eb775cc0c61ed0ae3.tar.gz
vdr-plugin-streamdev-1a933d6cc9344bd7e7ded82eb775cc0c61ed0ae3.tar.bz2
Merge branch 'switch_livetv'
Conflicts: HISTORY server/connection.c
Diffstat (limited to 'server/streamdev-server.h')
-rw-r--r--server/streamdev-server.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/server/streamdev-server.h b/server/streamdev-server.h
index 4083689..f1be8aa 100644
--- a/server/streamdev-server.h
+++ b/server/streamdev-server.h
@@ -26,6 +26,7 @@ public:
virtual cString Active(void);
virtual const char *MainMenuEntry(void);
virtual cOsdObject *MainMenuAction(void);
+ virtual void MainThreadHook(void);
virtual cMenuSetupPage *SetupMenu(void);
virtual bool SetupParse(const char *Name, const char *Value);
};