Commit ccced506 authored by Jasper St. Pierre's avatar Jasper St. Pierre

Rename monitor => meta-monitor-manager

parent 28b9160c
......@@ -141,10 +141,10 @@ libmutter_wayland_la_SOURCES = \
core/meta-idle-monitor-native.c \
core/meta-idle-monitor-native.h \
core/meta-xrandr-shared.h \
core/monitor.c \
core/monitor-private.h \
core/meta-monitor-config.c \
core/meta-monitor-config.h \
core/meta-monitor-manager.c \
core/meta-monitor-manager.h \
core/meta-monitor-manager-dummy.c \
core/meta-monitor-manager-dummy.h \
core/meta-monitor-manager-kms.c \
......
......@@ -40,7 +40,7 @@
#include "compositor-private.h"
#include "meta-window-actor-private.h"
#include "monitor-private.h"
#include "meta-monitor-manager.h"
G_DEFINE_ABSTRACT_TYPE (MetaPlugin, meta_plugin, G_TYPE_OBJECT);
......
......@@ -27,7 +27,7 @@
#include "meta-window-actor-private.h"
#include "meta-texture-rectangle.h"
#include "region-utils.h"
#include "monitor-private.h"
#include "meta-monitor-manager.h"
#include "meta-cullable.h"
#include "meta-surface-actor.h"
......
......@@ -44,7 +44,7 @@
#include "meta-cursor-private.h"
#include "meta-cursor-tracker-private.h"
#include "screen-private.h"
#include "monitor-private.h"
#include "meta-monitor-manager.h"
#include "wayland/meta-wayland-private.h"
......
......@@ -42,7 +42,6 @@
#include <meta/main.h>
#include <meta/errors.h>
#include "monitor-private.h"
/* These structures represent the intended/persistent configuration,
as stored in the monitors.xml file.
......
......@@ -23,7 +23,7 @@
#ifndef META_MONITOR_CONFIG_H
#define META_MONITOR_CONFIG_H
#include "monitor-private.h"
#include "meta-monitor-manager.h"
#define META_TYPE_MONITOR_CONFIG (meta_monitor_config_get_type ())
#define META_MONITOR_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_CONFIG, MetaMonitorConfig))
......
......@@ -23,7 +23,7 @@
#ifndef META_MONITOR_MANAGER_DUMMY_H
#define META_MONITOR_MANAGER_DUMMY_H
#include "monitor-private.h"
#include "meta-monitor-manager.h"
#define META_TYPE_MONITOR_MANAGER_DUMMY (meta_monitor_manager_dummy_get_type ())
#define META_MONITOR_MANAGER_DUMMY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_DUMMY, MetaMonitorManagerDummy))
......
......@@ -23,7 +23,7 @@
#ifndef META_MONITOR_MANAGER_KMS_H
#define META_MONITOR_MANAGER_KMS_H
#include "monitor-private.h"
#include "meta-monitor-manager.h"
#define META_TYPE_MONITOR_MANAGER_KMS (meta_monitor_manager_kms_get_type ())
#define META_MONITOR_MANAGER_KMS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_KMS, MetaMonitorManagerKms))
......
......@@ -23,7 +23,7 @@
#ifndef META_MONITOR_MANAGER_XRANDR_H
#define META_MONITOR_MANAGER_XRANDR_H
#include "monitor-private.h"
#include "meta-monitor-manager.h"
#define META_TYPE_MONITOR_MANAGER_XRANDR (meta_monitor_manager_xrandr_get_type ())
#define META_MONITOR_MANAGER_XRANDR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_XRANDR, MetaMonitorManagerXrandr))
......
......@@ -25,6 +25,8 @@
#include "config.h"
#include "meta-monitor-manager.h"
#include <string.h>
#include <math.h>
#include <stdlib.h>
......@@ -33,7 +35,6 @@
#include <meta/main.h>
#include "util-private.h"
#include <meta/errors.h>
#include "monitor-private.h"
#include "meta-monitor-config.h"
#include "meta-monitor-manager-kms.h"
#include "meta-monitor-manager-xrandr.h"
......
......@@ -227,8 +227,6 @@ struct _MetaMonitorManager
CRTCs refer to stuff that can drive outputs
(like encoders, but less tied to the HW),
while monitor_infos refer to logical ones.
See also the comment in monitor-private.h
*/
MetaOutput *outputs;
unsigned int n_outputs;
......
......@@ -36,7 +36,7 @@
#include <X11/Xutil.h>
#include "stack-tracker.h"
#include "ui.h"
#include "monitor-private.h"
#include "meta-monitor-manager.h"
typedef void (* MetaScreenWindowFunc) (MetaScreen *screen, MetaWindow *window,
gpointer user_data);
......
......@@ -55,7 +55,6 @@
#include <meta/types.h>
#include <meta/main.h>
#include "frame.h"
#include "monitor-private.h"
#include "meta-surface-actor.h"
#include "meta-surface-actor-wayland.h"
......
......@@ -52,7 +52,7 @@
#include <meta/main.h>
#include "frame.h"
#include "meta-weston-launch.h"
#include "monitor-private.h"
#include "meta-monitor-manager.h"
static MetaWaylandCompositor _meta_wayland_compositor;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment