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 07aa00b3e7891c8c1eb01c3a8251e80125acd8c7..f4fe0c3ad3f2f05d3d640ce027115c63ebd46ca6 100644 (file)
--- 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 1e6ef8d3e5348a86a3b599c88f42c90f911c76c5..87e753cd04e390b79c3f13ce9d37a6515d1b777c 100644 (file)
--- 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 1334e5e7c2d129fed11e33284c16fbe8743e33ad..3c3de37f9aa31b93be26a2eec2dc0dee6ea37bfb 100644 (file)
--- 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 292de030454d7c27b2244d21532c20b4a622f1e6..7e07ca8ca4f1be8859725e8013a885c7d44cfc7e 100644 (file)
--- 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 9cd3562eba166f9dd1019f9712cd925ce74f8671..14268e1d37709f5d0b57e17cb4b89c919c53450d 100644 (file)
--- 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 f7cd97cd94accae12af1451d1c5a0b7df7d21714..1ac33aafa235c7f2c02a646b9e7d184b5f78c64c 100644 (file)
--- 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 e86c6b76d0aaee9e024cf1562c50f00df263b56c..c55f6228d81752d65f35f8e07d82d2be42c5ccf1 100644 (file)
--- 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 7138e0cf09d8737fe73b03524291a9eb533bbfca..89e8b5164ffdc88bddfb4167346f0540cd5dfa98 100644 (file)
--- a/cinelerra-5.1/doc/shortcuts.html
+++ b/cinelerra-5.1/doc/shortcuts.html
@@ -7,7 +7,7 @@
        <title></title>
        <meta name="generator" content="LibreOffice 5.2.7.2 (Linux)"/>
        <meta name="created" content="00:00:00"/>
-       <meta name="changed" content="2017-11-29T19:40:27.221227659"/>
+       <meta name="changed" content="2018-04-03T19:40:27.221227659"/>
        
        <style type="text/css">
                body,div,table,thead,tbody,tfoot,tr,th,td,p { font-family:"Liberation Sans"; font-size:x-small }
@@ -852,6 +852,12 @@
                <td align="left"><font face="Liberation Serif" size=4>+Shift w/Alt</font></td>
                <td align="left"><font face="Liberation Serif" size=4>Shift with Alt+x above, adds/removes audio</font></td>
        </tr>
+       <tr>
+               <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>+Shift w/Ctrl</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Loops play; all or between In/Out</font></td>
+       </tr>
        <tr>
                <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
                <td align="left"><font face="Liberation Serif" size=4><br></font></td>
@@ -861,7 +867,7 @@
        <tr>
                <td height="26" align="left"><b><font face="Liberation Serif" size=4>    Edit Modes</font></b></td>
                <td align="left"><font face="Liberation Serif" size=4>Auto Gen. Keys</font></td>
-               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>'j'</font></td>
                <td align="left"><font face="Liberation Serif" size=4>Generate keyframes while tweeking</font></td>
        </tr>
        <tr>
@@ -1269,19 +1275,19 @@
        <tr>
                <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
                <td align="left"><font face="Liberation Serif" size=4>Protect video</font></td>
-               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>F1</font></td>
                <td align="left"><font face="Liberation Serif" size=4>Disable changes to the compositor output</font></td>
        </tr>
        <tr>
                <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
                <td align="left"><font face="Liberation Serif" size=4>Zoom view</font></td>
-               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>F2</font></td>
                <td align="left"><font face="Liberation Serif" size=4>Zoom in view without resizing the window</font></td>
        </tr>
        <tr>
                <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
                <td align="left"><font face="Liberation Serif" size=4>Edit mask</font></td>
-               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>F3</font></td>
                <td align="left"><font face="Liberation Serif" size=4>Brings up the mask editing tool</font></td>
        </tr>
        <tr>
@@ -1311,45 +1317,57 @@
        <tr>
                <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
                <td align="left"><font face="Liberation Serif" size=4>Ruler</font></td>
-               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>F4</font></td>
                <td align="left"><font face="Liberation Serif" size=4>Brings up the ruler for usage</font></td>
        </tr>
        <tr>
                <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
                <td align="left"><font face="Liberation Serif" size=4>Adjust camera</font></td>
-               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>F5</font></td>
                <td align="left"><font face="Liberation Serif" size=4>Brings up the camera editing tool</font></td>
        </tr>
        <tr>
                <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
                <td align="left"><font face="Liberation Serif" size=4>Adjust projector</font></td>
