From bdd6708750aa8b8315e9f4456504903f5f368807 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Mon, 17 Jun 2019 17:22:43 -0600 Subject: [PATCH] correct configure.ac help strings, fix track title using append tracks, tweak RenderMux.sh --- cinelerra-5.1/cinelerra/localsession.C | 1 + cinelerra-5.1/cinelerra/localsession.h | 2 ++ cinelerra-5.1/cinelerra/mwindow.C | 1 + cinelerra-5.1/cinelerra/mwindowedit.C | 3 +++ cinelerra-5.1/cinelerra/track.C | 9 ++++----- cinelerra-5.1/cinelerra/track.h | 2 +- cinelerra-5.1/configure.ac | 4 ++-- cinelerra-5.1/doc/RenderMux.sh | 3 ++- 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/cinelerra-5.1/cinelerra/localsession.C b/cinelerra-5.1/cinelerra/localsession.C index 0465795f..6f430e2c 100644 --- a/cinelerra-5.1/cinelerra/localsession.C +++ b/cinelerra-5.1/cinelerra/localsession.C @@ -64,6 +64,7 @@ LocalSession::LocalSession(EDL *edl) strcpy(clip_notes, _("Hello world")); strcpy(clip_icon, ""); clipboard_length = 0; + asset2edl = 0; loop_playback = 0; loop_start = loop_end = 0; playback_start = -1; diff --git a/cinelerra-5.1/cinelerra/localsession.h b/cinelerra-5.1/cinelerra/localsession.h index d43b6353..ea0a2d6b 100644 --- a/cinelerra-5.1/cinelerra/localsession.h +++ b/cinelerra-5.1/cinelerra/localsession.h @@ -74,6 +74,8 @@ public: // Number of samples if pasted from a clipboard. // If 0 use longest track double clipboard_length; +// edl created by asset_to_edl + int asset2edl; // Title if clip char clip_title[BCTEXTLEN]; char clip_notes[BCTEXTLEN]; diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index 3223b577..09747382 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -3602,6 +3602,7 @@ if(debug) printf("MWindow::asset_to_edl %d\n", __LINE__); //printf("MWindow::asset_to_edl 4 %s\n", string); if(debug) printf("MWindow::asset_to_edl %d\n", __LINE__); + new_edl->local_session->asset2edl = 1; return 0; } diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C index 9e5b5012..6be47c54 100644 --- a/cinelerra-5.1/cinelerra/mwindowedit.C +++ b/cinelerra-5.1/cinelerra/mwindowedit.C @@ -1486,6 +1486,9 @@ int MWindow::paste_edls(ArrayList *new_edls, int load_mode, default: continue; } +// re-label only if not already labeled + if( new_edl->local_session->asset2edl ) + strcpy(current->title, edl->tracks->last->title); destination_tracks.append(edl->tracks->last); } diff --git a/cinelerra-5.1/cinelerra/track.C b/cinelerra-5.1/cinelerra/track.C index ee16058b..b5382c33 100644 --- a/cinelerra-5.1/cinelerra/track.C +++ b/cinelerra-5.1/cinelerra/track.C @@ -80,10 +80,9 @@ void Track::create_objects() { } -int Track::copy_settings(Track *track, int do_title) + +int Track::copy_settings(Track *track) { - if( do_title ) - strcpy(this->title, track->title); this->expand_view = track->expand_view; this->draw = track->draw; this->gang = track->gang; @@ -93,6 +92,7 @@ int Track::copy_settings(Track *track, int do_title) this->play = track->play; this->track_w = track->track_w; this->track_h = track->track_h; + strcpy(this->title, track->title); return 0; } @@ -441,8 +441,7 @@ void Track::insert_track(Track *track, //printf("Track::insert_track %d %s %jd\n", __LINE__, title, min_length); // Decide whether to copy settings based on load_mode - if( replace_default ) - copy_settings(track, 0); + if(replace_default) copy_settings(track); edits->insert_edits(track->edits, to_units(position, 0), diff --git a/cinelerra-5.1/cinelerra/track.h b/cinelerra-5.1/cinelerra/track.h index 5552feeb..669b2db7 100644 --- a/cinelerra-5.1/cinelerra/track.h +++ b/cinelerra-5.1/cinelerra/track.h @@ -153,7 +153,7 @@ public: // align to frame boundary int64_t frame_align(int64_t position, int round); - virtual int copy_settings(Track *track, int do_title=1); + virtual int copy_settings(Track *track); void shift_keyframes(int64_t position, int64_t length); void shift_effects(int64_t position, int64_t length, int edit_autos, Edits *trim_edits); void change_plugins(SharedLocation &old_location, SharedLocation &new_location, int do_swap); diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 0f8c6e41..574b0db2 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -58,8 +58,8 @@ CHECK_WITH([thirdparty],[use thirdparty build],[CIN_3RDPARTY],[yes]) CHECK_WITH([shuttle],[shuttle device],[SHUTTLE],[yes]) CHECK_WITH([vaapi],[video acceleration api],[VAAPI],[yes]) CHECK_WITH([vdpau],[video decode+presentation api for unix],[VDPAU],[yes]) -CHECK_WITH([nv],[video acceleration api],[NV],[yes]) -CHECK_WITH([cuda],[video decode+presentation api for unix],[CUDA],[auto]) +CHECK_WITH([nv],[nvenc/nvdec ffnvcodec api],[NV],[yes]) +CHECK_WITH([cuda],[nv cuda plugins],[CUDA],[auto]) if test "x$WANT_LV2" != "xno"; then GTK2_LIBS=`pkg-config --libs gtk+-2.0` diff --git a/cinelerra-5.1/doc/RenderMux.sh b/cinelerra-5.1/doc/RenderMux.sh index ee5e6b85..1d098d04 100755 --- a/cinelerra-5.1/doc/RenderMux.sh +++ b/cinelerra-5.1/doc/RenderMux.sh @@ -1,5 +1,6 @@ #!/bin/bash exec >& /tmp/render_mux.log -echo == $0 $@ +echo == $0 cin_render="$CIN_RENDER" +test -z "$CIN_RENDER" && exit 1 # Render output mux-ed into a single file ffmpeg -f concat -safe 0 -i <(for f in "$CIN_RENDER"0*; do echo "file '$f'"; done) -c copy -y $CIN_RENDER -- 2.26.2