From 26d01a213db5d4f6ee57224cc9a9ea37bd74318c Mon Sep 17 00:00:00 2001 From: Good Guy Date: Mon, 29 Jun 2020 18:36:06 -0600 Subject: [PATCH] add new tracks as master, update msg txt --- cinelerra-5.1/cinelerra/mainmenu.C | 4 ++-- cinelerra-5.1/cinelerra/mwindow.h | 12 +++++------ cinelerra-5.1/cinelerra/mwindowedit.C | 31 +++++++++++++++------------ cinelerra-5.1/cinelerra/trackpopup.C | 4 ++-- cinelerra-5.1/msg/txt | 5 +++++ 5 files changed, 32 insertions(+), 24 deletions(-) diff --git a/cinelerra-5.1/cinelerra/mainmenu.C b/cinelerra-5.1/cinelerra/mainmenu.C index 0ec9cf67..de902545 100644 --- 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 d01f9ddb..049694ed 100644 --- 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 6336841b..5e4b797b 100644 --- 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 7b1d055a..077fa9cb 100644 --- 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 403345dc..3feb2fbc 100644 --- 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. -- 2.26.2