Commit Graph

719 Commits

Author SHA1 Message Date
Hristo Trendev 94278b5e54 allow enter and exit sounds to interrupt the MOH in a wait_mod conference
This patch does the following:
* only starts MOH if no other file (sync or async) is currently playing
* adds a variable "conference_permanent_wait_mod_moh" that controls the
  behavior of how the enter and exit sounds interact with the MOH when
  wait_mod is set. When the variable is set, the MOH keeps playing and
  the enter and exit sounds are mixed with the MOH. When the variable
  is unset, then any playing MOH is first stopped, then the enter or
  exit sound is played and the MOH is started again.

This functionality is useful in case the enter and exit sounds are
used to announce the name of the caller, who is joining or leaving a
conference.

FS-5159 #resolve
2014-11-06 19:32:17 +01:00
Mike Jerris fbe81ff886 Merge pull request #69 in FS/freeswitch from ~HRISTO/freeswitch:conference-flags to master
* commit '3695bdd9e4e0d925ab7296d2f4ce120bf656f623':
  set conference flags from a dial plan variable or via +flags{ }
2014-11-05 16:25:40 -06:00
Anthony Minessale 8f3c157f12 FS-6957 #resolve 2014-11-03 11:32:40 -06:00
Anthony Minessale 30e793a7ef fix missing paren in logic for hard mute enter muted mode 2014-10-29 12:16:32 -05:00
Anthony Minessale 5488757917 FS-6950 #resolve 2014-10-28 15:01:08 -05:00
Anthony Minessale d1e529aefd Add new hard_mute control to allow apps to request low level mute e.g. from the rtp stack level. Its used in mod_conference to avoid reading audio while muted and possibly reduce some transcoding load 2014-10-27 15:13:42 -04:00
Anthony Minessale 2514de94d2 fix obvious seg in setting a record file name to every participant and not checking for the recording member which does not have a session 2014-10-07 12:48:58 -05:00
Jeff Lenk ae5d86515a FS-6884 #comment these were mostly simple warnings 2014-10-02 19:20:35 -05:00
Hristo Trendev 3695bdd9e4 set conference flags from a dial plan variable or via +flags{ }
This patch allows conference flags to be set dynamically from the
dial plan by either passing them to the conference application in
the +flags{ } string or by setting the "conference_flags" dial plan
variable.

The +flags{ } string is currently used to set *user* flags only.
This patch changes this by allowing the +flags{ } string to contain
conference related flags as well (for example wait_mod). It shouldn't
be a problem to pass both types of flags via +flags{ } as long as
the user and conference flag names are kept unique.

