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/connectionVTP.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'server/connectionVTP.c') diff --git a/server/connectionVTP.c b/server/connectionVTP.c index 9ffa540..71fa43f 100644 --- a/server/connectionVTP.c +++ b/server/connectionVTP.c @@ -774,7 +774,7 @@ cConnectionVTP::~cConnectionVTP() bool cConnectionVTP::Abort(void) const { - return (m_LiveStreamer && m_LiveStreamer->Abort()) || + return !IsOpen() || (m_LiveStreamer && m_LiveStreamer->Abort()) || (m_FilterStreamer && m_FilterStreamer->Abort()); } @@ -1811,3 +1811,14 @@ bool cConnectionVTP::Respond(int Code, const char *Message, ...) Code < 0 ? -Code : Code, Code < 0 ? '-' : ' ', *str); } + +cString cConnectionVTP::ToText() const +{ + cString str = cServerConnection::ToText(); + if (m_LiveStreamer) + return cString::sprintf("%s\t%s", *str, *m_LiveStreamer->ToText()); + else if (m_RecPlayer) + return cString::sprintf("%s\t%s", *str, m_RecPlayer->getCurrentRecording()->Name()); + else + return str; +} -- cgit v1.2.3