diff --git a/.gitignore b/.gitignore index b6259fb..ca4edd1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,60 +1,33 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - # User-specific files *.rsuser *.suo *.user *.userosscache *.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) *.userprefs - -# Mono auto generated files mono_crash.* # Build results [Dd]ebug/ -[Dd]ebugPublic/ [Rr]elease/ -[Rr]eleases/ x64/ x86/ [Aa][Rr][Mm]/ [Aa][Rr][Mm]64/ bld/ -[Bb]in/ -[Oo]bj/ [Ll]og/ [Ll]ogs/ Flowframes*.7z FF*.7z Build/WebInstaller -# NMKD Python Redist Pkg -[Pp]y*/ - - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - # Visual Studio 2017 auto generated files -Generated\ Files/ +Generated Files/ # MSTest test Results [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - # Build Results of an ATL Project [Dd]ebugPS/ [Rr]eleasePS/ @@ -68,38 +41,6 @@ project.lock.json project.fragment.lock.json artifacts/ -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - # Chutzpah Test files _Chutzpah* @@ -123,20 +64,11 @@ ipch/ # Visual Studio Trace Files *.e2e -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - # ReSharper is a .NET coding add-in _ReSharper*/ *.[Rr]e[Ss]harper *.DotSettings.user -# TeamCity is a build add-in -_TeamCity* - # DotCover is a Code Coverage Tool *.dotCover @@ -179,29 +111,17 @@ publish/ # Publish Web Output *.[Pp]ublish.xml *.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted *.pubxml *.publishproj -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted +# Microsoft Azure Web App publish settings PublishScripts/ # NuGet Packages *.nupkg -# NuGet Symbol Packages *.snupkg -# The packages folder can be ignored because of Package Restore **/[Pp]ackages/* -# except build/, which is used as an MSBuild target. !**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets # Microsoft Azure Build Output csx/ @@ -220,37 +140,10 @@ _pkginfo.txt *.appxbundle *.appxupload -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others +# ClientBin folder generated by Visual Studio ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ # Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML @@ -278,56 +171,12 @@ FakesAssemblies/ # GhostDoc plugin setting file *.GhostDoc.xml -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) +# Node.js Tools for Visual Studio (PTVS) __pycache__/ *.pyc -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs +# CodeRush personal settings +.cr/personal # OpenCover UI analysis results OpenCover/ @@ -356,7 +205,29 @@ MigrationBackup/ # Ionide (cross platform F# VS Code tools) working folder .ionide/ -# AI Model Files (Too big for repo) +# Common IntelliJ Platform excludes +**/.idea/ +**/*.iml +**/*.iws +**/*.ipr + +# Rider +**/*.suo +**/*.user +**/*.resharper* +**/*.DotSettings.user +**/*.sln.docstates.user + +# Python AI Model Files (Too big for repo) *.pkl *.bin *.param + +# Visual Studio IntelliCode +.vscode/ + +# Visual Studio Scaffolding +*.scaffoldsettings + +# User-specific files for JetBrains Rider +.rider \ No newline at end of file diff --git a/Code/Media/FfmpegEncode.cs b/Code/Media/FfmpegEncode.cs index f76b4cd..d123771 100644 --- a/Code/Media/FfmpegEncode.cs +++ b/Code/Media/FfmpegEncode.cs @@ -95,7 +95,7 @@ public static async Task GetFfmpegExportArgsOut(Fraction resampleFps, Vi } filters.Add(GetPadFilter()); - filters = filters.Where(f => f.IsNotEmpty()).ToList(); + filters = filters.Where(f => !string.IsNullOrEmpty(f)).ToList(); return filters.Count > 0 ? $"{string.Join(" ", beforeArgs)} -filter_complex [0:v]{string.Join("[vf],[vf]", filters.Where(f => !string.IsNullOrWhiteSpace(f)))}[vf] -map [vf] {string.Join(" ", extraArgs)}" :