[v2,23/24] Rename 'streamfd' variable to 'stream', no longer a file descriptor

Submitted by Christophe de Dinechin on Feb. 21, 2018, 5:46 p.m.

Details

Message ID 20180221174636.37758-24-christophe@dinechin.org
State New
Headers show
Series "WIP: Refactor the streaming agent towards a more standard C++ style" ( rev: 2 ) in Spice

Not browsing as part of any series.

Commit Message

Christophe de Dinechin Feb. 21, 2018, 5:46 p.m.
From: Christophe de Dinechin <dinechin@redhat.com>

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

Patch hide | download patch | download mbox

diff --git a/src/spice-streaming-agent.cpp b/src/spice-streaming-agent.cpp
index a789aad..b889acc 100644
--- a/src/spice-streaming-agent.cpp
+++ b/src/spice-streaming-agent.cpp
@@ -638,10 +638,10 @@  int main(int argc, char* argv[])
         // register built-in plugins
         MjpegPlugin::Register(&agent);
         agent.LoadPlugins(PLUGINSDIR);
-        Stream streamfd(streamport);
-        X11CursorThread cursor_thread(streamfd);
+        Stream stream(streamport);
+        X11CursorThread cursor_thread(stream);
         FrameLog frame_log(log_filename, log_binary);
-        agent.CaptureLoop(streamfd, frame_log);
+        agent.CaptureLoop(stream, frame_log);
     }
     catch (Error &err) {
         syslog(LOG_ERR, "%s\n", err.message().c_str());

Comments

> 
> From: Christophe de Dinechin <dinechin@redhat.com>
> 
> Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>
> ---
>  src/spice-streaming-agent.cpp | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/spice-streaming-agent.cpp b/src/spice-streaming-agent.cpp
> index a789aad..b889acc 100644
> --- a/src/spice-streaming-agent.cpp
> +++ b/src/spice-streaming-agent.cpp
> @@ -638,10 +638,10 @@ int main(int argc, char* argv[])
>          // register built-in plugins
>          MjpegPlugin::Register(&agent);
>          agent.LoadPlugins(PLUGINSDIR);
> -        Stream streamfd(streamport);
> -        X11CursorThread cursor_thread(streamfd);
> +        Stream stream(streamport);
> +        X11CursorThread cursor_thread(stream);
>          FrameLog frame_log(log_filename, log_binary);
> -        agent.CaptureLoop(streamfd, frame_log);
> +        agent.CaptureLoop(stream, frame_log);
>      }
>      catch (Error &err) {
>          syslog(LOG_ERR, "%s\n", err.message().c_str());

This patch should be squashed with the patch introducing
these variables.

Frediano