Changeset 11014 for code/trunk/src/libraries/core/module/Plugin.cc

Timestamp:

Jan 2, 2016, 3:15:04 PM (9 years ago)

Author:

landauf

Message:

moved code for loading/unloading a plugin into separate functions

File:

• code/trunk/src/libraries/core/module/Plugin.cc (modified) (2 diffs)

code/trunk/src/libraries/core/module/Plugin.cc

@@ -44 +44 @@
     {
         if (this->moduleInstance_ != NULL)
-        {
-            this->referenceCounter_ = 1; // force unloading
             this->unload();
-        }
     }
 
-    void Plugin::load()
+    void Plugin::reference()
     {
         this->referenceCounter_++;
         if (this->referenceCounter_ == 1) // increased from 0 to 1 -> load plugin
-        {
-            orxout(internal_info) << "Loading plugin " << this->name_ << "..." << endl;
-            this->moduleInstance_ = new ModuleInstance(this->libraryName_);
-            Core::getInstance().loadModule(this->moduleInstance_);
-        }
+            this->load();
         else
             orxout(internal_info) << "Increased reference count for plugin " << this->name_ << " to " << this->referenceCounter_ << endl;
     }
 
-    void Plugin::unload()
+    void Plugin::dereference()
     {
         if (this->referenceCounter_ == 0)
@@ -73 +66 @@
         this->referenceCounter_--;
         if (this->referenceCounter_ == 0) // reduced from 1 to 0 -> load plugin
-        {
-            orxout(internal_info) << "Unloading plugin " << this->name_ << "..." << endl;
-            Core::getInstance().unloadModule(this->moduleInstance_);
-            delete this->moduleInstance_;
-            this->moduleInstance_ = NULL;
-        }
+            this->unload();
         else
             orxout(internal_info) << "Reduced reference count for plugin " << this->name_ << " to " << this->referenceCounter_ << endl;
     }
+
+    void Plugin::load()
+    {
+        orxout(internal_info) << "Loading plugin " << this->name_ << "..." << endl;
+        this->moduleInstance_ = new ModuleInstance(this->libraryName_);
+        Core::getInstance().loadModule(this->moduleInstance_);
+    }
+
+    void Plugin::unload()
+    {
+        orxout(internal_info) << "Unloading plugin " << this->name_ << "..." << endl;
+        Core::getInstance().unloadModule(this->moduleInstance_);
+        delete this->moduleInstance_;
+        this->moduleInstance_ = NULL;
+    }
 }