doh

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14744 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/include/switch_cpp.h b/src/include/switch_cpp.h
index fded3808220af370db7215624bbccc55cb404ae4..b59c2165c86ddd54ed17a7a4f23362e15881b78d 100644 (file)
--- a/src/include/switch_cpp.h
+++ b/src/include/switch_cpp.h
@@ -110,7 +110,7 @@ SWITCH_DECLARE(void) consoleCleanLog(char *msg);
           public:
                 SWITCH_DECLARE_CONSTRUCTOR API(void);
                 virtual SWITCH_DECLARE_CONSTRUCTOR ~ API();
-                SWITCH_DECLARE(const char *) execute(const char *command, const char *data);
+                SWITCH_DECLARE(const char *) execute(const char *command, const char *data = NULL);
                 SWITCH_DECLARE(const char *) executeString(const char *command);
                 SWITCH_DECLARE(char *) getTime(void);
         };

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index ce531f50c699c0aaad5da57785c782ba55b0614c..942bdbdd95a649f0440bf4bc74738ca10d568b0a 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -1071,7 +1071,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
                                                switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
                                                conference_add_event_data(conference, event);
                                                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file-done");
-                                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "File", conference->fnode->file);
+                                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "File", conference->async_fnode->file);
                                                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Async", "true");
                                                switch_event_fire(&event);
                                        }

diff --git a/src/mod/languages/mod_lua/mod_lua_wrap.cpp b/src/mod/languages/mod_lua/mod_lua_wrap.cpp
index 959c96d6bd3758ab39f2e29fcebd8bb1946d5024..b95163fdf84c50fc958a789c2e9a9caae923deb0 100644 (file)
--- a/src/mod/languages/mod_lua/mod_lua_wrap.cpp
+++ b/src/mod/languages/mod_lua/mod_lua_wrap.cpp
@@ -1799,7 +1799,7 @@ fail:
 }
 
 
-static int _wrap_API_execute(lua_State* L) {
+static int _wrap_API_execute__SWIG_0(lua_State* L) {
   int SWIG_arg = -1;
   API *arg1 = (API *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -1830,6 +1830,90 @@ fail:
 }
 
 
+static int _wrap_API_execute__SWIG_1(lua_State* L) {
+  int SWIG_arg = -1;
+  API *arg1 = (API *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *result = 0 ;
+  
+  SWIG_check_num_args("execute",2,2)
+  if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("execute",1,"API *");
+  if(!lua_isstring(L,2)) SWIG_fail_arg("execute",2,"char const *");
+  
+  if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_API,0))){
+    SWIG_fail_ptr("API_execute",1,SWIGTYPE_p_API);
+  }
+  
+  arg2 = (char *)lua_tostring(L, 2);
+  result = (char *)(arg1)->execute((char const *)arg2);
+  SWIG_arg=0;
+  lua_pushstring(L,(const char*)result); SWIG_arg++;
+  return SWIG_arg;
+  
+  if(0) SWIG_fail;
+  
+fail:
+  lua_error(L);
+  return SWIG_arg;
+}
+
+
+static int _wrap_API_execute(lua_State* L) {
+  int argc;
+  int argv[4]={
+    1,2,3,4
+  };
+  
+  argc = lua_gettop(L);
+  if (argc == 2) {
+    int _v;
+    {
+      void *ptr;
+      if (SWIG_isptrtype(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_API, 0)) {
+        _v = 0;
+      } else {
+        _v = 1;
+      }
+    }
+    if (_v) {
+      {
+        _v = lua_isstring(L,argv[1]);
+      }
+      if (_v) {
+        return _wrap_API_execute__SWIG_1(L);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    {
+      void *ptr;
+      if (SWIG_isptrtype(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_API, 0)) {
+        _v = 0;
+      } else {
+        _v = 1;
+      }
+    }
+    if (_v) {
+      {
+        _v = lua_isstring(L,argv[1]);
+      }
+      if (_v) {
+        {
+          _v = lua_isstring(L,argv[2]);
+        }
+        if (_v) {
+          return _wrap_API_execute__SWIG_0(L);
+        }
+      }
+    }
+  }
+  
+  lua_pushstring(L,"No matching function for overloaded 'API_execute'");
+  lua_error(L);return 0;
+}
+
+
 static int _wrap_API_executeString(lua_State* L) {
   int SWIG_arg = -1;
   API *arg1 = (API *) 0 ;

diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
index f2b2d7a0af1704dcf85c9de25e159633404c44f0..090e9f0bcdf5c76a408ff54ecaaed1e92e290ee1 100644 (file)
--- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx
+++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
@@ -27462,7 +27462,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_Api_Execute(void * jarg1, char * jarg2, cha
   char * jresult ;
   API *arg1 = (API *) 0 ;
   char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
+  char *arg3 = (char *) NULL ;
   char *result = 0 ;
   
   arg1 = (API *)jarg1;