/[svn]/linuxsampler/trunk/src/drivers/audio/AudioChannel.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/drivers/audio/AudioChannel.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 319 by schoenebeck, Mon Dec 13 00:46:42 2004 UTC revision 361 by schoenebeck, Wed Feb 9 01:22:18 2005 UTC
# Line 21  Line 21 
21   ***************************************************************************/   ***************************************************************************/
22    
23  #include "AudioChannel.h"  #include "AudioChannel.h"
24  #include <malloc.h>  
25    #if defined(__APPLE__)
26    # include <stdlib.h>
27    #else
28    # include <malloc.h>
29    #endif
30    
31    
32  namespace LinuxSampler {  namespace LinuxSampler {
33    
# Line 33  namespace LinuxSampler { Line 39  namespace LinuxSampler {
39       */       */
40      AudioChannel::AudioChannel(uint ChannelNr, uint BufferSize) {      AudioChannel::AudioChannel(uint ChannelNr, uint BufferSize) {
41          this->ChannelNr          = ChannelNr;          this->ChannelNr          = ChannelNr;
42            #if defined(__APPLE__)
43            this->pBuffer            = (float *) malloc(BufferSize*sizeof(float));
44            #else
45          this->pBuffer            = (float *) memalign(16,BufferSize*sizeof(float));          this->pBuffer            = (float *) memalign(16,BufferSize*sizeof(float));
46            #endif
47          this->uiBufferSize       = BufferSize;          this->uiBufferSize       = BufferSize;
48          this->pMixChannel        = NULL;          this->pMixChannel        = NULL;
49          this->UsesExternalBuffer = false;          this->UsesExternalBuffer = false;
# Line 73  namespace LinuxSampler { Line 83  namespace LinuxSampler {
83       */       */
84      AudioChannel::AudioChannel(uint ChannelNr, AudioChannel* pMixChannelDestination) {      AudioChannel::AudioChannel(uint ChannelNr, AudioChannel* pMixChannelDestination) {
85          this->ChannelNr          = ChannelNr;          this->ChannelNr          = ChannelNr;
86          this->pBuffer            = pMixChannel->Buffer();          this->pBuffer            = pMixChannelDestination->Buffer();
87          this->uiBufferSize       = pMixChannel->uiBufferSize;          this->uiBufferSize       = pMixChannelDestination->uiBufferSize;
88          this->pMixChannel        = pMixChannel;          this->pMixChannel        = pMixChannelDestination;
89          this->UsesExternalBuffer = true;          this->UsesExternalBuffer = true;
90    
91          Parameters["NAME"]           = new ParameterName("Channel " + ToString(ChannelNr));          Parameters["NAME"]           = new ParameterName("Channel " + ToString(ChannelNr));
Legend:
Removed from v.319  
changed lines
  Added in v.361
  ViewVC Help
Powered by ViewVC