diff --git a/author_menu.go b/author_menu.go index 2d8e3e6..08bcbe4 100644 --- a/author_menu.go +++ b/author_menu.go @@ -415,8 +415,7 @@ func writeSpumuxXML(path, overlayPath, highlightPath, selectPath string, buttons var b strings.Builder b.WriteString("\n") b.WriteString(" \n") - b.WriteString(fmt.Sprintf(" -", + b.WriteString(fmt.Sprintf(" ", escapeXMLAttr(overlayPath), escapeXMLAttr(highlightPath), escapeXMLAttr(selectPath), @@ -475,9 +474,9 @@ func findVTLogoPath() string { } func escapeDrawtextText(text string) string { - escaped := strings.ReplaceAll(text, "\", "\\\\") + escaped := strings.ReplaceAll(text, "\\", "\\\\") escaped = strings.ReplaceAll(escaped, ":", "\\:") - escaped = strings.ReplaceAll(escaped, "'", "\' ") + escaped = strings.ReplaceAll(escaped, "'", "\\'") escaped = strings.ReplaceAll(escaped, "%", "\\%") return escaped } \ No newline at end of file diff --git a/main.go b/main.go index 5413ee5..99b7ec9 100644 --- a/main.go +++ b/main.go @@ -10996,12 +10996,6 @@ func newPlaySession(path string, w, h int, fps, duration float64, targetW, targe unifiedAdapter: unifiedAdapter, } } - if targetW <= 0 { - targetW = 640 - } - if targetH <= 0 { - targetH = int(float64(targetW) * (float64(h) / float64(utils.MaxInt(w, 1)))) - } // Create UnifiedPlayer adapter instead of dual-process player adapter := player.NewUnifiedPlayerAdapter(path, w, h, fps, duration, targetW, targetH, prog, frameFunc, img)