js: use osd-dimentions for mp.get_osd_{size,margins}

This matches lua's 11b9315b but with the lagacy field names which the
js code used previously.

Currently the property always returns an object (with dummy/last/null
field values if there are no dimensions), but the code is ready for
a future case where it might return null if there are no dimensions - at
which case it will forward the null, breaking backward compatibility for
a better API.

1 files changed, 7 insertions, 4 deletions

diff --git a/player/javascript/defaults.js b/player/javascript/defaults.js
index 18edab35b7..0a1c99bcef 100644
--- a/player/javascript/defaults.js
+++ b/player/javascript/defaults.js
@@ -238,11 +238,14 @@ mp.set_osd_ass = function set_osd_ass(res_x, res_y, data) {
     return mp._legacy_overlay.update();
 }
 
+// the following return undefined on error, null passthrough, or legacy object
 mp.get_osd_size = function get_osd_size() {
-    var w = mp.get_property_number("osd-width", 0),
-        h = mp.get_property_number("osd-height", 0),
-        par = mp.get_property_number("osd-par", 0);
-    return {width: w, height: h, aspect: w / (h || 1) / (par || 1)};
+    var d = mp.get_property_native("osd-dimensions");
+    return d && {width: d.w, height: d.h, aspect: d.aspect};
+}
+mp.get_osd_margins = function get_osd_margins() {
+    var d = mp.get_property_native("osd-dimensions");
+    return d && {left: d.ml, right: d.mr, top: d.mt, bottom: d.mb};
 }
 
 /**********************************************************************