X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffilebase.C;h=4671fc4aab94032af9ddf77bf1e0693df87a247a;hb=ccd23c15fae578be22d48b1a1e8b09cb43d593ae;hp=29813196beb308005ab5ac159175574fd4f1db27;hpb=243336668c89096732786c6b3f3c5918aa2eff26;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/filebase.C b/cinelerra-5.1/cinelerra/filebase.C index 29813196..4671fc4a 100644 --- a/cinelerra-5.1/cinelerra/filebase.C +++ b/cinelerra-5.1/cinelerra/filebase.C @@ -42,26 +42,20 @@ FileBase::FileBase(Asset *asset, File *file) FileBase::~FileBase() { close_file(); - if(row_pointers_in) delete [] row_pointers_in; - if(row_pointers_out) delete [] row_pointers_out; - if(float_buffer) delete [] float_buffer; } int FileBase::close_file() { - if(row_pointers_in) delete [] row_pointers_in; - if(row_pointers_out) delete [] row_pointers_out; - if(float_buffer) delete [] float_buffer; + delete [] row_pointers_in; row_pointers_in = 0; + delete [] row_pointers_out; row_pointers_out = 0; + delete [] float_buffer; float_buffer = 0; - - if(pcm_history) - { + if( pcm_history ) { for(int i = 0; i < history_channels; i++) delete [] pcm_history[i]; - delete [] pcm_history; + delete [] pcm_history; pcm_history = 0; } - close_file_derived(); reset_parameters(); return 0; @@ -72,8 +66,7 @@ void FileBase::update_pcm_history(int64_t len) decode_start = 0; decode_len = 0; - if(!pcm_history) - { + if( !pcm_history ) { history_channels = asset->channels; pcm_history = new double*[history_channels]; for(int i = 0; i < history_channels; i++)