diff options
| author | Frediano Ziglio <fziglio@redhat.com> | 2017-11-21 18:08:11 +0000 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2017-11-23 11:39:01 +0000 |
| commit | 9b673fda8b32641f3f3e447e20ac9b5343242f2c (patch) | |
| tree | 52588ea58b1a5ba9ffd8c0b4d90612860a0c572d | |
| parent | 1deb0dd4f76897e3476189f925d7a3f07288ed76 (diff) | |
Remove binary dependencyc3d
| -rw-r--r-- | src/spice-stream.cpp | 5 | ||||
| -rw-r--r-- | src/spice-stream.hpp | 2 | ||||
| -rw-r--r-- | src/spice-streaming-agent.cpp | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/spice-stream.cpp b/src/spice-stream.cpp index 3aa951c..0fa104f 100644 --- a/src/spice-stream.cpp +++ b/src/spice-stream.cpp @@ -16,9 +16,6 @@ #include "spice-stream.hpp" -// FIXME -extern int streaming_requested; - using namespace SpiceStreamingAgent; struct SpiceStreamFormatMessage @@ -33,7 +30,7 @@ struct SpiceStreamDataMessage StreamMsgData msg; }; -int SpiceStream::read_command() +int SpiceStream::read_command(int &streaming_requested) { StreamDevHeader hdr; uint8_t msg[64]; diff --git a/src/spice-stream.hpp b/src/spice-stream.hpp index 5ef8cb5..17d158a 100644 --- a/src/spice-stream.hpp +++ b/src/spice-stream.hpp @@ -33,7 +33,7 @@ public: * Return file descriptor to poll from */ int eventFd() const { return streamfd; } - int read_command(); + int read_command(int &streaming_requested); int send_format(unsigned w, unsigned h, unsigned c); int send_frame(const void *buf, const unsigned size); void send_cursor(unsigned width, unsigned height, int hotspot_x, int hotspot_y, diff --git a/src/spice-streaming-agent.cpp b/src/spice-streaming-agent.cpp index d18e8be..31a68bc 100644 --- a/src/spice-streaming-agent.cpp +++ b/src/spice-streaming-agent.cpp @@ -37,7 +37,7 @@ using namespace SpiceStreamingAgent; static ConcreteAgent agent; -int streaming_requested; +static int streaming_requested; static bool quit; static bool stdin_ok; static int log_binary = 0; @@ -101,7 +101,7 @@ static int read_command(SpiceStream &stream, bool blocking) continue; } if (fd) { - n = stream.read_command(); + n = stream.read_command(streaming_requested); } else { n = read_command_from_stdin(); } |