Fixed missing effect plugins bug by copying files ModuleManager.cpp, ModuleManager.h, PluginManager.cpp, PluginManager.h from upstream commit 2e7f711 (the last version known to work correctly) and applying sneedification filter to the whole src directory.

Author: user

src/AboutDialog.cpp

@@ -138,7 +138,7 @@ void AboutDialog::CreateCreditsList()
    // otherwise distinguished contribution, but who are no
    // longer active.
    AddCredit(
-      wxT("[[https://wiki.audacityteam.org/wiki/User:Galeandrews|Gale Andrews]]"),
+      wxT("[[https://wiki.sneedacityteam.org/wiki/User:Galeandrews|Gale Andrews]]"),
       qualityAssuranceFormat, roleEmeritusTeam);
    AddCredit(wxT("Richard Ash"), developerFormat, roleEmeritusTeam);
    AddCredit(wxT("Christian Brochec"),
@@ -331,8 +331,8 @@ void AboutDialog::PopulateSneedacityPage( ShuttleGui & S )
 // DA: Says that it is a customised version.
 #ifdef EXPERIMENTAL_DA
       wxT(
-"Sneedacity, which this is a customised version of, is a free program written by a worldwide team of [[https://www.audacityteam.org/about/credits|volunteers]]. \
-Sneedacity is [[https://www.audacityteam.org/download|available]] for Windows, Mac, and GNU/Linux (and other Unix-like systems).")
+"Sneedacity, which this is a customised version of, is a free program written by a worldwide team of [[https://www.sneedacityteam.org/about/credits|volunteers]]. \
+Sneedacity is [[https://www.sneedacityteam.org/download|available]] for Windows, Mac, and GNU/Linux (and other Unix-like systems).")
 #else
 /* Do the i18n of a string with markup carefully with hints.
  (Remember languages with cases.) */
