[PATCH 1/3] stream: remove dcc parameter from stream_agent_stop()

[Fabiano Fidêncio <fidencio@xxxxxxxxxx>]

From: Marc-André Lureau <marcandre.lureau@xxxxxxxxx>

Author:    Marc-André Lureau <marcandre.lureau@xxxxxxxxx>
---
 server/red_worker.c | 2 +-
 server/stream.c     | 4 +++-
 server/stream.h     | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/red_worker.c b/server/red_worker.c
index 09ebc0d..ef27ebe 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -3918,7 +3918,7 @@ static void red_display_marshall_stream_end(RedChannelClient *rcc,
 
     red_channel_client_init_send_data(rcc, SPICE_MSG_DISPLAY_STREAM_DESTROY, NULL);
     destroy.id = get_stream_id(DCC_TO_DC(dcc), agent->stream);
-    stream_agent_stop(dcc, agent);
+    stream_agent_stop(agent);
     spice_marshall_msg_display_stream_destroy(base_marshaller, &destroy);
 }
 
diff --git a/server/stream.c b/server/stream.c
index 357c632..4d078de 100644
--- a/server/stream.c
+++ b/server/stream.c
@@ -736,8 +736,10 @@ void dcc_create_stream(DisplayChannelClient *dcc, Stream *stream)
 #endif
 }
 
-void stream_agent_stop(DisplayChannelClient *dcc, StreamAgent *agent)
+void stream_agent_stop(StreamAgent *agent)
 {
+    DisplayChannelClient *dcc = agent->dcc;
+
     dcc_update_streams_max_latency(dcc, agent);
     if (agent->mjpeg_encoder) {
         mjpeg_encoder_destroy(agent->mjpeg_encoder);
diff --git a/server/stream.h b/server/stream.h
index efe7ceb..7c589e4 100644
--- a/server/stream.h
+++ b/server/stream.h
@@ -152,8 +152,7 @@ void                  stream_maintenance                            (DisplayChan
 void                  stream_agent_unref                            (DisplayChannel *display,
                                                                      StreamAgent *agent);
 void                  stream_agent_stats_print                      (StreamAgent *agent);
-void                  stream_agent_stop                             (DisplayChannelClient *dcc,
-                                                                     StreamAgent *agent);
+void                  stream_agent_stop                             (StreamAgent *agent);
 
 void detach_stream(DisplayChannel *display, Stream *stream, int detach_sized);
 
-- 
2.5.0

_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel