From: System Administrator <moises.silva@gmail.com>
Date: Thu, 26 May 2011 04:13:12 +0000 (-0400)
Subject: Merge remote branch 'fsorig/master'
X-Git-Tag: v1.2-rc1~108^2~11^2~40^2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7eaef23955bd02bcc937db518b5617a0eb810c0f;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'fsorig/master'

Conflicts:
	src/mod/applications/mod_commands/mod_commands.c
	src/mod/endpoints/mod_portaudio/mod_portaudio.c
	src/mod/endpoints/mod_portaudio/pablio.c
---

7eaef23955bd02bcc937db518b5617a0eb810c0f
diff --cc src/mod/applications/mod_commands/mod_commands.c
index ae84463868,86d1e46d65..40fe306d68
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@@ -5091,7 -5238,7 +5266,8 @@@ SWITCH_MODULE_LOAD_FUNCTION(mod_command
  	SWITCH_ADD_API(commands_api_interface, "uuid_getvar", "uuid_getvar", uuid_getvar_function, GETVAR_SYNTAX);
  	SWITCH_ADD_API(commands_api_interface, "uuid_hold", "hold", uuid_hold_function, HOLD_SYNTAX);
  	SWITCH_ADD_API(commands_api_interface, "uuid_kill", "Kill Channel", kill_function, KILL_SYNTAX);
 +	SWITCH_ADD_API(commands_api_interface, "uuid_outgoing_answer", "Answer Outgoing Channel", outgoing_answer_function, OUTGOING_ANSWER_SYNTAX);
+ 	SWITCH_ADD_API(commands_api_interface, "uuid_limit", "Increase limit resource", uuid_limit_function, LIMIT_SYNTAX);
  	SWITCH_ADD_API(commands_api_interface, "uuid_limit_release", "Release limit resource", uuid_limit_release_function, LIMIT_RELEASE_SYNTAX);
  	SWITCH_ADD_API(commands_api_interface, "uuid_loglevel", "set loglevel on session", uuid_loglevel, UUID_LOGLEVEL_SYNTAX);
  	SWITCH_ADD_API(commands_api_interface, "uuid_media", "media", uuid_media_function, MEDIA_SYNTAX);
@@@ -5210,7 -5360,7 +5389,8 @@@
  	switch_console_set_complete("add uuid_hold ::console::list_uuid");
  	switch_console_set_complete("add uuid_jitterbuffer ::console::list_uuid");
  	switch_console_set_complete("add uuid_kill ::console::list_uuid");
 +	switch_console_set_complete("add uuid_outgoing_answer ::console::list_uuid");
+ 	switch_console_set_complete("add uuid_limit ::console::list_uuid");
  	switch_console_set_complete("add uuid_limit_release ::console::list_uuid");
  	switch_console_set_complete("add uuid_loglevel ::console::list_uuid console");
  	switch_console_set_complete("add uuid_loglevel ::console::list_uuid alert");
diff --cc src/mod/endpoints/mod_portaudio/mod_portaudio.c
index 743a6568fb,8564a771e5..f84fdeee96
--- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c
+++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
@@@ -1776,7 -1205,7 +1776,7 @@@ static switch_status_t load_config(void
  
  	if (globals.ringdev < 0) {
  		if (globals.outdev > -1) {
- 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No ring device configured, using output device\n");
 -			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid or no ring device configured, using output device as ring device\n");
++			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Invalid or no ring device configured, using output device as ring device\n");
  			globals.ringdev = globals.outdev;
  		}
  	}