diff options
| author | Frank Schmirler <vdr@schmirler.de> | 2011-03-18 15:56:34 +0100 |
|---|---|---|
| committer | Frank Schmirler <vdr@schmirler.de> | 2011-03-18 15:56:34 +0100 |
| commit | 17bb6390f9883a1f029ffe4caaa4cc130fcb8b7a (patch) | |
| tree | fc7a92c2f3ca24c21891ec54f1ebb5785fc56487 /server/streamdev-server.c | |
| parent | 58a4f3dbe5888d6da81b401154a8b4c778ff228a (diff) | |
| parent | 1a933d6cc9344bd7e7ded82eb775cc0c61ed0ae3 (diff) | |
| download | vdr-plugin-streamdev-17bb6390f9883a1f029ffe4caaa4cc130fcb8b7a.tar.gz vdr-plugin-streamdev-17bb6390f9883a1f029ffe4caaa4cc130fcb8b7a.tar.bz2 | |
Merge branch 'master' of projects.vdr-developer.org:vdr-plugin-streamdev
Conflicts:
HISTORY
Diffstat (limited to 'server/streamdev-server.c')
| -rw-r--r-- | server/streamdev-server.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/server/streamdev-server.c b/server/streamdev-server.c index b444df7..0a98394 100644 --- a/server/streamdev-server.c +++ b/server/streamdev-server.c @@ -13,8 +13,8 @@ #include "server/server.h" #include "server/suspend.h" -#if !defined(APIVERSNUM) || APIVERSNUM < 10509 -#error "VDR-1.5.9 API version or greater is required!" +#if !defined(APIVERSNUM) || APIVERSNUM < 10516 +#error "VDR-1.5.16 API version or greater is required!" #endif const char *cPluginStreamdevServer::DESCRIPTION = trNOOP("VDR Streaming Server"); @@ -130,6 +130,11 @@ cOsdObject *cPluginStreamdevServer::MainMenuAction(void) return NULL; } +void cPluginStreamdevServer::MainThreadHook(void) +{ + cStreamdevServer::MainThreadHook(); +} + cMenuSetupPage *cPluginStreamdevServer::SetupMenu(void) { return new cStreamdevServerMenuSetupPage; |