AoD resolution added

-AoD resolution added
- improvents for the user data input checks
This commit is contained in:
hama3254 2020-11-05 20:43:52 +01:00
parent 7306429b79
commit 80eaf1d7bd
22 changed files with 425 additions and 62 deletions

Binary file not shown.

View File

@ -442,6 +442,28 @@ Public Class Anime_Add
pictureBox4.Image = My.Resources.main_button_download_default pictureBox4.Image = My.Resources.main_button_download_default
ElseIf AoD_Mode = True Then ElseIf AoD_Mode = True Then
If AoD_DL_running = False Then If AoD_DL_running = False Then
If comboBox3.SelectedIndex < 0 And comboBox4.SelectedIndex < 0 Then
MsgBox("Error nothing selected!", MsgBoxStyle.Exclamation)
Exit Sub
ElseIf comboBox3.SelectedIndex < 0 Or comboBox4.SelectedIndex < 0 Then
MsgBox("deteced!", MsgBoxStyle.Exclamation)
If comboBox3.SelectedIndex < 0 Then
'MsgBox("deteced! 3", MsgBoxStyle.Exclamation)
Dim CB4 As Integer = comboBox4.SelectedIndex
comboBox3.SelectedIndex = CB4
comboBox3.SelectedIndex = CB4
ElseIf comboBox4.SelectedIndex < 0 Then
'MsgBox("deteced! 4", MsgBoxStyle.Exclamation)
Dim CB3 As Integer = comboBox3.SelectedIndex
comboBox4.SelectedIndex = CB3
comboBox4.SelectedIndex = CB3
Else
MsgBox("Error nothing selected!", MsgBoxStyle.Exclamation)
Exit Sub
End If
Else
'MsgBox("not deteced!", MsgBoxStyle.Exclamation)
End If
AoD_DL_running = True AoD_DL_running = True
ComboBox1.Enabled = False ComboBox1.Enabled = False
comboBox3.Enabled = False comboBox3.Enabled = False
@ -657,6 +679,7 @@ Public Class Anime_Add
Public Sub Add_AoD() Public Sub Add_AoD()
Dim ProcessList As New List(Of String) Dim ProcessList As New List(Of String)
Dim Dub As Boolean = False
Dim RDY As Boolean = True Dim RDY As Boolean = True
Dim Running As Integer = Main.RunningDownloads Dim Running As Integer = Main.RunningDownloads
Dim DlMax As Integer = Main.MaxDL Dim DlMax As Integer = Main.MaxDL
@ -665,15 +688,18 @@ Public Class Anime_Add
Dim SubExit As Boolean = False Dim SubExit As Boolean = False
Dim CB3 As Integer = 0 Dim CB3 As Integer = 0
Dim CB4 As Integer = 0 Dim CB4 As Integer = 0
Dim TargetReso As String = Main.Resu
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
'Main.StatusMainForm.Text = "Crunchyroll Downloader" 'Main.StatusMainForm.Text = "Crunchyroll Downloader"
Pfad2 = Main.Pfad Pfad2 = Main.Pfad
TargetReso = Main.Resu
If ComboBox1.Enabled = False Then If ComboBox1.Enabled = False Then
If AoD_DubList.Count > 1 Then If AoD_DubList.Count > 1 Then
For i As Integer = 0 To AoD_DubList.Count - 1 For i As Integer = 0 To AoD_DubList.Count - 1
ProcessList.Add(AoD_DubList(i)) ProcessList.Add(AoD_DubList(i))
Next Next
Dub = True
ElseIf AoD_OmuList.Count > 1 Then ElseIf AoD_OmuList.Count > 1 Then
For i As Integer = 0 To AoD_OmuList.Count - 1 For i As Integer = 0 To AoD_OmuList.Count - 1
ProcessList.Add(AoD_OmuList(i)) ProcessList.Add(AoD_OmuList(i))
@ -730,11 +756,15 @@ Public Class Anime_Add
Thread.Sleep(2000) Thread.Sleep(2000)
If RDY = True Then If RDY = True Then
Try
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()
Running = Main.RunningDownloads Running = Main.RunningDownloads
DlMax = Main.MaxDL DlMax = Main.MaxDL
Return Nothing Return Nothing
End Function)) End Function))
Catch ex As Exception
Exit Sub
End Try
If DlMax > Running Then If DlMax > Running Then
RDY = False RDY = False
@ -797,7 +827,43 @@ Public Class Anime_Add
Dim AoDThumbnail2() As String = AoDThumbnail1(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) Dim AoDThumbnail2() As String = AoDThumbnail1(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim AoDThumbnail As String = AoDThumbnail2(0) Dim AoDThumbnail As String = AoDThumbnail2(0)
Dim AoDTm3u8() As String = ProcessList.Item(i).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) Dim AoDTm3u8() As String = ProcessList.Item(i).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim AoDm3u8Final As String = "-i " + Chr(34) + AoDTm3u8(0).Replace("&amp;", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&") + Chr(34) + " " + Main.ffmpeg_command Dim m3u8_Master_url As String = AoDTm3u8(0).Replace("&amp;", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&")
Dim m3u8_url As String = Nothing
Dim m3u8_url_Temp As String = Nothing
Dim client As New WebClient
client.Encoding = System.Text.Encoding.UTF8
Dim text As String = client.DownloadString(m3u8_Master_url)
If InStr(text, "RESOLUTION=") Then 'master m3u8 no fragments
Dim new_m3u8() As String = text.Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries)
If TargetReso = 42 Then
m3u8_url = m3u8_Master_url
End If
For i2 As Integer = 0 To new_m3u8.Count - 1
'MsgBox("x" + Main.Resu.ToString)
If CBool(InStr(new_m3u8(i2), "x" + TargetReso.ToString)) = True Then
m3u8_url_Temp = new_m3u8(i2 + 1)
Exit For
End If
Next
If InStr(m3u8_url_Temp, "https://") Then
m3u8_url = m3u8_url_Temp
Else
Dim d() As String = New Uri(m3u8_Master_url).Segments
Dim path As String = "https://" + New Uri(m3u8_Master_url).Host
For i3 As Integer = 0 To d.Count - 2
path = path + d(i3)
Next
m3u8_url = path + m3u8_url_Temp
'MsgBox(m3u8_url_1)
End If
End If
Dim AoDm3u8Final As String = "-i " + Chr(34) + m3u8_url + Chr(34) + " " + Main.ffmpeg_command
Dim L1Name As String = "anime-on-demand.de" 'L1Name_Split(1).Replace("www.", "") + " | Dub : " + FunimationDub Dim L1Name As String = "anime-on-demand.de" 'L1Name_Split(1).Replace("www.", "") + " | Dub : " + FunimationDub

