/[svn]/linuxsampler/trunk/src/stream.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/stream.cpp

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

revision 17 by schoenebeck, Sun Nov 16 19:01:50 2003 UTC revision 18 by schoenebeck, Sun Dec 7 05:03:43 2003 UTC
# Line 63  int Stream::ReadAhead(unsigned long Samp Line 63  int Stream::ReadAhead(unsigned long Samp
63      if (endofsamplereached) SetState(state_end);      if (endofsamplereached) SetState(state_end);
64      else                    SetState(state_active);      else                    SetState(state_active);
65    
66      dmsg(5,("Refilled stream with %d (SamplePos: %d)", SampleCount - samplestoread, this->SampleOffset));      dmsg(5,("Refilled stream %d with %d (SamplePos: %d)", this->hThis, SampleCount - samplestoread, this->SampleOffset));
67      return (SampleCount - samplestoread);      return (SampleCount - samplestoread);
68  }  }
69    
# Line 75  void Stream::WriteSilence(unsigned long Line 75  void Stream::WriteSilence(unsigned long
75  Stream::Stream(uint BufferSize, uint BufferWrapElements) {  Stream::Stream(uint BufferSize, uint BufferWrapElements) {
76      this->pExportReference = NULL;      this->pExportReference = NULL;
77      this->State            = state_unused;      this->State            = state_unused;
78        this->hThis            = 0;
79      this->pSample          = NULL;      this->pSample          = NULL;
80      this->SampleOffset     = 0;      this->SampleOffset     = 0;
81      this->pRingBuffer      = new RingBuffer<sample_t>(BufferSize, BufferWrapElements);      this->pRingBuffer      = new RingBuffer<sample_t>(BufferSize, BufferWrapElements);
# Line 87  Stream::~Stream() { Line 88  Stream::~Stream() {
88  }  }
89    
90  /// Called by disk thread to activate the disk stream.  /// Called by disk thread to activate the disk stream.
91  void Stream::Launch(reference_t* pExportReference, gig::Sample* pSample, unsigned long SampleOffset) {  void Stream::Launch(Stream::Handle hStream, reference_t* pExportReference, gig::Sample* pSample, unsigned long SampleOffset) {
92      UnusedStreams--;      UnusedStreams--;
93      this->pExportReference = pExportReference;      this->pExportReference = pExportReference;
94        this->hThis        = hStream;
95      this->pSample      = pSample;      this->pSample      = pSample;
96      this->SampleOffset = SampleOffset;      this->SampleOffset = SampleOffset;
97      SetState(state_active);      SetState(state_active);
Legend:
Removed from v.17  
changed lines
  Added in v.18
  ViewVC Help
Powered by ViewVC