From d04b2249f0dd591e00e1d034a64d9b7a713bc7c0 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Wed, 7 Feb 2024 16:07:59 +0300 Subject: [PATCH] enable metadata by default --- .../java/ru/vtosters/lite/music/converter/ts/FFMpeg.java | 7 ++----- smali/res/xml/preferences_media.xml | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/music/converter/ts/FFMpeg.java b/app/src/main/java/ru/vtosters/lite/music/converter/ts/FFMpeg.java index dff3229e6..324227dfe 100644 --- a/app/src/main/java/ru/vtosters/lite/music/converter/ts/FFMpeg.java +++ b/app/src/main/java/ru/vtosters/lite/music/converter/ts/FFMpeg.java @@ -32,14 +32,11 @@ public class FFMpeg { } private static String setMetadata(MusicTrack track) { - if (!Preferences.getBoolValue("setMetaData", false)) { - return ""; - } - return " -metadata title=\"" + IOUtils.getValidFileName(M3UDownloader.getTitle(track)) + '"' + return Preferences.getBoolValue("setMetaData", true) ? " -metadata title=\"" + IOUtils.getValidFileName(M3UDownloader.getTitle(track)) + '"' + (track.L == null || track.I == null ? " -metadata artist=\"" + normalizeMetadata(track.C) + '"' : " -metadata artist=\"" + normalizeMetadata(track.L.stream().map(Artist::w1).collect(Collectors.joining(", "))) + '"' - + " -metadata album=\"" + normalizeMetadata(track.I.getTitle()) + '"'); + + " -metadata album=\"" + normalizeMetadata(track.I.getTitle()) + '"') : ""; } private static String normalizeMetadata(String in) { diff --git a/smali/res/xml/preferences_media.xml b/smali/res/xml/preferences_media.xml index 64dafc110..738dcd4a3 100644 --- a/smali/res/xml/preferences_media.xml +++ b/smali/res/xml/preferences_media.xml @@ -51,9 +51,9 @@ android:key="musicdefcatalog" android:title="@string/musicdefcatalog_title"/>