diff options
| author | Frank Schmirler <vdr@schmirler.de> | 2011-11-22 01:15:09 +0100 |
|---|---|---|
| committer | Frank Schmirler <vdr@schmirler.de> | 2011-11-22 01:16:42 +0100 |
| commit | c652e8fa8141d7e323cbdbbc0a662244a5a84955 (patch) | |
| tree | ee2a0a3421788e0f6cc5f653c42ac4f14acf322b /server/connectionVTP.c | |
| parent | ce1583a756fe7d80522ed3e82275705b9cbe00b7 (diff) | |
| download | vdr-plugin-streamdev-c652e8fa8141d7e323cbdbbc0a662244a5a84955.tar.gz vdr-plugin-streamdev-c652e8fa8141d7e323cbdbbc0a662244a5a84955.tar.bz2 | |
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.
Diffstat (limited to 'server/connectionVTP.c')
| -rw-r--r-- | server/connectionVTP.c | 13 |
1 files changed, 12 insertions, 1 deletions
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; +} |