-               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>F6</font></td>
                <td align="left"><font face="Liberation Serif" size=4>Brings up the projector editing tool</font></td>
        </tr>
        <tr>
                <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
-               <td align="left"><font face="Liberation Serif" size=4>Crop layer/outpt</font></td>
-               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Crop layer/output</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>F7</font></td>
                <td align="left"><font face="Liberation Serif" size=4>Crop a layer or output</font></td>
        </tr>
        <tr>
                <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
                <td align="left"><font face="Liberation Serif" size=4>Get color</font></td>
-               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>F8</font></td>
                <td align="left"><font face="Liberation Serif" size=4>Detects color at current spot &amp; stores temporary</font></td>
        </tr>
        <tr>
                <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
                <td align="left"><font face="Liberation Serif" size=4>Show tool info</font></td>
-               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>F9</font></td>
                <td align="left"><font face="Liberation Serif" size=4>Works with editing/cropping buttons</font></td>
        </tr>
        <tr>
                <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
                <td align="left"><font face="Liberation Serif" size=4>Show safe regs.</font></td>
-               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>F10</font></td>
                <td align="left"><font face="Liberation Serif" size=4>Draws safe regions in the video output</font></td>
        </tr>
+       <tr>
+               <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>'p'</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Turn on/off Click to Play</font></td>
+       </tr>
+       <tr>
+               <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Shift+w/Ctrl</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>With transport bt. Loops play; all or with []</font></td>
+       </tr>
        <tr>
                <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
                <td align="left"><font face="Liberation Serif" size=4><br></font></td>
@@ -1518,6 +1536,36 @@
                <td align="left"><font face="Liberation Serif" size=4>+Shift w/Alt</font></td>
                <td align="left"><font face="Liberation Serif" size=4>Shift with Alt+x above, adds/removes audio</font></td>
        </tr>
+       <tr>
+               <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>+Shift w/Ctrl</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Loops play; all or between In/Out</font></td>
+       </tr>
+       <tr>
+               <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>'Left click'</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Start or stop play forward</font></td>
+       </tr>
+       <tr>
+               <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Middle click</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Start or stop play reverse</font></td>
+       </tr>
+       <tr>
+               <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Middle wheel</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Plays forward or reverse 1 frame</font></td>
+       </tr>
+       <tr>
+               <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4><br></font></td>
+               <td align="left"><font face="Liberation Serif" size=4>'p'</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>Turn on/off Click to Play</font></td>
+       </tr>
        <tr>
                <td height="26" align="left"><font face="Liberation Serif,Times New Roman" size=4><br></font></td>
                <td align="left"><font face="Liberation Serif,Times New Roman" size=4>In point</font></td>
@@ -1856,7 +1904,7 @@
        </tr>
        <tr>
                <td height="26" align="left"><font face="Liberation Serif,Times New Roman" size=4><br></font></td>
-               <td align="left"><font face="Liberation Serif,Times New Roman" size=4>letter "o"</font></td>
+               <td align="left"><font face="Liberation Serif,Times New Roman" size=4>'o'</font></td>
                <td align="left"><font face="Liberation Serif,Times New Roman" size=4></font></td>
                <td align="left"><font face="Liberation Serif,Times New Roman" size=4>Opens Load files... menu</font></td>
        </tr>

diff --git a/cinelerra-5.1/guicast/bcpopupmenu.C b/cinelerra-5.1/guicast/bcpopupmenu.C
index be17a0a311403824ec130180a18e2cf7f7b767bd..4c639fe27d25890f96bd4289cc77c21c651ca569 100644 (file)
--- a/cinelerra-5.1/guicast/bcpopupmenu.C
+++ b/cinelerra-5.1/guicast/bcpopupmenu.C
@@ -369,6 +369,7 @@ int BC_PopupMenu::repeat_event(int64_t duration)
 
 int BC_PopupMenu::button_press_event()
 {
+       int result = 0;
        if(get_buttonpress() == 1 &&
                is_event_win() &&
                use_title)
@@ -404,17 +405,18 @@ int BC_PopupMenu::button_press_event()
 
                BC_MenuItem *tmp = menu_popup->menu_items.values[theval];
                set_text(tmp->get_text());
-               if (!tmp->handle_event())
-                       this->handle_event();
+               result = tmp->handle_event();
+               if( !result )
+                       result = this->handle_event();
        }
        if(popup_down)
        {
 // Menu is down so dispatch to popup.
                menu_popup->dispatch_button_press();
-               return 1;
+               result = 1;
        }
 
-       return 0;
+       return result;
 }
 
 int BC_PopupMenu::button_release_event()