[Spice-devel] [PATCH 3/3] stream: remove red_stream_ prefix from mjpeg callbacks

[Fabiano Fidêncio]

From: Marc-André Lureau <marcandre.lureau at gmail.com>

Author:    Marc-André Lureau <marcandre.lureau at gmail.com>
---
 server/stream.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/stream.c b/server/stream.c
index bd56601..85136ea 100644
--- a/server/stream.c
+++ b/server/stream.c
@@ -643,7 +643,7 @@ static uint64_t get_initial_bit_rate(DisplayChannelClient *dcc, Stream *stream)
             stream->width * stream->height) / DCC_TO_DC(dcc)->streams_size_total;
 }
 
-static uint32_t red_stream_mjpeg_encoder_get_roundtrip(void *opaque)
+static uint32_t get_roundtrip_ms(void *opaque)
 {
     StreamAgent *agent = opaque;
     int roundtrip;
@@ -663,14 +663,14 @@ static uint32_t red_stream_mjpeg_encoder_get_roundtrip(void *opaque)
     return roundtrip;
 }
 
-static uint32_t red_stream_mjpeg_encoder_get_source_fps(void *opaque)
+static uint32_t get_source_fps(void *opaque)
 {
     StreamAgent *agent = opaque;
 
     return agent->stream->input_fps;
 }
 
-static void red_stream_update_client_playback_latency(void *opaque, uint32_t delay_ms)
+static void update_client_playback_delay(void *opaque, uint32_t delay_ms)
 {
     StreamAgent *agent = opaque;
     DisplayChannelClient *dcc = agent->dcc;
@@ -707,9 +707,9 @@ void dcc_create_stream(DisplayChannelClient *dcc, Stream *stream)
         MJpegEncoderRateControlCbs mjpeg_cbs;
         uint64_t initial_bit_rate;
 
-        mjpeg_cbs.get_roundtrip_ms = red_stream_mjpeg_encoder_get_roundtrip;
-        mjpeg_cbs.get_source_fps = red_stream_mjpeg_encoder_get_source_fps;
-        mjpeg_cbs.update_client_playback_delay = red_stream_update_client_playback_latency;
+        mjpeg_cbs.get_roundtrip_ms = get_roundtrip_ms;
+        mjpeg_cbs.get_source_fps = get_source_fps;
+        mjpeg_cbs.update_client_playback_delay = update_client_playback_delay;
 
         initial_bit_rate = get_initial_bit_rate(dcc, stream);
         agent->mjpeg_encoder = mjpeg_encoder_new(initial_bit_rate, &mjpeg_cbs, agent);
-- 
2.5.0