Add files via upload

Revan654 · Feb 25, 2019 · 0b6af5d · 0b6af5d
1 parent 90ec9fc
commit 0b6af5d
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 84 deletions.
diff --git a/General/ApplicationSettings.vb b/General/ApplicationSettings.vb
@@ -119,62 +119,30 @@ Public Class ApplicationSettings
 
         If Check(Demuxers, "Demuxers", 106) Then Demuxers = Demuxer.GetDefaults()
 
-        If Path.GetDirectoryName(Folder.Startup).Contains("Revan") Then
-            If Check(AviSynthFilterPreferences, "AviSynth Source Filter Preferences", 1) Then
-                AviSynthFilterPreferences = New StringPairList
-                AviSynthFilterPreferences.Add("default", "DGSource")
-                AviSynthFilterPreferences.Add("264 h264 avc", "DGSource")
-                AviSynthFilterPreferences.Add("265 h265 hevc hvc", "DGSource")
-                AviSynthFilterPreferences.Add("d2v", "MPEG2Source")
-                AviSynthFilterPreferences.Add("dgi", "DGSource")
-                AviSynthFilterPreferences.Add("dgim", "DGSourceIM")
-                AviSynthFilterPreferences.Add("mp4 m4v mov", "DGSource")
-                AviSynthFilterPreferences.Add("ts m2ts mts m2t", "DGSource")
-                AviSynthFilterPreferences.Add("wmv", "DSS2")
-                AviSynthFilterPreferences.Add("avi vdr", "AviSource")
-                AviSynthFilterPreferences.Add("webm", "FFVideoSource")
-            End If
-        Else
-            If Check(AviSynthFilterPreferences, "AviSynth Source Filter Preferences", 1) Then
-                AviSynthFilterPreferences = New StringPairList
-                AviSynthFilterPreferences.Add("default", "FFVideoSource")
-                AviSynthFilterPreferences.Add("264 h264 avc", "LWLibavVideoSource")
-                AviSynthFilterPreferences.Add("265 h265 hevc hvc", "LWLibavVideoSource")
-                AviSynthFilterPreferences.Add("d2v", "MPEG2Source")
-                AviSynthFilterPreferences.Add("dgi", "DGSource")
-                AviSynthFilterPreferences.Add("dgim", "DGSourceIM")
-                AviSynthFilterPreferences.Add("mp4 m4v mov webm", "LSMASHVideoSource")
-                AviSynthFilterPreferences.Add("ts m2ts mts m2t", "LWLibavVideoSource")
-                AviSynthFilterPreferences.Add("wmv", "DSS2")
-                AviSynthFilterPreferences.Add("avi vdr", "AviSource")
-            End If
+        If Check(AviSynthFilterPreferences, "AviSynth Source Filter Preferences", 1) Then
+            AviSynthFilterPreferences = New StringPairList
+            AviSynthFilterPreferences.Add("default", "FFVideoSource")
+            AviSynthFilterPreferences.Add("264 h264 avc", "LWLibavVideoSource")
+            AviSynthFilterPreferences.Add("265 h265 hevc hvc", "LWLibavVideoSource")
+            AviSynthFilterPreferences.Add("d2v", "MPEG2Source")
+            AviSynthFilterPreferences.Add("dgi", "DGSource")
+            AviSynthFilterPreferences.Add("dgim", "DGSourceIM")
+            AviSynthFilterPreferences.Add("mp4 m4v mov webm", "LSMASHVideoSource")
+            AviSynthFilterPreferences.Add("ts m2ts mts m2t", "LWLibavVideoSource")
+            AviSynthFilterPreferences.Add("wmv", "DSS2")
+            AviSynthFilterPreferences.Add("avi vdr", "AviSource")
         End If
 
-        If Path.GetDirectoryName(Folder.Startup).Contains("Revan") Then
-            If Check(VapourSynthFilterPreferences, "VapourSynth Source Filter Preference", 3) Then
-                VapourSynthFilterPreferences = New StringPairList
-                VapourSynthFilterPreferences.Add("default", "DGSource")
-                VapourSynthFilterPreferences.Add("264 h264 avc", "DGSource")
-                VapourSynthFilterPreferences.Add("265 h265 hevc hvc", "DGSource")
-                VapourSynthFilterPreferences.Add("avi avs vdr", "AVISource")
-                VapourSynthFilterPreferences.Add("mp4 m4v mov", "DGSource")
-                VapourSynthFilterPreferences.Add("ts m2ts mts m2t", "DGSource")
-                VapourSynthFilterPreferences.Add("d2v", "d2vsource")
-                VapourSynthFilterPreferences.Add("dgi", "DGSource")
-                VapourSynthFilterPreferences.Add("webm", "ffms2")
-            End If
-        Else
-            If Check(VapourSynthFilterPreferences, "VapourSynth Source Filter Preference", 3) Then
-                VapourSynthFilterPreferences = New StringPairList
-                VapourSynthFilterPreferences.Add("default", "ffms2")
-                VapourSynthFilterPreferences.Add("264 h264 avc", "LWLibavSource")
-                VapourSynthFilterPreferences.Add("265 h265 hevc hvc", "LWLibavSource")
-                VapourSynthFilterPreferences.Add("avi avs vdr", "AVISource")
-                VapourSynthFilterPreferences.Add("mp4 m4v mov webm", "LibavSMASHSource")
-                VapourSynthFilterPreferences.Add("ts m2ts mts m2t", "LWLibavSource")
-                VapourSynthFilterPreferences.Add("d2v", "d2vsource")
-                VapourSynthFilterPreferences.Add("dgi", "DGSource")
-            End If
+        If Check(VapourSynthFilterPreferences, "VapourSynth Source Filter Preference", 3) Then
+            VapourSynthFilterPreferences = New StringPairList
+            VapourSynthFilterPreferences.Add("default", "ffms2")
+            VapourSynthFilterPreferences.Add("264 h264 avc", "LWLibavSource")
+            VapourSynthFilterPreferences.Add("265 h265 hevc hvc", "LWLibavSource")
+            VapourSynthFilterPreferences.Add("avi avs vdr", "AVISource")
+            VapourSynthFilterPreferences.Add("mp4 m4v mov webm", "LibavSMASHSource")
+            VapourSynthFilterPreferences.Add("ts m2ts mts m2t", "LWLibavSource")
+            VapourSynthFilterPreferences.Add("d2v", "d2vsource")
+            VapourSynthFilterPreferences.Add("dgi", "DGSource")
         End If
 
         If Check(eac3toProfiles, "eac3to Audio Stream Profiles", 4) Then

diff --git a/General/General.vb b/General/General.vb
@@ -13,14 +13,20 @@ Imports StaxRip.UI
 Imports VB6 = Microsoft.VisualBasic
 Imports Microsoft.Win32
 
-Public Class Folder
-
+Public Class Folder
+
 #Region "System"
-
+
     Shared ReadOnly Property Desktop() As String
         Get
             Return Environment.GetFolderPath(Environment.SpecialFolder.Desktop).FixDir
         End Get
+    End Property
+
+    Shared ReadOnly Property Fonts() As String
+        Get
+            Return Environment.GetFolderPath(Environment.SpecialFolder.Fonts).FixDir
+        End Get
     End Property
 
     Shared ReadOnly Property Startup() As String

diff --git a/General/GlobalCommands.vb b/General/GlobalCommands.vb
@@ -276,10 +276,10 @@ Public Class GlobalCommands
 
     <Command("Test")>
     Sub Test()
-        If Not File.Exists(Folder.Startup.Parent + "Encoding\nvenc.vb") Then
-            MsgError("This feature is development related.")
-            Exit Sub
-        End If
+        'If Not File.Exists(Folder.Startup.Parent + "Encoding\nvenc.vb") Then
+        '    MsgError("This feature is development related.")
+        '    Exit Sub
+        'End If
 
         Dim msg = ""
 
@@ -296,7 +296,7 @@ Public Class GlobalCommands
             --avsync --mux-option --input-res --fps --dar --audio-ignore-decode-error --audio-ignore-notrack-error
             --log --log-framelist".Split((" " + BR).ToCharArray())
 
