[Spice-devel] [PATCH 10/22] Remove client_codecs global variable, moved inside the 'Stream' class

[Christophe de Dinechin]

From: Christophe de Dinechin <dinechin at redhat.com>

It makes sense to place the codecs inside the Stream which is charged
with setting it up, until we create a proper abstraction for input
messages similar to what Message does for output messages in follow-up
patches.

Signed-off-by: Christophe de Dinechin <dinechin at redhat.com>
---
 src/spice-streaming-agent.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/spice-streaming-agent.cpp b/src/spice-streaming-agent.cpp
index 4d24234..403e65c 100644
--- a/src/spice-streaming-agent.cpp
+++ b/src/spice-streaming-agent.cpp
@@ -67,8 +67,11 @@ struct CursorMessage
 
 class Stream
 {
+    typedef std::set<SpiceVideoCodecType> codecs_t;
+
 public:
     Stream(const char *name)
+        : codecs()
     {
         streamfd = open(name, O_RDWR);
         if (streamfd < 0) {
@@ -80,6 +83,8 @@ public:
         close(streamfd);
     }
 
+    const codecs_t &client_codecs() { return codecs; }
+
     int read_command(bool blocking);
     size_t write_all(const void *buf, const size_t len);
     int send_format(unsigned w, unsigned h, uint8_t c);
@@ -98,6 +103,7 @@ private:
 private:
     int streamfd = -1;
     std::mutex mutex;
+    codecs_t codecs;
 };
 
 }} // namespace spice::streaming_agent
@@ -105,7 +111,6 @@ private:
 static bool streaming_requested = false;
 static bool quit_requested = false;
 static bool log_binary = false;
-static std::set<SpiceVideoCodecType> client_codecs;
 
 int Stream::have_something_to_read(int timeout)
 {
@@ -139,9 +144,9 @@ void Stream::handle_stream_start_stop(uint32_t len)
     streaming_requested = (msg[0] != 0); /* num_codecs */
     syslog(LOG_INFO, "GOT START_STOP message -- request to %s streaming\n",
            streaming_requested ? "START" : "STOP");
-    client_codecs.clear();
+    codecs.clear();
     for (int i = 1; i <= msg[0]; ++i) {
-        client_codecs.insert((SpiceVideoCodecType) msg[i]);
+        codecs.insert((SpiceVideoCodecType) msg[i]);
     }
 }
 
@@ -432,7 +437,7 @@ do_capture(Stream &stream, const char *streamport, FILE *f_log)
         syslog(LOG_INFO, "streaming starts now\n");
         uint64_t time_last = 0;
 
-        std::unique_ptr<FrameCapture> capture(agent.GetBestFrameCapture(client_codecs));
+        std::unique_ptr<FrameCapture> capture(agent.GetBestFrameCapture(stream.client_codecs()));
         if (!capture) {
             throw std::runtime_error("cannot find a suitable capture system");
         }
-- 
2.13.5 (Apple Git-94)