summaryrefslogtreecommitdiff
path: root/server/streamdev-server.c
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.c
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.c')
-rw-r--r--server/streamdev-server.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/server/streamdev-server.c b/server/streamdev-server.c
index 5777655..0a98394 100644
--- a/server/streamdev-server.c
+++ b/server/streamdev-server.c
@@ -130,6 +130,11 @@ cOsdObject *cPluginStreamdevServer::MainMenuAction(void)
return NULL;
}
+void cPluginStreamdevServer::MainThreadHook(void)
+{
+ cStreamdevServer::MainThreadHook();
+}
+
cMenuSetupPage *cPluginStreamdevServer::SetupMenu(void)
{
return new cStreamdevServerMenuSetupPage;