-        File.WriteAllText(Package.NVEnc.GetDir + "help.txt", ProcessHelp.GetStdOut(Package.NVEnc.Path, "-h"))
+        File.WriteAllText(Package.NVEnc.GetDir + "\help.txt", ProcessHelp.GetStdOut(Package.NVEnc.Path, "-h"))
         Dim nvHelp = File.ReadAllText(Package.NVEnc.GetDir + "help.txt").Replace("(no-)", "").Replace("--no-", "--")
         Dim nvHelpSwitches = Regex.Matches(nvHelp, "--[\w-]+").OfType(Of Match)().Select(Function(x) x.Value)
         Dim nvCode = File.ReadAllText(Folder.Startup.Parent + "Encoding\nvenc.vb").Replace("--no-", "--")
@@ -535,18 +535,18 @@ Default Scripts
 ---------------
 
 "
-        Dim psdir = "C:\Users\Revan\Desktop\StaxRip\docs\powershell"
+        Dim psdir = "C:\Users\Revan\Desktop\staxrip-master\docs\powershell"
         DirectoryHelp.Delete(psdir)
         Directory.CreateDirectory(psdir)
 
-        For Each i In Directory.GetFiles("C:\Users\Revan\Desktop\StaxRip\bin\Apps\Scripts")
+        For Each i In Directory.GetFiles("C:\Users\Revan\Desktop\staxrip-master\bin\Apps\Scripts")
             FileHelp.Copy(i, psdir + i.FileName)
             Dim filename = i.FileName
             powershell += filename + BR + "~".Multiply(filename.Length) + BR2
             powershell += ".. literalinclude:: " + "powershell/" + i.FileName + BR + "   :language: powershell" + BR2
         Next
 
-        powershell.WriteUTF8File("C:\Users\Revan\Desktop\StaxRip\docs\powershell.rst")
+        powershell.WriteUTF8File("C:\Users\Revan\Desktop\staxrip-master\docs\powershell.rst")
 
         Dim switches = "Command Line Interface
 ======================
@@ -615,7 +615,7 @@ Switches
             switches += command.Attribute.Description + BR2 + BR
         Next
 
-        switches.WriteUTF8File("C:\Users\Revan\Desktop\StaxRip\docs\cli.rst")
+        switches.WriteUTF8File("C:\Users\Revan\Desktop\staxrip-master\docs\cli.rst")
 
         If msg <> "" Then
             Dim fs = Folder.Temp + "staxrip todo.txt"

diff --git a/General/Package.vb b/General/Package.vb
@@ -1052,18 +1052,6 @@ Public Class Package
                 New VideoFilter("Source", "LibavSMASHSource", "clip = core.lsmas.LibavSMASHSource(r""%source_file%"")"),
                 New VideoFilter("Source", "LWLibavSource", "clip = core.lsmas.LWLibavSource(r""%source_file%"")")}})
 
-        Add(New PluginPackage With {
-            .Name = "vsrawsource",
-            .Filename = "vsrawsource.dll",
-            .DirPath = "Plugins\VS\vsRawSource",
-            .Description = "VapourSynth source filter based on Libav supporting a wide range of input formats.",
-            .HelpURL = "http://github.com/VFR-maniac/L-SMASH-Works/blob/master/VapourSynth/README",
-            .WebURL = "http://avisynth.nl/index.php/LSMASHSource",
-            .VSFilterNames = {"lsmas.LibavSMASHSource", "lsmas.LWLibavSource"},
-            .VSFiltersFunc = Function() {
-                New VideoFilter("Source", "LibavSMASHSource", "clip = core.lsmas.LibavSMASHSource(r""%source_file%"")"),
-                New VideoFilter("Source", "LWLibavSource", "clip = core.lsmas.LWLibavSource(r""%source_file%"")")}})
-
         Add(New PluginPackage With {
             .Name = "Deblock",
             .Filename = "Deblock.dll",
@@ -1984,7 +1972,7 @@ Public Class AviSynthPlusPackage
         WebURL = "http://avisynth.nl/index.php/AviSynth%2B"
         Description = "StaxRip support both AviSynth+ x64 and VapourSynth x64 as scripting based video processing tool."
         FixedDir = Folder.System
-        SetupFilename = "Installers\AviSynthPlus-MT-r2728.exe"
+        SetupFilename = "Installers\AviSynthPlus-MT-r2772.exe"
     End Sub
 
     Public Overrides Property IsRequired As Boolean