[asterisk-commits] rmudgett: branch group/v14_colp r168331 - in /team/group/v14_colp: ./ channel...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Jan  9 18:06:28 2009
New Revision: 168331

URL: http://svn.digium.com/view/asterisk?view=rev&rev=168331
Log:
Resolved conflicts and restarted automerge.

Merged revisions 168191,168198,168267 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r168191 | rmudgett | 2009-01-09 15:28:42 -0600 (Fri, 09 Jan 2009) | 3 lines
  
  *  Fix for JIRA AST-175/ABE-1757
  *  Miscellaneous doxygen comments added.
........
  r168198 | russell | 2009-01-09 16:14:38 -0600 (Fri, 09 Jan 2009) | 2 lines
  
  Make this compile for mvanbaak
........
  r168267 | kpfleming | 2009-01-09 17:12:29 -0600 (Fri, 09 Jan 2009) | 1 line
  
  update to use new sound file packages that include license files
........

Modified:
    team/group/v14_colp/   (props changed)
    team/group/v14_colp/channels/chan_misdn.c
    team/group/v14_colp/res/res_musiconhold.c
    team/group/v14_colp/sounds/Makefile

Propchange: team/group/v14_colp/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/v14_colp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan  9 18:06:28 2009
@@ -1,1 +1,1 @@
-/branches/1.4:1-168130
+/branches/1.4:1-168330

Modified: team/group/v14_colp/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/channels/chan_misdn.c?view=diff&rev=168331&r1=168330&r2=168331
==============================================================================
--- team/group/v14_colp/channels/chan_misdn.c (original)
+++ team/group/v14_colp/channels/chan_misdn.c Fri Jan  9 18:06:28 2009
@@ -338,7 +338,13 @@
 	 * \brief Incoming call dialplan context identifier.
 	 * \note The "context" string read in from /etc/asterisk/misdn.conf
 	 */
-	char context[BUFFERSIZE];
+	char context[AST_MAX_CONTEXT];
+
+	/*!
+	 * \brief The configured music-on-hold class to use for this call.
+	 * \note The "musicclass" string read in from /etc/asterisk/misdn.conf
+	 */
+	char mohinterpret[MAX_MUSICCLASS];
 
 	//int zero_read_cnt;	/* Not used */
 
@@ -399,7 +405,7 @@
 	 */
 	struct timeval overlap_tv;
   
-//	struct chan_list *peer;	/* Not used */
+	//struct chan_list *peer;	/* Not used */
 
 	/*!
 	 * \brief Next channel call record in the list.
@@ -2572,7 +2578,6 @@
 	int port;
 	int hdlc = 0;
 	char lang[BUFFERSIZE + 1];
-	char localmusicclass[BUFFERSIZE + 1];
 	char faxdetect[BUFFERSIZE + 1];
 	char buf[256];
 	char buf2[256];
@@ -2597,8 +2602,7 @@
 	misdn_cfg_get(port, MISDN_CFG_LANGUAGE, lang, sizeof(lang));
 	ast_string_field_set(ast, language, lang);
 
-	misdn_cfg_get(port, MISDN_CFG_MUSICCLASS, localmusicclass, sizeof(localmusicclass));
-	ast_string_field_set(ast, musicclass, localmusicclass);
+	misdn_cfg_get(port, MISDN_CFG_MUSICCLASS, ch->mohinterpret, sizeof(ch->mohinterpret));
 
 	misdn_cfg_get(port, MISDN_CFG_TXGAIN, &bc->txgain, sizeof(bc->txgain));
 	misdn_cfg_get(port, MISDN_CFG_RXGAIN, &bc->rxgain, sizeof(bc->rxgain));
@@ -3226,7 +3230,7 @@
 			start_bc_tones(p);
 		break;
 	case AST_CONTROL_HOLD:
-		ast_moh_start(ast,data,ast->musicclass); 
+		ast_moh_start(ast, data, p->mohinterpret); 
 		chan_misdn_log(1, p->bc->port, " --> *\tHOLD pid:%d\n", p->bc->pid);
 		break;
 	case AST_CONTROL_UNHOLD:

Modified: team/group/v14_colp/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/res/res_musiconhold.c?view=diff&rev=168331&r1=168330&r2=168331
==============================================================================
--- team/group/v14_colp/res/res_musiconhold.c (original)
+++ team/group/v14_colp/res/res_musiconhold.c Fri Jan  9 18:06:28 2009
@@ -171,7 +171,7 @@
 static int reload(void);
 
 #define mohclass_ref(class)   (ao2_ref((class), +1), class)
-#define mohclass_unref(class) (ao2_ref((class), -1), NULL)
+#define mohclass_unref(class) (ao2_ref((class), -1), (struct mohclass *) NULL)
 
 static void moh_files_release(struct ast_channel *chan, void *data)
 {

Modified: team/group/v14_colp/sounds/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/sounds/Makefile?view=diff&rev=168331&r1=168330&r2=168331
==============================================================================
--- team/group/v14_colp/sounds/Makefile (original)
+++ team/group/v14_colp/sounds/Makefile Fri Jan  9 18:06:28 2009
@@ -18,7 +18,7 @@
 PWD:=$(shell pwd)
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
 MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
-CORE_SOUNDS_VERSION:=1.4.9
+CORE_SOUNDS_VERSION:=1.4.14
 EXTRA_SOUNDS_VERSION:=1.4.8
 SOUNDS_URL:=http://downloads.digium.com/pub/telephony/sounds/releases
 MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS))