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

monitor-manager: Move default get_edid_file / read_edid to base class

Browse Source 
These are also used by the native manager.
This commit is contained in:
Jasper St. Pierre 2014-04-01 10:24:10 -04:00
parent f1c7063ee7
commit 899d4d8477
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backends/meta-monitor-manager-dummy.c
View File

@ -212,20 +212,6 @@ meta_monitor_manager_dummy_apply_config (MetaMonitorManager *manager,
meta_monitor_manager_rebuild_derived (manager); meta_monitor_manager_rebuild_derived (manager);
} }
static GBytes *
meta_monitor_manager_dummy_read_edid (MetaMonitorManager *manager,
MetaOutput *output)
{
return NULL;
}
static char *
meta_monitor_manager_dummy_get_edid_file (MetaMonitorManager *manager,
MetaOutput *output)
{
return NULL;
}
static void static void
meta_monitor_manager_dummy_class_init (MetaMonitorManagerDummyClass *klass) meta_monitor_manager_dummy_class_init (MetaMonitorManagerDummyClass *klass)
{ {
@ -233,8 +219,6 @@ meta_monitor_manager_dummy_class_init (MetaMonitorManagerDummyClass *klass)
manager_class->read_current = meta_monitor_manager_dummy_read_current; manager_class->read_current = meta_monitor_manager_dummy_read_current;
manager_class->apply_configuration = meta_monitor_manager_dummy_apply_config; manager_class->apply_configuration = meta_monitor_manager_dummy_apply_config;
manager_class->get_edid_file = meta_monitor_manager_dummy_get_edid_file;
manager_class->read_edid = meta_monitor_manager_dummy_read_edid;
} }
static void static void

17
src/backends/meta-monitor-manager.c
View File

@ -389,6 +389,20 @@ meta_monitor_manager_get_property (GObject *object,
} }
} }
static GBytes *
meta_monitor_manager_real_read_edid (MetaMonitorManager *manager,
MetaOutput *output)
{
return NULL;
}
static char *
meta_monitor_manager_real_get_edid_file (MetaMonitorManager *manager,
MetaOutput *output)
{
return NULL;
}
static void static void
meta_monitor_manager_class_init (MetaMonitorManagerClass *klass) meta_monitor_manager_class_init (MetaMonitorManagerClass *klass)
{ {
@ -400,6 +414,9 @@ meta_monitor_manager_class_init (MetaMonitorManagerClass *klass)
object_class->dispose = meta_monitor_manager_dispose; object_class->dispose = meta_monitor_manager_dispose;
object_class->finalize = meta_monitor_manager_finalize; object_class->finalize = meta_monitor_manager_finalize;
klass->get_edid_file = meta_monitor_manager_real_get_edid_file;
klass->read_edid = meta_monitor_manager_real_read_edid;
signals[CONFIRM_DISPLAY_CHANGE] = signals[CONFIRM_DISPLAY_CHANGE] =
g_signal_new ("confirm-display-change", g_signal_new ("confirm-display-change",
G_TYPE_FROM_CLASS (object_class), G_TYPE_FROM_CLASS (object_class),