rendering took msg, bg render active test, crikey show window

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

diff --git a/cinelerra-5.1/cinelerra/batchrender.C b/cinelerra-5.1/cinelerra/batchrender.C
index bbd66d47fa955d1756cdd70a35f147bc587812a3..62ef2955b2a6b48ffb2acda58d5548e380cf7c4b 100644 (file)
--- a/cinelerra-5.1/cinelerra/batchrender.C
+++ b/cinelerra-5.1/cinelerra/batchrender.C
@@ -203,7 +203,6 @@ BatchRenderThread::BatchRenderThread(MWindow *mwindow)
        preferences = 0;
        warn = 1;
        render = 0;
-       file_entries = 0;
        batch_path[0] = 0;
 }
 
@@ -219,7 +218,6 @@ BatchRenderThread::BatchRenderThread()
        preferences = 0;
        warn = 1;
        render = 0;
-       file_entries = 0;
        batch_path[0] = 0;
 }
 
@@ -229,10 +227,6 @@ BatchRenderThread::~BatchRenderThread()
        delete boot_defaults;
        delete preferences;
        delete render;
-       if( file_entries ) {
-               file_entries->remove_all_objects();
-               delete file_entries;
-       }
 }
 
 void BatchRenderThread::reset(const char *path)
@@ -245,10 +239,6 @@ void BatchRenderThread::reset(const char *path)
        rendering_job = -1;
        delete default_job;  default_job = 0;
        jobs.remove_all_objects();
-       if(file_entries) {
-               file_entries->remove_all_objects();
-               delete file_entries;  file_entries = 0;
-       }
 }
 
 void BatchRenderThread::handle_close_event(int result)
@@ -264,23 +254,6 @@ BC_Window* BatchRenderThread::new_gui()
        current_start = 0.0;
        current_end = 0.0;
        default_job = new BatchRenderJob(mwindow->preferences);
-
-
-       if(!file_entries)
-       {
-               file_entries = new ArrayList<BC_ListBoxItem*>;
-               FileSystem fs;
-               char string[BCTEXTLEN];
-       // Load current directory
-               fs.update(getcwd(string, BCTEXTLEN));
-               for(int i = 0; i < fs.total_files(); i++)
-               {
-                       file_entries->append(
-                               new BC_ListBoxItem(
-                                       fs.get_entry(i)->get_name()));
-               }
-       }
-
        load_jobs(batch_path, mwindow->preferences);
        load_defaults(mwindow->defaults);
        this->gui = new BatchRenderGUI(mwindow,
@@ -809,7 +782,6 @@ void BatchRenderGUI::create_objects()
        x += new_batch->get_w() + mwindow->theme->widget_border;
        add_subwindow(delete_batch = new BatchRenderDelete(thread, x, y));
        x = x2;  y += delete_batch->get_h() + mwindow->theme->widget_border;
-       y += mwindow->theme->widget_border;
        add_subwindow(savelist_batch = new BatchRenderSaveList(thread, x, y));
        x += savelist_batch->get_w() + mwindow->theme->widget_border;
        add_subwindow(loadlist_batch = new BatchRenderLoadList(thread, x, y));
@@ -895,7 +867,7 @@ int BatchRenderGUI::resize_event(int w, int h)
        x += savelist_batch->get_w() + mwindow->theme->widget_border;
        loadlist_batch->reposition_window(x, y);
        y += loadlist_batch->get_h() + mwindow->theme->widget_border;
-       warning->reposition_window(x, y);
+       warning->reposition_window(x2, y);
 
        y1 = 15 + BC_GenericButton::calculate_h() + mwindow->theme->widget_border;
        y2 = get_h() - y1 - batch_list->get_h();
@@ -1051,9 +1023,7 @@ BatchRenderEDLPath::BatchRenderEDLPath(BatchRenderThread *thread,
 
 int BatchRenderEDLPath::handle_event()
 {
-// Suggestions
-       calculate_suggestions(thread->file_entries);
-
+       calculate_suggestions();
        strcpy(thread->get_current_edl(), get_text());
        thread->gui->create_list(1);
        return 1;
@@ -1236,6 +1206,8 @@ void BatchRenderLoadList::run()
                thread->mwindow->defaults->update("DEFAULT_BATCHLOADPATH", thread->batch_path);
                thread->load_jobs(thread->batch_path, thread->mwindow->preferences);
                thread->gui->create_list(1);
+               thread->current_job = 0;
+               thread->gui->change_job();
        }
 
        thread->gui->flush();