From c0a6522f6e8095f3de182ef86a6d0481ec59bd06 Mon Sep 17 00:00:00 2001 From: Stefan Sayer Date: Mon, 30 Mar 2009 13:08:24 +0000 Subject: [PATCH] simplified dependencies: everything needed for a module is in DSMModule.h git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1340 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- apps/dsm/DSMCoreModule.cpp | 11 --------- apps/dsm/DSMCoreModule.h | 23 ------------------- apps/dsm/DSMModule.cpp | 10 ++++++++ apps/dsm/DSMModule.h | 22 ++++++++++++++++++ .../dsm/mods/mod_conference/ModConference.cpp | 2 -- apps/dsm/mods/mod_dlg/ModDlg.cpp | 2 -- .../dsm/mods/mod_monitoring/ModMonitoring.cpp | 1 - apps/dsm/mods/mod_mysql/ModMysql.cpp | 2 -- apps/dsm/mods/mod_sys/ModSys.cpp | 2 -- apps/dsm/mods/mod_uri/ModUri.cpp | 1 - 10 files changed, 32 insertions(+), 44 deletions(-) diff --git a/apps/dsm/DSMCoreModule.cpp b/apps/dsm/DSMCoreModule.cpp index 6f540339..4cac8cd0 100644 --- a/apps/dsm/DSMCoreModule.cpp +++ b/apps/dsm/DSMCoreModule.cpp @@ -34,17 +34,6 @@ DSMCoreModule::DSMCoreModule() { } - -void splitCmd(const string& from_str, - string& cmd, string& params) { - size_t b_pos = from_str.find('('); - if (b_pos != string::npos) { - cmd = from_str.substr(0, b_pos); - params = from_str.substr(b_pos + 1, from_str.rfind(')') - b_pos -1); - } else - cmd = from_str; -} - DSMAction* DSMCoreModule::getAction(const string& from_str) { string cmd; string params; diff --git a/apps/dsm/DSMCoreModule.h b/apps/dsm/DSMCoreModule.h index ecd9ebb0..1438079c 100644 --- a/apps/dsm/DSMCoreModule.h +++ b/apps/dsm/DSMCoreModule.h @@ -37,9 +37,6 @@ using std::map; class AmSession; class DSMSession; -void splitCmd(const string& from_str, - string& cmd, string& params); - class DSMCoreModule : public DSMModule { @@ -120,24 +117,4 @@ class TestDSMCondition map* event_params); }; - -#define GET_SCSESSION() \ - DSMSession* sc_sess = dynamic_cast(sess); \ - if (!sc_sess) { \ - ERROR("wrong session type\n"); \ - return false; \ - } - - -#define EXEC_ACTION_START(act_name) \ - bool act_name::execute(AmSession* sess, \ - DSMCondition::EventType event, \ - map* event_params) { \ - GET_SCSESSION(); - -#define EXEC_ACTION_END \ - return false; \ - } - - #endif diff --git a/apps/dsm/DSMModule.cpp b/apps/dsm/DSMModule.cpp index aa88a874..31f181c1 100644 --- a/apps/dsm/DSMModule.cpp +++ b/apps/dsm/DSMModule.cpp @@ -85,3 +85,13 @@ string resolveVars(const string s, AmSession* sess, } return s; } + +void splitCmd(const string& from_str, + string& cmd, string& params) { + size_t b_pos = from_str.find('('); + if (b_pos != string::npos) { + cmd = from_str.substr(0, b_pos); + params = from_str.substr(b_pos + 1, from_str.rfind(')') - b_pos -1); + } else + cmd = from_str; +} diff --git a/apps/dsm/DSMModule.h b/apps/dsm/DSMModule.h index a1de9b4d..6cc265be 100644 --- a/apps/dsm/DSMModule.h +++ b/apps/dsm/DSMModule.h @@ -213,6 +213,10 @@ class SCStrArgAction string resolveVars(const string s, AmSession* sess, DSMSession* sc_sess, map* event_params); +void splitCmd(const string& from_str, + string& cmd, string& params); + + #define DEF_CMD(cmd_name, class_name) \ \ if (cmd == cmd_name) { \ @@ -245,4 +249,22 @@ string resolveVars(const string s, AmSession* sess, #define MATCH_CONDITION_END } +#define GET_SCSESSION() \ + DSMSession* sc_sess = dynamic_cast(sess); \ + if (!sc_sess) { \ + ERROR("wrong session type\n"); \ + return false; \ + } + + +#define EXEC_ACTION_START(act_name) \ + bool act_name::execute(AmSession* sess, \ + DSMCondition::EventType event, \ + map* event_params) { \ + GET_SCSESSION(); + +#define EXEC_ACTION_END \ + return false; \ + } + #endif diff --git a/apps/dsm/mods/mod_conference/ModConference.cpp b/apps/dsm/mods/mod_conference/ModConference.cpp index 5157c646..c5642fb8 100644 --- a/apps/dsm/mods/mod_conference/ModConference.cpp +++ b/apps/dsm/mods/mod_conference/ModConference.cpp @@ -32,8 +32,6 @@ #include "AmRtpAudio.h" #include "DSMSession.h" -#include "DSMCoreModule.h" - #include "ModConference.h" SC_EXPORT(ConfModule); diff --git a/apps/dsm/mods/mod_dlg/ModDlg.cpp b/apps/dsm/mods/mod_dlg/ModDlg.cpp index d97e7ea3..eb142564 100644 --- a/apps/dsm/mods/mod_dlg/ModDlg.cpp +++ b/apps/dsm/mods/mod_dlg/ModDlg.cpp @@ -32,8 +32,6 @@ #include "AmSession.h" #include -#include "DSMCoreModule.h" - SC_EXPORT(DLGModule); DLGModule::DLGModule() { diff --git a/apps/dsm/mods/mod_monitoring/ModMonitoring.cpp b/apps/dsm/mods/mod_monitoring/ModMonitoring.cpp index 4cd4d3b3..92edcb46 100644 --- a/apps/dsm/mods/mod_monitoring/ModMonitoring.cpp +++ b/apps/dsm/mods/mod_monitoring/ModMonitoring.cpp @@ -31,7 +31,6 @@ #include "ampi/MonitoringAPI.h" #include "DSMSession.h" -#include "DSMCoreModule.h" #include "AmSession.h" #include "ModMonitoring.h" diff --git a/apps/dsm/mods/mod_mysql/ModMysql.cpp b/apps/dsm/mods/mod_mysql/ModMysql.cpp index 2f4a6240..d732b348 100644 --- a/apps/dsm/mods/mod_mysql/ModMysql.cpp +++ b/apps/dsm/mods/mod_mysql/ModMysql.cpp @@ -32,8 +32,6 @@ #include "DSMSession.h" #include "AmSession.h" -#include "DSMCoreModule.h" - SC_EXPORT(SCMysqlModule); SCMysqlModule::SCMysqlModule() { diff --git a/apps/dsm/mods/mod_sys/ModSys.cpp b/apps/dsm/mods/mod_sys/ModSys.cpp index 0cf026e4..1210422e 100644 --- a/apps/dsm/mods/mod_sys/ModSys.cpp +++ b/apps/dsm/mods/mod_sys/ModSys.cpp @@ -34,8 +34,6 @@ #include #include -#include "DSMCoreModule.h" - SC_EXPORT(SCSysModule); SCSysModule::SCSysModule() { diff --git a/apps/dsm/mods/mod_uri/ModUri.cpp b/apps/dsm/mods/mod_uri/ModUri.cpp index 9d1dc7e4..162e3f23 100644 --- a/apps/dsm/mods/mod_uri/ModUri.cpp +++ b/apps/dsm/mods/mod_uri/ModUri.cpp @@ -34,7 +34,6 @@ #include #include -#include "DSMCoreModule.h" #include "AmUriParser.h" SC_EXPORT(URIModule);