aboutsummaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2011-07-06 04:52:35 +0200
committerPatrick McHardy <kaber@trash.net>2011-07-06 04:52:35 +0200
commit916e420bf0c8db7a8cb1f60557cd2807652142cf (patch)
treeece8aaf3f22e6e1cc545a858cad9e05c34713426 /configs
parent9364aaccb699c6d19ac2cbe760c208b34ba7838a (diff)
parent357b97fb29d196a5f336d6a2879278ea135ab08c (diff)
Merge branch 'master' of 192.168.0.100:/repos/git/asterisk
Diffstat (limited to 'configs')
-rw-r--r--configs/confbridge.conf.sample22
-rw-r--r--configs/queuerules.conf.sample2
-rw-r--r--configs/queues.conf.sample11
-rw-r--r--configs/sip.conf.sample2
4 files changed, 35 insertions, 2 deletions
diff --git a/configs/confbridge.conf.sample b/configs/confbridge.conf.sample
index 1781b88..4083870 100644
--- a/configs/confbridge.conf.sample
+++ b/configs/confbridge.conf.sample
@@ -168,6 +168,26 @@ type=bridge
; larger amounts of delay into the bridge. Valid values here are 10, 20, 40,
; or 80. By default 20ms is used.
+;video_mode = follow_talker ; Sets how confbridge handles video distribution to the conference participants.
+ ; Note that participants wanting to view and be the source of a video feed
+ ; _MUST_ be sharing the same video codec.
+ ; --- MODES ---
+ ; none: No video sources are set by default in the conference. It is still
+ ; possible for a user to be set as a video source via AMI or DTMF action
+ ; at any time.
+ ;
+ ; follow_talker: The video feed will follow whoever is talking and providing video.
+ ;
+ ; last_marked: The last marked user to join the conference with video capabilities
+ ; will be the single source of video distributed to all participants.
+ ; If multiple marked users are capable of video, the last one to join
+ ; is always the source, when that user leaves it goes to the one who
+ ; joined before them.
+ ;
+ ; first_marked: The first marked user to join the conference with video capabilities
+ ; is the single source of video distribution among all participants. If
+ ; that user leaves, the marked user to join after them becomes the source.
+
; All sounds in the conference are customizable using the bridge profile options below.
; Simply state the option followed by the filename or full path of the filename after
; the option. Example: sound_had_joined=conf-hasjoin This will play the conf-hasjoin
@@ -264,6 +284,8 @@ type=bridge
; admin_toggle_conference_lock ; This action allows an Admin to toggle locking and
; unlocking the conference. Non admins can not use
; this action even if it is in their menu.
+; set_as_single_video_src ; This action allows any user to set themselves as the
+ ; single video source distributed to all participants.
[sample_user_menu]
type=menu
diff --git a/configs/queuerules.conf.sample b/configs/queuerules.conf.sample
index ccabe2c..fb2a1ba 100644
--- a/configs/queuerules.conf.sample
+++ b/configs/queuerules.conf.sample
@@ -7,7 +7,7 @@
;
; Note: There is a limitation to these rules; a caller will follow the penaltychange rules for
; the queue that were defined at the time the caller entered the queue. If an update to the rules is
-; made during the the caller's stay in the queue, these will not be reflected for that caller.
+; made during the caller's stay in the queue, these will not be reflected for that caller.
;
; The syntax for these rules is
; penaltychange => <number of seconds into the call>,<absolute or relative change to QUEUE_MAX_PENALTY>[,absolute or relative change to QUEUE_MIN_PENALTY]
diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample
index c2045f9..3f67d6d 100644
--- a/configs/queues.conf.sample
+++ b/configs/queues.conf.sample
@@ -61,6 +61,10 @@ monitor-type = MixMonitor
;
;shared_lastcall=no
;
+; Negative_penalty_invalid will treat members with a negative penalty as logged off
+;
+;negative_penalty_invalid = no
+;
;[markq]
;
; A sample call queue
@@ -196,6 +200,10 @@ monitor-type = MixMonitor
; all: Memeber will be paused in all queues he/she is a member
;autopause=yes
;
+; Autopausedelay delay autopause for autopausedelay seconds from the
+; last call if a member has not taken a call the delay has no effect.
+;autopausedelay=60
+;
; Maximum number of people waiting in the queue (0 for unlimited)
;
;maxlen = 0
@@ -459,6 +467,9 @@ monitor-type = MixMonitor
; uncomment this option. (Note: only the SIP channel driver currently is able
; to report 'in use'.)
;
+; A member can have the ignorebusy flag set or unset when ringinuse is set to
+; allow a per member control.
+;
; ringinuse = no
;
; If you wish to have a delay before the member is connected to the caller (or
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 21235a6..f33b1cf 100644
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -130,7 +130,7 @@ allowoverlap=no ; Disable overlap dialing support. (Default is y
; asterisk.conf, it defaults to that system name
; Realms MUST be globally unique according to RFC 3261
; Set this to your host name or domain name
-;domainsasrealm=no ; Use domans list as realms
+;domainsasrealm=no ; Use domains list as realms
; You can serve multiple Realms specifying several
; 'domain=...' directives (see below).
; In this case Realm will be based on request 'From'/'To' header