Browse Source

Mipmap peak building actually happens in the UI thread, not the IO thread.

Therefore, it is always necessary to fork when mipmapping peaks after capture.
tags/non-daw-v1.1.0
Jonathan Moore Liles 17 years ago
parent
commit
232d23915a
4 changed files with 6 additions and 16 deletions
  1. +0
    -1
      Timeline/Engine/Audio_Region.C
  2. +1
    -0
      Timeline/Engine/Disk_Stream.C
  3. +3
    -5
      Timeline/Engine/Peaks.C
  4. +2
    -10
      Timeline/Engine/Record_DS.C

+ 0
- 1
Timeline/Engine/Audio_Region.C View File

@@ -209,7 +209,6 @@ Audio_Region::write ( nframes_t nframes )
return nframes;
}

/* THREAD: IO */
/** finalize region capture. Assumes that this *is* a captured region
and that no other regions refer to the same source */
bool


+ 1
- 0
Timeline/Engine/Disk_Stream.C View File

@@ -135,6 +135,7 @@ Disk_Stream::shutdown ( void )
pthread_join( _thread, NULL );

_thread = 0;

_terminate = false;
}



+ 3
- 5
Timeline/Engine/Peaks.C View File

@@ -530,7 +530,6 @@ Peaks::prepare_for_writing ( void )
_peak_writer = new Peaks::Streamer( _clip->name(), _clip->channels(), cache_minimum );
}

/* THREAD: IO */
void
Peaks::finish_writing ( void )
{
@@ -539,10 +538,9 @@ Peaks::finish_writing ( void )
delete _peak_writer;
_peak_writer = NULL;

/* now fill in the rest of the cache */
make_peaks_mipmap();
/* if ( ! fork() ) */
/* exit( make_peaks_mipmap() ); */
/* now fill in the rest of the cache */
if ( ! fork() )
exit( make_peaks_mipmap() );

}



+ 2
- 10
Timeline/Engine/Record_DS.C View File

@@ -145,12 +145,11 @@ Record_DS::disk_thread ( void )
const nframes_t nframes = _nframes;
const size_t block_size = _nframes * sizeof( sample_t );


#ifdef AVOID_UNNECESSARY_COPYING
sample_t *cbuf = new sample_t[ nframes ];
#endif

while ( blocks_ready-- > 0 || ! sem_trywait( &_blocks ) && errno != EAGAIN )
while ( blocks_ready-- > 0 || ( ! sem_trywait( &_blocks ) && errno != EAGAIN ) )
{

for ( int i = channels(); i--; )
@@ -182,8 +181,6 @@ Record_DS::disk_thread ( void )
#ifndef AVOID_UNNECESSARY_COPYING
delete[] cbuf;
#endif

_thread = NULL;
}


@@ -217,21 +214,16 @@ Record_DS::stop ( nframes_t frame )
{
if ( ! _recording )
{
printf( "programming error: attempt to stop recording when no recording is being made\n" );
WARNING( "programming error: attempt to stop recording when no recording is being made\n" );
return;
}

_recording = false;

/* FIXME: we may still have data in the buffers waiting to be
* written to disk... We should flush it out before stopping... */

_stop_frame = frame;

shutdown();

/* FIXME: flush buffers here? */

track()->stop( frame );

DMESSAGE( "recording finished" );


Loading…
Cancel
Save