From: Good Guy <good1.2guy@gmail.com>
Date: Mon, 11 Apr 2022 16:20:28 +0000 (-0600)
Subject: minor fixes
X-Git-Tag: 2022-04~6
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=afc97a7cc7560ff3220da1f6f02e9bc372755e86;p=goodguy%2Fcinelerra.git

minor fixes
---

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index 30f5e2c6..65df2f4a 100644
--- 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 4150beee..865f7781 100644
--- 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 f875a14a..43b95cbb 100644
--- 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 d39ce455..b2ed8a82 100644
--- 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