From: Good Guy Date: Tue, 3 Apr 2018 22:56:35 +0000 (-0600) Subject: undo nested clip bug, wheel zoom redraw fix, uninited vars, shortcuts doc X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=6c533a5098aa5a5ca85b97dd405bb06b26033a91;p=goodguy%2Fhistory.git undo nested clip bug, wheel zoom redraw fix, uninited vars, shortcuts doc --- diff --git a/cinelerra-5.1/cinelerra/asset.C b/cinelerra-5.1/cinelerra/asset.C index 07aa00b3..f4fe0c3a 100644 --- a/cinelerra-5.1/cinelerra/asset.C +++ b/cinelerra-5.1/cinelerra/asset.C @@ -99,6 +99,7 @@ int Asset::init_values() interlace_mode = ILACE_MODE_UNDETECTED; interlace_fixmethod = ILACE_FIXMETHOD_NONE; + mp3_bitrate = 224; ampeg_bitrate = 256; ampeg_derivative = 3; diff --git a/cinelerra-5.1/cinelerra/cpanel.C b/cinelerra-5.1/cinelerra/cpanel.C index 1e6ef8d3..87e753cd 100644 --- a/cinelerra-5.1/cinelerra/cpanel.C +++ b/cinelerra-5.1/cinelerra/cpanel.C @@ -149,7 +149,7 @@ CPanelProtect::CPanelProtect(MWindow *mwindow, CPanel *gui, int x, int y) { this->mwindow = mwindow; this->gui = gui; - set_tooltip(_("Protect video from changes")); + set_tooltip(_("Protect video from changes (F1)")); } CPanelProtect::~CPanelProtect() { @@ -173,7 +173,7 @@ CPanelMask::CPanelMask(MWindow *mwindow, CPanel *gui, int x, int y) { this->mwindow = mwindow; this->gui = gui; - set_tooltip(_("Edit mask")); + set_tooltip(_("Edit mask (F3)")); } CPanelMask::~CPanelMask() { @@ -195,7 +195,7 @@ CPanelRuler::CPanelRuler(MWindow *mwindow, CPanel *gui, int x, int y) { this->mwindow = mwindow; this->gui = gui; - set_tooltip(_("Ruler")); + set_tooltip(_("Ruler (F4)")); } CPanelRuler::~CPanelRuler() { @@ -217,7 +217,7 @@ CPanelMagnify::CPanelMagnify(MWindow *mwindow, CPanel *gui, int x, int y) { this->mwindow = mwindow; this->gui = gui; - set_tooltip(_("Zoom view")); + set_tooltip(_("Zoom view (F2)")); } CPanelMagnify::~CPanelMagnify() { @@ -237,7 +237,7 @@ CPanelCamera::CPanelCamera(MWindow *mwindow, CPanel *gui, int x, int y) { this->mwindow = mwindow; this->gui = gui; - set_tooltip(_("Adjust camera automation")); + set_tooltip(_("Adjust camera automation (F5)")); } CPanelCamera::~CPanelCamera() { @@ -257,7 +257,7 @@ CPanelProj::CPanelProj(MWindow *mwindow, CPanel *gui, int x, int y) { this->mwindow = mwindow; this->gui = gui; - set_tooltip(_("Adjust projector automation")); + set_tooltip(_("Adjust projector automation (F6)")); } CPanelProj::~CPanelProj() { @@ -277,7 +277,7 @@ CPanelCrop::CPanelCrop(MWindow *mwindow, CPanel *gui, int x, int y) { this->mwindow = mwindow; this->gui = gui; - set_tooltip(_("Crop a layer or output")); + set_tooltip(_("Crop a layer or output (F7)")); } CPanelCrop::~CPanelCrop() @@ -301,7 +301,7 @@ CPanelEyedrop::CPanelEyedrop(MWindow *mwindow, CPanel *gui, int x, int y) { this->mwindow = mwindow; this->gui = gui; - set_tooltip(_("Get color")); + set_tooltip(_("Get color (F8)")); } CPanelEyedrop::~CPanelEyedrop() @@ -325,7 +325,7 @@ CPanelToolWindow::CPanelToolWindow(MWindow *mwindow, CPanel *gui, int x, int y) { this->mwindow = mwindow; this->gui = gui; - set_tooltip(_("Show tool info")); + set_tooltip(_("Show tool info (F9)")); } CPanelToolWindow::~CPanelToolWindow() @@ -356,7 +356,7 @@ CPanelTitleSafe::CPanelTitleSafe(MWindow *mwindow, CPanel *gui, int x, int y) { this->mwindow = mwindow; this->gui = gui; - set_tooltip(_("Show safe regions")); + set_tooltip(_("Show safe regions (F10)")); } CPanelTitleSafe::~CPanelTitleSafe() { diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C index 1334e5e7..3c3de37f 100644 --- a/cinelerra-5.1/cinelerra/edl.C +++ b/cinelerra-5.1/cinelerra/edl.C @@ -298,7 +298,7 @@ int EDL::read_xml(FileXML *file, uint32_t load_flags) nested_edl->create_objects(); nested_edl->read_xml(file, LOAD_ALL); if( (load_flags & LOAD_ALL) == LOAD_ALL ) - nested_edls.add_clip(nested_edl); + nested_edls.get_nested(nested_edl); nested_edl->remove_user(); } else diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C index 292de030..7e07ca8c 100644 --- a/cinelerra-5.1/cinelerra/edlsession.C +++ b/cinelerra-5.1/cinelerra/edlsession.C @@ -122,6 +122,8 @@ EDLSession::EDLSession(EDL *edl) scrub_speed = 2.; show_assets = 1; show_titles = 1; + si_useduration = 1; + si_duration = 3; test_playback_edits = 1; time_format = TIME_HMSF; nudge_format = 1; diff --git a/cinelerra-5.1/cinelerra/mainundo.C b/cinelerra-5.1/cinelerra/mainundo.C index 9cd3562e..14268e1d 100644 --- a/cinelerra-5.1/cinelerra/mainundo.C +++ b/cinelerra-5.1/cinelerra/mainundo.C @@ -260,6 +260,12 @@ int MainUndo::load_from_undo(FileXML *file, uint32_t load_flags) mwindow->close_mixers(); mwindow->gui->lock_window("MainUndo::load_from_undo"); } + if( (load_flags & LOAD_ALL) == LOAD_ALL ) { + EDL *edl = new EDL; + edl->create_objects(); + mwindow->edl->remove_user(); + mwindow->edl = edl; + } mwindow->edl->load_xml(file, load_flags); for( Asset *asset=mwindow->edl->assets->first; asset; asset=asset->next ) { mwindow->mainindexes->add_next_asset(0, asset); diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C index f7cd97cd..1ac33aaf 100644 --- a/cinelerra-5.1/cinelerra/mwindowgui.C +++ b/cinelerra-5.1/cinelerra/mwindowgui.C @@ -2328,7 +2328,8 @@ int PaneButton::cursor_motion_event() int PaneButton::button_release_event() { - mwindow->gui->stop_pane_drag(); + if( get_buttonpress() != WHEEL_DOWN && get_buttonpress() != WHEEL_UP ) + mwindow->gui->stop_pane_drag(); int result = BC_Button::button_release_event(); return result; } diff --git a/cinelerra-5.1/cinelerra/mwindowmove.C b/cinelerra-5.1/cinelerra/mwindowmove.C index e86c6b76..c55f6228 100644 --- a/cinelerra-5.1/cinelerra/mwindowmove.C +++ b/cinelerra-5.1/cinelerra/mwindowmove.C @@ -90,7 +90,7 @@ int MWindow::zoom_sample(int64_t zoom_sample) { CLAMP(zoom_sample, 1, 0x100000); edl->local_session->zoom_sample = zoom_sample; - find_cursor(); + find_cursor(); TimelinePane *pane = gui->get_focused_pane(); samplemovement(edl->local_session->view_start[pane->number], pane->number); diff --git a/cinelerra-5.1/doc/shortcuts.html b/cinelerra-5.1/doc/shortcuts.html index 7138e0cf..89e8b516 100644 --- a/cinelerra-5.1/doc/shortcuts.html +++ b/cinelerra-5.1/doc/shortcuts.html @@ -7,7 +7,7 @@ - +