diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo
index 9052868..512ab3b 100644
Binary files a/.vs/Crunchyroll Downloader/v17/.suo and b/.vs/Crunchyroll Downloader/v17/.suo differ
diff --git a/Crunchyroll Downloader/App.config b/Crunchyroll Downloader/App.config
index c0b5867..6c7cc59 100644
--- a/Crunchyroll Downloader/App.config
+++ b/Crunchyroll Downloader/App.config
@@ -156,6 +156,12 @@
0
+
+ False
+
+
+ False
+
diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb
index 4bb7c30..94f49fd 100644
--- a/Crunchyroll Downloader/Main.vb
+++ b/Crunchyroll Downloader/Main.vb
@@ -1394,23 +1394,13 @@ Public Class Main
#Region "VideoJson"
Dim VideoJson As String = Nothing
-
VideoJson = CurlAuth(Streams, Loc_CR_Cookies, Loc_AuthToken)
-
-
- 'VideoJson = Curl(Streams)
-
If CBool(InStr(VideoJson, "curl:")) = True Then
VideoJson = CurlAuth(Streams, Loc_CR_Cookies, Loc_AuthToken)
End If
- 'Dim StreamsUrlBuilder() As String = ObjectJson.Split(New String() {"videos/"}, System.StringSplitOptions.RemoveEmptyEntries)
- 'Dim StreamsUrlBuilder2() As String = StreamsUrlBuilder(1).Split(New String() {"/streams"}, System.StringSplitOptions.RemoveEmptyEntries)
-
-
-
If CBool(InStr(VideoJson, "curl:")) = True Then 'And CBool(InStr(CR_VideoJson.Url, StreamsUrlBuilder2(0))) Then
Debug.WriteLine("curl error, using CR_VideoJson " + vbNewLine + VideoJson)
VideoJson = CR_VideoJson.Content
@@ -1421,18 +1411,68 @@ Public Class Main
' Exit Sub
End If
-
Debug.WriteLine("VideoJson: " + VideoJson)
Debug.WriteLine("VideoStreams: " + Streams)
Dim CR_HardSubLang As String = SubSprache.CR_Value
+ VideoJson = CleanJSON(VideoJson)
+#End Region
+
+#Region "Check for dub override"
+
+ If My.Settings.OverrideDub = True And CBool(InStr(Streams, "/videos/")) Then 'einstellung ein + kein musikvideo oder Konzert
+
+ Dim Meta() As String = VideoJson.Split(New String() {Chr(34) + "meta" + Chr(34) + ":"}, System.StringSplitOptions.RemoveEmptyEntries)
+ Dim Meta2() As String = Meta(1).Split(New String() {Chr(34) + "audio_locale" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+
+ 'MsgBox(DubSprache.CR_Value)
+
+ For i As Integer = 0 To Meta2.Count - 1
+
+ If CBool(InStr(Meta2(i), Chr(34) + "media_guid" + Chr(34) + ":" + Chr(34))) And CBool(InStr(Meta2(i), DubSprache.CR_Value)) Then
+
+ Dim media_guid() As String = Meta2(i).Split(New String() {Chr(34) + "media_guid" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+
+ Dim media_guid2() As String = media_guid(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+
+ If CBool(InStr(Streams, media_guid2(0))) Then
+ MsgBox("done")
+ 'done
+ Exit For
+ Else
+ ' overriding ' https://www.crunchyroll.com/content/v2/cms/videos/GPPFKG08N/streams?locale=de-DE
+
+ Streams = "https://www.crunchyroll.com/content/v2/cms/videos/" + media_guid2(0) + "/streams?locale=" + locale
+
+ 'MsgBox(Streams)
+
+ VideoJson = CurlAuth(Streams, Loc_CR_Cookies, Loc_AuthToken)
+
+ If CBool(InStr(VideoJson, "curl:")) = True Then
+ VideoJson = CurlAuth(Streams, Loc_CR_Cookies, Loc_AuthToken)
+ Else
+ Exit For
+ End If
+
+ If CBool(InStr(VideoJson, "curl:")) = True Then
+ Throw New System.Exception("Error - Getting VideoJson data" + vbNewLine + VideoJson)
+ End If
+
+ End If
+
+ End If
+ Next
+
+
+ End If
+
#End Region
#Region "m3u8 suche"
- VideoJson = CleanJSON(VideoJson)
+
Dim VideoJObject As JObject = JObject.Parse(VideoJson)
Dim VideoData As List(Of JToken) = VideoJObject.Children().ToList
@@ -1528,7 +1568,7 @@ Public Class Main
ResoBackString = Nothing
'MsgBox(CR_Streams.Count.ToString)
For i As Integer = 0 To CR_Streams.Count - 1
- Debug.WriteLine("1484: " + CR_Streams.Item(i).subLang)
+ Debug.WriteLine("1571: " + CR_Streams.Item(i).subLang)
If CR_Streams.Item(i).subLang = CR_HardSubLang Then
CR_URI_Master.Add(CR_Streams.Item(i).Url)
End If
@@ -1924,15 +1964,31 @@ Public Class Main
#Region "GetSoftsubs"
Dim SoftSubsAvailable As New List(Of String)
+ Dim CCAvailable As New List(Of String)
Dim SoftSubsList As New List(Of CR_Subtiles)
- If SoftSubs.Count > 0 Then
+
+
+
+ Dim SplitVideo As String() = VideoJson.Split(New String() {Chr(34) + "closed_captions" + Chr(34) + ":"}, System.StringSplitOptions.RemoveEmptyEntries)
+
+ If SoftSubs.Count > 0 And My.Settings.Captions = True Then
+ For i As Integer = 0 To SoftSubs.Count - 1
+ If CBool(InStr(SplitVideo(1), Chr(34) + "locale" + Chr(34) + ":" + Chr(34) + SoftSubs(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34))) Then
+ CCAvailable.Add(SoftSubs(i))
+ End If
+ Next
+ End If
+
+ If SoftSubs.Count > 0 And CCAvailable.Count = 0 Then
For i As Integer = 0 To SoftSubs.Count - 1
If CBool(InStr(VideoJson, Chr(34) + "locale" + Chr(34) + ":" + Chr(34) + SoftSubs(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34))) Then
SoftSubsAvailable.Add(SoftSubs(i))
End If
Next
+ ElseIf SoftSubs.Count > 0 And CCAvailable.Count > 0 Then
+ SoftSubsAvailable.AddRange(CCAvailable)
End If
@@ -1949,7 +2005,7 @@ Public Class Main
ffmpegInput = "-i " + Chr(34) + Pfad6 + Chr(34) + " " + ffmpegInput + " -map 0 -map 1:a" + " -metadata:s:a:" + FFMPEG_Audio(Pfad6).ToString + " language=" + CCtoMP4CC(CR_audio_locale) + " -c copy"
- ElseIf SoftSubsAvailable.Count > 0 Then
+ ElseIf SoftSubsAvailable.Count > 0 Or CCAvailable.Count > 0 Then
Dim MergeSubsNow As Boolean = MergeSubs
@@ -1961,7 +2017,13 @@ Public Class Main
For i As Integer = 0 To SoftSubsAvailable.Count - 1
- Dim SoftSub As String() = VideoJson.Split(New String() {Chr(34) + "locale" + Chr(34) + ":" + Chr(34) + SoftSubsAvailable(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+ Dim SubsJson As String = VideoJson
+ If CCAvailable.Count > 0 Then
+ SubsJson = SplitVideo(1)
+ End If
+
+
+ Dim SoftSub As String() = SubsJson.Split(New String() {Chr(34) + "locale" + Chr(34) + ":" + Chr(34) + SoftSubsAvailable(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim SoftSub_2 As String() = SoftSub(1).Split(New [Char]() {Chr(34)})
Dim SoftSub_3 As String = SoftSub_2(0).Replace("&", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&")
SoftSubsList.Add(New CR_Subtiles(SoftSubsAvailable(i), HardSubValuesToDisplay(SoftSubsAvailable(i)), " -i " + Chr(34) + SoftSub_3 + Chr(34), i.ToString, SoftSubsAvailable(i) = DefaultSubCR))
@@ -2008,6 +2070,10 @@ Public Class Main
Else
For i As Integer = 0 To SoftSubsList.Count - 1
+ Dim SubFormat As String = "ass"
+ If CCAvailable.Count > 0 Then
+ SubFormat = "vtt"
+ End If
Dim i2 As Integer = i
Me.Invoke(New Action(Function() As Object
Anime_Add.StatusLabel.Text = "Status: downloading subtitle file " + SoftSubsList(i2).SubLangName
@@ -2019,9 +2085,9 @@ Public Class Main
Dim SubText As String = ""
SubText = Curl(SoftSubsList(i2).Url.Replace(" -i ", "").Replace(Chr(34), ""))
Dim Pfad3 As String = Pfad2.Replace(Chr(34), "")
- Dim FN As String = Path.ChangeExtension(Path.Combine(Path.GetFileNameWithoutExtension(Pfad3) + "." + GetSubFileLangName(SoftSubsList(i2).SubLangValue) + Path.GetExtension(Pfad3)), "ass")
+ Dim FN As String = Path.ChangeExtension(Path.Combine(Path.GetFileNameWithoutExtension(Pfad3) + "." + GetSubFileLangName(SoftSubsList(i2).SubLangValue) + Path.GetExtension(Pfad3)), SubFormat)
If i = 0 And IncludeLangName = False Then
- FN = Path.ChangeExtension(Path.GetFileName(Pfad3), "ass")
+ FN = Path.ChangeExtension(Path.GetFileName(Pfad3), SubFormat)
End If
Dim Pfad4 As String = Path.Combine(Path.GetDirectoryName(Pfad3), FN)
WriteText(Pfad4, SubText)
diff --git a/Crunchyroll Downloader/My Project/Settings.Designer.vb b/Crunchyroll Downloader/My Project/Settings.Designer.vb
index eff9d7b..61cc299 100644
--- a/Crunchyroll Downloader/My Project/Settings.Designer.vb
+++ b/Crunchyroll Downloader/My Project/Settings.Designer.vb
@@ -15,7 +15,7 @@ Option Explicit On
Namespace My
_
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -593,6 +593,30 @@ Namespace My
Me("DownloadScope") = value
End Set
End Property
+
+ _
+ Public Property OverrideDub() As Boolean
+ Get
+ Return CType(Me("OverrideDub"),Boolean)
+ End Get
+ Set
+ Me("OverrideDub") = value
+ End Set
+ End Property
+
+ _
+ Public Property Captions() As Boolean
+ Get
+ Return CType(Me("Captions"),Boolean)
+ End Get
+ Set
+ Me("Captions") = value
+ End Set
+ End Property
End Class
End Namespace
diff --git a/Crunchyroll Downloader/My Project/Settings.settings b/Crunchyroll Downloader/My Project/Settings.settings
index f6e6c10..f58ab39 100644
--- a/Crunchyroll Downloader/My Project/Settings.settings
+++ b/Crunchyroll Downloader/My Project/Settings.settings
@@ -137,5 +137,11 @@
0
+
+ False
+
+
+ False
+
\ No newline at end of file
diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb
index 5472cc9..094b287 100644
--- a/Crunchyroll Downloader/einstellungen.Designer.vb
+++ b/Crunchyroll Downloader/einstellungen.Designer.vb
@@ -154,6 +154,9 @@ Partial Class Einstellungen
Me.Label5 = New MetroFramework.Controls.MetroLabel()
Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
Me.Btn_Save = New System.Windows.Forms.Button()
+ Me.CB_OverrideDub = New MetroFramework.Controls.MetroCheckBox()
+ Me.GroupBox22 = New System.Windows.Forms.GroupBox()
+ Me.CB_Cap = New MetroFramework.Controls.MetroCheckBox()
CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.GroupBox14.SuspendLayout()
Me.SoftSubs.SuspendLayout()
@@ -193,6 +196,7 @@ Partial Class Einstellungen
Me.GroupBox8.SuspendLayout()
Me.TabPage7.SuspendLayout()
CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.GroupBox22.SuspendLayout()
Me.SuspendLayout()
'
'ToolTip1
@@ -220,7 +224,7 @@ Partial Class Einstellungen
Me.GroupBox14.Controls.Add(Me.CR_SoftSubDefault)
Me.GroupBox14.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox14.ForeColor = System.Drawing.Color.Black
- Me.GroupBox14.Location = New System.Drawing.Point(5, 255)
+ Me.GroupBox14.Location = New System.Drawing.Point(5, 345)
Me.GroupBox14.Name = "GroupBox14"
Me.GroupBox14.Size = New System.Drawing.Size(490, 70)
Me.GroupBox14.TabIndex = 30
@@ -247,7 +251,7 @@ Partial Class Einstellungen
Me.SoftSubs.BackColor = System.Drawing.Color.Transparent
Me.SoftSubs.Controls.Add(Me.CR_SoftSubs)
Me.SoftSubs.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.SoftSubs.Location = New System.Drawing.Point(5, 190)
+ Me.SoftSubs.Location = New System.Drawing.Point(5, 215)
Me.SoftSubs.Name = "SoftSubs"
Me.SoftSubs.Size = New System.Drawing.Size(490, 65)
Me.SoftSubs.TabIndex = 20
@@ -273,11 +277,12 @@ Partial Class Einstellungen
'
Me.GB_SubLanguage.BackColor = System.Drawing.Color.Transparent
Me.GB_SubLanguage.Controls.Add(Me.CB_CR_Harsubs)
+ Me.GB_SubLanguage.Controls.Add(Me.DubMode)
Me.GB_SubLanguage.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GB_SubLanguage.ForeColor = System.Drawing.Color.Black
- Me.GB_SubLanguage.Location = New System.Drawing.Point(5, 120)
+ Me.GB_SubLanguage.Location = New System.Drawing.Point(5, 115)
Me.GB_SubLanguage.Name = "GB_SubLanguage"
- Me.GB_SubLanguage.Size = New System.Drawing.Size(490, 65)
+ Me.GB_SubLanguage.Size = New System.Drawing.Size(490, 95)
Me.GB_SubLanguage.TabIndex = 10
Me.GB_SubLanguage.TabStop = False
Me.GB_SubLanguage.Text = "Sub Sprache"
@@ -289,7 +294,7 @@ Partial Class Einstellungen
Me.CB_CR_Harsubs.FormattingEnabled = True
Me.CB_CR_Harsubs.IntegralHeight = False
Me.CB_CR_Harsubs.ItemHeight = 23
- Me.CB_CR_Harsubs.Location = New System.Drawing.Point(85, 25)
+ Me.CB_CR_Harsubs.Location = New System.Drawing.Point(85, 55)
Me.CB_CR_Harsubs.Name = "CB_CR_Harsubs"
Me.CB_CR_Harsubs.Size = New System.Drawing.Size(320, 29)
Me.CB_CR_Harsubs.TabIndex = 20
@@ -795,10 +800,10 @@ Partial Class Einstellungen
Me.TabPage1.HorizontalScrollbarBarColor = True
Me.TabPage1.HorizontalScrollbarHighlightOnWheel = False
Me.TabPage1.HorizontalScrollbarSize = 10
- Me.TabPage1.Location = New System.Drawing.Point(4, 35)
+ Me.TabPage1.Location = New System.Drawing.Point(4, 44)
Me.TabPage1.Name = "TabPage1"
Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage1.Size = New System.Drawing.Size(501, 528)
+ Me.TabPage1.Size = New System.Drawing.Size(501, 519)
Me.TabPage1.TabIndex = 0
Me.TabPage1.Text = " Main"
Me.TabPage1.VerticalScrollbar = True
@@ -1032,7 +1037,7 @@ Partial Class Einstellungen
Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular
Me.TabControl1.Location = New System.Drawing.Point(22, 60)
Me.TabControl1.Name = "TabControl1"
- Me.TabControl1.SelectedIndex = 1
+ Me.TabControl1.SelectedIndex = 3
Me.TabControl1.Size = New System.Drawing.Size(509, 567)
Me.TabControl1.TabIndex = 0
Me.TabControl1.UseSelectable = True
@@ -1343,6 +1348,7 @@ Partial Class Einstellungen
'
'MetroTabPage1
'
+ Me.MetroTabPage1.Controls.Add(Me.GroupBox22)
Me.MetroTabPage1.Controls.Add(Me.GroupBox20)
Me.MetroTabPage1.Controls.Add(Me.GroupBox19)
Me.MetroTabPage1.Controls.Add(Me.GroupBox14)
@@ -1366,7 +1372,7 @@ Partial Class Einstellungen
Me.GroupBox20.Controls.Add(Me.ChB_Chapters)
Me.GroupBox20.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox20.ForeColor = System.Drawing.Color.Black
- Me.GroupBox20.Location = New System.Drawing.Point(3, 330)
+ Me.GroupBox20.Location = New System.Drawing.Point(3, 420)
Me.GroupBox20.Name = "GroupBox20"
Me.GroupBox20.Size = New System.Drawing.Size(490, 65)
Me.GroupBox20.TabIndex = 34
@@ -1387,13 +1393,13 @@ Partial Class Einstellungen
'GroupBox19
'
Me.GroupBox19.BackColor = System.Drawing.Color.Transparent
+ Me.GroupBox19.Controls.Add(Me.CB_OverrideDub)
Me.GroupBox19.Controls.Add(Me.CB_CR_Audio)
- Me.GroupBox19.Controls.Add(Me.DubMode)
Me.GroupBox19.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox19.ForeColor = System.Drawing.Color.Black
Me.GroupBox19.Location = New System.Drawing.Point(5, 15)
Me.GroupBox19.Name = "GroupBox19"
- Me.GroupBox19.Size = New System.Drawing.Size(490, 100)
+ Me.GroupBox19.Size = New System.Drawing.Size(490, 95)
Me.GroupBox19.TabIndex = 33
Me.GroupBox19.TabStop = False
Me.GroupBox19.Text = "Dubbed"
@@ -1405,7 +1411,7 @@ Partial Class Einstellungen
Me.CB_CR_Audio.FormattingEnabled = True
Me.CB_CR_Audio.IntegralHeight = False
Me.CB_CR_Audio.ItemHeight = 23
- Me.CB_CR_Audio.Location = New System.Drawing.Point(85, 55)
+ Me.CB_CR_Audio.Location = New System.Drawing.Point(85, 21)
Me.CB_CR_Audio.Name = "CB_CR_Audio"
Me.CB_CR_Audio.Size = New System.Drawing.Size(320, 29)
Me.CB_CR_Audio.TabIndex = 21
@@ -1415,11 +1421,11 @@ Partial Class Einstellungen
'
Me.DubMode.BackColor = System.Drawing.Color.Transparent
Me.DubMode.FontSize = MetroFramework.MetroCheckBoxSize.SomethingInBetween
- Me.DubMode.Location = New System.Drawing.Point(85, 21)
+ Me.DubMode.Location = New System.Drawing.Point(70, 20)
Me.DubMode.Name = "DubMode"
- Me.DubMode.Size = New System.Drawing.Size(320, 28)
+ Me.DubMode.Size = New System.Drawing.Size(348, 29)
Me.DubMode.TabIndex = 5
- Me.DubMode.Text = "accept no hardsubs for dubbed shows"
+ Me.DubMode.Text = "skip hardsubs if unavailable on dubbed shows"
Me.DubMode.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
Me.DubMode.UseCustomBackColor = True
Me.DubMode.UseSelectable = True
@@ -1434,10 +1440,10 @@ Partial Class Einstellungen
Me.TabPage6.HorizontalScrollbarBarColor = True
Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False
Me.TabPage6.HorizontalScrollbarSize = 10
- Me.TabPage6.Location = New System.Drawing.Point(4, 35)
+ Me.TabPage6.Location = New System.Drawing.Point(4, 44)
Me.TabPage6.Name = "TabPage6"
Me.TabPage6.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage6.Size = New System.Drawing.Size(501, 528)
+ Me.TabPage6.Size = New System.Drawing.Size(501, 519)
Me.TabPage6.TabIndex = 4
Me.TabPage6.Text = " Funimation"
Me.TabPage6.VerticalScrollbarBarColor = True
@@ -1671,9 +1677,9 @@ Partial Class Einstellungen
Me.TabPage7.Controls.Add(Me.Label4)
Me.TabPage7.Controls.Add(Me.Label6)
Me.TabPage7.Controls.Add(Me.Label5)
- Me.TabPage7.Location = New System.Drawing.Point(4, 35)
+ Me.TabPage7.Location = New System.Drawing.Point(4, 44)
Me.TabPage7.Name = "TabPage7"
- Me.TabPage7.Size = New System.Drawing.Size(501, 528)
+ Me.TabPage7.Size = New System.Drawing.Size(501, 519)
Me.TabPage7.TabIndex = 5
Me.TabPage7.Text = " About "
'
@@ -1805,6 +1811,43 @@ Partial Class Einstellungen
Me.Btn_Save.TabIndex = 9
Me.Btn_Save.UseVisualStyleBackColor = False
'
+ 'CB_OverrideDub
+ '
+ Me.CB_OverrideDub.BackColor = System.Drawing.Color.Transparent
+ Me.CB_OverrideDub.FontSize = MetroFramework.MetroCheckBoxSize.SomethingInBetween
+ Me.CB_OverrideDub.Location = New System.Drawing.Point(70, 56)
+ Me.CB_OverrideDub.Name = "CB_OverrideDub"
+ Me.CB_OverrideDub.Size = New System.Drawing.Size(348, 29)
+ Me.CB_OverrideDub.TabIndex = 22
+ Me.CB_OverrideDub.Text = "override Dub language"
+ Me.CB_OverrideDub.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+ Me.CB_OverrideDub.UseCustomBackColor = True
+ Me.CB_OverrideDub.UseSelectable = True
+ '
+ 'GroupBox22
+ '
+ Me.GroupBox22.BackColor = System.Drawing.Color.Transparent
+ Me.GroupBox22.Controls.Add(Me.CB_Cap)
+ Me.GroupBox22.Font = New System.Drawing.Font("Arial", 9.75!)
+ Me.GroupBox22.ForeColor = System.Drawing.Color.Black
+ Me.GroupBox22.Location = New System.Drawing.Point(3, 280)
+ Me.GroupBox22.Name = "GroupBox22"
+ Me.GroupBox22.Size = New System.Drawing.Size(490, 65)
+ Me.GroupBox22.TabIndex = 35
+ Me.GroupBox22.TabStop = False
+ Me.GroupBox22.Text = "CC"
+ '
+ 'CB_Cap
+ '
+ Me.CB_Cap.AutoSize = True
+ Me.CB_Cap.FontSize = MetroFramework.MetroCheckBoxSize.Medium
+ Me.CB_Cap.Location = New System.Drawing.Point(158, 23)
+ Me.CB_Cap.Name = "CB_Cap"
+ Me.CB_Cap.Size = New System.Drawing.Size(168, 19)
+ Me.CB_Cap.TabIndex = 5
+ Me.CB_Cap.Text = "use captions if available"
+ Me.CB_Cap.UseSelectable = True
+ '
'Einstellungen
'
Me.ApplyImageInvert = True
@@ -1872,6 +1915,8 @@ Partial Class Einstellungen
Me.GroupBox8.PerformLayout()
Me.TabPage7.ResumeLayout(False)
CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.GroupBox22.ResumeLayout(False)
+ Me.GroupBox22.PerformLayout()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -2008,4 +2053,7 @@ Partial Class Einstellungen
Friend WithEvents ChB_Chapters As MetroFramework.Controls.MetroCheckBox
Friend WithEvents CR_SoftSubs As MetroFramework.Controls.MetroComboBox
Public WithEvents CR_SoftSubDefault As MetroFramework.Controls.MetroComboBox
+ Friend WithEvents CB_OverrideDub As MetroFramework.Controls.MetroCheckBox
+ Friend WithEvents GroupBox22 As GroupBox
+ Friend WithEvents CB_Cap As MetroFramework.Controls.MetroCheckBox
End Class
diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb
index 368d100..e104284 100644
--- a/Crunchyroll Downloader/einstellungen.vb
+++ b/Crunchyroll Downloader/einstellungen.vb
@@ -33,6 +33,8 @@ Public Class Einstellungen
Manager.Owner = Me
Me.StyleManager = Manager
+ CB_OverrideDub.Checked = My.Settings.OverrideDub
+ CB_Cap.Checked = My.Settings.Captions
TempTB.Text = Main.TempFolder
LeadingZeroDD.SelectedIndex = Main.LeadingZero
@@ -349,7 +351,8 @@ Public Class Einstellungen
Private Sub Btn_Save_Click(sender As Object, e As EventArgs) Handles Btn_Save.Click
Main.LeadingZero = LeadingZeroDD.SelectedIndex
My.Settings.LeadingZero = LeadingZeroDD.SelectedIndex
-
+ My.Settings.OverrideDub = CB_OverrideDub.Checked
+ My.Settings.Captions = CB_Cap.Checked
Main.Funimation_Bitrate = Bitrate_Funi.SelectedIndex
My.Settings.Funimation_Bitrate = Bitrate_Funi.SelectedIndex