|
|
@@ -265,6 +265,8 @@ namespace Jack |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
assert(fNetAudioCaptureBuffer); |
|
|
|
|
|
|
|
|
if (fParams.fReturnAudioChannels) { |
|
|
if (fParams.fReturnAudioChannels) { |
|
|
|
|
|
|
|
|
switch (fParams.fSampleEncoder) { |
|
|
switch (fParams.fSampleEncoder) { |
|
|
@@ -285,6 +287,8 @@ namespace Jack |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
assert(fNetAudioPlaybackBuffer); |
|
|
|
|
|
|
|
|
} catch (exception&) { |
|
|
} catch (exception&) { |
|
|
jack_error("NetAudioBuffer allocation error..."); |
|
|
jack_error("NetAudioBuffer allocation error..."); |
|
|
return false; |
|
|
return false; |
|
|
@@ -788,41 +792,45 @@ namespace Jack |
|
|
switch (fParams.fSampleEncoder) { |
|
|
switch (fParams.fSampleEncoder) { |
|
|
|
|
|
|
|
|
case JackFloatEncoder: |
|
|
case JackFloatEncoder: |
|
|
fNetAudioCaptureBuffer = new NetFloatAudioBuffer ( &fParams, fParams.fSendAudioChannels, fRxData ); |
|
|
|
|
|
|
|
|
fNetAudioCaptureBuffer = new NetFloatAudioBuffer(&fParams, fParams.fSendAudioChannels, fRxData); |
|
|
break; |
|
|
break; |
|
|
|
|
|
|
|
|
case JackIntEncoder: |
|
|
case JackIntEncoder: |
|
|
fNetAudioCaptureBuffer = new NetIntAudioBuffer ( &fParams, fParams.fSendAudioChannels, fRxData ); |
|
|
|
|
|
|
|
|
fNetAudioCaptureBuffer = new NetIntAudioBuffer(&fParams, fParams.fSendAudioChannels, fRxData); |
|
|
break; |
|
|
break; |
|
|
|
|
|
|
|
|
case JackCeltEncoder: |
|
|
case JackCeltEncoder: |
|
|
#ifdef CELT |
|
|
#ifdef CELT |
|
|
fNetAudioCaptureBuffer = new NetCeltAudioBuffer ( &fParams, fParams.fSendAudioChannels, fRxData, fParams.fKBps ); |
|
|
|
|
|
|
|
|
fNetAudioCaptureBuffer = new NetCeltAudioBuffer(&fParams, fParams.fSendAudioChannels, fRxData, fParams.fKBps); |
|
|
#endif |
|
|
#endif |
|
|
break; |
|
|
break; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
assert(fNetAudioCaptureBuffer); |
|
|
|
|
|
|
|
|
if (fParams.fReturnAudioChannels) { |
|
|
if (fParams.fReturnAudioChannels) { |
|
|
|
|
|
|
|
|
switch (fParams.fSampleEncoder) { |
|
|
switch (fParams.fSampleEncoder) { |
|
|
|
|
|
|
|
|
case JackFloatEncoder: |
|
|
case JackFloatEncoder: |
|
|
fNetAudioPlaybackBuffer = new NetFloatAudioBuffer ( &fParams, fParams.fReturnAudioChannels, fTxData ); |
|
|
|
|
|
|
|
|
fNetAudioPlaybackBuffer = new NetFloatAudioBuffer(&fParams, fParams.fReturnAudioChannels, fTxData); |
|
|
break; |
|
|
break; |
|
|
|
|
|
|
|
|
case JackIntEncoder: |
|
|
case JackIntEncoder: |
|
|
fNetAudioPlaybackBuffer = new NetIntAudioBuffer ( &fParams, fParams.fReturnAudioChannels, fTxData); |
|
|
|
|
|
|
|
|
fNetAudioPlaybackBuffer = new NetIntAudioBuffer(&fParams, fParams.fReturnAudioChannels, fTxData); |
|
|
break; |
|
|
break; |
|
|
|
|
|
|
|
|
case JackCeltEncoder: |
|
|
case JackCeltEncoder: |
|
|
#ifdef CELT |
|
|
#ifdef CELT |
|
|
fNetAudioPlaybackBuffer = new NetCeltAudioBuffer ( &fParams, fParams.fReturnAudioChannels, fTxData, fParams.fKBps ); |
|
|
|
|
|
|
|
|
fNetAudioPlaybackBuffer = new NetCeltAudioBuffer(&fParams, fParams.fReturnAudioChannels, fTxData, fParams.fKBps); |
|
|
#endif |
|
|
#endif |
|
|
break; |
|
|
break; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
assert(fNetAudioPlaybackBuffer); |
|
|
|
|
|
|
|
|
} catch (exception&) { |
|
|
} catch (exception&) { |
|
|
jack_error("NetAudioBuffer allocation error..."); |
|
|
jack_error("NetAudioBuffer allocation error..."); |
|
|
return false; |
|
|
return false; |
|
|
|