brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

screen-cast-monitor-stream: Don't pass monitor manager when creating

Browse Source 
It can be fetched indirectly from the monitor already.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/357
This commit is contained in:
Jonas Ådahl 2018-12-12 11:32:11 +01:00
parent 50071303af
commit 08229a6f5d
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/backends/meta-screen-cast-monitor-stream.c
View File

@ -105,12 +105,13 @@ meta_screen_cast_monitor_stream_get_monitor (MetaScreenCastMonitorStream *monito
} }
MetaScreenCastMonitorStream * MetaScreenCastMonitorStream *
meta_screen_cast_monitor_stream_new (GDBusConnection *connection, meta_screen_cast_monitor_stream_new (GDBusConnection *connection,
MetaMonitorManager *monitor_manager, MetaMonitor *monitor,
MetaMonitor *monitor, ClutterStage *stage,
ClutterStage *stage, GError **error)
GError **error)
{ {
MetaGpu *gpu = meta_monitor_get_gpu (monitor);
MetaMonitorManager *monitor_manager = meta_gpu_get_monitor_manager (gpu);
MetaScreenCastMonitorStream *monitor_stream; MetaScreenCastMonitorStream *monitor_stream;
if (!meta_monitor_is_active (monitor)) if (!meta_monitor_is_active (monitor))

9
src/backends/meta-screen-cast-monitor-stream.h
View File

@ -34,11 +34,10 @@ G_DECLARE_FINAL_TYPE (MetaScreenCastMonitorStream,
META, SCREEN_CAST_MONITOR_STREAM, META, SCREEN_CAST_MONITOR_STREAM,
MetaScreenCastStream) MetaScreenCastStream)
MetaScreenCastMonitorStream * meta_screen_cast_monitor_stream_new (GDBusConnection *connection, MetaScreenCastMonitorStream * meta_screen_cast_monitor_stream_new (GDBusConnection *connection,
MetaMonitorManager *monitor_manager, MetaMonitor *monitor,
MetaMonitor *monitor, ClutterStage *stage,
ClutterStage *stage, GError **error);
GError **error);
ClutterStage * meta_screen_cast_monitor_stream_get_stage (MetaScreenCastMonitorStream *monitor_stream); ClutterStage * meta_screen_cast_monitor_stream_get_stage (MetaScreenCastMonitorStream *monitor_stream);

1
src/backends/meta-screen-cast-session.c
View File

@ -301,7 +301,6 @@ handle_record_monitor (MetaDBusScreenCastSession *skeleton,
stage = CLUTTER_STAGE (meta_backend_get_stage (backend)); stage = CLUTTER_STAGE (meta_backend_get_stage (backend));
monitor_stream = meta_screen_cast_monitor_stream_new (connection, monitor_stream = meta_screen_cast_monitor_stream_new (connection,
monitor_manager,
monitor, monitor,
stage, stage,
&error); &error);