Commit 39c3f27b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

quartz: remove unused XML validator

parent 65b041af
...@@ -794,7 +794,6 @@ static int RenderHtml(filter_t *p_filter, subpicture_region_t *p_region_out, ...@@ -794,7 +794,6 @@ static int RenderHtml(filter_t *p_filter, subpicture_region_t *p_region_out,
{ {
int rv = VLC_SUCCESS; int rv = VLC_SUCCESS;
stream_t *p_sub = NULL; stream_t *p_sub = NULL;
xml_t *p_xml = NULL;
xml_reader_t *p_xml_reader = NULL; xml_reader_t *p_xml_reader = NULL;
VLC_UNUSED(p_chroma_list); VLC_UNUSED(p_chroma_list);
...@@ -809,56 +808,51 @@ static int RenderHtml(filter_t *p_filter, subpicture_region_t *p_region_out, ...@@ -809,56 +808,51 @@ static int RenderHtml(filter_t *p_filter, subpicture_region_t *p_region_out,
strlen(p_region_in->psz_html), strlen(p_region_in->psz_html),
true); true);
if (p_sub) { if (p_sub) {
p_xml = xml_Create(p_filter); p_xml_reader = xml_ReaderCreate(p_filter, p_sub);
if (p_xml) { if (p_xml_reader) {
p_xml_reader = xml_ReaderCreate(p_xml, p_sub); /* Look for Root Node */
if (p_xml_reader) { const char *name;
/* Look for Root Node */ if (xml_ReaderNextNode(p_xml_reader, &name)
const char *name; == XML_READER_STARTELEM) {
if (xml_ReaderNextNode(p_xml_reader, &name) if (!strcasecmp("karaoke", name)) {
== XML_READER_STARTELEM) { /* We're going to have to render the text a number
if (!strcasecmp("karaoke", name)) { * of times to show the progress marker on the text. */
/* We're going to have to render the text a number var_SetBool(p_filter, "text-rerender", true);
* of times to show the progress marker on the text. } else if (strcasecmp("text", name)) {
*/ /* Only text and karaoke tags are supported */
var_SetBool(p_filter, "text-rerender", true); msg_Dbg(p_filter, "Unsupported top-level tag "
} else if (strcasecmp("text", name)) { "<%s> ignored.", name);
/* Only text and karaoke tags are supported */
msg_Dbg(p_filter, "Unsupported top-level tag "
"<%s> ignored.", name);
rv = VLC_EGENERIC;
}
} else {
msg_Err(p_filter, "Malformed HTML subtitle");
rv = VLC_EGENERIC; rv = VLC_EGENERIC;
} }
} else {
msg_Err(p_filter, "Malformed HTML subtitle");
rv = VLC_EGENERIC;
}
if (rv != VLC_SUCCESS) { if (rv != VLC_SUCCESS) {
xml_ReaderDelete(p_xml_reader); xml_ReaderDelete(p_xml_reader);
p_xml_reader = NULL; p_xml_reader = NULL;
}
} }
}
if (p_xml_reader) { if (p_xml_reader) {
int i_len; int i_len;
CFMutableAttributedStringRef p_attrString = CFAttributedStringCreateMutable(kCFAllocatorDefault, 0); CFMutableAttributedStringRef p_attrString = CFAttributedStringCreateMutable(kCFAllocatorDefault, 0);
rv = ProcessNodes(p_filter, p_xml_reader, rv = ProcessNodes(p_filter, p_xml_reader,
p_region_in->p_style, p_attrString); p_region_in->p_style, p_attrString);
i_len = CFAttributedStringGetLength(p_attrString); i_len = CFAttributedStringGetLength(p_attrString);
p_region_out->i_x = p_region_in->i_x; p_region_out->i_x = p_region_in->i_x;
p_region_out->i_y = p_region_in->i_y; p_region_out->i_y = p_region_in->i_y;
if ((rv == VLC_SUCCESS) && (i_len > 0)) if ((rv == VLC_SUCCESS) && (i_len > 0))
RenderYUVA(p_filter, p_region_out, p_attrString); RenderYUVA(p_filter, p_region_out, p_attrString);
CFRelease(p_attrString); CFRelease(p_attrString);
xml_ReaderDelete(p_xml_reader); xml_ReaderDelete(p_xml_reader);
}
xml_Delete(p_xml);
} }
stream_Delete(p_sub); stream_Delete(p_sub);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment