January 2021 - Cin - Cinelerra-GG Mailing Lists

gitwatch
by Andrew Randrianasulu 15 Jan '21

15 Jan '21

...oh, look! There is app (script) for that, too :} https://github.com/gitwatch/gitwatch ==== What to use it for? That's really up to you, but here are some examples: config files: some programs auto-write their config files, without waiting for you to click an 'Apply' button; or even if there is such a button, most programs offer you no way of going back to an earlier version of your settings. If you commit your config file(s) to a git repo, you can track changes and go back to older versions. This script makes it convenient, to have all changes recorded automatically. document files: if you use an editor that does not have built-in git support (or maybe if you don't like the git support it has), you can use gitwatch to automatically commit your files when you save them, or combine it with the editor's auto-save feature to fully automatically and regularly track your changes more stuff! If you have any other uses, or can think of ones, please let us know, and we can add them to this list! ==== Enjoy?

1 0

Creating a static assembly
by preobraz＠gmail.com 15 Jan '21

15 Jan '21

Hi all! I'm not in the subject of this question, so I'll ask: are there mechanisms for creating a static build of a program from source (as Blender does) so that you don't have to compile Cinelerra-GG every time? -- Ugin.

2 1

tips.ru and tips.en update.
by Andrew Randrianasulu 15 Jan '21

15 Jan '21

There was some strangeness (last tip not shown) when I added those line at very end of file Adding them before last tip solved problem for me.

2 3

[PATCH] Tooltips for batchrender window, GUI-driven hide of 'Save to EDL Path'
by Andrew Randrianasulu 15 Jan '21

15 Jan '21

Another attempt at patch. Combines (slightly extended) previous tooltip patch and new part reusing one of warn checkboxes for hiding two items in batchrender GUI: "save to EDL Path' and 'Warn is session/job mismatch'. Obviously, I can add more tooltips, rework wording on those I just added, etc. What do you think, I'm on the right track? Resizing batchrender window still sometimes can move two filepath input fields too close to each other. But otherwise it seems to work?

2 7

Batchrender GUI changes, third try ...
by Andrew Randrianasulu 13 Jan '21

13 Jan '21

