mirror of
https://github.com/hama3254/Crunchyroll-Downloader-v3.0.git
synced 2024-11-10 18:25:05 +01:00
more options for re-encoding
added h264 encoding added variable bitrates
This commit is contained in:
parent
b9458254b3
commit
61d63d67a4
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -102,6 +102,7 @@
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Deployment" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.IO.Compression.FileSystem" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="System.Core" />
|
||||
|
@ -6,6 +6,8 @@ Imports System.ComponentModel
|
||||
Imports System.Threading
|
||||
Imports System.Net
|
||||
Imports System.Net.WebUtility
|
||||
Imports System.IO.Compression
|
||||
|
||||
Public Class GeckoFX
|
||||
Public keks As String = Nothing
|
||||
'Public c As Boolean = True
|
||||
@ -302,6 +304,54 @@ Public Class GeckoFX
|
||||
End If
|
||||
Me.Icon = My.Resources.icon
|
||||
Main.UserBowser = True
|
||||
'Main.Pause(15)
|
||||
'For ii As Integer = 19 To 46
|
||||
' WebBrowser1.Navigate("https://proxer.me/read/22459/" + ii.ToString + "/en/1")
|
||||
' Main.Pause(15)
|
||||
' Main.WebbrowserURL = WebBrowser1.Url.ToString
|
||||
' Dim NameDLFinal As String = Nothing
|
||||
' Dim NameDL As String() = WebBrowser1.Document.Body.OuterHtml.Split(New String() {"<div id=" + Chr(34) + "breadcrumb" + Chr(34) + ">"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
' Dim NameDL2 As String() = NameDL(1).Split(New String() {"<div>"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
' Dim NameDL3 As String() = NameDL2(0).Split(New String() {Chr(34) + "true" + Chr(34) + ">"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
' For i As Integer = 0 To NameDL3.Count - 1
|
||||
' If InStr(NameDL3(i), "</a>") Then
|
||||
' Dim NameDL4 As String() = NameDL3(i).Split(New String() {"</a>"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
' If NameDLFinal = Nothing Then
|
||||
' NameDLFinal = NameDL4(0)
|
||||
' Else
|
||||
' NameDLFinal = NameDLFinal + " " + NameDL4(0)
|
||||
' End If
|
||||
' End If
|
||||
' Next
|
||||
' NameDLFinal = System.Text.RegularExpressions.Regex.Replace(NameDLFinal, "[^\w\\-]", " ")
|
||||
' If Main.Debug2 = True Then
|
||||
' MsgBox(NameDLFinal)
|
||||
' End If
|
||||
' Dim SiteData As String() = WebBrowser1.Document.Body.OuterHtml.Split(New String() {"var pages ="}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
' Dim SiteData2 As String() = SiteData(1).Split(New String() {"</script>"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
' Dim ImageNumbers As String() = SiteData2(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
' Dim ImageList As New List(Of String)
|
||||
' Dim ImageListString As String = Nothing
|
||||
' For i As Integer = 0 To ImageNumbers.Count - 1
|
||||
' If InStr(ImageNumbers(i), ".jpg") Then
|
||||
' ImageList.Add(ImageNumbers(i).Replace(vbNewLine, ""))
|
||||
' ImageListString = ImageListString + vbNewLine + ImageNumbers(i).Replace(vbNewLine, "")
|
||||
' ElseIf InStr(ImageNumbers(i), ".png") Then
|
||||
' ImageList.Add(ImageNumbers(i).Replace(vbNewLine, ""))
|
||||
' ImageListString = ImageListString + vbNewLine + ImageNumbers(i).Replace(vbNewLine, "")
|
||||
' End If
|
||||
' Next
|
||||
' If Main.Debug2 = True Then
|
||||
' MsgBox(ImageListString)
|
||||
' End If
|
||||
' Dim BaseURL As String() = SiteData2(0).Split(New String() {"var serverurl = '"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
' Dim BaseURL2 As String() = BaseURL(1).Split(New String() {"';"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
' Dim BaseURL3 As String = "https:" + BaseURL2(0)
|
||||
' If Main.Debug2 = True Then
|
||||
' MsgBox(BaseURL3)
|
||||
' End If
|
||||
' AsyncWorkerX.RunAsync(AddressOf Main.DownloadMangaPages, BaseURL3, ImageList, Main.RemoveExtraSpaces(NameDLFinal))
|
||||
'Next
|
||||
End Sub
|
||||
|
||||
Private Sub GeckoFX_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing
|
||||
@ -337,6 +387,51 @@ Public Class GeckoFX
|
||||
End Sub
|
||||
|
||||
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
|
||||
If InStr(WebBrowser1.Url.ToString, "https://proxer.me/read/") Then
|
||||
Main.WebbrowserURL = WebBrowser1.Url.ToString
|
||||
Dim NameDLFinal As String = Nothing
|
||||
Dim NameDL As String() = WebBrowser1.Document.Body.OuterHtml.Split(New String() {"<div id=" + Chr(34) + "breadcrumb" + Chr(34) + ">"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim NameDL2 As String() = NameDL(1).Split(New String() {"<div>"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim NameDL3 As String() = NameDL2(0).Split(New String() {Chr(34) + "true" + Chr(34) + ">"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
For i As Integer = 0 To NameDL3.Count - 1
|
||||
If InStr(NameDL3(i), "</a>") Then
|
||||
Dim NameDL4 As String() = NameDL3(i).Split(New String() {"</a>"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
If NameDLFinal = Nothing Then
|
||||
NameDLFinal = NameDL4(0)
|
||||
Else
|
||||
NameDLFinal = NameDLFinal + " " + NameDL4(0)
|
||||
End If
|
||||
End If
|
||||
Next
|
||||
NameDLFinal = System.Text.RegularExpressions.Regex.Replace(NameDLFinal, "[^\w\\-]", " ")
|
||||
If Main.Debug2 = True Then
|
||||
MsgBox(NameDLFinal)
|
||||
End If
|
||||
Dim SiteData As String() = WebBrowser1.Document.Body.OuterHtml.Split(New String() {"var pages ="}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim SiteData2 As String() = SiteData(1).Split(New String() {"</script>"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim ImageNumbers As String() = SiteData2(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim ImageList As New List(Of String)
|
||||
Dim ImageListString As String = Nothing
|
||||
For i As Integer = 0 To ImageNumbers.Count - 1
|
||||
If InStr(ImageNumbers(i), ".jpg") Then
|
||||
ImageList.Add(ImageNumbers(i).Replace(vbNewLine, ""))
|
||||
ImageListString = ImageListString + vbNewLine + ImageNumbers(i).Replace(vbNewLine, "")
|
||||
ElseIf InStr(ImageNumbers(i), ".png") Then
|
||||
ImageList.Add(ImageNumbers(i).Replace(vbNewLine, ""))
|
||||
ImageListString = ImageListString + vbNewLine + ImageNumbers(i).Replace(vbNewLine, "")
|
||||
End If
|
||||
Next
|
||||
If Main.Debug2 = True Then
|
||||
MsgBox(ImageListString)
|
||||
End If
|
||||
Dim BaseURL As String() = SiteData2(0).Split(New String() {"var serverurl = '"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim BaseURL2 As String() = BaseURL(1).Split(New String() {"';"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim BaseURL3 As String = "https:" + BaseURL2(0)
|
||||
If Main.Debug2 = True Then
|
||||
MsgBox(BaseURL3)
|
||||
End If
|
||||
AsyncWorkerX.RunAsync(AddressOf Main.DownloadMangaPages, BaseURL3, ImageList, Main.RemoveExtraSpaces(NameDLFinal))
|
||||
Else
|
||||
Try
|
||||
|
||||
Main.m3u8List.Clear()
|
||||
@ -479,6 +574,7 @@ Public Class GeckoFX
|
||||
Button2.Enabled = True
|
||||
ScanTrue = False
|
||||
End Try
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub GeckoFX_LocationChanged(sender As Object, e As EventArgs) Handles Me.LocationChanged
|
||||
|
@ -2003,7 +2003,76 @@ Public Class Main
|
||||
einstellungen.Close()
|
||||
'MsgBox("Debug activated")
|
||||
End If
|
||||
End Sub
|
||||
Public Sub DownloadMangaPages(ByVal BaseURL As String, ByVal SiteList As List(Of String), ByVal FolderName As String)
|
||||
Dim L1Name_Split As String() = WebbrowserURL.Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
Dim L1Name As String = L1Name_Split(1).Replace("www.", "")
|
||||
Pfad_DL = Pfad + "\" + FolderName
|
||||
If Debug2 = True Then
|
||||
MsgBox(BaseURL + SiteList(0))
|
||||
End If
|
||||
Me.Invoke(New Action(Function()
|
||||
|
||||
ListAdd(Pfad_DL, L1Name, FolderName, "Manga", "Manga", "", BaseURL + SiteList(0))
|
||||
|
||||
Return Nothing
|
||||
End Function))
|
||||
|
||||
Dim CurrentIndex As Integer = 0
|
||||
For i As Integer = 0 To PB_list.Count - 1
|
||||
If PB_list.Item(i).Name = Pfad_DL Then
|
||||
CurrentIndex = i
|
||||
End If
|
||||
Next
|
||||
|
||||
|
||||
Try
|
||||
Directory.CreateDirectory(Pfad_DL)
|
||||
'MsgBox(True.ToString)
|
||||
Catch ex As Exception
|
||||
End Try
|
||||
|
||||
'If Not Directory.Exists(Path.GetDirectoryName(Pfad_DL)) Then
|
||||
' ' Nein! Jetzt erstellen...
|
||||
' Try
|
||||
' Directory.CreateDirectory(Path.GetDirectoryName(Pfad_DL))
|
||||
' MsgBox(True.ToString)
|
||||
' Catch ex As Exception
|
||||
' MsgBox(False.ToString)
|
||||
' ' Ordner wurde nich erstellt
|
||||
' Exit Sub
|
||||
' 'Pfad_DL = Pfad + "\" + CR_FilenName_Backup + ".mp4"
|
||||
' End Try
|
||||
'End If
|
||||
|
||||
For i As Integer = 0 To SiteList.Count - 1
|
||||
Using client As New WebClient()
|
||||
client.DownloadFile(BaseURL + SiteList(i), Pfad_DL + "\" + SiteList(i))
|
||||
Pause(1)
|
||||
End Using
|
||||
Me.Invoke(New Action(Function()
|
||||
Dim stringFormat As New StringFormat()
|
||||
stringFormat.Alignment = StringAlignment.Far
|
||||
stringFormat.LineAlignment = StringAlignment.Center
|
||||
Dim p As PictureBox = PB_list(CurrentIndex)
|
||||
p.Image = p.BackgroundImage
|
||||
Dim g As Graphics = Graphics.FromImage(p.Image)
|
||||
Dim ProgressbarPoint As Point = New Point(195, 70)
|
||||
Dim WeißeBox As Point = New Point(525, 93)
|
||||
Dim ProzentText As Point = New Point(795, 113)
|
||||
Dim Weiß As Brush = New SolidBrush(Color.FromArgb(242, 242, 242))
|
||||
g.FillRectangle(Weiß, WeißeBox.X + 1, WeißeBox.Y + 1, 275, 30)
|
||||
g.DrawString((i + 1).ToString + "/" + SiteList.Count.ToString + " " + Math.Round(i / (SiteList.Count - 1) * 100, 2, MidpointRounding.AwayFromZero).ToString + "%", FontLabel2.Font, Brushes.Black, ProzentText, stringFormat)
|
||||
Dim brGradient As Brush = New SolidBrush(Color.FromArgb(247, 140, 37))
|
||||
g.FillRectangle(brGradient, ProgressbarPoint.X + 1, ProgressbarPoint.Y + 1, CInt((i / (SiteList.Count - 1)) * 600), 19)
|
||||
g.Dispose()
|
||||
Return Nothing
|
||||
End Function))
|
||||
|
||||
Next
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
|
||||
End Class
|
@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("3.2.3")>
|
||||
<Assembly: AssemblyFileVersion("3.2.3")>
|
||||
<Assembly: AssemblyVersion("3.2.4")>
|
||||
<Assembly: AssemblyFileVersion("3.2.4")>
|
||||
<Assembly: NeutralResourcesLanguage("")>
|
||||
|
Binary file not shown.
Binary file not shown.
203
Crunchyroll Downloader/einstellungen.Designer.vb
generated
203
Crunchyroll Downloader/einstellungen.Designer.vb
generated
@ -45,7 +45,26 @@ Partial Class einstellungen
|
||||
Me.TabPage2 = New System.Windows.Forms.TabPage()
|
||||
Me.CheckBox1 = New System.Windows.Forms.CheckBox()
|
||||
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
|
||||
Me.FFMPEG_Command = New System.Windows.Forms.ComboBox()
|
||||
Me.Panel1 = New System.Windows.Forms.Panel()
|
||||
Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
|
||||
Me.FFMPEG_CommandP1 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ListC1 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ListC2 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ListC3 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ListC4 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ListC5 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.FFMPEG_CommandP2 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ListP1 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ListP2 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.FFMPEG_CommandP3 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ListBit1 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ListBit2 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ListBit3 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ListBit4 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ListBit5 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ListBit6 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ListBit7 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.FFMPEG_CommandP4 = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.SoftSubs = New System.Windows.Forms.GroupBox()
|
||||
Me.MergeMP4 = New System.Windows.Forms.CheckBox()
|
||||
Me.CBesES = New System.Windows.Forms.CheckBox()
|
||||
@ -90,6 +109,8 @@ Partial Class einstellungen
|
||||
CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.TabPage2.SuspendLayout()
|
||||
Me.GroupBox2.SuspendLayout()
|
||||
Me.Panel1.SuspendLayout()
|
||||
Me.MenuStrip1.SuspendLayout()
|
||||
Me.SoftSubs.SuspendLayout()
|
||||
Me.GB_SubLanguage.SuspendLayout()
|
||||
Me.GB_Resolution.SuspendLayout()
|
||||
@ -221,9 +242,9 @@ Partial Class einstellungen
|
||||
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(12, 301)
|
||||
Me.GroupBox5.Location = New System.Drawing.Point(6, 301)
|
||||
Me.GroupBox5.Name = "GroupBox5"
|
||||
Me.GroupBox5.Size = New System.Drawing.Size(444, 55)
|
||||
Me.GroupBox5.Size = New System.Drawing.Size(456, 55)
|
||||
Me.GroupBox5.TabIndex = 7
|
||||
Me.GroupBox5.TabStop = False
|
||||
Me.GroupBox5.Text = "Multi-Download"
|
||||
@ -346,7 +367,7 @@ Partial Class einstellungen
|
||||
'GroupBox2
|
||||
'
|
||||
Me.GroupBox2.BackColor = System.Drawing.Color.Transparent
|
||||
Me.GroupBox2.Controls.Add(Me.FFMPEG_Command)
|
||||
Me.GroupBox2.Controls.Add(Me.Panel1)
|
||||
Me.GroupBox2.Enabled = False
|
||||
Me.GroupBox2.Font = New System.Drawing.Font("Arial", 9.75!)
|
||||
Me.GroupBox2.ForeColor = System.Drawing.Color.Black
|
||||
@ -357,21 +378,140 @@ Partial Class einstellungen
|
||||
Me.GroupBox2.TabStop = False
|
||||
Me.GroupBox2.Text = "ffmpeg command"
|
||||
'
|
||||
'FFMPEG_Command
|
||||
'Panel1
|
||||
'
|
||||
Me.FFMPEG_Command.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
|
||||
Me.FFMPEG_Command.DropDownHeight = 250
|
||||
Me.FFMPEG_Command.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
|
||||
Me.FFMPEG_Command.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.FFMPEG_Command.FormattingEnabled = True
|
||||
Me.FFMPEG_Command.IntegralHeight = False
|
||||
Me.FFMPEG_Command.ItemHeight = 16
|
||||
Me.FFMPEG_Command.Items.AddRange(New Object() {" -c copy -bsf:a aac_adtstoasc ", " -c:v hevc_nvenc -preset fast -b:v 6M -bsf:a aac_adtstoasc ", " -c:v libx265 -preset fast -b:v 6M -bsf:a aac_adtstoasc "})
|
||||
Me.FFMPEG_Command.Location = New System.Drawing.Point(6, 25)
|
||||
Me.FFMPEG_Command.Name = "FFMPEG_Command"
|
||||
Me.FFMPEG_Command.Size = New System.Drawing.Size(437, 22)
|
||||
Me.FFMPEG_Command.Sorted = True
|
||||
Me.FFMPEG_Command.TabIndex = 33
|
||||
Me.Panel1.Controls.Add(Me.MenuStrip1)
|
||||
Me.Panel1.Location = New System.Drawing.Point(1, 21)
|
||||
Me.Panel1.Name = "Panel1"
|
||||
Me.Panel1.Size = New System.Drawing.Size(446, 32)
|
||||
Me.Panel1.TabIndex = 37
|
||||
'
|
||||
'MenuStrip1
|
||||
'
|
||||
Me.MenuStrip1.BackColor = System.Drawing.SystemColors.Control
|
||||
Me.MenuStrip1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!)
|
||||
Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FFMPEG_CommandP1, Me.FFMPEG_CommandP2, Me.FFMPEG_CommandP3, Me.FFMPEG_CommandP4})
|
||||
Me.MenuStrip1.Location = New System.Drawing.Point(0, 0)
|
||||
Me.MenuStrip1.Name = "MenuStrip1"
|
||||
Me.MenuStrip1.Size = New System.Drawing.Size(446, 24)
|
||||
Me.MenuStrip1.TabIndex = 37
|
||||
Me.MenuStrip1.Text = "MenuStrip1"
|
||||
'
|
||||
'FFMPEG_CommandP1
|
||||
'
|
||||
Me.FFMPEG_CommandP1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListC1, Me.ListC2, Me.ListC3, Me.ListC4, Me.ListC5})
|
||||
Me.FFMPEG_CommandP1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.FFMPEG_CommandP1.Name = "FFMPEG_CommandP1"
|
||||
Me.FFMPEG_CommandP1.Size = New System.Drawing.Size(64, 20)
|
||||
Me.FFMPEG_CommandP1.Text = "-c copy"
|
||||
'
|
||||
'ListC1
|
||||
'
|
||||
Me.ListC1.Name = "ListC1"
|
||||
Me.ListC1.Size = New System.Drawing.Size(180, 22)
|
||||
Me.ListC1.Text = "-c copy"
|
||||
'
|
||||
'ListC2
|
||||
'
|
||||
Me.ListC2.Name = "ListC2"
|
||||
Me.ListC2.Size = New System.Drawing.Size(180, 22)
|
||||
Me.ListC2.Text = "-c:v h264_nvenc "
|
||||
'
|
||||
'ListC3
|
||||
'
|
||||
Me.ListC3.Name = "ListC3"
|
||||
Me.ListC3.Size = New System.Drawing.Size(180, 22)
|
||||
Me.ListC3.Text = "-c:v hevc_nvenc"
|
||||
'
|
||||
'ListC4
|
||||
'
|
||||
Me.ListC4.Name = "ListC4"
|
||||
Me.ListC4.Size = New System.Drawing.Size(180, 22)
|
||||
Me.ListC4.Text = "-c:v libx264"
|
||||
'
|
||||
'ListC5
|
||||
'
|
||||
Me.ListC5.Name = "ListC5"
|
||||
Me.ListC5.Size = New System.Drawing.Size(180, 22)
|
||||
Me.ListC5.Text = "-c:v libx265"
|
||||
'
|
||||
'FFMPEG_CommandP2
|
||||
'
|
||||
Me.FFMPEG_CommandP2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListP1, Me.ListP2})
|
||||
Me.FFMPEG_CommandP2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.FFMPEG_CommandP2.Name = "FFMPEG_CommandP2"
|
||||
Me.FFMPEG_CommandP2.Size = New System.Drawing.Size(86, 20)
|
||||
Me.FFMPEG_CommandP2.Text = "-preset fast"
|
||||
'
|
||||
'ListP1
|
||||
'
|
||||
Me.ListP1.Name = "ListP1"
|
||||
Me.ListP1.Size = New System.Drawing.Size(180, 22)
|
||||
Me.ListP1.Text = "-preset fast"
|
||||
'
|
||||
'ListP2
|
||||
'
|
||||
Me.ListP2.Name = "ListP2"
|
||||
Me.ListP2.Size = New System.Drawing.Size(180, 22)
|
||||
Me.ListP2.Text = "-preset slow"
|
||||
'
|
||||
'FFMPEG_CommandP3
|
||||
'
|
||||
Me.FFMPEG_CommandP3.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListBit1, Me.ListBit2, Me.ListBit3, Me.ListBit4, Me.ListBit5, Me.ListBit6, Me.ListBit7})
|
||||
Me.FFMPEG_CommandP3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.FFMPEG_CommandP3.Name = "FFMPEG_CommandP3"
|
||||
Me.FFMPEG_CommandP3.Size = New System.Drawing.Size(80, 20)
|
||||
Me.FFMPEG_CommandP3.Text = "-b:v 7000k"
|
||||
'
|
||||
'ListBit1
|
||||
'
|
||||
Me.ListBit1.Name = "ListBit1"
|
||||
Me.ListBit1.Size = New System.Drawing.Size(180, 22)
|
||||
Me.ListBit1.Text = "-b:v 7000k"
|
||||
'
|
||||
'ListBit2
|
||||
'
|
||||
Me.ListBit2.Name = "ListBit2"
|
||||
Me.ListBit2.Size = New System.Drawing.Size(180, 22)
|
||||
Me.ListBit2.Text = "-b:v 6000k"
|
||||
'
|
||||
'ListBit3
|
||||
'
|
||||
Me.ListBit3.Name = "ListBit3"
|
||||
Me.ListBit3.Size = New System.Drawing.Size(180, 22)
|
||||
Me.ListBit3.Text = "-b:v 5000k"
|
||||
'
|
||||
'ListBit4
|
||||
'
|
||||
Me.ListBit4.Name = "ListBit4"
|
||||
Me.ListBit4.Size = New System.Drawing.Size(180, 22)
|
||||
Me.ListBit4.Text = "-b:v 4000k"
|
||||
'
|
||||
'ListBit5
|
||||
'
|
||||
Me.ListBit5.Name = "ListBit5"
|
||||
Me.ListBit5.Size = New System.Drawing.Size(180, 22)
|
||||
Me.ListBit5.Text = "-b:v 3000k"
|
||||
'
|
||||
'ListBit6
|
||||
'
|
||||
Me.ListBit6.Name = "ListBit6"
|
||||
Me.ListBit6.Size = New System.Drawing.Size(180, 22)
|
||||
Me.ListBit6.Text = "-b:v 2000k"
|
||||
'
|
||||
'ListBit7
|
||||
'
|
||||
Me.ListBit7.Name = "ListBit7"
|
||||
Me.ListBit7.Size = New System.Drawing.Size(180, 22)
|
||||
Me.ListBit7.Text = "-b:v 1000k"
|
||||
'
|
||||
'FFMPEG_CommandP4
|
||||
'
|
||||
Me.FFMPEG_CommandP4.Enabled = False
|
||||
Me.FFMPEG_CommandP4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.FFMPEG_CommandP4.Name = "FFMPEG_CommandP4"
|
||||
Me.FFMPEG_CommandP4.Size = New System.Drawing.Size(145, 20)
|
||||
Me.FFMPEG_CommandP4.Text = "-bsf:a aac_adtstoasc"
|
||||
'
|
||||
'SoftSubs
|
||||
'
|
||||
@ -398,7 +538,7 @@ Partial Class einstellungen
|
||||
'
|
||||
Me.MergeMP4.AutoSize = True
|
||||
Me.MergeMP4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.MergeMP4.Location = New System.Drawing.Point(128, 155)
|
||||
Me.MergeMP4.Location = New System.Drawing.Point(119, 148)
|
||||
Me.MergeMP4.Name = "MergeMP4"
|
||||
Me.MergeMP4.Size = New System.Drawing.Size(194, 20)
|
||||
Me.MergeMP4.TabIndex = 6
|
||||
@ -792,6 +932,10 @@ Partial Class einstellungen
|
||||
Me.TabPage2.ResumeLayout(False)
|
||||
Me.TabPage2.PerformLayout()
|
||||
Me.GroupBox2.ResumeLayout(False)
|
||||
Me.Panel1.ResumeLayout(False)
|
||||
Me.Panel1.PerformLayout()
|
||||
Me.MenuStrip1.ResumeLayout(False)
|
||||
Me.MenuStrip1.PerformLayout()
|
||||
Me.SoftSubs.ResumeLayout(False)
|
||||
Me.SoftSubs.PerformLayout()
|
||||
Me.GB_SubLanguage.ResumeLayout(False)
|
||||
@ -856,8 +1000,27 @@ Partial Class einstellungen
|
||||
Public WithEvents ComboBox2 As ComboBox
|
||||
Public WithEvents comboBox3 As ComboBox
|
||||
Friend WithEvents GroupBox2 As GroupBox
|
||||
Friend WithEvents FFMPEG_Command As ComboBox
|
||||
Friend WithEvents CheckBox1 As CheckBox
|
||||
Friend WithEvents GroupBox5 As GroupBox
|
||||
Friend WithEvents ListViewAdd_True As CheckBox
|
||||
Friend WithEvents Panel1 As Panel
|
||||
Friend WithEvents MenuStrip1 As MenuStrip
|
||||
Friend WithEvents FFMPEG_CommandP1 As ToolStripMenuItem
|
||||
Friend WithEvents ListC1 As ToolStripMenuItem
|
||||
Friend WithEvents ListC2 As ToolStripMenuItem
|
||||
Friend WithEvents ListC3 As ToolStripMenuItem
|
||||
Friend WithEvents ListC4 As ToolStripMenuItem
|
||||
Friend WithEvents ListC5 As ToolStripMenuItem
|
||||
Friend WithEvents FFMPEG_CommandP2 As ToolStripMenuItem
|
||||
Friend WithEvents ListP1 As ToolStripMenuItem
|
||||
Friend WithEvents ListP2 As ToolStripMenuItem
|
||||
Friend WithEvents FFMPEG_CommandP3 As ToolStripMenuItem
|
||||
Friend WithEvents ListBit1 As ToolStripMenuItem
|
||||
Friend WithEvents ListBit2 As ToolStripMenuItem
|
||||
Friend WithEvents ListBit3 As ToolStripMenuItem
|
||||
Friend WithEvents ListBit4 As ToolStripMenuItem
|
||||
Friend WithEvents ListBit5 As ToolStripMenuItem
|
||||
Friend WithEvents ListBit6 As ToolStripMenuItem
|
||||
Friend WithEvents ListBit7 As ToolStripMenuItem
|
||||
Friend WithEvents FFMPEG_CommandP4 As ToolStripMenuItem
|
||||
End Class
|
||||
|
@ -123,4 +123,10 @@
|
||||
<metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>346, 17</value>
|
||||
</metadata>
|
||||
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>346, 17</value>
|
||||
</metadata>
|
||||
</root>
|
@ -104,13 +104,26 @@ Public Class einstellungen
|
||||
NumericUpDown1.Value = Main.MaxDL
|
||||
TextBox1.Text = Main.Startseite
|
||||
|
||||
If Main.ffmpeg_command = " -c:v hevc_nvenc -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
|
||||
FFMPEG_Command.SelectedIndex = 1
|
||||
ElseIf Main.FFMPEG_Command = " -c:v libx265 -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
|
||||
FFMPEG_Command.SelectedIndex = 2
|
||||
If InStr(Main.ffmpeg_command, "-c copy") Then
|
||||
FFMPEG_CommandP1.Text = "-c copy"
|
||||
FFMPEG_CommandP4.Text = "-bsf:a aac_adtstoasc"
|
||||
Else
|
||||
FFMPEG_Command.SelectedIndex = 0
|
||||
Dim ffmpegDisplayCurrent As String() = Main.ffmpeg_command.Split(New String() {" "}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
FFMPEG_CommandP1.Text = ffmpegDisplayCurrent(0) + " " + ffmpegDisplayCurrent(1)
|
||||
FFMPEG_CommandP2.Text = ffmpegDisplayCurrent(2) + " " + ffmpegDisplayCurrent(3)
|
||||
FFMPEG_CommandP3.Text = ffmpegDisplayCurrent(4) + " " + ffmpegDisplayCurrent(5)
|
||||
'FFMPEG_CommandP4.Text = ffmpegDisplayCurrent(6) + " " + ffmpegDisplayCurrent(7)
|
||||
End If
|
||||
|
||||
'Dim ffmpegDisplayCurrent As String() = Main.ffmpeg_command.Split(New String() {" "}, System.StringSplitOptions.RemoveEmptyEntries)
|
||||
|
||||
'If Main.ffmpeg_command = " -c:v hevc_nvenc -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
|
||||
' FFMPEG_CommandP10.SelectedIndex = 1
|
||||
'ElseIf Main.ffmpeg_command = " -c:v libx265 -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
|
||||
' FFMPEG_CommandP10.SelectedIndex = 2
|
||||
'Else
|
||||
' FFMPEG_CommandP10.SelectedIndex = 0
|
||||
'End If
|
||||
Try
|
||||
Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
|
||||
Firefox_True.Checked = CBool(Integer.Parse(rkg.GetValue("NoUse").ToString))
|
||||
@ -206,16 +219,24 @@ Public Class einstellungen
|
||||
Main.SubFolder = 2
|
||||
rk.SetValue("SubFolder", 2, RegistryValueKind.String)
|
||||
End If
|
||||
If FFMPEG_Command.Text = "" Then
|
||||
If CheckBox1.Enabled = False Then
|
||||
|
||||
Else
|
||||
rk.SetValue("ffmpeg_command", FFMPEG_Command.Text, RegistryValueKind.String)
|
||||
Main.ffmpeg_command = FFMPEG_Command.Text
|
||||
Dim ffpmeg_cmd As String = Nothing
|
||||
If FFMPEG_CommandP1.Text = "-c copy" Then
|
||||
ffpmeg_cmd = " " + FFMPEG_CommandP1.Text + " " + FFMPEG_CommandP4.Text
|
||||
Else
|
||||
|
||||
ffpmeg_cmd = " " + FFMPEG_CommandP1.Text + " " + FFMPEG_CommandP2.Text + " " + FFMPEG_CommandP3.Text + " " + FFMPEG_CommandP4.Text
|
||||
|
||||
End If
|
||||
rk.SetValue("ffmpeg_command", ffpmeg_cmd, RegistryValueKind.String)
|
||||
Main.ffmpeg_command = ffpmeg_cmd
|
||||
End If
|
||||
|
||||
If FFMPEG_Command.Text = " -c:v hevc_nvenc -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
|
||||
If InStr(FFMPEG_CommandP1.Text, "nvenc") Then
|
||||
NumericUpDown1.Value = 2
|
||||
ElseIf FFMPEG_Command.Text = " -c:v libx265 -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
|
||||
ElseIf inStr(FFMPEG_CommandP1.Text, "libx26") Then
|
||||
NumericUpDown1.Value = 1
|
||||
End If
|
||||
rk.SetValue("SL_DL", NumericUpDown1.Value, RegistryValueKind.String)
|
||||
@ -385,7 +406,7 @@ Public Class einstellungen
|
||||
|
||||
|
||||
|
||||
Private Sub ComboBox1_DrawItem(sender As Object, e As DrawItemEventArgs) Handles ComboBox1.DrawItem, ComboBox2.DrawItem, comboBox3.DrawItem, comboBox4.DrawItem, FFMPEG_Command.DrawItem
|
||||
Private Sub ComboBox1_DrawItem(sender As Object, e As DrawItemEventArgs) Handles ComboBox1.DrawItem, ComboBox2.DrawItem, comboBox3.DrawItem, comboBox4.DrawItem
|
||||
sender.BackColor = Color.White
|
||||
If e.Index >= 0 Then
|
||||
Using st As New StringFormat With {.Alignment = StringAlignment.Center}
|
||||
@ -497,21 +518,57 @@ Public Class einstellungen
|
||||
Next
|
||||
End Sub
|
||||
|
||||
Private Sub FFMPEG_Command_SelectedIndexChanged(sender As Object, e As EventArgs) Handles FFMPEG_Command.SelectedIndexChanged
|
||||
If CheckBox1.Checked = True Then
|
||||
MsgBox("Other commands than " + Chr(34) + " -c copy -bsf:a aac_adtstoasc " + Chr(34) + "convert the Video into h265/hevc!", MsgBoxStyle.Information)
|
||||
If FFMPEG_Command.Text = " -c:v hevc_nvenc -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
|
||||
MsgBox("This command requires a Nvidia GTX 6xx/7xx (Kepler generation) or higher.", MsgBoxStyle.Information)
|
||||
ElseIf FFMPEG_Command.Text = " -c:v libx265 -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
|
||||
MsgBox("CPU encoding is low and uses all resources of the computer.", MsgBoxStyle.Information) ' -c:v libx265 -preset fast -b:v 6M -bsf:a aac_adtstoasc
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
'Private Sub FFMPEG_Command_SelectedIndexChanged(sender As Object, e As EventArgs)
|
||||
' If CheckBox1.Checked = True Then
|
||||
' MsgBox("Other commands than " + Chr(34) + " -c copy -bsf:a aac_adtstoasc " + Chr(34) + "convert the Video into h265/hevc!", MsgBoxStyle.Information)
|
||||
' If FFMPEG_CommandP10.Text = " -c:v hevc_nvenc -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
|
||||
' MsgBox("This command requires a Nvidia GTX 6xx/7xx (Kepler generation) or higher.", MsgBoxStyle.Information)
|
||||
' ElseIf FFMPEG_CommandP10.Text = " -c:v libx265 -preset fast -b:v 6M -bsf:a aac_adtstoasc " Then
|
||||
' MsgBox("CPU encoding is low and uses all resources of the computer.", MsgBoxStyle.Information) ' -c:v libx265 -preset fast -b:v 6M -bsf:a aac_adtstoasc
|
||||
' End If
|
||||
' End If
|
||||
'End Sub
|
||||
|
||||
Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox1.CheckedChanged
|
||||
GroupBox2.Enabled = CheckBox1.CheckState
|
||||
If FFMPEG_CommandP1.Text = "-c copy" Then
|
||||
FFMPEG_CommandP2.Enabled = False
|
||||
FFMPEG_CommandP3.Enabled = False
|
||||
Else
|
||||
FFMPEG_CommandP2.Enabled = True
|
||||
FFMPEG_CommandP3.Enabled = True
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub ListC1_Click(sender As Object, e As EventArgs) Handles ListC1.Click, ListC2.Click, ListC3.Click, ListC4.Click, ListC5.Click
|
||||
Dim Button As ToolStripMenuItem = sender
|
||||
If Button.Text = "-c copy" Then
|
||||
FFMPEG_CommandP1.Text = "-c copy"
|
||||
FFMPEG_CommandP2.Enabled = False
|
||||
FFMPEG_CommandP3.Enabled = False
|
||||
Else
|
||||
FFMPEG_CommandP1.Text = Button.Text
|
||||
FFMPEG_CommandP2.Enabled = True
|
||||
FFMPEG_CommandP3.Enabled = True
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub ListP1_Click(sender As Object, e As EventArgs) Handles ListP1.Click, ListP2.Click
|
||||
Dim Button As ToolStripMenuItem = sender
|
||||
FFMPEG_CommandP2.Text = Button.Text
|
||||
FFMPEG_CommandP2.Enabled = True
|
||||
FFMPEG_CommandP3.Enabled = True
|
||||
End Sub
|
||||
|
||||
Private Sub ListBit1_Click(sender As Object, e As EventArgs) Handles ListBit1.Click, ListBit2.Click, ListBit3.Click, ListBit4.Click, ListBit5.Click, ListBit6.Click, ListBit7.Click
|
||||
Dim Button As ToolStripMenuItem = sender
|
||||
FFMPEG_CommandP3.Text = Button.Text
|
||||
FFMPEG_CommandP2.Enabled = True
|
||||
FFMPEG_CommandP3.Enabled = True
|
||||
End Sub
|
||||
|
||||
|
||||
|
||||
|
||||
#End Region
|
||||
|
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
18a59f282f1f5b16b30399d2b0996e199647fe62
|
||||
f5bb51c2bd559fd873e12f725d513bde820bf4f0
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user