Permalink
Browse files

-

  • Loading branch information...
stax76
stax76 committed Sep 7, 2017
1 parent e17762b commit 2385eb41b96d89de0f206f132f8942f1b960d37e
View
@@ -37,10 +37,10 @@ Public Class AOMEnc
Overrides Sub Encode()
p.Script.Synchronize()
Encode("Encoding video using aomenc " + Package.AOMEnc.Version, GetArgs(1, p.Script))
Encode("Video encoding using aomenc " + Package.AOMEnc.Version, GetArgs(1, p.Script))
If Params.Mode.Value = AV1RateMode.TwoPass Then
Encode("Encoding video second pass using aomenc " + Package.AOMEnc.Version, GetArgs(2, p.Script))
Encode("Video encoding second pass using aomenc " + Package.AOMEnc.Version, GetArgs(2, p.Script))
End If
AfterEncoding()
View
@@ -487,7 +487,7 @@ Public Class BatchEncoder
Dim batchCode = Proc.WriteBatchFile(batchPath, GetBatchCode(Macro.Expand(CommandLines).Trim))
Using proc As New Proc
proc.Header = "Encoding video command line encoder: " + Name
proc.Header = "Video encoding command line encoder: " + Name
proc.SkipStrings = GetSkipStrings(CommandLines)
proc.WriteLog(batchCode + BR2)
proc.File = "cmd.exe"
View
@@ -38,13 +38,13 @@ Public Class x264Enc
Overrides Sub Encode()
p.Script.Synchronize()
Encode("Encoding video", GetArgs(1, p.Script), s.ProcessPriority)
Encode("Video encoding", GetArgs(1, p.Script), s.ProcessPriority)
If Params.Mode.Value = x264RateMode.TwoPass Then
Encode("Encoding video second pass", GetArgs(2, p.Script), s.ProcessPriority)
Encode("Video encoding second pass", GetArgs(2, p.Script), s.ProcessPriority)
ElseIf Params.Mode.Value = x264RateMode.ThreePass Then
Encode("Encoding video second pass", GetArgs(3, p.Script), s.ProcessPriority)
Encode("Encoding video third pass", GetArgs(2, p.Script), s.ProcessPriority)
Encode("Video encoding second pass", GetArgs(3, p.Script), s.ProcessPriority)
Encode("Video encoding third pass", GetArgs(2, p.Script), s.ProcessPriority)
End If
AfterEncoding()
View
@@ -39,13 +39,13 @@ Public Class x265Enc
Overrides Sub Encode()
p.Script.Synchronize()
Encode("Encoding video", GetArgs(1, p.Script), s.ProcessPriority)
Encode("Video encoding", GetArgs(1, p.Script), s.ProcessPriority)
If Params.Mode.Value = x265RateMode.TwoPass Then
Encode("Encoding video second pass", GetArgs(2, p.Script), s.ProcessPriority)
Encode("Video encoding second pass", GetArgs(2, p.Script), s.ProcessPriority)
ElseIf Params.Mode.Value = x265RateMode.ThreePass Then
Encode("Encoding video second pass", GetArgs(3, p.Script), s.ProcessPriority)
Encode("Encoding video third pass", GetArgs(2, p.Script), s.ProcessPriority)
Encode("Video encoding second pass", GetArgs(3, p.Script), s.ProcessPriority)
Encode("Video encoding third pass", GetArgs(2, p.Script), s.ProcessPriority)
End If
AfterEncoding()
View
@@ -230,7 +230,11 @@ Public Class AppsForm
ToolStrip.Font = New Font("Segoe UI", 9 * s.UIScaleFactor)
g.SetRenderer(ToolStrip)
AddHandler SetupButton.Click, Sub() RunSetup()
AddHandler SetupButton.Click, Sub()
CurrentPackage.SetupAction.Invoke
ShowActivePackage()
End Sub
SetupButton.ForeColor = Color.Red
SetupButton.AutoSize = True
SetupButton.AutoSizeMode = Windows.Forms.AutoSizeMode.GrowAndShrink
@@ -264,7 +268,9 @@ Public Class AppsForm
Headers("Title").Text = CurrentPackage.Name
SetupButton.Text = "Install " + CurrentPackage.Name
SetupButton.Visible = CurrentPackage.SetupFilename <> "" AndAlso (CurrentPackage.IsStatusCritical OrElse (Not CurrentPackage.IsCorrectVersion AndAlso CurrentPackage.Version <> "")) AndAlso File.Exists(Folder.Apps + CurrentPackage.SetupFilename)
SetupButton.Visible = Not CurrentPackage.SetupAction Is Nothing AndAlso
(CurrentPackage.IsStatusCritical OrElse
(Not CurrentPackage.IsCorrectVersion AndAlso CurrentPackage.Version <> ""))
DownloadButton.Text = "Download " + CurrentPackage.Name
DownloadButton.Visible = CurrentPackage.DownloadURL <> "" AndAlso (CurrentPackage.IsStatusCritical OrElse (Not CurrentPackage.IsCorrectVersion AndAlso CurrentPackage.Version <> ""))
@@ -352,11 +358,6 @@ Public Class AppsForm
flp.Controls.Add(contentLabel)
End Sub
Sub RunSetup()
g.StartProcess(Folder.Apps + CurrentPackage.SetupFilename)
ShowActivePackage()
End Sub
Sub ShowPackage(package As Package)
For Each i As TreeNode In tv.Nodes
If i.IsExpanded Then i.Collapse()
@@ -414,8 +415,8 @@ Public Class AppsForm
Dim plugin = TryCast(pack, PluginPackage)
Dim searchString = pack.Name + pack.Description + pack.Version +
plugin?.VapourSynthFilterNames.Join(" ") +
plugin?.AviSynthFilterNames.Join(" ")
plugin?.VapourSynthFilterNames.Join(" ") +pack.Path+
plugin?.AviSynthFilterNames.Join(" ")
If searchString?.ToLower.Contains(SearchTextBox.Text?.ToLower) Then
If plugin Is Nothing Then
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -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
@@ -0,0 +1,38 @@
Imports System.Text.RegularExpressions
Public Class LogForm
Property Path As String
Public Sub New()
InitializeComponent()
ScaleClientSize(55, 35)
lb.ItemHeight = FontHeight * 2
rtb.Font = New Font("Consolas", 10 * s.UIScaleFactor)
rtb.ReadOnly = True
rtb.BackColor = Color.White
End Sub
Sub Init()
rtb.Text = File.ReadAllText(Path)
For Each match As Match In Regex.Matches(rtb.Text, "----- (.+) -----")
Dim val = match.Groups(1).Value
Dim match2 = Regex.Match(val, " \d+\.+.+")
If match2.Success Then val = val.Substring(0, val.Length - match2.Value.Length)
lb.Items.Add(val)
Next
lb.Items.Add("Open with " + g.GetTextEditor.Base)
End Sub
Private Sub lb_SelectedIndexChanged(sender As Object, e As EventArgs) Handles lb.SelectedIndexChanged
If lb.SelectedItem Is Nothing Then Exit Sub
If lb.SelectedItem.ToString.StartsWith("Open with") Then
g.StartProcess(g.GetTextEditor, p.Log.GetPath.Escape)
Else
rtb.Find(lb.SelectedItem.ToString)
rtb.ScrollToCaret()
End If
End Sub
End Class
View
@@ -1579,6 +1579,8 @@ Public Class MainForm
Log = p.Log
If File.Exists(Folder.Temp + "staxrip.log") Then FileHelp.Delete(Folder.Temp + "staxrip.log")
SetBindings(p, True)
Text = Application.ProductName + " x64 - " + path.Base
@@ -1938,7 +1940,7 @@ Public Class MainForm
tbTargetFile.Text = FilePath.GetDirAndBase(p.TargetFile) + "_new" + FilePath.GetExtFull(p.TargetFile)
End If
Log.WriteHeader("Source file MediaInfo")
Log.WriteHeader("MediaInfo Source File")
For Each i In p.SourceFiles
Log.WriteLine(i)
@@ -4402,8 +4404,7 @@ Public Class MainForm
ret.Add("Options", NameOf(ShowOptionsDialog), Keys.F8)
ret.Add("Tools|Jobs...", NameOf(ShowJobsDialog), Keys.F6, Symbol.MultiSelectLegacy)
ret.Add("Tools|Log File", NameOf(g.DefaultCommands.ExecuteCommandLine), Symbol.Page, {"""%text_editor%"" ""%working_dir%%target_name%_staxrip.log"""})
ret.Add("Tools|Log File", NameOf(g.DefaultCommands.ShowLogFile), Symbol.Page)
ret.Add("Tools|Folders", Symbol.Folder)
ret.Add("Tools|Folders|Log Files", NameOf(g.DefaultCommands.ExecuteCommandLine), {"""%settings_dir%Log Files"""})
ret.Add("Tools|Folders|Plugins", NameOf(g.DefaultCommands.ExecuteCommandLine), {"""%plugin_dir%"""})
Oops, something went wrong.

0 comments on commit 2385eb4

Please sign in to comment.