Oh, trying to get it right .... So far this version survived 'Load with unsafe GUI disabled, enable it, try render, try to check 'Do not show this warning' checkbox, try render again, re-check checkbox, disable Usafe GUI feature, try to render again ....' --- diff --git a/cinelerra-5.1/cinelerra/appearanceprefs.C b/cinelerra-5.1/cinelerra/appearanceprefs.C index 1f878835..313339df 100644 --- a/cinelerra-5.1/cinelerra/appearanceprefs.C +++ b/cinelerra-5.1/cinelerra/appearanceprefs.C @@ -649,15 +649,15 @@ int UseWarnIndecies::handle_event() } UseWarnVersion::UseWarnVersion(PreferencesWindow *pwindow, int x, int y) - : BC_CheckBox(x, y, pwindow->thread->preferences->warn_version, - _("EDL version warns if mismatched")) + : BC_CheckBox(x, y, pwindow->thread->preferences->unsafe_gui, + _("Unsafe GUI in batchrender")) { this->pwindow = pwindow; } int UseWarnVersion::handle_event() { - pwindow->thread->preferences->warn_version = get_value(); + pwindow->thread->preferences->unsafe_gui = get_value(); return 1; } diff --git a/cinelerra-5.1/cinelerra/batchrender.C b/cinelerra-5.1/cinelerra/batchrender.C index 6dcdbc62..d98dcc07 100644 --- a/cinelerra-5.1/cinelerra/batchrender.C +++ b/cinelerra-5.1/cinelerra/batchrender.C @@ -60,6 +60,8 @@ #include "dvdcreate.h" #include "bdcreate.h" +#define UNSAFE_BUTTON 0 + int BatchRenderThread::column_widths[] = { 42, 42, 42, 222, 222, 150 }; const char *BatchRenderThread::column_titles[] = { N_("Enabled"), N_("Labeled"), N_("Farmed"), N_("Output"), N_("EDL"), N_("Elapsed") @@ -198,6 +200,7 @@ BatchRenderThread::BatchRenderThread(MWindow *mwindow) boot_defaults = 0; preferences = 0; warn = 1; + render = 0; batch_path[0] = 0; do_farmed = 0; @@ -268,7 +271,10 @@ void BatchRenderThread::load_jobs(char *path, Preferences *preferences) while( !result ) { if( !(result = file.read_tag()) ) { if( file.tag.title_is("JOBS") ) { + if (mwindow->preferences->unsafe_gui) warn = file.tag.get_property("WARN", 1); + if (!mwindow->preferences->unsafe_gui) + warn = 0; } else if( file.tag.title_is("JOB") ) { BatchRenderJob *job = new BatchRenderJob(preferences, 0,0); @@ -293,6 +299,7 @@ void BatchRenderThread::save_jobs(char *path) { FileXML file; file.tag.set_title("JOBS"); + if (mwindow->preferences->unsafe_gui) file.tag.set_property("WARN", warn); file.append_tag(); file.append_newline(); @@ -382,6 +389,7 @@ void BatchRenderThread::use_current_edl() gui->edl_path_text->update(get_current_edl()); } + void BatchRenderThread::update_selected_edl() { FileXML xml_file; @@ -508,10 +516,13 @@ int BatchRenderThread::test_edl_files() ret = 1; } + if( !ret && warn && mwindow ) { ret = test_errmsg(not_equiv, _("%d job EDLs do not match session edl\n"), &warn); if( !warn ) gui->warning->update(0); } + + if( !ret && mwindow ) ret = test_errmsg(empty_jobs, _("%d job EDLs begin position beyond end of media\n"), 0); if( !ret && mwindow ) @@ -792,8 +803,12 @@ void BatchRenderGUI::create_objects() y2 = y + edl_path_browse->get_h() + mwindow->theme->widget_border; x = x2; y = y2; + + if (mwindow->preferences->unsafe_gui) { add_subwindow(update_selected_edl = new BatchRenderUpdateEDL(thread, x, y)); y += update_selected_edl->get_h() + mwindow->theme->widget_border; + } + add_subwindow(use_current_edl = new BatchRenderCurrentEDL(thread, x, y)); y += use_current_edl->get_h() + mwindow->theme->widget_border; if( !mwindow->edl || !mwindow->edl->path[0] ) use_current_edl->disable(); @@ -805,8 +820,12 @@ void BatchRenderGUI::create_objects() x += savelist_batch->get_w() + mwindow->theme->widget_border; add_subwindow(loadlist_batch = new BatchRenderLoadList(thread, x, y)); y += loadlist_batch->get_h() + mwindow->theme->widget_border; + + if (mwindow->preferences->unsafe_gui) { add_subwindow(warning = new BatchRenderWarning(thread, x2, y)); y2 = y + warning->get_h() + mwindow->theme->widget_border; + } + if( y2 > y1 ) y1 = y2; x = mwindow->theme->batchrender_x1, y = y1; @@ -835,6 +854,7 @@ void BatchRenderGUI::button_disable() new_batch->disable(); delete_batch->disable(); use_current_edl->disable(); + if (mwindow->preferences->unsafe_gui) update_selected_edl->disable(); } @@ -844,6 +864,7 @@ void BatchRenderGUI::button_enable() delete_batch->enable(); if( mwindow->edl && mwindow->edl->path[0] ) use_current_edl->enable(); + if (mwindow->preferences->unsafe_gui) update_selected_edl->enable(); } @@ -876,8 +897,12 @@ int BatchRenderGUI::resize_event(int w, int h) y2 = y + edl_path_browse->get_h() + mwindow->theme->widget_border; x = x2; y = y2; + + if (mwindow->preferences->unsafe_gui) { update_selected_edl->reposition_window(x, y); y += update_selected_edl->get_h() + mwindow->theme->widget_border; + } + use_current_edl->reposition_window(x, y); y += use_current_edl->get_h() + mwindow->theme->widget_border; new_batch->reposition_window(x, y); @@ -889,9 +914,12 @@ 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; + if (mwindow->preferences->unsafe_gui) { warning->reposition_window(x2, y); y1 = ys15 + BC_GenericButton::calculate_h() + mwindow->theme->widget_border; + } + y2 = get_h() - y1 - batch_list->get_h(); y2 -= list_title->get_h() + mwindow->theme->widget_border; @@ -1236,6 +1264,7 @@ int BatchRenderCurrentEDL::handle_event() return 1; } + BatchRenderUpdateEDL::BatchRenderUpdateEDL(BatchRenderThread *thread, int x, int y) @@ -1244,8 +1273,10 @@ BatchRenderUpdateEDL::BatchRenderUpdateEDL(BatchRenderThread *thread, this->thread = thread; } + int BatchRenderUpdateEDL::handle_event() { + //if (thread->preferences->unsafe_gui) thread->update_selected_edl(); return 1; } @@ -1374,6 +1405,7 @@ BatchRenderWarning::BatchRenderWarning(BatchRenderThread *thread, int x, int y) int BatchRenderWarning::handle_event() { + //if (thread->preferences->unsafe_gui) thread->warn = get_value(); return 1; } diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C index ad92bac8..bb603b6e 100644 --- a/cinelerra-5.1/cinelerra/preferences.C +++ b/cinelerra-5.1/cinelerra/preferences.C @@ -93,7 +93,7 @@ Preferences::Preferences() ffmpeg_marker_indexes = 1; memset(&use_hw_dev, 0, sizeof(use_hw_dev)); warn_indexes = 1; - warn_version = 1; + unsafe_gui = 1; warn_fileref = 1; bd_warn_root = 1; popupmenu_btnup = 1; @@ -220,7 +220,7 @@ void Preferences::copy_from(Preferences *that) ffmpeg_marker_indexes = that->ffmpeg_marker_indexes; strcpy(use_hw_dev, &that->use_hw_dev[0]); warn_indexes = that->warn_indexes; - warn_version = that->warn_version; + unsafe_gui = that->unsafe_gui; warn_fileref = that->warn_fileref; bd_warn_root = that->bd_warn_root; popupmenu_btnup = that->popupmenu_btnup; @@ -371,7 +371,7 @@ int Preferences::load_defaults(BC_Hash *defaults) memset(&use_hw_dev, 0, sizeof(use_hw_dev)); defaults->get("USE_HW_DEV", use_hw_dev); warn_indexes = defaults->get("WARN_INDEXES", warn_indexes); - warn_version = defaults->get("WARN_VERSION", warn_version); + unsafe_gui = defaults->get("UNSAFE_GUI", unsafe_gui); warn_fileref = defaults->get("WARN_FILEREF", warn_fileref); bd_warn_root = defaults->get("BD_WARN_ROOT", bd_warn_root); popupmenu_btnup = defaults->get("POPUPMENU_BTNUP", popupmenu_btnup); @@ -522,7 +522,7 @@ int Preferences::save_defaults(BC_Hash *defaults) defaults->update("FFMPEG_MARKER_INDEXES", ffmpeg_marker_indexes); defaults->update("USE_HW_DEV", use_hw_dev); defaults->update("WARN_INDEXES", warn_indexes); - defaults->update("WARN_VERSION", warn_version); + defaults->update("UNSAFE_GUI", unsafe_gui); defaults->update("WARN_FILEREF", warn_fileref); defaults->update("BD_WARN_ROOT", bd_warn_root); defaults->update("POPUPMENU_BTNUP", popupmenu_btnup); diff --git a/cinelerra-5.1/cinelerra/preferences.h b/cinelerra-5.1/cinelerra/preferences.h index 4b60577a..980e55e0 100644 --- a/cinelerra-5.1/cinelerra/preferences.h +++ b/cinelerra-5.1/cinelerra/preferences.h @@ -118,7 +118,7 @@ public: char use_hw_dev[BCSTRLEN]; // warning int warn_indexes; - int warn_version; + int unsafe_gui; int warn_stack; int warn_fileref; int bd_warn_root; --- Naming still a bit off (UseWarnVersion::UseWarnVersion should say UseUnsafeGUI, in appearanceprefs.C) but at least it *appear* to work .. PS: this is my first attempt at dynamic GUI changes inside CinGG ..or any other program.

1 0

First version of UNSAFE button in batchrender dialog as GUI toggle
by Andrew Randrianasulu 13 Jan '21

13 Jan '21

Try it, and let me know if it works for you.. For now I reused 'Warn about EDL version mismatch' toggle, but of course if we decide to remove this old toggle and add our new, more useful batchrender UNSAFE GUI toggle - I'll rename ithose variables .... Right now I just want to be sure batchrender (without GUI, as DVD/BD creator, as renderfarm ..) still works. --- diff --git a/cinelerra-5.1/cinelerra/batchrender.C b/cinelerra-5.1/cinelerra/batchrender.C index 6dcdbc62..93000d47 100644 --- a/cinelerra-5.1/cinelerra/batchrender.C +++ b/cinelerra-5.1/cinelerra/batchrender.C @@ -60,6 +60,8 @@ #include "dvdcreate.h" #include "bdcreate.h" +#define UNSAFE_BUTTON 0 + int BatchRenderThread::column_widths[] = { 42, 42, 42, 222, 222, 150 }; const char *BatchRenderThread::column_titles[] = { N_("Enabled"), N_("Labeled"), N_("Farmed"), N_("Output"), N_("EDL"), N_("Elapsed") @@ -197,7 +199,8 @@ BatchRenderThread::BatchRenderThread(MWindow *mwindow) default_job = 0; boot_defaults = 0; preferences = 0; - warn = 1; + warn = 0; + render = 0; batch_path[0] = 0; do_farmed = 0; @@ -217,7 +220,8 @@ void BatchRenderThread::reset(const char *path) { if( path ) { strcpy(batch_path, path); - warn = 1; + if (mwindow->preferences->warn_version) + warn = 0; } current_job = 0; rendering_job = -1; @@ -268,6 +272,7 @@ void BatchRenderThread::load_jobs(char *path, Preferences *preferences) while( !result ) { if( !(result = file.read_tag()) ) { if( file.tag.title_is("JOBS") ) { + if (mwindow->preferences->warn_version) warn = file.tag.get_property("WARN", 1); } else if( file.tag.title_is("JOB") ) { @@ -293,6 +298,7 @@ void BatchRenderThread::save_jobs(char *path) { FileXML file; file.tag.set_title("JOBS"); + if (mwindow->preferences->warn_version) file.tag.set_property("WARN", warn); file.append_tag(); file.append_newline(); @@ -382,6 +388,7 @@ void BatchRenderThread::use_current_edl() gui->edl_path_text->update(get_current_edl()); } + void BatchRenderThread::update_selected_edl() { FileXML xml_file; @@ -792,8 +799,12 @@ void BatchRenderGUI::create_objects() y2 = y + edl_path_browse->get_h() + mwindow->theme->widget_border; x = x2; y = y2; + + if (mwindow->preferences->warn_version) { add_subwindow(update_selected_edl = new BatchRenderUpdateEDL(thread, x, y)); y += update_selected_edl->get_h() + mwindow->theme->widget_border; + } + add_subwindow(use_current_edl = new BatchRenderCurrentEDL(thread, x, y)); y += use_current_edl->get_h() + mwindow->theme->widget_border; if( !mwindow->edl || !mwindow->edl->path[0] ) use_current_edl->disable(); @@ -805,8 +816,12 @@ void BatchRenderGUI::create_objects() x += savelist_batch->get_w() + mwindow->theme->widget_border; add_subwindow(loadlist_batch = new BatchRenderLoadList(thread, x, y)); y += loadlist_batch->get_h() + mwindow->theme->widget_border; + + if (mwindow->preferences->warn_version) { add_subwindow(warning = new BatchRenderWarning(thread, x2, y)); y2 = y + warning->get_h() + mwindow->theme->widget_border; + } + if( y2 > y1 ) y1 = y2; x = mwindow->theme->batchrender_x1, y = y1; @@ -835,6 +850,7 @@ void BatchRenderGUI::button_disable() new_batch->disable(); delete_batch->disable(); use_current_edl->disable(); + if (mwindow->preferences->warn_version) update_selected_edl->disable(); } @@ -844,6 +860,7 @@ void BatchRenderGUI::button_enable() delete_batch->enable(); if( mwindow->edl && mwindow->edl->path[0] ) use_current_edl->enable(); + if (mwindow->preferences->warn_version) update_selected_edl->enable(); } @@ -876,8 +893,12 @@ int BatchRenderGUI::resize_event(int w, int h) y2 = y + edl_path_browse->get_h() + mwindow->theme->widget_border; x = x2; y = y2; + + if (mwindow->preferences->warn_version) { update_selected_edl->reposition_window(x, y); y += update_selected_edl->get_h() + mwindow->theme->widget_border; + } + use_current_edl->reposition_window(x, y); y += use_current_edl->get_h() + mwindow->theme->widget_border; new_batch->reposition_window(x, y); @@ -889,9 +910,12 @@ 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; + if (mwindow->preferences->warn_version) { warning->reposition_window(x2, y); y1 = ys15 + BC_GenericButton::calculate_h() + mwindow->theme->widget_border; + } + y2 = get_h() - y1 - batch_list->get_h(); y2 -= list_title->get_h() + mwindow->theme->widget_border; @@ -1236,6 +1260,7 @@ int BatchRenderCurrentEDL::handle_event() return 1; } + BatchRenderUpdateEDL::BatchRenderUpdateEDL(BatchRenderThread *thread, int x, int y) @@ -1244,8 +1269,10 @@ BatchRenderUpdateEDL::BatchRenderUpdateEDL(BatchRenderThread *thread, this->thread = thread; } + int BatchRenderUpdateEDL::handle_event() { + //if (mwindow->preferences->warn_version) thread->update_selected_edl(); return 1; } @@ -1374,6 +1401,7 @@ BatchRenderWarning::BatchRenderWarning(BatchRenderThread *thread, int x, int y) int BatchRenderWarning::handle_event() { + //if (thread->preferences->warn_version) thread->warn = get_value(); return 1; } ---

1 0

Update: I tried to restore "Warn on EDL version mismatch' preference setting
by Andrew Randrianasulu 13 Jan '21

13 Jan '21

There is much simpler version diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index 04549fde..ded1603e 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -2211,8 +2211,9 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__); if( strcmp(cin_version, CINELERRA_VERSION) && strcmp(cin_version, "Unify") && strcmp(cin_version, "5.1") ) { + if (preferences->warn_version) eprintf(_("Warning: XML from cinelerra version %s\n" - "Session data may be incompatible."), cin_version); + "Session data may be incompatible."), cin_version); } if( new_edl->load_xml(&xml_file, LOAD_ALL) ) { eprintf(_("Error: unable to load:\n %s"), filename); ---- With this patch it shows warning in same window where plugin mismatch warn shows it, so it remain more compact.. Again, not sure if we want to extend or repair or remove this *toggle* altogether ..... I think this warning can be set to 'always display' now, when it doesn't spawn their own window. PS: My non-loading old project was simply because by now CinGG tries to 'Create resources only' first I switched it back to loading/replacing current proj, and it showed up.

1 0

I tried to restore "Warn on EDL version mismatch' preference setting
by Andrew Randrianasulu 13 Jan '21

13 Jan '21

I tested with with artificially modified project file (changed version to 5.0) it seems to work, and now this psecific warning show up depending on preferences setting/toggle. --- diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index 04549fde..8551c2e3 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -2211,8 +2211,11 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__); if( strcmp(cin_version, CINELERRA_VERSION) && strcmp(cin_version, "Unify") && strcmp(cin_version, "5.1") ) { - eprintf(_("Warning: XML from cinelerra version %s\n" - "Session data may be incompatible."), cin_version); + char string[BCTEXTLEN]; + snprintf(string, sizeof(string), + _("Warning: XML from cinelerra version %s\n" + "Session data may be incompatible."), cin_version); + show_warning(&preferences->warn_version, string); } if( new_edl->load_xml(&xml_file, LOAD_ALL) ) { eprintf(_("Error: unable to load:\n %s"), filename); --- But I have another warning coming from plugin server (because in old CinGG plugin names were localized) Still, old Cin 5.1 project can be loaded if I insist (load it again after warning first show up) Not sure if we should consider this bug or feature .....

1 0

'Warn on version mismatch' historical research ...
by Andrew Randrianasulu 13 Jan '21

13 Jan '21

It seems this flag was introduced in this commit: https://git.cinelerra-gg.org/git/?p=goodguy/history.git;a=commit;h=9e779f63… author Good Guy <good1.2guy(a)gmail.com> Wed, 7 Sep 2016 01:18:17 +0300 (16:18 -0600) committer Good Guy <good1.2guy(a)gmail.com> Wed, 7 Sep 2016 01:18:17 +0300 (16:18 -0600) rework svg plugin, fast flash flush, init resize pixmaps, test edl version so, it was testing version in mwindow.C https://git.cinelerra-gg.org/git/?p=goodguy/history.git;a=blobdiff;f=cinele… (sorry for ultralong line) - + const char *cin_version = 0; + while( !xml_file.read_tag() ) { + if( xml_file.tag.title_is("EDL") ) { + cin_version = xml_file.tag.get_property("VERSION"); + break; + } + } + xml_file.rewind(); + if( !cin_version ) { + eprintf(_("XML file %s\n not from cinelerra."),filenames->get(i)); + char string[BCTEXTLEN]; + sprintf(string,_("Unknown %s"), filenames->get(i)); + gui->show_message(string); + result = 1; + break; + } + if( strcmp(cin_version, CINELERRA_VERSION) ) { + char string[BCTEXTLEN]; + snprintf(string, sizeof(string), + _("Warning: XML from cinelerra version %s\n" + "Session data may be incompatible."), cin_version); + show_warning(&preferences->warn_version, string); + } hm ... in current we have .... https://git.cinelerra-gg.org/git/?p=goodguy/cinelerra.git;a=blob;f=cinelerr… 2196 const char *cin_version = 0; 2197 while( !xml_file.read_tag() ) { 2198 if( xml_file.tag.title_is("EDL") ) { 2199 cin_version = xml_file.tag.get_property("VERSION"); 2200 break; 2201 } 2202 } 2203 xml_file.rewind(); 2204 if( !cin_version ) { 2205 eprintf(_("XML file %s\n not from cinelerra."),filename); 2206 char string[BCTEXTLEN]; 2207 sprintf(string,_("Unknown %s"), filename); 2208 gui->show_message(string); 2209 break; 2210 } 2211 if( strcmp(cin_version, CINELERRA_VERSION) && 2212 strcmp(cin_version, "Unify") && 2213 strcmp(cin_version, "5.1") ) { 2214 eprintf(_("Warning: XML from cinelerra version %s\n" 2215 "Session data may be incompatible."), cin_version); 2216 } so, IT SEEMS this preference simply unused now? Should we try to repair it, or just remove this warning checkbox altogether? (or possible replace it with 'unsafe_button_in_batchrender' preference?) I think replacing eprintf with show_warning still will do work, but need to check!

1 0

Second attempt at simplifying BatchRender window
by Andrew Randrianasulu 13 Jan '21

13 Jan '21

This time I hopefully found how to NOT initialize this variable, and not load it from file either .... Try this patch instead of any my previous attempts ... sorry! ---- diff --git a/cinelerra-5.1/cinelerra/batchrender.C b/cinelerra-5.1/cinelerra/batchrender.C index 6dcdbc62..f9a91fff 100644 --- a/cinelerra-5.1/cinelerra/batchrender.C +++ b/cinelerra-5.1/cinelerra/batchrender.C @@ -60,6 +60,8 @@ #include "dvdcreate.h" #include "bdcreate.h" +#define UNSAFE_BUTTON 0 + int BatchRenderThread::column_widths[] = { 42, 42, 42, 222, 222, 150 }; const char *BatchRenderThread::column_titles[] = { N_("Enabled"), N_("Labeled"), N_("Farmed"), N_("Output"), N_("EDL"), N_("Elapsed") @@ -197,7 +199,10 @@ BatchRenderThread::BatchRenderThread(MWindow *mwindow) default_job = 0; boot_defaults = 0; preferences = 0; + + if (UNSAFE_BUTTON) warn = 1; + render = 0; batch_path[0] = 0; do_farmed = 0; @@ -217,6 +222,7 @@ void BatchRenderThread::reset(const char *path) { if( path ) { strcpy(batch_path, path); + if (UNSAFE_BUTTON) warn = 1; } current_job = 0; @@ -268,6 +274,7 @@ void BatchRenderThread::load_jobs(char *path, Preferences *preferences) while( !result ) { if( !(result = file.read_tag()) ) { if( file.tag.title_is("JOBS") ) { + if (UNSAFE_BUTTON) warn = file.tag.get_property("WARN", 1); } else if( file.tag.title_is("JOB") ) { @@ -293,6 +300,7 @@ void BatchRenderThread::save_jobs(char *path) { FileXML file; file.tag.set_title("JOBS"); + if (UNSAFE_BUTTON) file.tag.set_property("WARN", warn); file.append_tag(); file.append_newline(); @@ -382,6 +390,7 @@ void BatchRenderThread::use_current_edl() gui->edl_path_text->update(get_current_edl()); } + void BatchRenderThread::update_selected_edl() { FileXML xml_file; @@ -792,8 +801,12 @@ void BatchRenderGUI::create_objects() y2 = y + edl_path_browse->get_h() + mwindow->theme->widget_border; x = x2; y = y2; + + if (UNSAFE_BUTTON) { add_subwindow(update_selected_edl = new BatchRenderUpdateEDL(thread, x, y)); y += update_selected_edl->get_h() + mwindow->theme->widget_border; + } + add_subwindow(use_current_edl = new BatchRenderCurrentEDL(thread, x, y)); y += use_current_edl->get_h() + mwindow->theme->widget_border; if( !mwindow->edl || !mwindow->edl->path[0] ) use_current_edl->disable(); @@ -805,8 +818,12 @@ void BatchRenderGUI::create_objects() x += savelist_batch->get_w() + mwindow->theme->widget_border; add_subwindow(loadlist_batch = new BatchRenderLoadList(thread, x, y)); y += loadlist_batch->get_h() + mwindow->theme->widget_border; + + if (UNSAFE_BUTTON) { add_subwindow(warning = new BatchRenderWarning(thread, x2, y)); y2 = y + warning->get_h() + mwindow->theme->widget_border; + } + if( y2 > y1 ) y1 = y2; x = mwindow->theme->batchrender_x1, y = y1; @@ -835,6 +852,7 @@ void BatchRenderGUI::button_disable() new_batch->disable(); delete_batch->disable(); use_current_edl->disable(); + if (UNSAFE_BUTTON) update_selected_edl->disable(); } @@ -844,6 +862,7 @@ void BatchRenderGUI::button_enable() delete_batch->enable(); if( mwindow->edl && mwindow->edl->path[0] ) use_current_edl->enable(); + if (UNSAFE_BUTTON) update_selected_edl->enable(); } @@ -876,8 +895,12 @@ int BatchRenderGUI::resize_event(int w, int h) y2 = y + edl_path_browse->get_h() + mwindow->theme->widget_border; x = x2; y = y2; + + if (UNSAFE_BUTTON) { update_selected_edl->reposition_window(x, y); y += update_selected_edl->get_h() + mwindow->theme->widget_border; + } + use_current_edl->reposition_window(x, y); y += use_current_edl->get_h() + mwindow->theme->widget_border; new_batch->reposition_window(x, y); @@ -889,9 +912,12 @@ 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; + if (UNSAFE_BUTTON) { warning->reposition_window(x2, y); y1 = ys15 + BC_GenericButton::calculate_h() + mwindow->theme->widget_border; + } + y2 = get_h() - y1 - batch_list->get_h(); y2 -= list_title->get_h() + mwindow->theme->widget_border; @@ -1236,6 +1262,7 @@ int BatchRenderCurrentEDL::handle_event() return 1; } + BatchRenderUpdateEDL::BatchRenderUpdateEDL(BatchRenderThread *thread, int x, int y) @@ -1244,8 +1271,10 @@ BatchRenderUpdateEDL::BatchRenderUpdateEDL(BatchRenderThread *thread, this->thread = thread; } + int BatchRenderUpdateEDL::handle_event() { + if (UNSAFE_BUTTON) thread->update_selected_edl(); return 1; } @@ -1374,6 +1403,7 @@ BatchRenderWarning::BatchRenderWarning(BatchRenderThread *thread, int x, int y) int BatchRenderWarning::handle_event() { + if (UNSAFE_BUTTON) thread->warn = get_value(); return 1; } ----

2 3