correct configure.ac help strings, fix track title using append tracks, tweak RenderM...

diff --git a/cinelerra-5.1/cinelerra/localsession.C b/cinelerra-5.1/cinelerra/localsession.C
index 0465795f50dd7bdb12ebc88a9e5c66af58f28b83..6f430e2c561adee9f631b3df24c291636671ae85 100644 (file)
--- 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 d43b6353f0f90f3b31dd969df0c0c49c1709fd08..ea0a2d6b78c1e624aab2ff6fa54e37e19a28f17c 100644 (file)
--- 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 3223b577f8f268821cf79c9c6bbde6efa84b72de..09747382f32777e885377167b721780ed43d1ae3 100644 (file)
--- 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 9e5b5012003c9150a41eac4d87c27b2a340d8089..6be47c54fd90881330ad5d89393ec74f86d5b7a2 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -1486,6 +1486,9 @@ int MWindow::paste_edls(ArrayList<EDL*> *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 ee16058bd1db7054d97c5a3f9eb9979288402c77..b5382c3383406354a7b6a55d81c8c8928cdc6dac 100644 (file)
--- 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 5552feeb40f2d69e18e27368162e09fa25378417..669b2db769cb9136b6df9cf62aa364c1d84de160 100644 (file)
--- 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 0f8c6e417cd167c3bb4d1846ffba26f7eca18a58..574b0db28ce6fe5d4c6f0e94339331d933ee1dd1 100644 (file)
--- 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 ee5e6b85b83c5bec6bc68eadbcb5ae4b9eb4078d..1d098d047e5c781fe084877bcf9377fe0bc2b016 100755 (executable)
--- 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