bsd lang segv fix, enable bsd lv2, lv2 gui enable fix, proxy/ffmpeg toggle resize...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / filebase.C

diff --git a/cinelerra-5.1/cinelerra/filebase.C b/cinelerra-5.1/cinelerra/filebase.C
index b8a663164a99c748db78394a516347f8ff873cb2..4671fc4aab94032af9ddf77bf1e0693df87a247a 100644 (file)
--- a/cinelerra-5.1/cinelerra/filebase.C
+++ b/cinelerra-5.1/cinelerra/filebase.C
@@ -37,33 +37,25 @@ FileBase::FileBase(Asset *asset, File *file)
        this->asset = asset;
        internal_byte_order = get_byte_order();
        reset_parameters();
-       overlayer = new OverlayFrame;
 }
 
 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;
-       delete overlayer;
 }
 
 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;
@@ -74,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++)
@@ -247,6 +238,11 @@ void FileBase::get_mode(char *mode, int rd, int wr)
        }
 }
 
+int FileBase::get_best_colormodel(int driver, int vstream)
+{
+       return File::get_best_colormodel(asset, driver);
+}
+
 
 // ======================================= audio codecs