Commit Graph

78 Commits

Author SHA1 Message Date
Chris Rienzo 19b09689c8 FS-11785 [mod_conference] Fix dead assignments. Removed auto-record-canvas-id param which never did anything. 2019-07-17 20:22:37 +04:00
Seven Du 26f4c98b21 FS-11291 #resolve fix canvas id it was impossible to watch the first canvas 2019-07-16 23:32:29 +04:00
Seven Du 68abd253fe FS-11290 #resolve add canvasID and wachingCanvasID 2019-07-16 23:30:48 +04:00
Andrey Volk 44c38c5273 FS-11903: Fix errors reported by PVS-Studio Static Code Analyzer for mod_conference 2019-07-15 23:47:08 +04:00
David Grant b7bce76da5 FS-11826 [mod_conference] conference_member.c: channel variables (conference_join_) Fixes variables being seen as empty and proper range on conference_join_energy_level 2019-05-13 16:29:07 -05:00
Mike Jerris 8acb26e35a Merge pull request #1426 in FS/freeswitch from ~LAZEDO/freeswitch:feature/FS-10744 to master
* commit '78a0ed5de24cd11616c5c74ab8188a16f2f6f4bb':
  FS-10744 [mod_conference] provide call-id for conference fetch
2019-02-12 15:33:09 +00:00
Chad Phillips c83f7871fa FS-11276: dedicated video layers can no longer become audio floor holder
In mod_conference 1.6.x, all conference users could get the audio floor
regardless of the kind of video layer they were placed in.

In 1.8.x, the concept of a 'dedicated video layer' was introduced, such that
video layout slots with a reservation ID or a role ID are marked with the
'MFLAG_DED_VID_LAYER' member flag when a member is in the slot, and such
marked layers are prevented from becoming the conference audio/video floor
holder.

This makes sense for the video floor in all circumstances, and the audio floor
in most circumstances.

However, there are some circumstances where allowing users in these dedicated
video layers to become the conference audio floor holder is preferred, such as
when all slots in the layout have reservation IDs, and the audio floor events
are used to manage users in those slots manually.

This adds a conference profile flag, 'ded-vid-layer-audio-floor, which, when
enabled, allows conference members in dedicated video layers to become the
conference audio floor holder.
2018-07-25 20:43:05 -05:00
Mike Jerris 7f3878dfcb FS-11206: [mod_conference] add conference hold feature 2018-07-24 07:21:56 +00:00
Anthony Minessale d3aee10e28 FS-11057: [mod_conference] CPU race on personal canvas #resolve 2018-07-24 07:21:46 +00:00
Anthony Minessale b048830414 FS-11017: [mod_conference] Add moh controls to conference #resolve 2018-07-24 07:21:45 +00:00
Brian West ada117fb73 FS-10967: [mod_conference] chan var "conference_enter_sound" not working, only work when profile param active and being overridden #resolve 2018-07-24 07:21:45 +00:00
Anthony Minessale 9d9af7c153 FS-10883: [mod_conference] Conference member can get stuck read locked #resolve 2018-07-24 07:21:45 +00:00
Anthony Minessale 2a6990a7e0 rewind 2018-07-24 07:21:44 +00:00
Anthony Minessale 9140aba9f9 Revert "FS-11057: [mod_conference] CPU race on personal canvas #resolve"
This reverts commit 7acc94be97.
2018-07-24 07:21:44 +00:00
Anthony Minessale 443166dc2b FS-11057: [mod_conference] CPU race on personal canvas #resolve 2018-07-24 07:21:44 +00:00
Brian West 0e33e567e3 revert 2018-07-24 07:21:43 +00:00
Anthony Minessale b12762dd5a FS-11057: [mod_conference] CPU race on personal canvas #resolve 2018-07-24 07:21:43 +00:00
Brian West b5a7b74b1c revert 2018-07-24 07:21:43 +00:00
Mike Jerris f193aff269 FS-11057: [mod_conference] CPU race on personal canvas #resolve 2018-07-24 07:21:43 +00:00
Anthony Minessale 89770f4522 FS-11057: [mod_conference] CPU race on personal canvas #resolve 2018-07-24 07:21:43 +00:00
Anthony Minessale 6387cc1ffd FS-10883: [mod_conference] Conference member can get stuck read locked #resolve 2018-07-24 07:21:38 +00:00
Anthony Minessale 86ae01462a FS-10802: [mod_conference] Convert conference floor to id based 2018-07-24 07:21:36 +00:00
Anthony Minessale b8744e4c6d FS-10803: [mod_conference] Add support for alternate video layout config per conference profile #resolve 2018-07-24 07:21:36 +00:00
Anthony Minessale 2b5b9341e7 FS-10802: [mod_conference] Convert conference floor to id based #resolve 2018-07-24 07:21:36 +00:00
lazedo c4772b5bf0 FS-11099 [mod_conference] provide profile name when requesting for
caller-controls
2018-04-09 01:10:40 +01:00
Anthony Minessale 03576e82b8 FS-10757: [mod_conference] Race condition freeing avatar image #resolve 2017-10-25 14:20:45 -05:00
Luis Azedo 78a0ed5de2 FS-10744 [mod_conference] provide call-id for conference fetch 2017-10-20 13:41:34 +01:00
Anthony Minessale 44021b1c61 FS-10472: [mod_conference] Invalid free in personal canvas mode 2017-07-10 19:13:27 -05:00
Anthony Minessale c229ea05a6 FS-9922: [mod_conference] Auto Energy Level -- typo 2017-04-27 17:45:12 -05:00
Anthony Minessale b84662ae6b FS-10243: [mod_conference] Add conference variables #resolve 2017-04-17 17:00:11 -05:00
Mike Jerris 6c46b78f93 Merge pull request #1204 in FS/freeswitch from ~DRAGOS_OANCEA_NX/freeswitch-dragos-nx:fix_vol_conference_member to master
* commit '5d35744fb2870f1c22a987b809d2f7677b24b66c':
  FS-10087: fix for volume level per member of conference (volume level when playing file)
