From: Robert J. <spa...@us...> - 2006-04-13 19:09:53
|
Update of /cvsroot/lmuse/muse/muse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20705/muse Modified Files: Tag: REL07 audioprefetch.cpp node.cpp node.h Log Message: audio strip edit fix record audio fifo fix Index: node.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/Attic/node.h,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -C2 -d -r1.8.2.1 -r1.8.2.2 *** node.h 28 Dec 2005 22:17:55 -0000 1.8.2.1 --- node.h 13 Apr 2006 19:09:48 -0000 1.8.2.2 *************** *** 126,129 **** --- 126,130 ---- bool get(int, unsigned long, float** buffer, unsigned* pos); void remove(); + int getCount(); }; Index: audioprefetch.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/audioprefetch.cpp,v retrieving revision 1.14.2.2 retrieving revision 1.14.2.3 diff -C2 -d -r1.14.2.2 -r1.14.2.3 *** audioprefetch.cpp 28 Dec 2005 22:17:55 -0000 1.14.2.2 --- audioprefetch.cpp 13 Apr 2006 19:09:48 -0000 1.14.2.3 *************** *** 82,87 **** switch(msg->id) { case PREFETCH_TICK: ! if (audio->isRecording()) audio->writeTick(); prefetch(); seekPos = ~0; // invalidate cached last seek position --- 82,89 ---- switch(msg->id) { case PREFETCH_TICK: ! if (audio->isRecording()) { ! //puts("writeTick"); audio->writeTick(); + } prefetch(); seekPos = ~0; // invalidate cached last seek position *************** *** 159,163 **** // printf("prefetch %d\n", writePos); if (track->prefetchFifo()->getWriteBuffer(ch, segmentSize, bp, writePos)) { ! printf("Prefetch: NO BUFFER\n"); continue; } --- 161,165 ---- // printf("prefetch %d\n", writePos); if (track->prefetchFifo()->getWriteBuffer(ch, segmentSize, bp, writePos)) { ! //printf("Prefetch: NO BUFFER\n"); continue; } Index: node.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/Attic/node.cpp,v retrieving revision 1.36.2.5 retrieving revision 1.36.2.6 diff -C2 -d -r1.36.2.5 -r1.36.2.6 *** node.cpp 1 Feb 2006 23:17:38 -0000 1.36.2.5 --- node.cpp 13 Apr 2006 19:09:48 -0000 1.36.2.6 *************** *** 707,722 **** float* buffer[_channels]; ! // printf("AudioTrack: record() fifo %p\n", &fifo); ! if (fifo.get(_channels, segmentSize, buffer, &pos)) { ! printf("AudioTrack::record(): empty fifo\n"); ! return; ! } ! if (_recFile) { ! _recFile->seek(pos, 0); ! _recFile->write(_channels, buffer, segmentSize); ! } ! else { ! printf("AudioNode::record(): no recFile\n"); } } --- 707,725 ---- float* buffer[_channels]; ! //printf("AudioTrack: record() fifo %p, count=%d\n", &fifo, fifo.getCount()); ! while(fifo.getCount()) { ! ! if (fifo.get(_channels, segmentSize, buffer, &pos)) { ! printf("AudioTrack::record(): empty fifo\n"); ! return; ! } ! if (_recFile) { ! _recFile->seek(pos, 0); ! _recFile->write(_channels, buffer, segmentSize); ! } ! else { ! printf("AudioNode::record(): no recFile\n"); ! } } } *************** *** 887,890 **** --- 890,897 ---- } + int Fifo::getCount() + { + return muse_atomic_read(&count); + } //--------------------------------------------------------- // remove |