[asterisk-commits] rmudgett: branch rmudgett/aoc_event r258301 - in /team/rmudgett/aoc_event: ./...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Apr 21 09:56:41 CDT 2010 

Author: rmudgett
Date: Wed Apr 21 09:56:39 2010
New Revision: 258301

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=258301
Log:
Merged revisions 258230,258268 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/group/CCSS

................
  r258230 | root | 2010-04-21 08:17:45 -0500 (Wed, 21 Apr 2010) | 14 lines
  
  Merged revisions 258227-258228 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
    r258227 | jmls | 2010-04-21 07:48:32 -0500 (Wed, 21 Apr 2010) | 1 line
    
    Added CHANGES entry for new MixMonitorMute AMI command.
  ........
    r258228 | jmls | 2010-04-21 08:08:44 -0500 (Wed, 21 Apr 2010) | 2 lines
    
    Added NEW ACTIONS entry for new MixMonitorMute AMI command.
    Added State and Direction variables for new MixMonitorMute AMI command.
  ........
................
  r258268 | root | 2010-04-21 09:17:44 -0500 (Wed, 21 Apr 2010) | 13 lines
  
  Merged revisions 258256,258265 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
    r258256 | jmls | 2010-04-21 08:24:28 -0500 (Wed, 21 Apr 2010) | 1 line
    
    fix whitespace issue
  ........
    r258265 | lmadsen | 2010-04-21 08:26:28 -0500 (Wed, 21 Apr 2010) | 1 line
    
    Fix the \brief description in the res_calendar_*.c files.
  ........
................

Modified:
    team/rmudgett/aoc_event/   (props changed)
    team/rmudgett/aoc_event/CHANGES
    team/rmudgett/aoc_event/doc/manager_1_1.txt
    team/rmudgett/aoc_event/doc/tex/manager.tex
    team/rmudgett/aoc_event/res/res_calendar_caldav.c
    team/rmudgett/aoc_event/res/res_calendar_exchange.c
    team/rmudgett/aoc_event/res/res_calendar_icalendar.c

Propchange: team/rmudgett/aoc_event/
------------------------------------------------------------------------------
--- aoc_event-integrated (original)
+++ aoc_event-integrated Wed Apr 21 09:56:39 2010
@@ -1,1 +1,1 @@
-/team/group/CCSS:1-258211
+/team/group/CCSS:1-258300

Propchange: team/rmudgett/aoc_event/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/rmudgett/aoc_event/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 21 09:56:39 2010
@@ -1,1 +1,1 @@
-/trunk:1-258191
+/trunk:1-258267

Modified: team/rmudgett/aoc_event/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/aoc_event/CHANGES?view=diff&rev=258301&r1=258300&r2=258301
==============================================================================
--- team/rmudgett/aoc_event/CHANGES (original)
+++ team/rmudgett/aoc_event/CHANGES Wed Apr 21 09:56:39 2010
@@ -357,6 +357,8 @@
    location than the first.
  * Added new event "JabberStatus" in the Jabber module to monitor buddies
    status.
+ * Added a "MixMonitorMute" AMI action for muting inbound and/or outbound audio
+   in a MixMonitor recording.
  * Added Advice-Of-Charge events (AOC-S, AOC-D, and AOC-E) in the new
    aoc event class.
 

Modified: team/rmudgett/aoc_event/doc/manager_1_1.txt
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/aoc_event/doc/manager_1_1.txt?view=diff&rev=258301&r1=258300&r2=258301
==============================================================================
--- team/rmudgett/aoc_event/doc/manager_1_1.txt (original)
+++ team/rmudgett/aoc_event/doc/manager_1_1.txt Wed Apr 21 09:56:39 2010
@@ -290,7 +290,17 @@
 		CoreReloadTime: 22:35:17
 		CoreCurrentCalls: 20
 
-		
+- Action: MixMonitorMute
+	Modules: app_mixmonitor.c
+	Purpose: 
+		Mute / unMute a Mixmonitor recording.
+	Variables: 
+		ActionId: <id> Action ID for this transaction. Will be returned.
+		Channel: the channel MixMonitor is running on
+		Direction: Which part of the recording to mute:  read, write or both (from
+			channel, to channel or both channels).
+		State: Turn mute on or off : 1 to turn on, 0 to turn off.
+
 * NEW EVENTS
 ------------
 

Modified: team/rmudgett/aoc_event/doc/tex/manager.tex
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/aoc_event/doc/tex/manager.tex?view=diff&rev=258301&r1=258300&r2=258301
==============================================================================
--- team/rmudgett/aoc_event/doc/tex/manager.tex (original)
+++ team/rmudgett/aoc_event/doc/tex/manager.tex Wed Apr 21 09:56:39 2010
@@ -163,6 +163,7 @@
  DestinationContext:      -- Destination context (cdr_manager)
  DestinationChannel:      -- Destination channel (cdr_manager)
  DestUniqueID:            -- UniqueID of destination (dial event)
+ Direction: <type>        -- Audio to mute (read | write | both) 
  Disposition:             -- Call disposition (CDR manager)
  Domain: <domain>         -- DNS domain
  Duration: <secs>         -- Duration of call (cdr_manager)
@@ -231,6 +232,7 @@
  SrcUniqueID:             -- UniqueID of source (dial event)
  StartTime:               -- Start time of call (cdr_manager)
  State:                   -- Channel state
+ State: <1 | 0>           -- Mute flag
  Status:                  -- Registration status (Registry events SIP)
  Status:                  -- Extension status (Extensionstate)
  Status:                  -- Peer status (if monitored)  ** Will change name **

Modified: team/rmudgett/aoc_event/res/res_calendar_caldav.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/aoc_event/res/res_calendar_caldav.c?view=diff&rev=258301&r1=258300&r2=258301
==============================================================================
--- team/rmudgett/aoc_event/res/res_calendar_caldav.c (original)
+++ team/rmudgett/aoc_event/res/res_calendar_caldav.c Wed Apr 21 09:56:39 2010
@@ -17,7 +17,7 @@
  */
 
 /*! \file
- * \brief Resource for handling iCalnedar calendars
+ * \brief Resource for handling CalDAV calendars
  */
 
 /*** MODULEINFO

Modified: team/rmudgett/aoc_event/res/res_calendar_exchange.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/aoc_event/res/res_calendar_exchange.c?view=diff&rev=258301&r1=258300&r2=258301
==============================================================================
--- team/rmudgett/aoc_event/res/res_calendar_exchange.c (original)
+++ team/rmudgett/aoc_event/res/res_calendar_exchange.c Wed Apr 21 09:56:39 2010
@@ -17,7 +17,7 @@
  */
 
 /*! \file
- * \brief Resource for handling iCalnedar calendars
+ * \brief Resource for handling MS Exchange calendars
  */
 
 /*** MODULEINFO

Modified: team/rmudgett/aoc_event/res/res_calendar_icalendar.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/aoc_event/res/res_calendar_icalendar.c?view=diff&rev=258301&r1=258300&r2=258301
==============================================================================
--- team/rmudgett/aoc_event/res/res_calendar_icalendar.c (original)
+++ team/rmudgett/aoc_event/res/res_calendar_icalendar.c Wed Apr 21 09:56:39 2010
@@ -17,7 +17,7 @@
  */
 
 /*! \file
- * \brief Resource for handling iCalnedar calendars
+ * \brief Resource for handling iCalendar calendars
  */
 
 /*** MODULEINFO

More information about the asterisk-commits mailing list