Mercurial > mplayer.hg

changeset 22273:13a3013f3a27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Any style modifier followed by no recognizable parameter resets to the default.
author eugeni
date Tue, 20 Feb 2007 17:17:51 +0000
parents 3d5a5178fc9c
children 7cb8c95727ab
files libass/ass_render.c
diffstat 1 files changed, 17 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libass/ass_render.c	Tue Feb 20 17:11:56 2007 +0000
+++ b/libass/ass_render.c	Tue Feb 20 17:17:51 2007 +0000
@@ -774,19 +774,25 @@
 		render_context.evt_type = EVENT_POSITIONED;
 	} else if (mystrcmp(&p, "frx")) {
 		double val;
-		mystrtod(&p, &val);
+		if (mystrtod(&p, &val)) {
 		val *= M_PI / 180;
 		render_context.frx = val * pwr + render_context.frx * (1-pwr);
+		} else
+			render_context.frx = 0.;
 	} else if (mystrcmp(&p, "fry")) {
 		double val;
-		mystrtod(&p, &val);
+		if (mystrtod(&p, &val)) {
 		val *= M_PI / 180;
 		render_context.fry = val * pwr + render_context.fry * (1-pwr);
+		} else
+			render_context.fry = 0.;
 	} else if (mystrcmp(&p, "frz") || mystrcmp(&p, "fr")) {
 		double val;
-		mystrtod(&p, &val);
+		if (mystrtod(&p, &val)) {
 		val *= M_PI / 180;
 		render_context.frz = val * pwr + render_context.frz * (1-pwr);
+		} else
+			render_context.frz = M_PI * render_context.style->Angle / 180.;
 	} else if (mystrcmp(&p, "fn")) {
 		char* start = p;
 		char* family;
@@ -816,7 +822,8 @@
 		}
 		// FIXME: simplify
 	} else if (mystrcmp(&p, "an")) {
-		int val = strtol(p, &p, 10);
+		int val;
+		if (mystrtoi(&p, 10, &val) && val) {
 		int v = (val - 1) / 3; // 0, 1 or 2 for vertical alignment
 		mp_msg(MSGT_ASS, MSGL_DBG2, "an %d\n", val);
 		if (v != 0) v = 3 - v;
@@ -824,9 +831,14 @@
 		val += v*4;
 		mp_msg(MSGT_ASS, MSGL_DBG2, "align %d\n", val);
 		render_context.alignment = val;
+		} else
+			render_context.alignment = render_context.style->Alignment;
 	} else if (mystrcmp(&p, "a")) {
 		int val = strtol(p, &p, 10);
+		if (mystrtoi(&p, 10, &val) && val)
 		render_context.alignment = val;
+		else
+			render_context.alignment = render_context.style->Alignment;
 	} else if (mystrcmp(&p, "pos")) {
 		int v1, v2;
 		skip('(');
@@ -1182,7 +1194,7 @@
 	reset_render_context();
 
 	render_context.evt_type = EVENT_NORMAL;
-	render_context.alignment = 0;
+	render_context.alignment = render_context.style->Alignment;
 	render_context.pos_x = 0;
 	render_context.pos_y = 0;
 	render_context.org_x = 0;
@@ -1764,8 +1776,6 @@
 	
 	// alignments
 	alignment = render_context.alignment;
-	if (!alignment)
-		alignment = render_context.style->Alignment;
 	halign = alignment & 3;
 	valign = alignment & 12;