2017-03-24 17:14:16 +00:00
Anthony Minessale 4a56cc6401 FS-10146: [mod_conference] Completely setup conference member before adding them to the conference #resolve 2017-03-16 19:06:06 -05:00
Anthony Minessale 2e71cfd536 FS-10138: [freeswitch-core,mod_conference] Add alpha video to conference 2017-03-15 18:02:46 -05:00
Anthony Minessale 2c368307d8 FS-10138: [freeswitch-core,mod_conference] Add alpha video to conference #resolve 2017-03-15 15:28:08 -05:00
Anthony Minessale a62f26803e FS-10121: [mod_conference] Add role-id and layout transitions to conference #resolve 2017-03-09 14:18:16 -06:00
Anthony Minessale 51dd5e87a7 FS-9922: [mod_conference] Auto Energy Level #resolve 2017-03-09 12:03:55 -06:00
Anthony Minessale 115e69a0c0 FS-10114: [mod_conference] Reduce image reads from disk for logo image #resolve 2017-03-08 19:36:18 -06:00
Dragos Oancea 5d35744fb2 FS-10087: fix for volume level per member of conference (volume level when playing file) 2017-03-03 13:54:09 +00:00
Sergey Safarov df1ab07ca4 FS-9924: Removed extra space in source files 2017-02-09 23:59:49 -05:00
Seven Du c2141c98b2 FS-9787 #resolve remove duplicated headers in conference del-member events 2016-12-01 00:15:12 +08:00
Andy Newlands b5266ed6b4 FS-9325 [mod_dptools] Priority flag for faster bind_digit_action matches
Add exec: flag, 'P' (for "Priority") to bind_digit_action so that a
match is returned as soon as it is found, without waiting for the
inter-digit timeout to expire.

This can be very useful where the system needs to be more responsive
to the user.

By default, if multiple bindings are enabled and one or more use a
regex, switch_ivr_dmachine_check_match waits for the inter-digit
timeout to expire before returning a match.  This ensures overlapping
patterns, such as "^\d{4}$" and "^\12{3}$" can both be reliably matched

When the 'P' flag is specified with bind_digit_action, whose action is
exec, a match is returned as soon as the condition is satisfied,
regardless of whether or not a longer match may be possible if further
digits were entered.

For example:

	<action application="bind_digit_action" data="test,~^*\d{2}$,
		exec[P]:execute_extension,myextn,self,self"/>

	<action application="bind_digit_action" data="test,~^#\d{2}$",
		exec:execute_extension,myotherextn,self,peer"/>

	The first example causes a match to be returned immediately
	after the 2nd digit is received, whereas the second example
	defaults to waiting for the inter-digit timeout to expire
	before returning.

In cases where the 'P' flag is used with a regex and string, and both
are matched, the more explicit, string match will be returned.

For example:

	<action application="bind_digit_action" data="test,~^*\d{2}$,
		exec[P]:execute_extension,myextn,self,self"/>

	<action application="bind_digit_action" data="test,*12,
		exec[P]:execute_extension,myotherextn,self,self"/>

	If "*12" is matched, myotherextn is executed, because "*12" is
	more explicit/specific than "^*\d{2}$"

If the 'P'(riority) flag is not used, behaviour is unchanged from
previous versions.  This ensures backward compatibility.

FS-9325 #resolve
2016-11-08 13:47:37 +00:00
Anthony Minessale c409499cd9 FS-9576 #resolve [Add Realtime Text] 2016-09-27 16:40:43 -05:00
Mike Jerris 96e96a8099 FS-9552: [mod_conference] added 'deaf' to the json status per member 2016-09-20 17:25:47 -04:00
Anthony Minessale 71c54d6f3a FS-9495 #resolve [add conference_join_energy_level variable] 2016-09-08 17:33:21 -05:00
Anthony Minessale 34bff55ffd FS-9494 #resolve [Issues with video avatar switching when video starts/stops] 2016-09-08 14:52:42 -05:00
Anthony Minessale 1f1e372826 FS-9474 #resolve [Add variables to set initial volume on mod_conference] 2016-09-01 13:30:55 -05:00
Brian West ff169d8133 Revert "FS-8704: Add min-members, wait-min-members-timeout, wait-mod-timeout, wait-min-members-timeout-message, wait-mod-timeout-message, endconf-mod-exit-message, and endconf-message parameters and functionality to mod_conference."
This reverts commit c39fbb295f.
2016-04-27 11:00:29 -05:00
Mike Jerris beada9b0cb Merge pull request #656 in FS/freeswitch from mod_conf_enhancements to master
* commit 'c39fbb295f6b9bc01baa5dbfc578e12022c088ae':
  FS-8704: Add min-members, wait-min-members-timeout, wait-mod-timeout, wait-min-members-timeout-message, wait-mod-timeout-message, endconf-mod-exit-message, and endconf-message parameters and functionality to mod_conference.
2016-04-11 12:00:37 -05:00
Anthony Minessale f93668e3fd FS-7800 fix some stuff in multi-canvas 2016-03-18 18:21:25 -05:00
Anthony Minessale 3eff2d553d FS-7800 should be able to call extra screens with same extension as the original and place the param conferenceCanvasID with the desired canvas id into the call params in the same place bandwidth prefs are added 2016-03-18 14:54:31 -05:00