small change for #655
This commit is contained in:
hama3254 2023-01-10 17:04:41 +01:00
parent bc5d9aac10
commit 848879aee5
4 changed files with 24 additions and 16 deletions

Binary file not shown.

View File

@ -113,7 +113,7 @@ Public Class Main
Public ResoSave As String = "6666x6666" Public ResoSave As String = "6666x6666"
Public ResoFunBackup As String = "6666x6666" Public ResoFunBackup As String = "6666x6666"
Public SubSprache As NameValuePair Public SubSprache As NameValuePair = New NameValuePair("[ null ]", "", Nothing)
Public SubSpracheEnum As New List(Of NameValuePair) Public SubSpracheEnum As New List(Of NameValuePair)
Public SoftSubs As New List(Of String) Public SoftSubs As New List(Of String)
Public IncludeLangName As Boolean = False Public IncludeLangName As Boolean = False
@ -510,7 +510,6 @@ Public Class Main
LeadingZero = My.Settings.LeadingZero LeadingZero = My.Settings.LeadingZero
SubSprache = SubSpracheEnum(0)
For i As Integer = 0 To SubSpracheEnum.Count - 1 For i As Integer = 0 To SubSpracheEnum.Count - 1
If SubSpracheEnum(i).CR_Value = My.Settings.Subtitle Then If SubSpracheEnum(i).CR_Value = My.Settings.Subtitle Then
@ -520,6 +519,10 @@ Public Class Main
End If End If
Next Next
'If My.Settings.Subtitle = Nothing Then
' SubSprache = SubSpracheEnum(0)
'End If
Funimation_Bitrate = My.Settings.Funimation_Bitrate Funimation_Bitrate = My.Settings.Funimation_Bitrate
@ -4232,7 +4235,7 @@ Public Class Main
Sub FillArray() ' Sub FillArray() '
SubSpracheEnum.Add(New NameValuePair("[ null ]", Nothing, Nothing)) SubSpracheEnum.Add(New NameValuePair("[ null ]", "", Nothing))
SubSpracheEnum.Add(New NameValuePair("Deutsch", "de-DE", Nothing)) SubSpracheEnum.Add(New NameValuePair("Deutsch", "de-DE", Nothing))
SubSpracheEnum.Add(New NameValuePair("English", "en-US", "en")) SubSpracheEnum.Add(New NameValuePair("English", "en-US", "en"))
SubSpracheEnum.Add(New NameValuePair("Português (Brasil)", "pt-BR", "pt")) SubSpracheEnum.Add(New NameValuePair("Português (Brasil)", "pt-BR", "pt"))

View File

@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.12.2")> <Assembly: AssemblyVersion("3.13")>
<Assembly: AssemblyFileVersion("3.12.2")> <Assembly: AssemblyFileVersion("3.13")>
<Assembly: NeutralResourcesLanguage("en")> <Assembly: NeutralResourcesLanguage("en")>

View File

@ -204,9 +204,9 @@ Public Class Einstellungen
AAuto.Checked = True AAuto.Checked = True
End If End If
Try
CB_CR_Harsubs.Items.Clear() CB_CR_Harsubs.Items.Clear()
For i As Integer = 0 To Main.SubSpracheEnum.Count - 1 For i As Integer = 0 To Main.SubSpracheEnum.Count - 1
CB_CR_Harsubs.Items.Add(Main.SubSpracheEnum(i).Name) CB_CR_Harsubs.Items.Add(Main.SubSpracheEnum(i).Name)
If Main.SubSpracheEnum(i).CR_Value = Main.SubSprache.CR_Value Then If Main.SubSpracheEnum(i).CR_Value = Main.SubSprache.CR_Value Then
@ -217,13 +217,16 @@ Public Class Einstellungen
End If End If
Next Next
Catch ex As Exception
MsgBox(ex.ToString)
End Try
DD_Season_Prefix.Text = Main.Season_Prefix DD_Season_Prefix.Text = Main.Season_Prefix
DD_Episode_Prefix.Text = Main.Episode_Prefix DD_Episode_Prefix.Text = Main.Episode_Prefix
NumericUpDown2.Value = Main.ErrorTolerance NumericUpDown2.Value = Main.ErrorTolerance
NumericUpDown1.Value = Main.MaxDL NumericUpDown1.Value = Main.MaxDL
TextBox1.Text = Main.Startseite TextBox1.Text = Main.Startseite
@ -257,6 +260,7 @@ Public Class Einstellungen
FFMPEG_CommandP4.Text = "-c:a copy -bsf:a aac_adtstoasc" FFMPEG_CommandP4.Text = "-c:a copy -bsf:a aac_adtstoasc"
End If End If
If FFMPEG_CommandP1.Text = "-c:v libsvtav1" And FFMPEG_CommandP2.Text = "[no Preset]" Then If FFMPEG_CommandP1.Text = "-c:v libsvtav1" And FFMPEG_CommandP2.Text = "[no Preset]" Then
FFMPEG_CommandP2.Enabled = False FFMPEG_CommandP2.Enabled = False
FFMPEG_CommandP3.Enabled = True FFMPEG_CommandP3.Enabled = True
@ -461,6 +465,7 @@ Public Class Einstellungen
Next Next
If CR_SoftSubDefault.SelectedItem.ToString = "English" Then If CR_SoftSubDefault.SelectedItem.ToString = "English" Then
Main.DefaultSubCR = "en-US" Main.DefaultSubCR = "en-US"
My.Settings.DefaultSubCR = Main.DefaultSubCR My.Settings.DefaultSubCR = Main.DefaultSubCR