- Cin - Cinelerra-GG Mailing Lists

[PATCH] Copy backups of backup.xml automatically
by Andrew Randrianasulu 16 Jan '21

16 Jan '21

So, I tried to implement 'create more than one backup' It uses 'system' call, so probably not ideal if you run CinGG as root ( 'man system' warns about such case) Patch attached.

2 1

Minor GIT checkins for code + manual
by Phyllis Smith 16 Jan '21

16 Jan '21

So that the improvements made by Andrew and RafaMar for minor Russian/English and Spanish tips and translations did not get lost among the Batch Render, I checked them into GIT right away. This includes a slight increase in the Tip Window sizes. Also, checked in manual changes and updated the HTML and PDF CinelerraGG_Manual on the website.

2 2

Backups discussion
by Andrew Randrianasulu 15 Jan '21

15 Jan '21

So, right now CinGG tracks your work and can create two backup files (backup.xml and backup.prev). It works [hopefully] but feels a bit TOO dangerous in the event of crash, when confused user may save backup instead of loading it. Recently I crashed Audacity a bit :} It surely shows up Session recovery dialog, where you can see backups with time-date added to their names, and choose one to load. Do you think similar system will work for CinGG? At very minimum I think I can try to write 'we_are_running.lock' file on app startup, and only delete it on clean shutdown. So, there will be way to act in case we detect crash. After we detect crash - probably right now Warning can be displayed, instructing user to seek LOADING backups. If I can made this sytem work reliably - I hope multi-backup solution also will be within reach.

3 2

Tried gitwatch
by Andrew Randrianasulu 15 Jan '21

15 Jan '21

First I created .git/ directory by typing 'git init' in /dev/shm where I have few BIG files and tmp dirs with compiled software Initially I ran into problem that git was checking ALL my files, it was slow and wrong. so, I consulted 'man gitignore' It worked much better with this .gitignore in /dev/shm/ (as example) (ignore all files BUT *.xml ones in tree, do not look into dirs) --- */* *.* !*.xml now if you run ./gitwatch from its own git tree, you will see .... ./gitwatch.sh /dev/shm/ [master d067f65] Scripted auto-commit on change (2021-01-15 17:46:25) by gitwatch.sh 1 file changed, 1 insertion(+), 1 deletion(-) [master 30c5669] Scripted auto-commit on change (2021-01-15 17:46:35) by gitwatch.sh 1 file changed, 1 insertion(+) create mode 120000 .#1.xml [master 4ac3506] Scripted auto-commit on change (2021-01-15 17:46:38) by gitwatch.sh 2 files changed, 8 insertions(+), 2 deletions(-) delete mode 120000 .#1.xml [master 77f79f9] Scripted auto-commit on change (2021-01-15 17:46:48) by gitwatch.sh 1 file changed, 1 insertion(+) create mode 120000 .#1.xml [master d8508b2] Scripted auto-commit on change (2021-01-15 17:46:59) by gitwatch.sh 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 120000 .#1.xml ^C (I was using mc's editor) Now you can look around by using git log, git reflog and gitk (graphical git tree viewer) And return to any point in time. (git reset --hard <commit> / git checkout <commit>) Be aware, that wrong/absent .gitignore file WILL cause ALL stuff in dirs and subdirs to be checked in, this is obviously (?) not that you want. Yes, this is not out-of-the box, not GUI. But. IT WORKS.

1 0

Debate on batch render
by Rafa Mar Multimedia en Gnu\Linux 15 Jan '21

15 Jan '21

The batch render window is true that it is not very intuitive, but once we know that each new line that we want to add, we must first use the "New" button, with this data it is already perfect, except for two options that I will comment below. Two options that in my point of view do not make any sense in this assistant. One of these options in the "Save to EDL Path" option is the first time I have seen this option to save the open project in a batch render window, but it can ruin our work. Let me explain, a batch render is normally prepared with the application without any project loaded. Imagine that you have just loaded in "EDL Path" the path of a project file that has taken you months of work, and of which you do not have a backup copy. And by mistake you click on this button ... you have just lost all your work and there is no going back. I find this button a bad joke, so dangerous, meaningless and with disastrous consequences. I would ask that it be removed, because it is not useful or logical and can also frustrate many hours of work. Another option that doesn't make sense in the "warn if jobs/session mismatched" option. Let me explain, normally when we program a batch render we do it to export different projects, so that these are carried out automatically at times when we do not need to use the computer. This option sometimes seems to be disabled, but it is not, despite the apparently inactive button, it is active and when we try to start the batch rendering we get the error "# job EDLs do not match session edl". It is true that a batch render can be done from a single project to export it in different formats, but even so, I don't see any sense, because when we program this batch render we do it from an .xml project file, already saved, without the need for it to be loaded into the project. I honestly think this window would be much better without these options. I don't know how to program, but I think these changes are very easy to make. I open this debate in order to improve the experience with Cinelerra, an editor that I really like, but that is sometimes a little overshadowed by these details.

6 50

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