Mercurial > hg > easaier-soundaccess
changeset 178:f0e9330bee36
cleaning
| author | lbajardsilogic |
|---|---|
| date | Wed, 21 Nov 2007 13:59:48 +0000 |
| parents | 846a6259a081 |
| children | c77d6434d60c |
| files | sv/audioio/AudioCallbackPlaySource.cpp sv/audioio/AudioGenerator.cpp sv/filter/FilterStack.cpp sv/videoio/SDL_ffmpeg.cpp |
| diffstat | 4 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/sv/audioio/AudioCallbackPlaySource.cpp Wed Nov 21 13:58:55 2007 +0000 +++ b/sv/audioio/AudioCallbackPlaySource.cpp Wed Nov 21 13:59:48 2007 +0000 @@ -309,6 +309,7 @@ if (m_readBuffers != m_writeBuffers) { delete m_writeBuffers; + m_writeBuffers = 0; } m_writeBuffers = new RingBufferVector;
--- a/sv/audioio/AudioGenerator.cpp Wed Nov 21 13:58:55 2007 +0000 +++ b/sv/audioio/AudioGenerator.cpp Wed Nov 21 13:59:48 2007 +0000 @@ -304,6 +304,7 @@ RealTimePluginInstance *instance = m_synthMap[sodm]; m_synthMap.erase(sodm); delete instance; + instance = 0; } void @@ -314,6 +315,7 @@ RealTimePluginInstance *instance = m_synthMap.begin()->second; m_synthMap.erase(m_synthMap.begin()); delete instance; + instance = 0; } }
--- a/sv/filter/FilterStack.cpp Wed Nov 21 13:58:55 2007 +0000 +++ b/sv/filter/FilterStack.cpp Wed Nov 21 13:59:48 2007 +0000 @@ -93,6 +93,7 @@ delete filter; m_filters.erase(iter); emit filterRemoved(name); + filter = 0; return; } }
--- a/sv/videoio/SDL_ffmpeg.cpp Wed Nov 21 13:58:55 2007 +0000 +++ b/sv/videoio/SDL_ffmpeg.cpp Wed Nov 21 13:59:48 2007 +0000 @@ -268,7 +268,10 @@ //for(i=0; i<SDL_FFMPEG_MAX_BUFFERED_FRAMES; i++) { pos=MWinsA->Get_CurAudioTime(); - fprintf (pFile, "p: \t %u\t", pos); + if (pFile) + { + fprintf (pFile, "p: \t %u\t", pos); + } //if (MWinsA->Get_HardwareBufferTime()==0) // pos1=0; //else { @@ -281,8 +284,11 @@ // fprintf (pFile, "%u\t", pos1); //} //pos2=pos+pos1; - fprintf (pFile, "%u\n", pos); - + if (pFile) + { + fprintf (pFile, "%u\n", pos); + } + // if this entry does not exist, continue while(((file->vs[file->videoStream]->writeImage - file->vs[file->videoStream]->readImage)>0)&&(file->vs[file->videoStream]->imageBuffer[file->vs[file->videoStream]->readImage%SDL_FFMPEG_MAX_BUFFERED_FRAMES]->timestamp <= pos + ((AVFormatContext*)file->_ffmpeg)->start_time/1000))//&& (file->vs[file->videoStream]->imageBuffer[file->vs[file->videoStream]->readImage%SDL_FFMPEG_MAX_BUFFERED_FRAMES]->timestamp >= pos - file->timebase+ ((AVFormatContext*)file->_ffmpeg)->start_time/1000)) { @@ -327,7 +333,10 @@ pos=MWinsA->Get_CurAudioTime(); - fprintf (pFile, "e:\t%u\t", pos); + if (pFile) + { + fprintf (pFile, "e:\t%u\t", pos); + } //if (MWinsA->Get_HardwareBufferTime()==0) // pos1=0; //else {