From 15abb82b6a149534421d0be1980e14cc0c45cb90 Mon Sep 17 00:00:00 2001 From: Maxime Gervais Date: Tue, 25 Jun 2024 15:30:47 +0200 Subject: [PATCH] Handle 64bit graph plugin Signed-off-by: Maxime Gervais --- Source/Common/Preferences.cpp | 11 +++++++++++ Source/Common/Preferences.h | 1 + Source/GUI/VCL/GUI_Plugin.cpp | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/Source/Common/Preferences.cpp b/Source/Common/Preferences.cpp index 3dfd27d54..48ab5402a 100644 --- a/Source/Common/Preferences.cpp +++ b/Source/Common/Preferences.cpp @@ -74,6 +74,7 @@ Preferences::Preferences() //Plugins GraphPluginURL=__T(""); + GraphPlugin64URL=__T(""); GraphPluginVersion=__T(""); FFmpegPluginURL=__T(""); FFmpegPluginVersion=__T(""); @@ -219,6 +220,9 @@ int Preferences::Config_Load() SponsorUrl.Write(Saved); } + if (!Config(__T("GraphPlugin64URL")).empty()) + GraphPlugin64URL=Config(__T("GraphPlugin64URL")); + if (!Config(__T("GraphPluginURL")).empty()) GraphPluginURL=Config(__T("GraphPluginURL")); @@ -542,6 +546,13 @@ void __fastcall ThreadInternetCheck::Execute() Prefs->Config_Save(); //Plugins + Ztring GraphPlugin64URL=Download(__T("GraphPlugin64URL")); + if (!GraphPlugin64URL.empty()) + { + Prefs->Config(__T("GraphPlugin64URL"))=GraphPlugin64URL; + Prefs->Config_Save(); + } + Ztring GraphPluginURL=Download(__T("GraphPluginURL")); if (!GraphPluginURL.empty()) { diff --git a/Source/Common/Preferences.h b/Source/Common/Preferences.h index deb1d541e..f2be462b1 100644 --- a/Source/Common/Preferences.h +++ b/Source/Common/Preferences.h @@ -95,6 +95,7 @@ class Preferences //Plugins ZenLib::Ztring GraphPluginURL; + ZenLib::Ztring GraphPlugin64URL; ZenLib::Ztring GraphPluginVersion; ZenLib::Ztring FFmpegPluginURL; ZenLib::Ztring FFmpegPluginVersion; diff --git a/Source/GUI/VCL/GUI_Plugin.cpp b/Source/GUI/VCL/GUI_Plugin.cpp index 069a0dfac..45c76306e 100644 --- a/Source/GUI/VCL/GUI_Plugin.cpp +++ b/Source/GUI/VCL/GUI_Plugin.cpp @@ -214,7 +214,11 @@ bool __fastcall TPluginF::Configure() switch (Plugin) { case PLUGIN_GRAPH: + #ifdef _WIN64 + SourceURL = Prefs->Config(__T("GraphPlugin64URL")); + #else SourceURL = Prefs->Config(__T("GraphPluginURL")); + #endif break; case PLUGIN_FFMPEG: SourceURL = Prefs->Config(__T("FFmpegPluginURL"));