add new tracks as master, update msg txt

diff --git a/cinelerra-5.1/cinelerra/mainmenu.C b/cinelerra-5.1/cinelerra/mainmenu.C
index 0ec9cf672a87ab07dcbd6ca213c6b685b1a06080..de902545f4d2a9c6977469b021287effe5b55233 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainmenu.C
+++ b/cinelerra-5.1/cinelerra/mainmenu.C
@@ -1158,7 +1158,7 @@ AddVideoTrack::AddVideoTrack(MWindow *mwindow)
 int AddVideoTrack::handle_event()
 {
        if( mwindow->session->current_operation == NO_OPERATION )
-               mwindow->add_video_track_entry();
+               mwindow->add_video_track_entry(1, 0);
        return 1;
 }
 
@@ -1341,7 +1341,7 @@ AddSubttlTrack::AddSubttlTrack(MWindow *mwindow)
 int AddSubttlTrack::handle_event()
 {
        if( mwindow->session->current_operation == NO_OPERATION )
-               mwindow->add_subttl_track_entry();
+               mwindow->add_subttl_track_entry(1, 0);
        return 1;
 }
 

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index d01f9ddb1299ec93dda1c127704148b9a6242e3c..049694ed3ef1c057d8436c1622848e5e1e1587ee 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -408,13 +408,13 @@ public:
                AUDIO_5_1_TO_2,
                AUDIO_1_TO_1
        };
-       void add_audio_track_entry(int above, Track *dst);
-       int add_audio_track(int above, Track *dst);
        void add_clip_to_edl(EDL *edl);
-       void add_video_track_entry(Track *dst = 0);
-       int add_video_track(int above, Track *dst);
-       void add_subttl_track_entry(Track *dst = 0);
-       int add_subttl_track(int above, Track *dst);
+       void add_audio_track_entry(int above, Track *dst);
+       Track *add_audio_track(int above, Track *dst);
+       void add_video_track_entry(int above, Track *dst);
+       Track *add_video_track(int above, Track *dst);
+       void add_subttl_track_entry(int above, Track *dst);
+       Track *add_subttl_track(int above, Track *dst);
 
        void asset_to_all();
        void asset_to_size();

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index 6336841b434dfbd73a51c5bf0a6f516c9299a57d..5e4b797be1f96ead14415d179af9467b3f04116b 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -85,7 +85,8 @@
 void MWindow::add_audio_track_entry(int above, Track *dst)
 {
        undo_before();
-       add_audio_track(above, dst);
+       Track *track = add_audio_track(above, dst);
+       track->master = 1;
        save_backup();
        undo_after(_("add track"), LOAD_ALL);
 
@@ -95,10 +96,11 @@ void MWindow::add_audio_track_entry(int above, Track *dst)
        cwindow->refresh_frame(CHANGE_EDL);
 }
 
-void MWindow::add_video_track_entry(Track *dst)
+void MWindow::add_video_track_entry(int above, Track *dst)
 {
        undo_before();
-       add_video_track(1, dst);
+       Track *track = add_video_track(above, dst);
+       track->master = 1;
        undo_after(_("add track"), LOAD_ALL);
 
        restart_brender();
@@ -109,10 +111,11 @@ void MWindow::add_video_track_entry(Track *dst)
        save_backup();
 }
 
-void MWindow::add_subttl_track_entry(Track *dst)
+void MWindow::add_subttl_track_entry(int above, Track *dst)
 {
        undo_before();
-       add_subttl_track(1, dst);
+       Track *track = add_subttl_track(above, dst);
+       track->master = 1;
        undo_after(_("add track"), LOAD_ALL);
 
        restart_brender();
@@ -124,28 +127,28 @@ void MWindow::add_subttl_track_entry(Track *dst)
 }
 
 
-int MWindow::add_audio_track(int above, Track *dst)
+Track *MWindow::add_audio_track(int above, Track *dst)
 {
-       edl->tracks->add_audio_track(above, dst);
+       Track *track = edl->tracks->add_audio_track(above, dst);
        edl->tracks->update_y_pixels(theme);
        save_backup();
-       return 0;
+       return track;
 }
 
-int MWindow::add_video_track(int above, Track *dst)
+Track *MWindow::add_video_track(int above, Track *dst)
 {
-       edl->tracks->add_video_track(above, dst);
+       Track *track = edl->tracks->add_video_track(above, dst);
        edl->tracks->update_y_pixels(theme);
        save_backup();
-       return 0;
+       return track;
 }
 
-int MWindow::add_subttl_track(int above, Track *dst)
+Track *MWindow::add_subttl_track(int above, Track *dst)
 {
-       edl->tracks->add_subttl_track(above, dst);
+       Track *track = edl->tracks->add_subttl_track(above, dst);
        edl->tracks->update_y_pixels(theme);
        save_backup();
-       return 0;
+       return track;
 }
 
 void MWindow::asset_to_all()

diff --git a/cinelerra-5.1/cinelerra/trackpopup.C b/cinelerra-5.1/cinelerra/trackpopup.C
index 7b1d055a6ceff47d431ee212a805088f8837f413..077fa9cb23cd208ea90fe20feb77f9a35257f0c4 100644 (file)
--- a/cinelerra-5.1/cinelerra/trackpopup.C
+++ b/cinelerra-5.1/cinelerra/trackpopup.C
@@ -216,10 +216,10 @@ int TrackPopupAddTrack::handle_event()
                mwindow->add_audio_track_entry(1, popup->track);
                break;
        case TRACK_VIDEO:
-               mwindow->add_video_track_entry(popup->track);
+               mwindow->add_video_track_entry(1, popup->track);
                break;
        case TRACK_SUBTITLE:
-               mwindow->add_subttl_track_entry(popup->track);
+               mwindow->add_subttl_track_entry(1, popup->track);
                break;
        }
        return 1;

diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt
index 403345dc4911e3f4e8cd30543edebd41e93fa8f9..3feb2fbc2b4b6ae4b041bcffe7eeb00e14ff5a33 100644 (file)
--- a/cinelerra-5.1/msg/txt
+++ b/cinelerra-5.1/msg/txt
@@ -7,6 +7,11 @@ Cinfinity icons selected in Preferences Sam (CC BY 3.0,
 Cakewalk and Neophyte themes by Olaf Wolff (CC BY 4.0,
   https://creativecommons.org/licenses/by/4.0/)
 .
+June 2020 New Features of note:
+  Ganging modes added for DAW-like editing of channels.
+  Rotate plugin has been modernized and improved.
+  Debug assist added of BC_TRACE_XERROR environment variable.
+  Perspective plugin minor addition of numbered corners.
 May 2020 New Features of note:
   Audio track height button added, separate from video height.
   New patchbay toggle to vary individual vertical track height.