summaryrefslogtreecommitdiff
path: root/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c
diff options
context:
space:
mode:
authorOctasic Inc <support@octasic.com>2010-07-16 16:25:26 +0300
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>2011-02-27 21:11:22 +0200
commit9e764fa01379cc515831e4353eade0b1cf53c8bf (patch)
tree23c34b79a6ffb046eef7cca704978d220ab7ce80 /software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c
parent7d344854228f44259f71de172f24f9a8b07f7c0d (diff)
importing OCT612x-01.04.01
Diffstat (limited to 'software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c')
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c
index f57f90a..6e6a277 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c
@@ -23,9 +23,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: 44 $
+$Octasic_Revision: 45 $
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
@@ -324,7 +324,8 @@ UINT32 Oct6100ApiMixerSwInit(
pMixerEventList[ cOCT6100_MIXER_TAIL_NODE ].usEventType = cOCT6100_MIXER_CONTROL_MEM_NO_OP;
/* Now reserve the entry used for channel recording if the feature is enabled. */
- if ( pSharedInfo->ChipConfig.fEnableChannelRecording == TRUE )
+ if ( ( pSharedInfo->ChipConfig.fEnableChannelRecording == TRUE )
+ || ( pSharedInfo->ChipConfig.fAllowDynamicRecording == TRUE ) )
{
UINT32 ulAllocIndex;