correct configure.ac help strings, fix track title using append tracks, tweak RenderM...
authorGood Guy <good1.2guy@gmail.com>
Mon, 17 Jun 2019 23:22:43 +0000 (17:22 -0600)
committerGood Guy <good1.2guy@gmail.com>
Mon, 17 Jun 2019 23:22:43 +0000 (17:22 -0600)
cinelerra-5.1/cinelerra/localsession.C
cinelerra-5.1/cinelerra/localsession.h
cinelerra-5.1/cinelerra/mwindow.C
cinelerra-5.1/cinelerra/mwindowedit.C
cinelerra-5.1/cinelerra/track.C
cinelerra-5.1/cinelerra/track.h
cinelerra-5.1/configure.ac
cinelerra-5.1/doc/RenderMux.sh

index 0465795..6f430e2 100644 (file)
@@ -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;
index d43b635..ea0a2d6 100644 (file)
@@ -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];
index 3223b57..0974738 100644 (file)
@@ -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;
 }
 
index 9e5b501..6be47c5 100644 (file)
@@ -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);
                        }
 
index ee16058..b5382c3 100644 (file)
@@ -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),
index 5552fee..669b2db 100644 (file)
@@ -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);
index 0f8c6e4..574b0db 100644 (file)
@@ -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`
index ee5e6b8..1d098d0 100755 (executable)
@@ -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