Changeset 4012
- Timestamp:
- 05/12/10 01:37:24 (4 months ago)
- Files:
-
- jack2/branches/libjacknet/common/JackNetInterface.cpp (modified) (7 diffs)
- jack2/branches/libjacknet/common/JackNetTool.cpp (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
jack2/branches/libjacknet/common/JackNetInterface.cpp
r3957 r4012 229 229 bool JackNetMasterInterface::SetParams() 230 230 { 231 jack_log ( "JackNetMasterInterface::SetParams");231 jack_log("JackNetMasterInterface::SetParams"); 232 232 233 233 JackNetInterface::SetParams(); … … 237 237 238 238 //midi net buffers 239 fNetMidiCaptureBuffer = new NetMidiBuffer ( &fParams, fParams.fSendMidiChannels, fTxData ); 240 fNetMidiPlaybackBuffer = new NetMidiBuffer ( &fParams, fParams.fReturnMidiChannels, fRxData ); 241 assert ( fNetMidiCaptureBuffer ); 242 assert ( fNetMidiPlaybackBuffer ); 243 239 if (fParams.fSendMidiChannels) 240 fNetMidiCaptureBuffer = new NetMidiBuffer(&fParams, fParams.fSendMidiChannels, fTxData); 241 242 if (fParams.fReturnMidiChannels) 243 fNetMidiPlaybackBuffer = new NetMidiBuffer(&fParams, fParams.fReturnMidiChannels, fRxData); 244 244 245 try { 245 246 … … 254 255 255 256 case JackIntEncoder: 256 257 fNetAudioCaptureBuffer = new NetIntAudioBuffer ( &fParams, fParams.fSendAudioChannels, fTxData ); 257 258 break; 258 259 … … 270 271 271 272 case JackFloatEncoder: 272 273 fNetAudioPlaybackBuffer = new NetFloatAudioBuffer ( &fParams, fParams.fReturnAudioChannels, fRxData ); 273 274 break; 274 275 … … 775 776 fRxHeader.fDataStream = 's'; 776 777 777 //midi net buffers 778 fNetMidiCaptureBuffer = new NetMidiBuffer ( &fParams, fParams.fSendMidiChannels, fRxData ); 779 fNetMidiPlaybackBuffer = new NetMidiBuffer ( &fParams, fParams.fReturnMidiChannels, fTxData ); 780 assert ( fNetMidiCaptureBuffer ); 781 assert ( fNetMidiPlaybackBuffer ); 782 783 //audio net buffers 784 //fNetAudioCaptureBuffer = new NetFloatAudioBuffer ( &fParams, fParams.fSendAudioChannels, fRxData ); 785 //fNetAudioPlaybackBuffer = new NetFloatAudioBuffer ( &fParams, fParams.fReturnAudioChannels, fTxData ); 786 778 //midi net buffers 779 if (fParams.fSendMidiChannels) 780 fNetMidiCaptureBuffer = new NetMidiBuffer(&fParams, fParams.fSendMidiChannels, fTxData); 781 782 if (fParams.fReturnMidiChannels) 783 fNetMidiPlaybackBuffer = new NetMidiBuffer(&fParams, fParams.fReturnMidiChannels, fRxData); 784 787 785 try { 788 #ifdef CELT 789 if (fParams.fSendAudioChannels) { 790 // fNetAudioCaptureBuffer = new NetCeltAudioBuffer ( &fParams, fParams.fSendAudioChannels, fRxData ); 791 fNetAudioCaptureBuffer = new NetIntAudioBuffer ( &fParams, fParams.fSendAudioChannels, fRxData ); 792 } 793 794 if (fParams.fReturnAudioChannels) { 795 //fNetAudioPlaybackBuffer = new NetCeltAudioBuffer ( &fParams, fParams.fReturnAudioChannels, fTxData ); 796 fNetAudioPlaybackBuffer = new NetIntAudioBuffer ( &fParams, fParams.fReturnAudioChannels, fTxData ); 797 } 798 799 // fNetAudioCaptureBuffer = new NetIntAudioBuffer ( &fParams, fParams.fSendAudioChannels, fRxData ); 800 // fNetAudioPlaybackBuffer = new NetIntAudioBuffer ( &fParams, fParams.fReturnAudioChannels, fTxData ); 801 #else 802 fNetAudioCaptureBuffer = new NetFloatAudioBuffer ( &fParams, fParams.fSendAudioChannels, fRxData ); 803 fNetAudioPlaybackBuffer = new NetFloatAudioBuffer ( &fParams, fParams.fReturnAudioChannels, fTxData ); 804 805 //fNetAudioCaptureBuffer = new NetBufferedAudioBuffer ( &fParams, fParams.fSendAudioChannels, fRxData ); 806 //fNetAudioPlaybackBuffer = new NetBufferedAudioBuffer ( &fParams, fParams.fReturnAudioChannels, fTxData ); 807 #endif 808 809 786 810 787 //audio net buffers 811 788 if (fParams.fSendAudioChannels) { … … 818 795 819 796 case JackIntEncoder: 820 797 fNetAudioCaptureBuffer = new NetIntAudioBuffer ( &fParams, fParams.fSendAudioChannels, fRxData ); 821 798 break; 822 799 … … 834 811 835 812 case JackFloatEncoder: 836 813 fNetAudioPlaybackBuffer = new NetFloatAudioBuffer ( &fParams, fParams.fReturnAudioChannels, fTxData ); 837 814 break; 838 815 jack2/branches/libjacknet/common/JackNetTool.cpp
r3959 r4012 305 305 fCompressedBuffer[port_index] = new unsigned char[fCompressedSizeByte]; 306 306 307 jack_log(" fCompressedSizeByte %d", fCompressedSizeByte);307 jack_log("NetCeltAudioBuffer fCompressedSizeByte %d", fCompressedSizeByte); 308 308 309 309 res1 = (fNPorts * fCompressedSizeByte) % (params->fMtu - sizeof(packet_header_t)); 310 310 res2 = (fNPorts * fCompressedSizeByte) / (params->fMtu - sizeof(packet_header_t)); 311 311 312 jack_log(" res1 = %d res2 = %d", res1, res2);312 jack_log("NetCeltAudioBuffer res1 = %d res2 = %d", res1, res2); 313 313 314 314 fNumPackets = (res1) ? (res2 + 1) : res2; … … 317 317 fLastSubPeriodBytesSize = fSubPeriodBytesSize + fCompressedSizeByte % fNumPackets; 318 318 319 jack_log(" fNumPackets = %d fSubPeriodBytesSize = %d, fLastSubPeriodBytesSize = %d", fNumPackets, fSubPeriodBytesSize, fLastSubPeriodBytesSize);319 jack_log("NetCeltAudioBuffer fNumPackets = %d fSubPeriodBytesSize = %d, fLastSubPeriodBytesSize = %d", fNumPackets, fSubPeriodBytesSize, fLastSubPeriodBytesSize); 320 320 321 321 fCycleDuration = float(fSubPeriodBytesSize / sizeof(sample_t)) / float(params->fSampleRate); … … 711 711 jack_info ( "Sample rate : %u frames per second", params->fSampleRate ); 712 712 jack_info ( "Period size : %u frames per period", params->fPeriodSize ); 713 jack_info ( "SampleEncoder : %u", params->fSampleEncoder ); 713 switch (params->fSampleEncoder) { 714 case (JackFloatEncoder): 715 jack_info ( "SampleEncoder : %s", "Float" ); 716 break; 717 case (JackIntEncoder): 718 jack_info ( "SampleEncoder : %s", "16 bits integer"); 719 break; 720 case (JackCeltEncoder): 721 jack_info ( "SampleEncoder : %s", "CELT"); 722 break; 723 }; 714 724 jack_info ( "Slave mode : %s", ( params->fSlaveSyncMode ) ? "sync" : "async" ); 715 725 jack_info ( "Network mode : %s", mode );
