version update, undo fix

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

diff --git a/cinelerra-5.1/cinelerra/render.C b/cinelerra-5.1/cinelerra/render.C
index 085384ae9b8ad3f2b165062f349897ff53acb7b3..f50ae8958935d0bc96a5eb172122ba68355e0334 100644 (file)
--- a/cinelerra-5.1/cinelerra/render.C
+++ b/cinelerra-5.1/cinelerra/render.C
@@ -255,9 +255,7 @@ Render::~Render()
        delete package_lock;
        delete counter_lock;
        delete completion;
-// May be owned by someone else.  This is owned by mwindow, so we don't care
-// about deletion.
-//     delete preferences;
+       delete preferences;
        delete progress_timer;
        if( asset ) asset->Garbage::remove_user();
        delete thread;
@@ -271,7 +269,7 @@ void Render::start_interactive()
        }
        else if( in_progress ) {
                int cx, cy;
-               mwindow->gui->get_abs_cursor_xy(cx, cy, 1);
+               mwindow->gui->get_abs_cursor(cx, cy, 1);
                ErrorBox error_box(_(PROGRAM_NAME ": Error"), cx, cy);
                error_box.create_objects(_("Already rendering"));
                error_box.raise_window();
@@ -295,7 +293,7 @@ void Render::start_batches(ArrayList<BatchRenderJob*> *jobs)
        }
        else if( in_progress ) {
                int cx, cy;
-               mwindow->gui->get_abs_cursor_xy(cx, cy, 1);
+               mwindow->gui->get_abs_cursor(cx, cy, 1);
                ErrorBox error_box(_(PROGRAM_NAME ": Error"), cx, cy);
                error_box.create_objects("Already rendering");
                error_box.raise_window();
@@ -314,13 +312,11 @@ void Render::start_batches(ArrayList<BatchRenderJob*> *jobs,
        mode = Render::BATCH;
        batch_cancelled = 0;
        this->jobs = jobs;
-       this->preferences = preferences;
+       this->preferences = new Preferences;
+       this->preferences->copy_from(preferences);
 
        completion->reset();
-PRINT_TRACE
        thread->run();
-PRINT_TRACE
-       this->preferences = 0;
 }
 
 
@@ -394,7 +390,7 @@ void Render::handle_close_event(int result)
        }
        if( err_msg ) {
                int cx, cy;
-               mwindow->gui->get_abs_cursor_xy(cx, cy, 1);
+               mwindow->gui->get_abs_cursor(cx, cy, 1);
                ErrorBox error_box(_(PROGRAM_NAME ": Error"),cx, cy);
                error_box.create_objects(err_msg);
                error_box.raise_window();
@@ -715,15 +711,12 @@ void RenderThread::render_single(int test_overwrite, Asset *asset, EDL *edl,
        render->progress = 0;
        render->result = 0;
 
-       if(mwindow)
-       {
-               if(!render->preferences)
+       if( mwindow ) {
+               if( !render->preferences )
                        render->preferences = new Preferences;
-
                render->preferences->copy_from(mwindow->preferences);
        }
 
-
 // Create rendering command
        TransportCommand *command = new TransportCommand;
        command->command = NORMAL_FWD;
@@ -930,7 +923,7 @@ if(debug) printf("Render::render %d\n", __LINE__);
                        {
 if(debug) printf("Render::render %d\n", __LINE__);
                                int cx, cy;
-                               mwindow->gui->get_abs_cursor_xy(cx, cy, 1);
+                               mwindow->gui->get_abs_cursor(cx, cy, 1);
                                ErrorBox error_box(_(PROGRAM_NAME ": Error"), cx, cy);
                                error_box.create_objects(_("Error rendering data."));
                                error_box.raise_window();
@@ -1135,6 +1128,9 @@ RenderWindow::RenderWindow(MWindow *mwindow,
        this->mwindow = mwindow;
        this->render = render;
        this->asset = asset;
+       render_format = 0;
+       loadmode = 0;
+       renderprofile = 0;
        rangeproject = 0;
        rangeselection = 0;
        rangeinout = 0;
@@ -1143,15 +1139,11 @@ RenderWindow::RenderWindow(MWindow *mwindow,
 
 RenderWindow::~RenderWindow()
 {
-SET_TRACE
        lock_window("RenderWindow::~RenderWindow");
-SET_TRACE
        delete render_format;
-SET_TRACE
        delete loadmode;
-SET_TRACE
+       delete renderprofile;
        unlock_window();
-SET_TRACE
 }