[mutter] screen-cast-src: Move back MetaSpaType to C file
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] screen-cast-src: Move back MetaSpaType to C file
- Date: Tue, 26 Feb 2019 13:51:48 +0000 (UTC)
commit 183de60d91f1fa3539bc394722e35604ff881dfd
Author: Jonas Ådahl <jadahl gmail com>
Date: Thu Jan 24 19:00:24 2019 +0100
screen-cast-src: Move back MetaSpaType to C file
It's not needed by the monitor source anymore.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/413
src/backends/meta-screen-cast-stream-src.c | 18 +++++++++---------
src/backends/meta-screen-cast-stream-src.h | 11 -----------
2 files changed, 9 insertions(+), 20 deletions(-)
---
diff --git a/src/backends/meta-screen-cast-stream-src.c b/src/backends/meta-screen-cast-stream-src.c
index a9097ff02..3fc6084af 100644
--- a/src/backends/meta-screen-cast-stream-src.c
+++ b/src/backends/meta-screen-cast-stream-src.c
@@ -62,6 +62,15 @@ enum
static guint signals[N_SIGNALS];
+typedef struct _MetaSpaType
+{
+ struct spa_type_media_type media_type;
+ struct spa_type_media_subtype media_subtype;
+ struct spa_type_format_video format_video;
+ struct spa_type_video_format video_format;
+ uint32_t meta_cursor;
+} MetaSpaType;
+
typedef struct _MetaPipeWireSource
{
GSource base;
@@ -151,15 +160,6 @@ meta_screen_cast_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc *src,
klass->set_cursor_metadata (src, spa_meta_cursor);
}
-MetaSpaType *
-meta_screen_cast_stream_src_get_spa_type (MetaScreenCastStreamSrc *src)
-{
- MetaScreenCastStreamSrcPrivate *priv =
- meta_screen_cast_stream_src_get_instance_private (src);
-
- return &priv->spa_type;
-}
-
static gboolean
draw_cursor_sprite_via_offscreen (MetaScreenCastStreamSrc *src,
CoglTexture *cursor_texture,
diff --git a/src/backends/meta-screen-cast-stream-src.h b/src/backends/meta-screen-cast-stream-src.h
index 108582893..3f8c6fa27 100644
--- a/src/backends/meta-screen-cast-stream-src.h
+++ b/src/backends/meta-screen-cast-stream-src.h
@@ -35,15 +35,6 @@
#include "cogl/cogl.h"
#include "meta/boxes.h"
-typedef struct _MetaSpaType
-{
- struct spa_type_media_type media_type;
- struct spa_type_media_subtype media_subtype;
- struct spa_type_format_video format_video;
- struct spa_type_video_format video_format;
- uint32_t meta_cursor;
-} MetaSpaType;
-
typedef struct _MetaScreenCastStream MetaScreenCastStream;
#define META_TYPE_SCREEN_CAST_STREAM_SRC (meta_screen_cast_stream_src_get_type ())
@@ -74,8 +65,6 @@ void meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *sr
MetaScreenCastStream * meta_screen_cast_stream_src_get_stream (MetaScreenCastStreamSrc *src);
-MetaSpaType * meta_screen_cast_stream_src_get_spa_type (MetaScreenCastStreamSrc *src);
-
void meta_screen_cast_stream_src_unset_cursor_metadata (MetaScreenCastStreamSrc *src,
struct spa_meta_cursor *spa_meta_cursor);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]