FS-5099 #resolve
2014-09-30 11:31:03 +02:00
Seven Du f78007766b don't reset when video floor is locked
when video floor is locked by a member, changing audio floor on del_member
will cause the video floor lock cleared unexpectedly, this commit fixes that.
2014-09-16 19:15:12 +08:00
Michael Jerris 56e4afb209 FS-6595: Enable pause_play and file_seek for conference member fnode #resolve 2014-09-04 15:56:15 -04:00
Anthony Minessale 0f1494ae06 Improve conference recording 2014-08-26 09:52:55 -05:00
Anthony Minessale fb274514df add switch_separate_file_params function so when using relative paths with bracketed params the full path can be constructed with the params in tact 2014-08-01 22:57:40 +05:00
Anthony Minessale 004c5ab2b0 fix some issues with duplicate chat events and some cleanup 2014-07-24 22:58:12 +05:00
Anthony Minessale 7596689865 add chat to demo 2014-07-24 10:13:39 +05:00
Anthony Minessale f0d1be5f41 reduce radius for auto positioning 2014-07-23 01:05:55 +05:00
Anthony Minessale 025e65a0cd fix resampler issue caused by refactoring impacting audio quality of resampled calls in the conference 2014-07-23 01:04:35 +05:00
Anthony Minessale 93983e63cc revert fd9d77feee 2014-07-23 01:01:44 +05:00
Anthony Minessale 997e921721 add transfer command 2014-07-19 00:32:09 +05:00
Anthony Minessale fd9d77feee add clear channel for mono participants while in a conference with 3d callers 2014-07-12 03:31:26 +05:00
Anthony Minessale a03963fb92 fold livetables into verto obj and expose moderator mode 2014-07-12 03:27:08 +05:00
Michael Jerris f2887fb89e CID:1224272 Dereference after null check. member can not actually be NULL in any of the scenarios calling this function 2014-07-09 14:32:38 -04:00
Anthony Minessale 9e0d1d6841 only count unmuted channels in positioning 2014-07-02 22:57:29 +05:00
Anthony Minessale f0d16d0d18 expand positioning api usage 2014-07-02 04:49:16 +05:00
Anthony Minessale 7f9348dbc3 fix volume adjustments in stereo conference 2014-06-30 23:39:42 +05:00
Anthony Minessale 41a7d1cf31 some refactoring to make new stereo stuff more stable 2014-06-30 23:00:45 +05:00
Anthony Minessale 591ea9e9ca tweaks 2014-06-30 04:39:46 +05:00
Anthony Minessale 0bb7f1659f check for member channel 2014-06-30 01:59:21 +05:00
Anthony Minessale 0ac78cacc3 add openal code to mod_conference 2014-06-30 01:23:08 +05:00
Anthony Minessale ba784f2548 skip update on member channels with no json 2014-06-25 13:40:50 -05:00
Eliot Gable b21f34bffc Clarify error message. 2014-06-21 19:16:50 +00:00
Anthony Minessale 011e069652 fix recording in stereo conferences 2014-06-20 23:53:22 +05:00
Anthony Minessale 579a051867 add channels param the the silence generator function 2014-06-13 04:49:44 +05:00
Anthony Minessale 97cc089826 fix compile errs 2014-06-12 13:12:39 -04:00
Anthony Minessale 928a989de1 first pass of stereo support 2014-06-12 22:06:33 +05:00
Michael Jerris 16805187ec CID:1214256 Unused pointer value 2014-05-15 12:36:36 +00:00
Michael Jerris 128601316f CID:1214255 Unused pointer value 2014-05-15 12:34:50 +00:00
Michael Jerris 19f3ab5182 CID:1214218 fix memory leak in conference_event_channel_handler 2014-05-15 12:33:15 +00:00
Travis Cross fc40e4ab79 Avoid leaking data_buf in mod_conference
When we couldn't acquire the rwlock on the conference we were leaking
a buffer we just allocated.  On a 48k/10ms conference we would leak
960 bytes per attempt.
2014-05-02 03:48:10 +00:00
Michael Jerris 64f1098b8c remove dead assignment 2014-05-01 14:17:06 -04:00
Anthony Minessale 2e0cd74e07 FS-6477 --resolve 2014-04-22 23:51:44 +05:00
Anthony Minessale c98fb0bd0e send muted members as recvonly on RFC4575 data 2014-04-07 20:51:29 +05:00
Anthony Minessale 7151d6acea FS-6402 part 2 2014-04-02 03:21:37 +05:00
Anthony Minessale 5c0cff70b3 FS-6402 --resolve 2014-04-02 01:20:19 +05:00
Anthony Minessale 107c5eccc3 video refresh floor holder on conference join 2014-03-31 22:39:46 +05:00
Brian West f890854e0d FS-6381 add hostname to conference cdr 2014-03-21 17:23:50 -05:00
Anthony Minessale 804ef7709d change from sqlite hash to newly added one 2014-03-09 00:37:17 +05:00
Travis Cross 010740d664 Correct sizeof argument in mod_conference
This corrects a memset introduced in commit
bd4a0d8cbc.

The sizeof would have only returned the size of a pointer.
2014-03-08 01:56:18 +00:00
Anthony Minessale 5375d8b643 add on to last commit 2014-03-07 06:34:32 +05:00
Anthony Minessale bd4a0d8cbc add a way to tell mod_conference when the rate of the channel has changed due to a codec change so it can reset the resampler and codecs internally 2014-03-07 05:17:47 +05:00