From c6c46775c4eb276c439baffc484d2d2ec6251c1a Mon Sep 17 00:00:00 2001 From: Marco Giuntoni Date: Wed, 18 Dec 2024 16:31:07 +0100 Subject: [PATCH] Temporarily disabled FFMPeg to allow compile Release in OFFICE --- ComicCompress.csproj | 1 + ComicCompress.csproj.user | 5 ++++- ComicCompress.sln | 3 +++ Program.cs | 11 ++++++----- Properties/launchSettings.json | 3 ++- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ComicCompress.csproj b/ComicCompress.csproj index 8d860f2..291e1fa 100644 --- a/ComicCompress.csproj +++ b/ComicCompress.csproj @@ -6,6 +6,7 @@ ComicCompressor ComicCompress True + Debug;Release;ReleaseWDbg diff --git a/ComicCompress.csproj.user b/ComicCompress.csproj.user index e2ee5ae..34aa672 100644 --- a/ComicCompress.csproj.user +++ b/ComicCompress.csproj.user @@ -4,9 +4,12 @@ ProjectDebugger - DEV_HOME + DEV_UFF ProjectDebugger + + ProjectDebugger + \ No newline at end of file diff --git a/ComicCompress.sln b/ComicCompress.sln index 7b2586c..5af609b 100644 --- a/ComicCompress.sln +++ b/ComicCompress.sln @@ -9,12 +9,15 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU + ReleaseWDbg|Any CPU = ReleaseWDbg|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {2625C71D-E4EC-4768-BF04-87AAB364916A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2625C71D-E4EC-4768-BF04-87AAB364916A}.Debug|Any CPU.Build.0 = Debug|Any CPU {2625C71D-E4EC-4768-BF04-87AAB364916A}.Release|Any CPU.ActiveCfg = Release|Any CPU {2625C71D-E4EC-4768-BF04-87AAB364916A}.Release|Any CPU.Build.0 = Release|Any CPU + {2625C71D-E4EC-4768-BF04-87AAB364916A}.ReleaseWDbg|Any CPU.ActiveCfg = ReleaseWDbg|Any CPU + {2625C71D-E4EC-4768-BF04-87AAB364916A}.ReleaseWDbg|Any CPU.Build.0 = ReleaseWDbg|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Program.cs b/Program.cs index e65235f..8e4876b 100644 --- a/Program.cs +++ b/Program.cs @@ -146,13 +146,14 @@ namespace ComicCompressor Logger.Log(progVersion, LogLevel.Verbose, true); - var progress = new Progress( p => Logger.Log(p.ToString(), LogLevel.Verbose, true) ); - FFmpeg.SetExecutablesPath(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location)); - FFmpegDownloader.GetLatestVersion(FFmpegVersion.Official,progress); + //var progress = new Progress( p => Logger.Log(p.ToString(), LogLevel.Verbose, true) ); + //FFmpeg.SetExecutablesPath(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location)); + //FFmpegDownloader.GetLatestVersion(FFmpegVersion.Official,progress); - //FFmpeg.SetExecutablesPath (Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "FFmpeg")); - Logger.Log(FFmpeg.ExecutablesPath, LogLevel.Verbose, true); + //==//FFmpeg.SetExecutablesPath (Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "FFmpeg")); + + //Logger.Log(FFmpeg.ExecutablesPath, LogLevel.Verbose, true); IList files = new FileParser().ListAllFiles(Input, Recursive); diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json index 65d0ded..04f4d26 100644 --- a/Properties/launchSettings.json +++ b/Properties/launchSettings.json @@ -26,7 +26,8 @@ }, "DEV_UFF": { "commandName": "Project", - "commandLineArgs": "-i \"E:\\SynologyDrive\\SynologyDrive\\A\\_PRINT_TEMPLATES_\\DEV_IN\" -o \"E:\\SynologyDrive\\SynologyDrive\\A\\_PRINT_TEMPLATES_\\DEV_OUT\" -r -s -j -a -n" + "commandLineArgs": "-i \"E:\\SynologyDrive\\SynologyDrive\\A\\_PRINT_TEMPLATES_\\DEV_IN\" -o \"E:\\SynologyDrive\\SynologyDrive\\A\\_PRINT_TEMPLATES_\\DEV_OUT\" -r -s -j -a -n", + "nativeDebugging": true }, "DEV_HOME": { "commandName": "Project",