From: Good Guy <good1.2guy@gmail.com>
Date: Wed, 18 May 2022 22:55:19 +0000 (-0600)
Subject: update openjpeg and fix timecode shortcut
X-Git-Tag: 2022-05~3
X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=commitdiff_plain;h=2ff681c423ff0f83efbaed49aa37195a3b37f6db;ds=sidebyside

update openjpeg and fix timecode shortcut
---

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C
index 43b95cbb..3b939df5 100644
--- a/cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/cinelerra-5.1/cinelerra/mwindowgui.C
@@ -1238,7 +1238,27 @@ int MWindowGUI::keypress_event()
 
 	case '!':
 		if( !ctrl_down() || !shift_down() ) break;
-/* code to execute is same as lines 383-401 in editpopup.C */
+		{
+			if( mwindow->session->current_operation != NO_OPERATION ) return 1;
+			first_track = mwindow->edl->tracks->first;
+			double start = mwindow->edl->local_session->get_selectionstart();
+			int64_t pos = first_track->to_units(start, 0);
+			Edit *edit=first_track->edits->editof(pos, PLAY_FORWARD, 0);
+			if( !edit || !edit->asset ) return 1;
+			Asset *asset = edit->asset;
+			double timecode = asset->timecode != -2 ? asset->timecode :
+				FFMPEG::get_timecode(asset->path,
+					edit->track->data_type, edit->channel,
+					mwindow->edl->session->frame_rate);
+			asset->timecode = timecode;
+			if( timecode >= 0 ) {
+				int64_t pos = edit->startproject + edit->startsource;
+				double position = edit->track->from_units(pos);
+				mwindow->set_timecode_offset(timecode - position);
+			}
+			else
+				mwindow->set_timecode_offset(0);
+		}
 		result = 1;
 		break;
 
diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 5ee692fc..1c9f289d 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -296,7 +296,7 @@ PKG_3RD([opus],[auto],
   [ include ])
 
 PKG_3RD([openjpeg],[auto],
-  [openjpeg-2.4.0],
+  [openjpeg-2.5.0],
   [ bin/libopenjp2.a ],
   [ src/lib/openjp2 ])
 
diff --git a/cinelerra-5.1/thirdparty/src/openjpeg-2.5.0.tar.xz b/cinelerra-5.1/thirdparty/src/openjpeg-2.5.0.tar.xz
new file mode 100644
index 00000000..d1fbd40f
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/openjpeg-2.5.0.tar.xz differ