View File

@ -11,7 +11,7 @@ Public Class CRD_List_Item
Dim proc As Process Dim proc As Process
Dim ThreadList As New List(Of Thread) Dim ThreadList As New List(Of Thread)
Dim timeout As DateTime Dim timeout As DateTime
Dim Item_ErrorTolerance As Integer
Dim Canceld As Boolean = False Dim Canceld As Boolean = False
Dim Finished As Boolean = False Dim Finished As Boolean = False
Dim Label_website_Text As String = Nothing Dim Label_website_Text As String = Nothing
@ -47,6 +47,9 @@ Public Class CRD_List_Item
Label_website.Text = Text Label_website.Text = Text
Label_website_Text = Text Label_website_Text = Text
End Sub End Sub
Public Sub SetTolerance(ByVal value As Integer)
Item_ErrorTolerance = value
End Sub
Public Sub SetLabelAnimeTitel(ByVal Text As String) Public Sub SetLabelAnimeTitel(ByVal Text As String)
Label_Anime.Text = Text Label_Anime.Text = Text
End Sub End Sub
@ -829,8 +832,11 @@ Public Class CRD_List_Item
Return Nothing Return Nothing
End Function)) End Function))
ElseIf InStr(e.Data, "Failed to open segment") Then ElseIf InStr(e.Data, "Failed to open segment") Then
Failed = True
FailedCount = FailedCount + 1 FailedCount = FailedCount + 1
If Item_ErrorTolerance = 0 Then
ElseIf FailedCount >= Item_ErrorTolerance Then
Failed = True
StatusRunning = False StatusRunning = False
bt_pause.BackgroundImage = My.Resources.main_pause_play bt_pause.BackgroundImage = My.Resources.main_pause_play
SuspendProcess(proc) SuspendProcess(proc)
@ -839,6 +845,8 @@ Public Class CRD_List_Item
Label_percent.Text = "Missing segment detected, retry or resume with the play button" Label_percent.Text = "Missing segment detected, retry or resume with the play button"
Return Nothing Return Nothing
End Function)) End Function))
End If
ElseIf InStr(e.Data, "muxing overhead:") Then ElseIf InStr(e.Data, "muxing overhead:") Then
Finished = True Finished = True
Me.Invoke(New Action(Function() Me.Invoke(New Action(Function()

View File

@ -140,6 +140,12 @@
<Compile Include="Debug_Mode.vb"> <Compile Include="Debug_Mode.vb">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="FirstStartup.Designer.vb">
<DependentUpon>FirstStartup.vb</DependentUpon>
</Compile>
<Compile Include="FirstStartup.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="GeckoFX.Designer.vb"> <Compile Include="GeckoFX.Designer.vb">
<DependentUpon>GeckoFX.vb</DependentUpon> <DependentUpon>GeckoFX.vb</DependentUpon>
</Compile> </Compile>
@ -197,6 +203,9 @@
<EmbeddedResource Include="Debug_Mode.resx"> <EmbeddedResource Include="Debug_Mode.resx">
<DependentUpon>Debug_Mode.vb</DependentUpon> <DependentUpon>Debug_Mode.vb</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FirstStartup.resx">
<DependentUpon>FirstStartup.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GeckoFX.resx"> <EmbeddedResource Include="GeckoFX.resx">
<DependentUpon>GeckoFX.vb</DependentUpon> <DependentUpon>GeckoFX.vb</DependentUpon>
</EmbeddedResource> </EmbeddedResource>

View File

@ -0,0 +1,38 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
Partial Class FirstStartup
Inherits System.Windows.Forms.Form
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
<System.Diagnostics.DebuggerNonUserCode()> _
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
Try
If disposing AndAlso components IsNot Nothing Then
components.Dispose()
End If
Finally
MyBase.Dispose(disposing)
End Try
End Sub
'Wird vom Windows Form-Designer benötigt.
Private components As System.ComponentModel.IContainer
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
Me.SuspendLayout()
'
'FirstStartup
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(800, 450)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
Me.Name = "FirstStartup"
Me.Text = "FirstStartup"
Me.ResumeLayout(False)
End Sub
End Class

View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@ -0,0 +1,49 @@
Public Class FirstStartup
Private Sub FistStartup_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Me.Icon = My.Resources.icon
End Sub
#Region " Move Form "
' [ Move Form ]
'
' // By Elektro
Public MoveForm As Boolean
Public MoveForm_MousePosition As Point
Public Sub MoveForm_MouseDown(sender As Object, e As MouseEventArgs) Handles _
MyBase.MouseDown ' Add more handles here (Example: PictureBox1.MouseDown)
If e.Button = MouseButtons.Left Then
MoveForm = True
Me.Cursor = Cursors.NoMove2D
MoveForm_MousePosition = e.Location
End If
End Sub
Public Sub MoveForm_MouseMove(sender As Object, e As MouseEventArgs) Handles _
MyBase.MouseMove ' Add more handles here (Example: PictureBox1.MouseMove)
If MoveForm Then
Me.Location = Me.Location + (e.Location - MoveForm_MousePosition)
End If
End Sub
Public Sub MoveForm_MouseUp(sender As Object, e As MouseEventArgs) Handles _
MyBase.MouseUp ' Add more handles here (Example: PictureBox1.MouseUp)
If e.Button = MouseButtons.Left Then
MoveForm = False
Me.Cursor = Cursors.Default
End If
End Sub
#End Region
End Class

View File

@ -10,6 +10,7 @@ Imports System.Drawing.Drawing2D
Imports Gecko Imports Gecko
Public Class Main Public Class Main
Public ErrorTolerance As Integer = 0
Public liList As New List(Of String) Public liList As New List(Of String)
Public HTMLString As String = My.Resources.Startuphtml Public HTMLString As String = My.Resources.Startuphtml
Public RunServer As Boolean = True Public RunServer As Boolean = True
@ -134,6 +135,13 @@ Public Class Main
Private Sub Form8_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub Form8_Load(sender As Object, e As EventArgs) Handles MyBase.Load
'Try
' Dim SettingsDone As Boolean = False
' Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
' SettingsDone = CBool(Integer.Parse(rkg.GetValue("SettingsDone").ToString))
'Catch ex As Exception
' FirstStartup.ShowDialog()
'End Try
Try Try
@ -197,11 +205,12 @@ Public Class Main
ffmpeg_command = " -c copy -bsf:a aac_adtstoasc " ffmpeg_command = " -c copy -bsf:a aac_adtstoasc "
End Try End Try
If ffmpeg_command = " -c:v hevc_nvenc -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
MaxDL = 2 'If ffmpeg_command = " -c:v hevc_nvenc -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
ElseIf ffmpeg_command = " -c:v libx265 -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then ' MaxDL = 2
MaxDL = 1 'ElseIf ffmpeg_command = " -c:v libx265 -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
End If ' MaxDL = 1
'End If
Try Try
Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
Resu = Integer.Parse(rkg.GetValue("Resu").ToString) Resu = Integer.Parse(rkg.GetValue("Resu").ToString)
@ -230,6 +239,13 @@ Public Class Main
Catch ex As Exception Catch ex As Exception
MaxDL = 1 MaxDL = 1
End Try End Try
Try
Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
ErrorTolerance = Integer.Parse(rkg.GetValue("ErrorTolerance").ToString)
Catch ex As Exception
ErrorTolerance = 0
End Try
Try Try
Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
MergeSubstoMP4 = CBool(Integer.Parse(rkg.GetValue("MergeMP4").ToString)) MergeSubstoMP4 = CBool(Integer.Parse(rkg.GetValue("MergeMP4").ToString))
@ -326,6 +342,7 @@ Public Class Main
r = ListView1.Items(c).Bounds() r = ListView1.Items(c).Bounds()
r.Width = 838 r.Width = 838
r.Height = 142 r.Height = 142
Item.SetTolerance(ErrorTolerance)
Item.SetTargetReso(Resu) Item.SetTargetReso(Resu)
Item.SetLabelWebsite(NameP1) Item.SetLabelWebsite(NameP1)
Item.SetLabelAnimeTitel(NameP2) Item.SetLabelAnimeTitel(NameP2)

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

View File

@ -90,10 +90,12 @@ Partial Class einstellungen
Me.A720p = New System.Windows.Forms.RadioButton() Me.A720p = New System.Windows.Forms.RadioButton()
Me.A1080p = New System.Windows.Forms.RadioButton() Me.A1080p = New System.Windows.Forms.RadioButton()
Me.TabPage1 = New System.Windows.Forms.TabPage() Me.TabPage1 = New System.Windows.Forms.TabPage()
Me.GroupBox6 = New System.Windows.Forms.GroupBox()
Me.Label2 = New System.Windows.Forms.Label()
Me.NumericUpDown2 = New System.Windows.Forms.NumericUpDown()
Me.GroupBox8 = New System.Windows.Forms.GroupBox() Me.GroupBox8 = New System.Windows.Forms.GroupBox()
Me.PictureBox6 = New System.Windows.Forms.PictureBox()
Me.GroupBox5 = New System.Windows.Forms.GroupBox()
Me.Server = New System.Windows.Forms.CheckBox() Me.Server = New System.Windows.Forms.CheckBox()
Me.GroupBox5 = New System.Windows.Forms.GroupBox()
Me.CB_Log = New System.Windows.Forms.CheckBox() Me.CB_Log = New System.Windows.Forms.CheckBox()
Me.ListViewAdd_True = New System.Windows.Forms.CheckBox() Me.ListViewAdd_True = New System.Windows.Forms.CheckBox()
Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox()
@ -101,6 +103,7 @@ Partial Class einstellungen
Me.TextBox1 = New System.Windows.Forms.TextBox() Me.TextBox1 = New System.Windows.Forms.TextBox()
Me.DL_Count_simultaneous = New System.Windows.Forms.GroupBox() Me.DL_Count_simultaneous = New System.Windows.Forms.GroupBox()
Me.NumericUpDown1 = New System.Windows.Forms.NumericUpDown() Me.NumericUpDown1 = New System.Windows.Forms.NumericUpDown()
Me.PictureBox6 = New System.Windows.Forms.PictureBox()
Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabControl1 = New System.Windows.Forms.TabControl()
Me.TabPage6 = New System.Windows.Forms.TabPage() Me.TabPage6 = New System.Windows.Forms.TabPage()
Me.GroupBox7 = New System.Windows.Forms.GroupBox() Me.GroupBox7 = New System.Windows.Forms.GroupBox()
@ -127,12 +130,14 @@ Partial Class einstellungen
Me.MenuStrip1.SuspendLayout() Me.MenuStrip1.SuspendLayout()
Me.GB_Resolution.SuspendLayout() Me.GB_Resolution.SuspendLayout()
Me.TabPage1.SuspendLayout() Me.TabPage1.SuspendLayout()
Me.GroupBox6.SuspendLayout()
CType(Me.NumericUpDown2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.GroupBox8.SuspendLayout() Me.GroupBox8.SuspendLayout()
CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit()
Me.GroupBox5.SuspendLayout() Me.GroupBox5.SuspendLayout()
Me.GroupBox1.SuspendLayout() Me.GroupBox1.SuspendLayout()
Me.DL_Count_simultaneous.SuspendLayout() Me.DL_Count_simultaneous.SuspendLayout()
CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabControl1.SuspendLayout() Me.TabControl1.SuspendLayout()
Me.TabPage6.SuspendLayout() Me.TabPage6.SuspendLayout()
Me.GroupBox7.SuspendLayout() Me.GroupBox7.SuspendLayout()
@ -844,6 +849,7 @@ Partial Class einstellungen
'TabPage1 'TabPage1
' '
Me.TabPage1.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer)) Me.TabPage1.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer))
Me.TabPage1.Controls.Add(Me.GroupBox6)
Me.TabPage1.Controls.Add(Me.GroupBox8) Me.TabPage1.Controls.Add(Me.GroupBox8)
Me.TabPage1.Controls.Add(Me.GroupBox5) Me.TabPage1.Controls.Add(Me.GroupBox5)
Me.TabPage1.Controls.Add(Me.GroupBox1) Me.TabPage1.Controls.Add(Me.GroupBox1)
@ -855,58 +861,78 @@ Partial Class einstellungen
Me.TabPage1.TabIndex = 0 Me.TabPage1.TabIndex = 0
Me.TabPage1.Text = "Settings" Me.TabPage1.Text = "Settings"
' '
'GroupBox6
'
Me.GroupBox6.BackColor = System.Drawing.Color.Transparent
Me.GroupBox6.Controls.Add(Me.Label2)
Me.GroupBox6.Controls.Add(Me.NumericUpDown2)
Me.GroupBox6.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox6.ForeColor = System.Drawing.Color.Black
Me.GroupBox6.Location = New System.Drawing.Point(202, 276)
Me.GroupBox6.Name = "GroupBox6"
Me.GroupBox6.Size = New System.Drawing.Size(260, 128)
Me.GroupBox6.TabIndex = 45
Me.GroupBox6.TabStop = False
Me.GroupBox6.Text = "Error Handling"
'
'Label2
'
Me.Label2.AutoSize = True
Me.Label2.Location = New System.Drawing.Point(18, 23)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(186, 48)
Me.Label2.TabIndex = 2
Me.Label2.Text = "The amout of error(s) until the" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Download process get paused " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(0 = deactivated)"
'
'NumericUpDown2
'
Me.NumericUpDown2.Location = New System.Drawing.Point(18, 80)
Me.NumericUpDown2.Name = "NumericUpDown2"
Me.NumericUpDown2.Size = New System.Drawing.Size(225, 22)
Me.NumericUpDown2.TabIndex = 1
Me.NumericUpDown2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'GroupBox8 'GroupBox8
' '
Me.GroupBox8.BackColor = System.Drawing.Color.Transparent Me.GroupBox8.BackColor = System.Drawing.Color.Transparent
Me.GroupBox8.Controls.Add(Me.PictureBox6) Me.GroupBox8.Controls.Add(Me.Server)
Me.GroupBox8.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox8.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox8.ForeColor = System.Drawing.Color.Black Me.GroupBox8.ForeColor = System.Drawing.Color.Black
Me.GroupBox8.Location = New System.Drawing.Point(6, 311) Me.GroupBox8.Location = New System.Drawing.Point(6, 276)
Me.GroupBox8.Name = "GroupBox8" Me.GroupBox8.Name = "GroupBox8"
Me.GroupBox8.Size = New System.Drawing.Size(456, 94) Me.GroupBox8.Size = New System.Drawing.Size(190, 128)
Me.GroupBox8.TabIndex = 44 Me.GroupBox8.TabIndex = 44
Me.GroupBox8.TabStop = False Me.GroupBox8.TabStop = False
' Me.GroupBox8.Text = "Add-on Support"
'PictureBox6
'
Me.PictureBox6.Cursor = System.Windows.Forms.Cursors.Hand
Me.PictureBox6.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_credits_default
Me.PictureBox6.Location = New System.Drawing.Point(182, 30)
Me.PictureBox6.Name = "PictureBox6"
Me.PictureBox6.Size = New System.Drawing.Size(76, 39)
Me.PictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
Me.PictureBox6.TabIndex = 43
Me.PictureBox6.TabStop = False
'
'GroupBox5
'
Me.GroupBox5.BackColor = System.Drawing.Color.Transparent
Me.GroupBox5.Controls.Add(Me.Server)
Me.GroupBox5.Controls.Add(Me.CB_Log)
Me.GroupBox5.Controls.Add(Me.ListViewAdd_True)
Me.GroupBox5.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox5.ForeColor = System.Drawing.Color.Black
Me.GroupBox5.Location = New System.Drawing.Point(6, 205)
Me.GroupBox5.Name = "GroupBox5"
Me.GroupBox5.Size = New System.Drawing.Size(456, 100)
Me.GroupBox5.TabIndex = 7
Me.GroupBox5.TabStop = False
Me.GroupBox5.Text = "Other"
' '
'Server 'Server
' '
Me.Server.AutoSize = True Me.Server.AutoSize = True
Me.Server.Location = New System.Drawing.Point(285, 29) Me.Server.Location = New System.Drawing.Point(24, 66)
Me.Server.Name = "Server" Me.Server.Name = "Server"
Me.Server.Size = New System.Drawing.Size(129, 20) Me.Server.Size = New System.Drawing.Size(129, 20)
Me.Server.TabIndex = 42 Me.Server.TabIndex = 42
Me.Server.Text = "enable http server" Me.Server.Text = "enable http server"
Me.Server.UseVisualStyleBackColor = True Me.Server.UseVisualStyleBackColor = True
' '
'GroupBox5
'
Me.GroupBox5.BackColor = System.Drawing.Color.Transparent
Me.GroupBox5.Controls.Add(Me.CB_Log)
Me.GroupBox5.Controls.Add(Me.ListViewAdd_True)
Me.GroupBox5.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox5.ForeColor = System.Drawing.Color.Black
Me.GroupBox5.Location = New System.Drawing.Point(6, 205)
Me.GroupBox5.Name = "GroupBox5"
Me.GroupBox5.Size = New System.Drawing.Size(456, 70)
Me.GroupBox5.TabIndex = 7
Me.GroupBox5.TabStop = False
Me.GroupBox5.Text = "Other"
'
'CB_Log 'CB_Log
' '
Me.CB_Log.AutoSize = True Me.CB_Log.AutoSize = True
Me.CB_Log.Location = New System.Drawing.Point(64, 29) Me.CB_Log.Location = New System.Drawing.Point(45, 38)
Me.CB_Log.Name = "CB_Log" Me.CB_Log.Name = "CB_Log"
Me.CB_Log.Size = New System.Drawing.Size(84, 20) Me.CB_Log.Size = New System.Drawing.Size(84, 20)
Me.CB_Log.TabIndex = 1 Me.CB_Log.TabIndex = 1
@ -916,7 +942,7 @@ Partial Class einstellungen
'ListViewAdd_True 'ListViewAdd_True
' '
Me.ListViewAdd_True.AutoSize = True Me.ListViewAdd_True.AutoSize = True
Me.ListViewAdd_True.Location = New System.Drawing.Point(108, 74) Me.ListViewAdd_True.Location = New System.Drawing.Point(214, 38)
Me.ListViewAdd_True.Name = "ListViewAdd_True" Me.ListViewAdd_True.Name = "ListViewAdd_True"
Me.ListViewAdd_True.Size = New System.Drawing.Size(236, 20) Me.ListViewAdd_True.Size = New System.Drawing.Size(236, 20)
Me.ListViewAdd_True.TabIndex = 0 Me.ListViewAdd_True.TabIndex = 0
@ -978,6 +1004,17 @@ Partial Class einstellungen
Me.NumericUpDown1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center Me.NumericUpDown1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
Me.NumericUpDown1.Value = New Decimal(New Integer() {1, 0, 0, 0}) Me.NumericUpDown1.Value = New Decimal(New Integer() {1, 0, 0, 0})
' '
'PictureBox6
'
Me.PictureBox6.Cursor = System.Windows.Forms.Cursors.Hand
Me.PictureBox6.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_credits_default
Me.PictureBox6.Location = New System.Drawing.Point(326, 2)
Me.PictureBox6.Name = "PictureBox6"
Me.PictureBox6.Size = New System.Drawing.Size(76, 39)
Me.PictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
Me.PictureBox6.TabIndex = 43
Me.PictureBox6.TabStop = False
'
'TabControl1 'TabControl1
' '
Me.TabControl1.Controls.Add(Me.TabPage1) Me.TabControl1.Controls.Add(Me.TabPage1)
@ -1046,6 +1083,7 @@ Partial Class einstellungen
Me.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.crdSettings_Background Me.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.crdSettings_Background
Me.ClientSize = New System.Drawing.Size(500, 550) Me.ClientSize = New System.Drawing.Size(500, 550)
Me.Controls.Add(Me.TabControl1) Me.Controls.Add(Me.TabControl1)
Me.Controls.Add(Me.PictureBox6)
Me.Controls.Add(Me.pictureBox4) Me.Controls.Add(Me.pictureBox4)
Me.Controls.Add(Me.pictureBox1) Me.Controls.Add(Me.pictureBox1)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
@ -1083,15 +1121,18 @@ Partial Class einstellungen
Me.GB_Resolution.ResumeLayout(False) Me.GB_Resolution.ResumeLayout(False)
Me.GB_Resolution.PerformLayout() Me.GB_Resolution.PerformLayout()
Me.TabPage1.ResumeLayout(False) Me.TabPage1.ResumeLayout(False)
Me.GroupBox6.ResumeLayout(False)
Me.GroupBox6.PerformLayout()
CType(Me.NumericUpDown2, System.ComponentModel.ISupportInitialize).EndInit()
Me.GroupBox8.ResumeLayout(False) Me.GroupBox8.ResumeLayout(False)
Me.GroupBox8.PerformLayout() Me.GroupBox8.PerformLayout()
CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit()
Me.GroupBox5.ResumeLayout(False) Me.GroupBox5.ResumeLayout(False)
Me.GroupBox5.PerformLayout() Me.GroupBox5.PerformLayout()
Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.ResumeLayout(False)
Me.GroupBox1.PerformLayout() Me.GroupBox1.PerformLayout()
Me.DL_Count_simultaneous.ResumeLayout(False) Me.DL_Count_simultaneous.ResumeLayout(False)
CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabControl1.ResumeLayout(False) Me.TabControl1.ResumeLayout(False)
Me.TabPage6.ResumeLayout(False) Me.TabPage6.ResumeLayout(False)
Me.GroupBox7.ResumeLayout(False) Me.GroupBox7.ResumeLayout(False)
@ -1183,4 +1224,7 @@ Partial Class einstellungen
Public WithEvents CBdeDE As CheckBox Public WithEvents CBdeDE As CheckBox
Public WithEvents CBenUS As CheckBox Public WithEvents CBenUS As CheckBox
Friend WithEvents GroupBox8 As GroupBox Friend WithEvents GroupBox8 As GroupBox
Friend WithEvents GroupBox6 As GroupBox
Friend WithEvents Label2 As Label
Friend WithEvents NumericUpDown2 As NumericUpDown
End Class End Class

View File

@ -98,6 +98,7 @@ Public Class einstellungen
ElseIf Main.SubFolder = 2 Then ElseIf Main.SubFolder = 2 Then
RBStaffel.Checked = True RBStaffel.Checked = True
End If End If
NumericUpDown2.Value = Main.ErrorTolerance
NumericUpDown1.Value = Main.MaxDL NumericUpDown1.Value = Main.MaxDL
TextBox1.Text = Main.Startseite TextBox1.Text = Main.Startseite
@ -245,13 +246,21 @@ Public Class einstellungen
End If End If
If InStr(FFMPEG_CommandP1.Text, "nvenc") Then If InStr(FFMPEG_CommandP1.Text, "nvenc") Then
If NumericUpDown1.Value > 2 Then
NumericUpDown1.Value = 2 NumericUpDown1.Value = 2
End If
ElseIf InStr(FFMPEG_CommandP1.Text, "libx26") Then ElseIf InStr(FFMPEG_CommandP1.Text, "libx26") Then
If NumericUpDown1.Value > 1 Then
NumericUpDown1.Value = 1 NumericUpDown1.Value = 1
End If End If
End If
rk.SetValue("SL_DL", NumericUpDown1.Value, RegistryValueKind.String) rk.SetValue("SL_DL", NumericUpDown1.Value, RegistryValueKind.String)
Main.MaxDL = NumericUpDown1.Value Main.MaxDL = NumericUpDown1.Value
rk.SetValue("ErrorTolerance", NumericUpDown2.Value, RegistryValueKind.String)
Main.ErrorTolerance = NumericUpDown2.Value
If ListViewAdd_True.Checked = True Then If ListViewAdd_True.Checked = True Then
rk.SetValue("QueueMode", 1, RegistryValueKind.String) rk.SetValue("QueueMode", 1, RegistryValueKind.String)
@ -631,5 +640,7 @@ Public Class einstellungen
#End Region #End Region
End Class End Class

View File

@ -1 +1 @@
4fd6c811fe7e219c2d379e53fa18d465c7ca6bd0 457fb228272c8471f463cf798ead405f95f2aa0a

View File

@ -116,3 +116,4 @@ D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.5\Crun
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.5\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.exe D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.5\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.exe
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.5\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.xml D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.5\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.xml
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.5\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.pdb D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.5\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.pdb
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.FirstStartup.resources