path: root/sub/osd_dummy.c
diff options
authorwm4 <wm4@nowhere>2016-03-07 22:20:51 +0100
committerwm4 <wm4@nowhere>2016-03-07 22:22:18 +0100
commit5fa45fb5641c95a5dc65faac2087d842333b5425 (patch)
tree0807f5cff191b18427b36ebf5d30de25620ae033 /sub/osd_dummy.c
parentb7617f42d873adceebd3904d906e4eff818240ed (diff)
osd, lua: remove weird OSD scaling
Do not scale OSD mouse input to the ASS OSD script resolution. The original idea of this mechanism was that the user doesn't have to care about the actual resolution of anything, and can just use the OSD resolution consistently. But this made things worse. Remove the implicit scaling, and always use the screen resolution. (Except with --vo=xv, where additional scaling is forced upon everything.) Drop get_osd_resolution(). There is no replacement. Rename get_screen_size() and get_screen_margins() to use "osd" instead of "screen". For anything but --vo=xv these are equivalent, but with --vo=xv the OSD resolution has additional implicit scaling. Add code to osc.lua which emulates the old behavior. Note that none of the changed functions were public API, so implicit breakage of scripts which used it is just going to happen.
Diffstat (limited to 'sub/osd_dummy.c')
1 files changed, 0 insertions, 7 deletions
diff --git a/sub/osd_dummy.c b/sub/osd_dummy.c
index 5c50569dd6..1982870248 100644
--- a/sub/osd_dummy.c
+++ b/sub/osd_dummy.c
@@ -26,10 +26,3 @@ void osd_object_get_bitmaps(struct osd_state *osd, struct osd_object *obj,
*out_imgs = (struct sub_bitmaps) {0};
-void osd_object_get_resolution(struct osd_state *osd, int obj,
- int *out_w, int *out_h)
- *out_w = 0;
- *out_h = 0;