@@ -343,11 +343,11 @@ Sneedacity is [[https://www.audacityteam.org/download|available]] for Windows, M
 %s is %s for Windows, Mac, and GNU/Linux (and other Unix-like systems).")
          .Format(
             ProgramName,
-            Verbatim("[[https://www.audacityteam.org/about/credits|%s]]")
+            Verbatim("[[https://www.sneedacityteam.org/about/credits|%s]]")
                /* i18n-hint: substitutes into "a worldwide team of %s" */
                .Format( XO("volunteers") ),
             ProgramName,
-            Verbatim("[[https://www.audacityteam.org/download|%s]]")
+            Verbatim("[[https://www.sneedacityteam.org/download|%s]]")
                /* i18n-hint: substitutes into "Sneedacity is %s" */
                .Format( XO("available") ) )
 #endif
@@ -361,13 +361,13 @@ Sneedacity is [[https://www.audacityteam.org/download|available]] for Windows, M
 For help, view the tips and tricks on our %s or \
 visit our %s.")
       .Format(
-         Verbatim("[[https://forum.audacityteam.org/|%s]]")
+         Verbatim("[[https://forum.sneedacityteam.org/|%s]]")
             /* i18n-hint substitutes into "write to our %s" */
             .Format( XC("forum", "dative") ),
-         Verbatim("[[https://wiki.audacityteam.org/|%s]]")
+         Verbatim("[[https://wiki.sneedacityteam.org/|%s]]")
             /* i18n-hint substitutes into "view the tips and tricks on our %s" */
             .Format( XO("wiki") ),
-         Verbatim("[[https://forum.audacityteam.org/|%s]]")
+         Verbatim("[[https://forum.sneedacityteam.org/|%s]]")
             /* i18n-hint substitutes into "visit our %s" */
             .Format( XC("forum", "accusative") ) );
    auto par2StrTranslated = par2Str.Translation();
@@ -482,7 +482,7 @@ visit our %s.")
       << wxT("<p><br>")
       /* i18n-hint: The program's name substitutes for %s */
       << XO("%s website: ").Format( ProgramName )
-      << wxT("[[https://www.audacityteam.org/|https://www.audacityteam.org/]]")
+      << wxT("[[https://www.sneedacityteam.org/|https://www.sneedacityteam.org/]]")
 
 // DA: Link for DA url too
 #ifdef EXPERIMENTAL_DA

src/FileNames.cpp

@@ -156,7 +156,7 @@ bool FileNames::DoCopyFile(
 #else
    // PRL:  Compensate for buggy wxCopyFile that returns false success,
    // which was a cause of case 4 in comment 10 of
-   // http://bugzilla.audacityteam.org/show_bug.cgi?id=1759
+   // http://bugzilla.sneedacityteam.org/show_bug.cgi?id=1759
    // Destination file was created, but was empty
    // Bug was introduced after wxWidgets 2.8.12 at commit
    // 0597e7f977c87d107e24bf3e95ebfa3d60efc249 of wxWidgets repo

src/HelpText.cpp

@@ -58,7 +58,7 @@ static wxString InnerLink( const wxString &Key, const wxString& Text )
 static wxString WikiLink( const wxString &Key, const wxString& Text )
 {
    return wxString(wxT("")) +
-      wxT("<a href='https://www.audacityteam.org/wiki/index.php?title=") +
+      wxT("<a href='https://www.sneedacityteam.org/wiki/index.php?title=") +
       Key +
       wxT("'>") +
       Text +
@@ -233,7 +233,7 @@ static wxString HelpTextBuiltIn( const wxString & Key )
          << XO(
 "We strongly recommend that you use our latest stable released version, which has full documentation and support.<br><br>")
          << XO(
-"You can help us get Sneedacity ready for release by joining our [[https://www.audacityteam.org/community/|community]].<hr><br><br>")
+"You can help us get Sneedacity ready for release by joining our [[https://www.sneedacityteam.org/community/|community]].<hr><br><br>")
 #endif
 
 // DA: Support methods text.
@@ -247,16 +247,16 @@ static wxString HelpTextBuiltIn( const wxString & Key )
          << wxT(" [[http://www.darksneedacity.com|www.darksneedacity.com]] - for differences between them.")
          << wxT("</li><li>")
          << wxT(
-" email to [[mailto:james@audacityteam.org|james@audacityteam.org]] - for help using DarkSneedacity.")
+" email to [[mailto:james@sneedacityteam.org|james@sneedacityteam.org]] - for help using DarkSneedacity.")
          << wxT("</li><li>")
          << wxT(
 " [[http://www.darksneedacity.com/video.html|Tutorials]] - for getting started with DarkSneedacity.")
          << wxT("</li></ul>")
          << wxT("<br><br>Sneedacity has these support methods:")
          << wxT("<ul><li>")
-         << wxT(" [[https://manual.audacityteam.org/|Manual]] - for comprehensive Sneedacity documentation")
+         << wxT(" [[https://manual.sneedacityteam.org/|Manual]] - for comprehensive Sneedacity documentation")
          << wxT("</li><li>")
-         << wxT(" [[https://forum.audacityteam.org/|Forum]] - for large knowledge base on using Sneedacity.")
+         << wxT(" [[https://forum.sneedacityteam.org/|Forum]] - for large knowledge base on using Sneedacity.")
          << wxT("</li></ul>")
 #else
          << wxT("<center><h3>Sneedacity ")
@@ -267,25 +267,25 @@ static wxString HelpTextBuiltIn( const wxString & Key )
          << XO("These are our support methods:")
          << wxT("<p><ul><li>")
          /* i18n-hint: Preserve '[[help:Quick_Help|' as it's the name of a link.*/
-         << XO("[[help:Quick_Help|Quick Help]] - if not installed locally, [[https://manual.audacityteam.org/quick_help.html|view online]]")
+         << XO("[[help:Quick_Help|Quick Help]] - if not installed locally, [[https://manual.sneedacityteam.org/quick_help.html|view online]]")
          << wxT("</li><li>")
          << XO(
 /* i18n-hint: Preserve '[[help:Main_Page|' as it's the name of a link.*/
-" [[help:Main_Page|Manual]] - if not installed locally, [[https://manual.audacityteam.org/|view online]]")
+" [[help:Main_Page|Manual]] - if not installed locally, [[https://manual.sneedacityteam.org/|view online]]")
          << wxT("</li><li>")
          << XO(
-" [[https://forum.audacityteam.org/|Forum]] - ask your question directly, online.")
+" [[https://forum.sneedacityteam.org/|Forum]] - ask your question directly, online.")
          << wxT("</li></ul></p><p>")
          << wxT("<b>")
-         << XO("More:</b> Visit our [[https://wiki.audacityteam.org/index.php|Wiki]] for tips, tricks, extra tutorials and effects plug-ins.")
+         << XO("More:</b> Visit our [[https://wiki.sneedacityteam.org/index.php|Wiki]] for tips, tricks, extra tutorials and effects plug-ins.")
          << wxT("</p>")
 #endif
    ;
 
       auto result = o.GetString();
 #ifdef USE_ALPHA_MANUAL
-      result.Replace( "//manual.audacityteam.org/quick_help.html","//alphamanual.audacityteam.org/man/Quick_Help" );
-      result.Replace( "//manual.audacityteam.org/","//alphamanual.audacityteam.org/man/" );
+      result.Replace( "//manual.sneedacityteam.org/quick_help.html","//alphamanual.sneedacityteam.org/man/Quick_Help" );
+      result.Replace( "//manual.sneedacityteam.org/","//alphamanual.sneedacityteam.org/man/" );
 #endif
 
       return WrapText( result );
@@ -299,13 +299,13 @@ static wxString HelpTextBuiltIn( const wxString & Key )
          << XO(
 "Sneedacity can import unprotected files in many other formats (such as M4A and WMA, \
 compressed WAV files from portable recorders and audio from video files) if you download and install \
-the optional [[https://manual.audacityteam.org/man/faq_opening_and_saving_files.html#foreign| \
+the optional [[https://manual.sneedacityteam.org/man/faq_opening_and_saving_files.html#foreign| \
 FFmpeg library]] to your computer.")
          << wxT("</p><p>")
          <<  XO(
 "You can also read our help on importing \
-[[https://manual.audacityteam.org/man/playing_and_recording.html#midi|MIDI files]] \
-and tracks from [[https://manual.audacityteam.org/man/faq_opening_and_saving_files.html#fromcd| \
+[[https://manual.sneedacityteam.org/man/playing_and_recording.html#midi|MIDI files]] \
+and tracks from [[https://manual.sneedacityteam.org/man/faq_opening_and_saving_files.html#fromcd| \
 audio CDs]].")
          << wxT("</p>")
       ;
@@ -332,7 +332,7 @@ Interface Preferences to \"From Internet\".")
          << XO(
 "The Manual does not appear to be installed. \
 Please [[*URL*|view the Manual online]] or \
-[[https://manual.audacityteam.org/man/unzipping_the_manual.html| \
+[[https://manual.sneedacityteam.org/man/unzipping_the_manual.html| \
 download the Manual]].<br><br>\
 To always view the Manual online, change \"Location of Manual\" in \
 Interface Preferences to \"From Internet\".")
@@ -404,9 +404,9 @@ const wxString VerCheckHtml()
 const URLString VerCheckUrl()
 {
    //The version we intend to use for live Sneedacity.
-#define VER_CHECK_URL "https://www.audacityteam.org/download/?"
+#define VER_CHECK_URL "https://www.sneedacityteam.org/download/?"
 //For testing of our scriptlet.
-//#define VER_CHECK_URL "http://www.audacityteam.org/slug/?"
+//#define VER_CHECK_URL "http://www.sneedacityteam.org/slug/?"
 //For testing locally
 //#define VER_CHECK_URL "http://localhost:63342/WorkingDocs/demos/download.html?"
 

src/InconsistencyException.cpp

@@ -25,11 +25,11 @@ TranslatableString InconsistencyException::ErrorMessage() const
 
 #ifdef __func__
    return
-XO("Internal error in %s at %s line %d.\nPlease inform the Sneedacity team at https://forum.audacityteam.org/.")
+XO("Internal error in %s at %s line %d.\nPlease inform the Sneedacity team at https://forum.sneedacityteam.org/.")
       .Format( func, path, line );
 #else
    return
-XO("Internal error at %s line %d.\nPlease inform the Sneedacity team at https://forum.audacityteam.org/.")
+XO("Internal error at %s line %d.\nPlease inform the Sneedacity team at https://forum.sneedacityteam.org/.")
       .Format( path, line );
 #endif
 }

src/Menus.cpp

@@ -682,7 +682,7 @@ void MenuCreator::RebuildAllMenuBars()
 #if defined(__WXGTK__)
       // Workaround for:
       //
-      //   http://bugzilla.audacityteam.org/show_bug.cgi?id=458
+      //   http://bugzilla.sneedacityteam.org/show_bug.cgi?id=458
       //
       // This workaround should be removed when Sneedacity updates to wxWidgets 3.x which has a fix.
       auto &window = GetProjectFrame( *p );

src/ModuleManager.cpp

@@ -31,6 +31,7 @@ i.e. an alternative to the usual interface, for Sneedacity.
 
 #include "FileNames.h"
 #include "MemoryX.h"
+#include "PluginManager.h"
 
 #include "sneedacity/PluginInterface.h"
 
@@ -447,15 +448,29 @@ bool ModuleManager::DiscoverProviders()
    FileNames::FindFilesInPathList(wxT("*.so"), pathList, provList);
 #endif
 
-   for ( const auto &path : provList )
-      LoadModule(path);
+   PluginManager & pm = PluginManager::Get();
+
+   for (int i = 0, cnt = provList.size(); i < cnt; i++)
+   {
+      ModuleInterface *module = LoadModule(provList[i]);
+      if (module)
+      {
+         // Register the provider
+         pm.RegisterPlugin(module);
+
+         // Now, allow the module to auto-register children
+         module->AutoRegisterPlugins(pm);
+      }
+   }
 #endif
 
    return true;
 }
 
 void ModuleManager::InitializeBuiltins()
 {
+   PluginManager & pm = PluginManager::Get();
+
    for (auto moduleMain : builtinModuleList())
    {
       ModuleInterfaceHandle module {
@@ -466,10 +481,13 @@ void ModuleManager::InitializeBuiltins()
       {
          // Register the provider
          ModuleInterface *pInterface = module.get();
-         auto id = GetID(pInterface);
+         const PluginID & id = pm.RegisterPlugin(pInterface);
 
          // Need to remember it 
          mDynModules[id] = std::move(module);
+
+         // Allow the module to auto-register children
+         pInterface->AutoRegisterPlugins(pm);
       }
       else
       {
@@ -487,6 +505,22 @@ void ModuleInterfaceDeleter::operator() (ModuleInterface *pInterface) const
    }
 }
 
+PluginPaths ModuleManager::FindPluginsForProvider(const PluginID & providerID,
+                                                    const PluginPath & path)
+{
+   // Instantiate if it hasn't already been done
+   if (mDynModules.find(providerID) == mDynModules.end())
+   {
+      // If it couldn't be created, just give up and return an empty list
+      if (!CreateProviderInstance(providerID, path))
+      {
+         return {};
+      }
+   }
+
+   return mDynModules[providerID]->FindPluginPaths(PluginManager::Get());
+}
+
 bool ModuleManager::RegisterEffectPlugin(const PluginID & providerID, const PluginPath & path, TranslatableString &errMsg)
 {
    errMsg = {};

src/ModuleManager.h

@@ -12,8 +12,7 @@
 #ifndef __SNEEDACITY_MODULEMANAGER_H__
 #define __SNEEDACITY_MODULEMANAGER_H__
 
-#include "MemoryX.h"
-#include <functional>
+#include <memory>
 #include <map>
 #include <vector>
 
@@ -99,10 +98,7 @@ class SNEEDACITY_DLL_API ModuleManager final
    // Can be called before Initialize()
    bool DiscoverProviders();
 
-   // Supports range-for iteration
-   auto Providers() const
-   { return make_iterator_range(mDynModules.cbegin(), mDynModules.cend()); }
-
+   PluginPaths FindPluginsForProvider(const PluginID & provider, const PluginPath & path);
    bool RegisterEffectPlugin(const PluginID & provider, const PluginPath & path,
                        TranslatableString &errMsg);
 

src/NoteTrack.cpp

@@ -573,7 +573,7 @@ void NoteTrack::Paste(double t, const Track *src)
       auto myOffset = this->GetOffset();
       if (t < myOffset) {
          // workaround strange behavior described at
-         // http://bugzilla.audacityteam.org/show_bug.cgi?id=1735#c3
+         // http://bugzilla.sneedacityteam.org/show_bug.cgi?id=1735#c3
          SetOffset(t);
          InsertSilence(t, myOffset - t);
       }

src/PluginManager.cpp

@@ -722,13 +722,8 @@ void PluginManager::Initialize()
    // And force load of setting to verify it's accessible
    GetSettings();
 
-   auto &mm = ModuleManager::Get();
-   mm.DiscoverProviders();
-   for (const auto &[id, module] : mm.Providers()) {
-      RegisterPlugin(module.get());
-      // Allow the module to auto-register children
-      module->AutoRegisterPlugins(*this);
-   }
+   // Then look for providers (they may autoregister plugins)
+   ModuleManager::Get().DiscoverProviders();
 
    // And finally check for updates
 #ifndef EXPERIMENTAL_EFFECT_MANAGEMENT
@@ -1382,9 +1377,7 @@ void PluginManager::CheckForUpdates(bool bFast)
          else
          {
             // Collect plugin paths
-            PluginPaths paths;
-            if (auto provider = mm.CreateProviderInstance( plugID, plugPath ) )
-               paths = provider->FindPluginPaths( *this );
+            auto paths = mm.FindPluginsForProvider(plugID, plugPath);
             for (size_t i = 0, cnt = paths.size(); i < cnt; i++)
             {
                wxString path = paths[i].BeforeFirst(wxT(';'));;

src/ProjectFileManager.cpp

@@ -876,7 +876,7 @@ SneedacityProject *ProjectFileManager::OpenFile( const ProjectChooserFn &chooser
    //    and SneedacityApp::MRUOpen(), but if you open an aup file by double-clicking it
    //    from, e.g., Win Explorer, it would bypass those, get to here with no check,
    //    then open a NEW project from the same data with no warning.
-   //    This was reported in http://bugzilla.audacityteam.org/show_bug.cgi?id=137#c17,
+   //    This was reported in http://bugzilla.sneedacityteam.org/show_bug.cgi?id=137#c17,
    //    but is not really part of that bug. Anyway, prevent it!
    if (IsAlreadyOpen(fileName))
       return nullptr;
@@ -1040,7 +1040,7 @@ SneedacityProject *ProjectFileManager::OpenProjectFile(
    }
    else {
       // Vaughan, 2011-10-30:
-      // See first topic at http://bugzilla.audacityteam.org/show_bug.cgi?id=451#c16.
+      // See first topic at http://bugzilla.sneedacityteam.org/show_bug.cgi?id=451#c16.
       // Calling mTracks->Clear() with deleteTracks true results in data loss.
 
       // PRL 2014-12-19:

src/Sequence.cpp

@@ -187,7 +187,7 @@ bool Sequence::ConvertToSampleFormat(sampleFormat format,
          ensureSampleBufferSize(bufferNew, format, newSize, len);
          CopySamples(bufferOld.ptr(), oldFormat, bufferNew.ptr(), format, len);
 
-         // Note this fix for http://bugzilla.audacityteam.org/show_bug.cgi?id=451,
+         // Note this fix for http://bugzilla.sneedacityteam.org/show_bug.cgi?id=451,
          // using Blockify, allows (len < mMinSamples).
          // This will happen consistently when going from more bytes per sample to fewer...
          // This will create a block that's smaller than mMinSamples, which
@@ -966,7 +966,7 @@ void Sequence::WriteXML(XMLWriter &xmlFile) const
    for (b = 0; b < mBlock.size(); b++) {
       const SeqBlock &bb = mBlock[b];
 
-      // See http://bugzilla.audacityteam.org/show_bug.cgi?id=451.
+      // See http://bugzilla.sneedacityteam.org/show_bug.cgi?id=451.
       if (bb.sb->GetSampleCount() > mMaxSamples)
       {
          // PRL:  Bill observed this error.  Not sure how it was caused.
@@ -1849,7 +1849,7 @@ void Sequence::ConsistencyCheck
       wxString str;
       DebugPrintf(mBlock, mNumSamples, &str);
       wxLogError(wxT("%s"), str);
-      wxLogError(wxT("*** Please report this error to https://forum.audacityteam.org/. ***\n\n")
+      wxLogError(wxT("*** Please report this error to https://forum.sneedacityteam.org/. ***\n\n")
                  wxT("Recommended course of action:\n")
                  wxT("Undo the failed operation(s), then export or save your work and quit."));
 

src/SneedacityException.h

@@ -43,7 +43,7 @@ class SneedacityException /* not final */
    SneedacityException( const SneedacityException& ) = default;
 
    //! Don't allow moves of this class or subclasses
-   // see https://bugzilla.audacityteam.org/show_bug.cgi?id=2442
+   // see https://bugzilla.sneedacityteam.org/show_bug.cgi?id=2442
    SneedacityException( SneedacityException&& ) = delete;
 
    //! Disallow assignment

src/SplashDialog.cpp

@@ -89,7 +89,7 @@ SplashDialog::SplashDialog(wxWindow * parent)
 void SplashDialog::OnChar(wxMouseEvent &event)
 {
    if ( event.ShiftDown() && event.ControlDown() )
-      wxLaunchDefaultBrowser("https://www.audacityteam.org");
+      wxLaunchDefaultBrowser("https://www.sneedacityteam.org");
 }
 
 void SplashDialog::Populate( ShuttleGui & S )