From c652e8fa8141d7e323cbdbbc0a662244a5a84955 Mon Sep 17 00:00:00 2001 From: Frank Schmirler Date: Tue, 22 Nov 2011 01:15:09 +0100 Subject: Added server menu with list of clients. Connections can be terminated with the "red" key. The former main menu action of suspending live TV moved to the "blue" key. --- server/streamdev-server.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'server/streamdev-server.c') diff --git a/server/streamdev-server.c b/server/streamdev-server.c index 0a98394..f2fa057 100644 --- a/server/streamdev-server.c +++ b/server/streamdev-server.c @@ -9,9 +9,9 @@ #include #include #include "streamdev-server.h" +#include "server/menu.h" #include "server/setup.h" #include "server/server.h" -#include "server/suspend.h" #if !defined(APIVERSNUM) || APIVERSNUM < 10516 #error "VDR-1.5.16 API version or greater is required!" @@ -119,20 +119,20 @@ cString cPluginStreamdevServer::Active(void) const char *cPluginStreamdevServer::MainMenuEntry(void) { - if (StreamdevServerSetup.SuspendMode == smOffer && !cSuspendCtl::IsActive()) - return tr("Suspend Live TV"); - return NULL; + return tr("Streamdev Connections"); } cOsdObject *cPluginStreamdevServer::MainMenuAction(void) { - cControl::Launch(new cSuspendCtl); - return NULL; + return new cStreamdevServerMenu(); } void cPluginStreamdevServer::MainThreadHook(void) { - cStreamdevServer::MainThreadHook(); + cThreadLock lock; + const cList& clients = cStreamdevServer::Clients(lock); + for (cServerConnection *s = clients.First(); s; s = clients.Next(s)) + s->MainThreadHook(); } cMenuSetupPage *cPluginStreamdevServer::SetupMenu(void) -- cgit v1.2.3