ffmpeg -> FFmpeg

Signed-off-by: Maxime Gervais <[email protected]>
MediaArea · Nov 26, 2023 · bd3ac20 · bd3ac20
1 parent c9d08a6
commit bd3ac20
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/Source/Common/Preferences.cpp b/Source/Common/Preferences.cpp
@@ -75,8 +75,8 @@ Preferences::Preferences()
     //Plugins
     GraphPluginURL=__T("");
     GraphPluginVersion=__T("");
-    ffmpegPluginURL=__T("");
-    ffmpegPluginVersion=__T("");
+    FFmpegPluginURL=__T("");
+    FFmpegPluginVersion=__T("");
 }
 
 //***************************************************************************
@@ -225,11 +225,11 @@ int Preferences::Config_Load()
     if (!Config(__T("GraphPluginVersion")).empty())
         GraphPluginVersion=Config(__T("GraphPluginVersion"));
 
-    if (!Config(__T("ffmpegPluginURL")).empty())
-        ffmpegPluginURL=Config(__T("ffmpegPluginURL"));
+    if (!Config(__T("FFmpegPluginURL")).empty())
+        FFmpegPluginURL=Config(__T("FFmpegPluginURL"));
 
-    if (!Config(__T("ffmpegPluginVersion")).empty())
-        ffmpegPluginVersion=Config(__T("ffmpegPluginVersion"));
+    if (!Config(__T("FFmpegPluginVersion")).empty())
+        FFmpegPluginVersion=Config(__T("FFmpegPluginVersion"));
 
     delete Reg_User; Reg_User=NULL;
 
@@ -554,17 +554,17 @@ void __fastcall ThreadInternetCheck::Execute()
         Prefs->Config_Save();
     }
 
-    Ztring ffmpegPluginURL=Download(__T("ffmpegPluginURL"));
-    if (!ffmpegPluginURL.empty())
+    Ztring FFmpegPluginURL=Download(__T("FFmpegPluginURL"));
+    if (!FFmpegPluginURL.empty())
     {
-        Prefs->Config(__T("ffmpegPluginURL"))=ffmpegPluginURL;
+        Prefs->Config(__T("FFmpegPluginURL"))=FFmpegPluginURL;
         Prefs->Config_Save();
     }
 
-    Ztring ffmpegPluginVersion=Download(__T("ffmpegPluginVersion"));
-    if (!ffmpegPluginVersion.empty())
+    Ztring FFmpegPluginVersion=Download(__T("FFmpegPluginVersion"));
+    if (!FFmpegPluginVersion.empty())
     {
-        Prefs->Config(__T("ffmpegPluginVersion"))=ffmpegPluginVersion;
+        Prefs->Config(__T("FFmpegPluginVersion"))=FFmpegPluginVersion;
         Prefs->Config_Save();
     }
 

diff --git a/Source/Common/Preferences.h b/Source/Common/Preferences.h
@@ -96,8 +96,8 @@ class Preferences
     //Plugins
     ZenLib::Ztring GraphPluginURL;
     ZenLib::Ztring GraphPluginVersion;
-    ZenLib::Ztring ffmpegPluginURL;
-    ZenLib::Ztring ffmpegPluginVersion;
+    ZenLib::Ztring FFmpegPluginURL;
+    ZenLib::Ztring FFmpegPluginVersion;
 };
 
 //General preference for the whole program

diff --git a/Source/GUI/VCL/GUI_Plugin.cpp b/Source/GUI/VCL/GUI_Plugin.cpp
@@ -36,7 +36,7 @@ using namespace ZenLib;
 //---------------------------------------------------------------------------
 ZenLib::Char* PluginInfo[PLUGIN_MAX][2] = {
     {__T("GraphPlugin"), __T("Graph visualization plugin")},
-    {__T("ffmpegPlugin"), __T("FFmpeg plugin")},
+    {__T("FFmpegPlugin"), __T("FFmpeg plugin")},
 };
 //---------------------------------------------------------------------------
 
@@ -217,7 +217,7 @@ bool __fastcall TPluginF::Configure()
         SourceURL = Prefs->Config(__T("GraphPluginURL"));
         break;
     case PLUGIN_FFMPEG:
-        SourceURL = Prefs->Config(__T("ffmpegPluginURL"));
+        SourceURL = Prefs->Config(__T("FFmpegPluginURL"));
         break;
     default:;
     }

diff --git a/Source/GUI/VCL/GUI_Preferences.cpp b/Source/GUI/VCL/GUI_Preferences.cpp
@@ -442,14 +442,14 @@ void __fastcall TPreferencesF::Advanced_EnableFfmpegClick(TObject *Sender)
         Ztring InstallFolder = Application->ExeName.c_str();
         InstallFolder = InstallFolder.substr(0, InstallFolder.rfind(__T("\\")) + 1);
 
-        if (!File::Exists(InstallFolder+__T("\\Plugin\\ffmpeg\\version.txt"))) //Try to install plugin
+        if (!File::Exists(InstallFolder+__T("\\Plugin\\FFmpeg\\version.txt"))) //Try to install plugin
         {
             TPluginF* P = new TPluginF(this, PLUGIN_FFMPEG);
             if (P->Configure())
                 P->ShowModal();
             delete P;
 
-            if (!File::Exists(InstallFolder+__T("\\Plugin\\ffmpeg\\version.txt")))
+            if (!File::Exists(InstallFolder+__T("\\Plugin\\FFmpeg\\version.txt")))
                 MessageBox(NULL, __T("An error occured, please download and install the plugin manually from the MediaInfo download page."), __T("Error"), MB_OK);
         }
         #endif