From: Good Guy Date: Sun, 31 Mar 2019 22:57:46 +0000 (-0600) Subject: version update, msg txt, tweak mixeralign locks/leaks, disable libwebp,libaom in... X-Git-Tag: 2019-08~75 X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=commitdiff_plain;h=78d1d3d26843ec91b048befb13569e6a1d54c065;ds=sidebyside version update, msg txt, tweak mixeralign locks/leaks, disable libwebp,libaom in centos,ubuntu builds --- diff --git a/cinelerra-5.1/blds/PKGBUILD b/cinelerra-5.1/blds/PKGBUILD index 4c805b2f..3cddc5a0 100644 --- a/cinelerra-5.1/blds/PKGBUILD +++ b/cinelerra-5.1/blds/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: goodguy pkgname=cin pkgver=5.1 -pkgrel=20190228 +pkgrel=20190331 pkgdesc="Cinelerra git://git.cinelerra-gg.org/goodguy/cinelerra.git ($pkgrel)" arch=('x86_64') url="https://www.cinelerra-gg.org" diff --git a/cinelerra-5.1/blds/cinelerra.spec b/cinelerra-5.1/blds/cinelerra.spec index bdeb5167..6c8353a9 100644 --- a/cinelerra-5.1/blds/cinelerra.spec +++ b/cinelerra-5.1/blds/cinelerra.spec @@ -1,4 +1,4 @@ -%define ver 20190228 +%define ver 20190331 %define cin cinelerra Summary: Multimedia Editing and construction @@ -26,6 +26,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %if 0%{?centos} %define rhat 1 %define distro centos +%define centos_cfg --disable-libaom --disable-libwebp %endif BuildRequires: autoconf @@ -76,7 +77,7 @@ Multimedia editing and construction %setup -q -n %{cin}-%{version} %build ./autogen.sh -%configure %{?xcfg} +%configure %{?xcfg} %{?centos_cfg} %{__make} %install diff --git a/cinelerra-5.1/blds/debian/changelog b/cinelerra-5.1/blds/debian/changelog index d130d9b6..52f75089 100644 --- a/cinelerra-5.1/blds/debian/changelog +++ b/cinelerra-5.1/blds/debian/changelog @@ -1,4 +1,4 @@ -cin (1:5.1.20190228) unstable; urgency=low +cin (1:5.1.20190331) unstable; urgency=low [ guy goode ] diff --git a/cinelerra-5.1/blds/debian/control b/cinelerra-5.1/blds/debian/control index bdc83e40..74672f66 100644 --- a/cinelerra-5.1/blds/debian/control +++ b/cinelerra-5.1/blds/debian/control @@ -1,7 +1,7 @@ Source: cin Section: video Priority: optional -Standards-Version: 5.1.20190228 +Standards-Version: 5.1.20190331 Maintainer: mailing list Homepage: https://www.cinelerra-gg.org/ Build-Depends: nasm, yasm, g++, gdb, build-essential, e2fsprogs, diff --git a/cinelerra-5.1/cinelerra/mixersalign.C b/cinelerra-5.1/cinelerra/mixersalign.C index 1e91b6ca..8092b14a 100644 --- a/cinelerra-5.1/cinelerra/mixersalign.C +++ b/cinelerra-5.1/cinelerra/mixersalign.C @@ -685,6 +685,7 @@ BC_Window *MixersAlign::new_gui() // shift armed mixer tracks by nudge void MixersAlign::nudge_tracks() { + mwindow->gui->lock_window("MixersAlign::apply_tracks"); int idx = ma_gui->mtrack_list->get_selection_number(0, 0); int midx = mmixer_of(idx); EDL *edl = mwindow->edl; @@ -716,7 +717,6 @@ void MixersAlign::nudge_tracks() } edl->optimize(); - mwindow->gui->lock_window("MixersAlign::apply_tracks"); mwindow->update_gui(1); mwindow->gui->unlock_window(); clear_mixer_nudge(); @@ -725,6 +725,7 @@ void MixersAlign::nudge_tracks() // move selected mixer edits by nudge void MixersAlign::nudge_selected() { + mwindow->gui->lock_window("MixersAlign::apply_selected"); int idx = ma_gui->mtrack_list->get_selection_number(0, 0); int midx = mmixer_of(idx); EDL *edl = mwindow->edl; @@ -778,7 +779,6 @@ void MixersAlign::nudge_selected() track->record = track_arms[i++]; edl->optimize(); - mwindow->gui->lock_window("MixersAlign::apply_selected"); mwindow->update_gui(1); mwindow->gui->unlock_window(); clear_mixer_nudge(); @@ -798,11 +798,13 @@ void MixersAlign::clear_mixer_nudge() void MixersAlign::check_point() { + mwindow->gui->lock_window("MixersAlign::check_point"); ma_gui->undo->add_undo_item(undo_edls.size()); EDL *undo_edl = new EDL(); undo_edl->create_objects(); undo_edl->copy_all(mwindow->edl); undo_edls.append(undo_edl); + mwindow->gui->unlock_window(); } @@ -856,22 +858,28 @@ void MixersAlign::handle_done_event(int result) thread->join(); } if( !result ) { + mwindow->gui->lock_window("MixersAlign::handle_done_event"); EDL *edl = mwindow->edl; mwindow->edl = undo_edls[0]; mwindow->undo_before(); mwindow->edl = edl; mwindow->undo_after(_("align mixers"), LOAD_ALL); + mwindow->gui->unlock_window(); } } void MixersAlign::handle_close_event(int result) { ma_gui = 0; + mixers.clear(); + mtracks.clear(); + atracks.clear(); + undo_edls.clear(); } void MixersAlign::load_mixers() { - mixers.remove_all_objects(); + mixers.clear(); Mixers &edl_mixers = mwindow->edl->mixers; for( int i=0; iedl->tracks->first; for( int no=0; track; ++no, track=track->next ) { if( track->data_type != TRACK_AUDIO ) continue; @@ -889,7 +897,7 @@ void MixersAlign::load_mtracks() void MixersAlign::load_atracks() { - atracks.remove_all_objects(); + atracks.clear(); Track *track=mwindow->edl->tracks->first; for( int no=0; track; ++no, track=track->next ) { if( track->data_type != TRACK_AUDIO ) continue; @@ -986,9 +994,9 @@ void MixersAlign::apply_undo(int no) failed = -1; thread->join(); } + mwindow->gui->lock_window("MixersAlignUndo::handle_event"); EDL *undo_edl = undo_edls[no]; mwindow->edl->copy_all(undo_edl); - mwindow->gui->lock_window("MixersAlignUndo::handle_event"); mwindow->update_gui(1); mwindow->gui->unlock_window(); ma_gui->reset->handle_event(); @@ -1224,8 +1232,8 @@ void MixersAlignTargetClient::process_package(LoadPackage *package) pkg->sd2 = sd2; pkg->ss = ss; pkg->pos = scan->pos; -printf("targ %s:%d at %jd,ss=%f sd2=%f\n", - scan->pkg->mixer->mixer->title, ch, scan->pos, ss, sd2); +//printf("targ %s:%d at %jd,ss=%f sd2=%f\n", +// scan->pkg->mixer->mixer->title, ch, scan->pos, ss, sd2); double *best = pkg->best; int i = 0, len = targ->len; while( i < len1 ) best[i++] = *data++; @@ -1514,7 +1522,7 @@ void MixersAlignMatchRevClient::process_package(LoadPackage *package) if( mix->mx < mx ) { mix->mx = mx; mix->mi = mi; -printf("best %d: %f at %jd\n", get_package_number(), mx, mi); +//printf("best %d: %f at %jd\n", get_package_number(), mx, mi); } farm->mixer_lock->unlock(); } diff --git a/cinelerra-5.1/cinelerra/mixersalign.h b/cinelerra-5.1/cinelerra/mixersalign.h index 92b36bae..bee2c901 100644 --- a/cinelerra-5.1/cinelerra/mixersalign.h +++ b/cinelerra-5.1/cinelerra/mixersalign.h @@ -52,7 +52,8 @@ class MixersAlignMixers : public ArrayList { public: MixersAlignMixers() {} - ~MixersAlignMixers() { remove_all_objects(); } + ~MixersAlignMixers() { clear(); } + void clear() { remove_all_objects(); } }; class MixersAlignMixerList : public BC_ListBox @@ -99,7 +100,8 @@ class MixersAlignMTracks : public ArrayList { public: MixersAlignMTracks() {} - ~MixersAlignMTracks() { remove_all_objects(); } + ~MixersAlignMTracks() { clear(); } + void clear() { remove_all_objects(); } }; @@ -149,7 +151,8 @@ class MixersAlignATracks : public ArrayList { public: MixersAlignATracks() {} - ~MixersAlignATracks() { remove_all_objects(); } + ~MixersAlignATracks() { clear(); } + void clear() { remove_all_objects(); } }; class MixersAlignATrackList : public BC_ListBox @@ -259,8 +262,10 @@ class MixersAlignUndoEDLs : public ArrayList { public: MixersAlignUndoEDLs() {} - ~MixersAlignUndoEDLs() { + ~MixersAlignUndoEDLs() { clear(); } + void clear() { for( int i=size(); --i>=0; ) get(i)->remove_user(); + remove_all(); } }; diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt index 7ec204e0..536451ad 100644 --- a/cinelerra-5.1/msg/txt +++ b/cinelerra-5.1/msg/txt @@ -4,7 +4,7 @@ Cinelerra-GG Infinity continuously merged/enriched from the provided over prior years from the Community Version. Email cin@lists.cinelerra-gg.org 4 help. For usage help, refer to the following: - https://cinelerra-cv.org/docs/cinelerra_cv_manual_en.html + https://cinelerra-gg.org/downloads/CinelerraGG_manual.pdf https://cinelerra-gg.org/downloads/Features.pdf http://g-raffa.eu/Cinelerra/HOWTO/basics.html Cinfinity icons selected in Preferences Sam (CC BY 3.0, @@ -12,6 +12,12 @@ Cinfinity icons selected in Preferences Sam (CC BY 3.0, Neophyte theme selected in Preferences by Olaf Wolff (CC BY 4.0, https://creativecommons.org/licenses/by/4.0/) . +March 2019 New Features of note: + Mixers, multiple cameras, now has Audio Alignment. + Additional options for Preview mode in Resources window. + Named layouts for easier identification purposes. + ShuttlePro/Xpress will work on multiple instances. + Insert Mixers for multiple cameras at Insertion point. February 2019 New Features of note: AV1 and WebP format usage is now included. ShuttlePro/Xpress stabilization/setup/definition is complete.