Public interfaces: part 2

[stg.git] / stargazer / plugins / configuration / sgconfig / stgconfig.cpp

diff --git a/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
index 73f58145f6beb23bcf1986575362b844d602dafb..3f47f24b87bb0f5e7ef30ae35e473e9c43cd472f 100644 (file)
--- a/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
+++ b/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
@@ -20,7 +20,6 @@
 
 #include "stgconfig.h"
 
 
 #include "stgconfig.h"
 

-#include "stg/plugin_creator.h"

 #include "stg/common.h"
 
 #include <algorithm>
 #include "stg/common.h"
 
 #include <algorithm>


@@ -31,14 +30,10 @@
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-static PLUGIN_CREATOR<STG_CONFIG> stgc;
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-bool STG_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
+bool STG_CONFIG_SETTINGS::ParseSettings(const STG::ModuleSettings & s)

 {
 {

-    PARAM_VALUE pv;
-    std::vector<PARAM_VALUE>::const_iterator pvi;
+    STG::ParamValue pv;
+    std::vector<STG::ParamValue>::const_iterator pvi;

     ///////////////////////////
     pv.param = "Port";
     pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
     ///////////////////////////
     pv.param = "Port";
     pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);


@@ -67,9 +62,10 @@ bool STG_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-extern "C" PLUGIN * GetPlugin()
+extern "C" STG::Plugin * GetPlugin()

 {
 {

-return stgc.GetPlugin();
+    static STG_CONFIG plugin;
+    return &plugin;

 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------


@@ -77,7 +73,7 @@ return stgc.GetPlugin();
 STG_CONFIG::STG_CONFIG()
     : nonstop(false),
       isRunning(false),
 STG_CONFIG::STG_CONFIG()
     : nonstop(false),
       isRunning(false),

-      logger(GetPluginLogger(GetStgLogger(), "conf_sg")),
+      logger(STG::PluginLogger::get("conf_sg")),

       config(logger)
 {
 }
       config(logger)
 {
 }