diff options
Diffstat (limited to 'software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c')
| -rw-r--r-- | software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c index 1a1bc24..159b21f 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c @@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.03.05 $ +$Octasic_Release: OCT612xAPI-01.04.01 $ -$Octasic_Revision: 148 $ +$Octasic_Revision: 149 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -704,7 +704,8 @@ UINT32 Oct6100ApiGetConfBridgeSwSizes( UINT32 ulResult; /* Calculate memory needed for conference bridge list. */ - if ( f_pOpenChip->ulMaxConfBridges == 0 && f_pOpenChip->fEnableChannelRecording == TRUE ) + if ( ( f_pOpenChip->ulMaxConfBridges == 0 ) + && ( f_pOpenChip->fEnableChannelRecording == TRUE || f_pOpenChip->fAllowDynamicRecording == TRUE ) ) f_pOpenChip->ulMaxConfBridges = 1; f_pInstSizes->ulConfBridgeList = f_pOpenChip->ulMaxConfBridges * sizeof( tOCT6100_API_CONF_BRIDGE ); @@ -1369,8 +1370,9 @@ UINT32 Oct6100ApiCheckBridgeAddParams( if ( f_pApiInstance->pSharedInfo->ChipConfig.usMaxConfBridges == 0 ) return cOCT6100_ERR_CONF_BRIDGE_DISABLED; - if ( f_pApiInstance->pSharedInfo->ChipConfig.usMaxConfBridges == 1 && - f_pApiInstance->pSharedInfo->ChipConfig.fEnableChannelRecording == TRUE ) + if ( ( f_pApiInstance->pSharedInfo->ChipConfig.usMaxConfBridges == 1 ) + && ( ( f_pApiInstance->pSharedInfo->ChipConfig.fEnableChannelRecording == TRUE ) + || ( f_pApiInstance->pSharedInfo->ChipConfig.fAllowDynamicRecording == TRUE ) ) ) return cOCT6100_ERR_CONF_BRIDGE_DISABLED; if ( f_pConfBridgeAdd->ulConfBridgeHndl == cOCT6100_INVALID_HANDLE ) |