diff options
Diffstat (limited to 'xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c')
| -rw-r--r-- | xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c b/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c index 1fc539e..1b279d6 100644 --- a/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c +++ b/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c @@ -2893,7 +2893,6 @@ UINT32 Oct6100ApiBridgeAddParticipantToChannel( tPOCT6100_API_CHANNEL pSourceChanEntry; tPOCT6100_API_CHANNEL pDestinationChanEntry; - tPOCT6100_API_FLEX_CONF_PARTICIPANT pSourceParticipant; tPOCT6100_API_FLEX_CONF_PARTICIPANT pDestinationParticipant; tPOCT6100_SHARED_INFO pSharedInfo; @@ -2914,7 +2913,6 @@ UINT32 Oct6100ApiBridgeAddParticipantToChannel( mOCT6100_GET_CONF_BRIDGE_ENTRY_PNT( f_pApiInstance->pSharedInfo, pBridgeEntry, f_usBridgeIndex ); mOCT6100_GET_CHANNEL_ENTRY_PNT( f_pApiInstance->pSharedInfo, pSourceChanEntry, f_usSourceChannelIndex ); - mOCT6100_GET_FLEX_CONF_PARTICIPANT_ENTRY_PNT( f_pApiInstance->pSharedInfo, pSourceParticipant, pSourceChanEntry->usFlexConfParticipantIndex ); mOCT6100_GET_CHANNEL_ENTRY_PNT( f_pApiInstance->pSharedInfo, pDestinationChanEntry, f_usDestinationChannelIndex ); mOCT6100_GET_FLEX_CONF_PARTICIPANT_ENTRY_PNT( f_pApiInstance->pSharedInfo, pDestinationParticipant, pDestinationChanEntry->usFlexConfParticipantIndex ); @@ -5069,12 +5067,9 @@ UINT32 Oct6100ApiBridgeRemoveParticipantFromChannel( tPOCT6100_API_MIXER_EVENT pTempEntry; tPOCT6100_API_MIXER_EVENT pLoadTempEntry; tPOCT6100_API_MIXER_EVENT pLastEventEntry; - tPOCT6100_API_MIXER_EVENT pLastLoadOrAccumulateEventEntry; - tPOCT6100_API_CHANNEL pSourceChanEntry; tPOCT6100_API_CHANNEL pDestinationChanEntry; - tPOCT6100_API_FLEX_CONF_PARTICIPANT pSourceParticipant; tPOCT6100_API_FLEX_CONF_PARTICIPANT pDestinationParticipant; tPOCT6100_SHARED_INFO pSharedInfo; @@ -5083,7 +5078,6 @@ UINT32 Oct6100ApiBridgeRemoveParticipantFromChannel( UINT32 ulResult; UINT32 ulLoopCount; - UINT16 usLastLoadEventIndex; UINT16 usLoadOrAccumulateEventIndex; UINT16 usTempEventIndex; UINT16 usPreviousEventIndex; @@ -5091,7 +5085,6 @@ UINT32 Oct6100ApiBridgeRemoveParticipantFromChannel( UINT16 usReadData; BOOL fLastEvent = FALSE; - BOOL fSoutCopyEvent = FALSE; /* Obtain local pointer to shared portion of instance. */ pSharedInfo = f_pApiInstance->pSharedInfo; @@ -5107,8 +5100,6 @@ UINT32 Oct6100ApiBridgeRemoveParticipantFromChannel( mOCT6100_GET_CONF_BRIDGE_ENTRY_PNT( f_pApiInstance->pSharedInfo, pBridgeEntry, f_usBridgeIndex ); - mOCT6100_GET_CHANNEL_ENTRY_PNT( f_pApiInstance->pSharedInfo, pSourceChanEntry, f_usSourceChannelIndex ); - mOCT6100_GET_FLEX_CONF_PARTICIPANT_ENTRY_PNT( f_pApiInstance->pSharedInfo, pSourceParticipant, pSourceChanEntry->usFlexConfParticipantIndex ); mOCT6100_GET_CHANNEL_ENTRY_PNT( f_pApiInstance->pSharedInfo, pDestinationChanEntry, f_usDestinationChannelIndex ); mOCT6100_GET_FLEX_CONF_PARTICIPANT_ENTRY_PNT( f_pApiInstance->pSharedInfo, pDestinationParticipant, pDestinationChanEntry->usFlexConfParticipantIndex ); @@ -5127,8 +5118,6 @@ UINT32 Oct6100ApiBridgeRemoveParticipantFromChannel( mOCT6100_GET_MIXER_EVENT_ENTRY_PNT( pSharedInfo, pTempEntry, usTempEventIndex ); pLastEventEntry = pLoadEventEntry; - pLastLoadOrAccumulateEventEntry = pLoadEventEntry; - usLastLoadEventIndex = usTempEventIndex; usLastEventIndex = usTempEventIndex; while( pTempEntry->usEventType != cOCT6100_MIXER_CONTROL_MEM_SUB_STORE && @@ -5224,9 +5213,6 @@ UINT32 Oct6100ApiBridgeRemoveParticipantFromChannel( } } - pLastLoadOrAccumulateEventEntry = pTempEntry; - usLastLoadEventIndex = usTempEventIndex; - /* Go to the next entry into the list. */ usTempEventIndex = pTempEntry->usNextEventPtr; mOCT6100_GET_MIXER_EVENT_ENTRY_PNT( pSharedInfo, pTempEntry, usTempEventIndex ); @@ -5362,7 +5348,6 @@ UINT32 Oct6100ApiBridgeRemoveParticipantFromChannel( if ( pTempEntry->usEventType == cOCT6100_MIXER_CONTROL_MEM_COPY ) { /* No more previous bridges. */ - fSoutCopyEvent = TRUE; } /* Now modify the previous last Store or Sub-Store or Head-Node event from another bridge/channel. */ @@ -7412,7 +7397,6 @@ UINT32 Oct6100ApiGetPrevLastSubStoreEvent( IN UINT16 f_usBridgeFirstLoadEventPtr, OUT PUINT16 f_pusLastSubStoreEventIndex ) { - tPOCT6100_API_CONF_BRIDGE pBridgeEntry; tPOCT6100_API_MIXER_EVENT pTempMixerEntry; UINT16 usNextEventPtr; UINT16 usHeadEventPtr; @@ -7421,9 +7405,6 @@ UINT32 Oct6100ApiGetPrevLastSubStoreEvent( UINT16 usCurrentPtr; UINT32 ulResult = cOCT6100_ERR_OK; - /* Get current entry to obtain the link to the previous entry.*/ - mOCT6100_GET_CONF_BRIDGE_ENTRY_PNT( f_pApiInstance->pSharedInfo, pBridgeEntry, f_usBridgeIndex ); - /* Since we have flexible bridges, we have to */ /* run down the list and check for the appropriate event. */ |