minor fixes

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index 30f5e2c6b98e8b312e6e45764910fe2d81d9e31e..65df2f4a391699b9b6bfb1110fb8948c6487ccfe 100644 (file)
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -561,6 +561,7 @@ tags:
        ctags -R -h default --langmap=c:+.inc . ../guicast/ ../libzmpeg3 ../plugins ../thirdparty/ffmpeg-*
 
 $(OBJDIR)/fileexr.o:   BFLAGS:= -Wno-deprecated -std=c++11
+$(OBJDIR)/filedpx.o:   BFLAGS:= -Wno-deprecated -std=c++11
 $(OBJDIR)/sha1.o:      BFLAGS:= -O3
 $(OVERLAYS):           BFLAGS:= -Ofast -g0
 

diff --git a/cinelerra-5.1/cinelerra/editpopup.C b/cinelerra-5.1/cinelerra/editpopup.C
index 4150beee73da49c1aeb2573106e7b616e4db86f2..865f77812da0418413c6cc48a856d8e2a5d25a8a 100644 (file)
--- a/cinelerra-5.1/cinelerra/editpopup.C
+++ b/cinelerra-5.1/cinelerra/editpopup.C
@@ -377,6 +377,7 @@ EditPopupTimecode::EditPopupTimecode(MWindow *mwindow, EditPopup *popup)
        this->mwindow = mwindow;
        this->popup = popup;
        set_ctrl(1);
+       set_shift(1);
 }
 
 int EditPopupTimecode::handle_event()

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C
index f875a14a30bac80becd05082c7d60a9fd5a31c2a..43b95cbbd57a9db35c247f0e425c5e40bd90b64c 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/cinelerra-5.1/cinelerra/mwindowgui.C
@@ -1236,6 +1236,12 @@ int MWindowGUI::keypress_event()
                }
                break;
 
+       case '!':
+               if( !ctrl_down() || !shift_down() ) break;
+/* code to execute is same as lines 383-401 in editpopup.C */
+               result = 1;
+               break;
+
        case UP:
                if( ctrl_down() && !alt_down() )
                        mwindow->expand_y();

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C
index d39ce4554757009a84897e7828a093c4415e1588..b2ed8a8257b4c5f274cd73705cf2929864cae10b 100644 (file)
--- a/cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/cinelerra-5.1/cinelerra/trackcanvas.C
@@ -1482,7 +1482,9 @@ void TrackCanvas::draw_resources(int mode,
                        if(MWindowGUI::visible(edit_x, edit_x + edit_w, 0, get_w()) &&
                                MWindowGUI::visible(edit_y, edit_y + edit_h, 0, get_h()))
                        {
-                               int64_t pixmap_x, pixmap_w, pixmap_h;
+                               int64_t pixmap_x=0;
+                               int64_t pixmap_w=0;
+                               int64_t pixmap_h=0;
                                if(debug) PRINT_TRACE
 
 // Search for existing pixmap containing edit