isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 11:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

mir: use output names that are more conformat to the one used by Xmir

Browse Source 
And by X itself...
This commit is contained in:
Marco Trevisan (Treviño) 2014-12-12 18:45:49 +01:00
parent bc83282f4f
commit cd9676380f
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cogl/winsys/cogl-winsys-egl-mir.c
View File

@ -133,35 +133,31 @@ _mir_output_get_name (MirDisplayOutput *output)
switch (output->type) switch (output->type)
{ {
case mir_display_output_type_unknown: case mir_display_output_type_unknown:
return g_strdup_printf ("UNKNOWN-%u", output->output_id); return g_strdup_printf ("None-%u", output->output_id);
case mir_display_output_type_vga: case mir_display_output_type_vga:
return g_strdup_printf ("VGA-%u", output->output_id); return g_strdup_printf ("VGA-%u", output->output_id);
case mir_display_output_type_dvii: case mir_display_output_type_dvii:
return g_strdup_printf ("DVII-%u", output->output_id);
case mir_display_output_type_dvid: case mir_display_output_type_dvid:
return g_strdup_printf ("DVID-%u", output->output_id);
case mir_display_output_type_dvia: case mir_display_output_type_dvia:
return g_strdup_printf ("DVIA-%u", output->output_id); return g_strdup_printf ("DVI-%u", output->output_id);
case mir_display_output_type_composite: case mir_display_output_type_composite:
return g_strdup_printf ("COMPOSITE-%u", output->output_id); return g_strdup_printf ("Composite-%u", output->output_id);
case mir_display_output_type_svideo:
return g_strdup_printf ("SVIDEO-%u", output->output_id);
case mir_display_output_type_lvds: case mir_display_output_type_lvds:
return g_strdup_printf ("LVDS-%u", output->output_id); return g_strdup_printf ("LVDS-%u", output->output_id);
case mir_display_output_type_component: case mir_display_output_type_component:
return g_strdup_printf ("COMPONENT-%u", output->output_id); return g_strdup_printf ("CTV-%u", output->output_id);
case mir_display_output_type_ninepindin: case mir_display_output_type_ninepindin:
return g_strdup_printf ("NINEPINDIN-%u", output->output_id); return g_strdup_printf ("DIN-%u", output->output_id);
case mir_display_output_type_displayport: case mir_display_output_type_displayport:
return g_strdup_printf ("DISPLAYPORT-%u", output->output_id); return g_strdup_printf ("DP-%u", output->output_id);
case mir_display_output_type_hdmia: case mir_display_output_type_hdmia:
return g_strdup_printf ("HDMIA-%u", output->output_id);
case mir_display_output_type_hdmib: case mir_display_output_type_hdmib:
return g_strdup_printf ("HDMIB-%u", output->output_id); return g_strdup_printf ("HDMI-%u", output->output_id);
case mir_display_output_type_svideo:
case mir_display_output_type_tv: case mir_display_output_type_tv:
return g_strdup_printf ("TV-%u", output->output_id); return g_strdup_printf ("TV-%u", output->output_id);
case mir_display_output_type_edp: case mir_display_output_type_edp:
return g_strdup_printf ("EDP-%u", output->output_id); return g_strdup_printf ("eDP-%u", output->output_id);
} }
return NULL; return NULL;