From: Victor Toso <me@xxxxxxxxxxxxxx> This reverts commit 00f56647a97a95342f235ef6d107ac8216aa9e49. As this take no consideration to multiple streams. Signed-off-by: Victor Toso <victortoso@xxxxxxxxxx> --- src/channel-display.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/src/channel-display.c b/src/channel-display.c index f30c7ed..7a5a23b 100644 --- a/src/channel-display.c +++ b/src/channel-display.c @@ -70,7 +70,6 @@ struct _SpiceDisplayChannelPrivate { GArray *monitors; guint monitors_max; gboolean enable_adaptive_streaming; - SpiceVideoCodecType stream_video_codec_type; #ifdef G_OS_WIN32 HDC dc; #endif @@ -87,7 +86,6 @@ enum { PROP_MONITORS, PROP_MONITORS_MAX, PROP_GL_SCANOUT, - PROP_STREAM_VIDEO_CODEC_TYPE, }; enum { @@ -224,10 +222,6 @@ static void spice_display_get_property(GObject *object, g_value_set_static_boxed(value, spice_display_get_gl_scanout(channel)); break; } - case PROP_STREAM_VIDEO_CODEC_TYPE: { - g_value_set_int(value, c->stream_video_codec_type); - break; - } default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; @@ -341,23 +335,6 @@ static void spice_display_channel_class_init(SpiceDisplayChannelClass *klass) G_PARAM_STATIC_STRINGS)); /** - * SpiceDisplayChannel:stream-video-codec-type - * - * The SpiceVideoCodecType enum value for the video-codec being used in the - * current stream or 0 when there is no ongoing streaming. - * - * Since: 0.34 - */ - g_object_class_install_property - (gobject_class, PROP_STREAM_VIDEO_CODEC_TYPE, - g_param_spec_int("stream-video-codec-type", - "Stream Video Codec Type", - "The Video Codec Type from current Stream", - 0, SPICE_VIDEO_CODEC_TYPE_ENUM_END, 0, - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS)); - - /** * SpiceDisplayChannel::display-primary-create: * @display: the #SpiceDisplayChannel that emitted the signal * @format: %SPICE_SURFACE_FMT_32_xRGB or %SPICE_SURFACE_FMT_16_555; @@ -1241,10 +1218,6 @@ static void display_handle_stream_create(SpiceChannel *channel, SpiceMsgIn *in) spice_printerr("could not create a video decoder for codec %u", op->codec_type); destroy_stream(channel, op->id); report_invalid_stream(channel, op->id); - } else { - spice_debug("New stream created of type: %u", op->codec_type); - c->stream_video_codec_type = op->codec_type; - g_coroutine_object_notify(G_OBJECT(channel), "stream-video-codec-type"); } } @@ -1594,8 +1567,6 @@ static void destroy_stream(SpiceChannel *channel, int id) g_free(st); c->streams[id] = NULL; - c->stream_video_codec_type = 0; - g_coroutine_object_notify(G_OBJECT(channel), "stream-video-codec-type"); } static void clear_streams(SpiceChannel *channel) -- 2.9.3 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel