From aae6d70fee4e3723dfb0be8a472d702969b70290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= <ggarra13@gmail.com>
Date: Mon, 23 Oct 2023 08:54:37 -0300
Subject: [PATCH 1/4] Fixed annotations.

---
 mrv2/lib/mrvEdit/mrvEditCallbacks.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/mrv2/lib/mrvEdit/mrvEditCallbacks.cpp b/mrv2/lib/mrvEdit/mrvEditCallbacks.cpp
index c192e1ace..27fbe4616 100644
--- a/mrv2/lib/mrvEdit/mrvEditCallbacks.cpp
+++ b/mrv2/lib/mrvEdit/mrvEditCallbacks.cpp
@@ -1285,6 +1285,11 @@ namespace mrv
                 annotation->time = insertTime + offset;
                 skipAnnotations.insert(annotation);
             }
+            else if (previous)
+            {
+                if (annotation->time < range.start_time())
+                    skipAnnotations.insert(annotation);
+            }
         }
 
         // Finally, move the annotations.
@@ -1659,7 +1664,7 @@ namespace mrv
                     // #endif
                 }
 
-                auto audioInfoDuration = audioInfo.audioTime.duration();
+                auto audioInfoDuration = RationalTime(0.0, sampleRate);
                 if (!audioInfo.audio.isValid() && audioTrackIndex >= 0)
                 {
                     auto audioTrack = otio::dynamic_retainer_cast<Track>(
@@ -1672,6 +1677,11 @@ namespace mrv
                             sampleRate = trackSampleRate;
                     }
                 }
+                else
+                {
+                    std::cerr << "valid audio info" << std::endl;
+                    audioInfoDuration = audioInfo.audioTime.duration();
+                }
 
                 if (audioInfoDuration.rate() > sampleRate)
                     sampleRate = audioInfoDuration.rate();
@@ -1735,8 +1745,8 @@ namespace mrv
                         }
                         auto gapRange = TimeRange(
                             RationalTime(0.0, sampleRate),
-                            RationalTime(videoRange.start_time().rescaled_to(
-                                sampleRate)));
+                            RationalTime(
+                                videoRange.duration().rescaled_to(sampleRate)));
                         auto gap = new otio::Gap(gapRange);
                         audioTrack->append_child(gap);
                     }

From ae45998960add435f56a438c45b1731448ee4883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= <ggarra13@gmail.com>
Date: Tue, 24 Oct 2023 05:52:03 -0300
Subject: [PATCH 2/4] Updated tlRender.

---
 tlRender | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tlRender b/tlRender
index 1426c33f6..1e15d415f 160000
--- a/tlRender
+++ b/tlRender
@@ -1 +1 @@
-Subproject commit 1426c33f68bb8b6b17760994b954530e9a5336a2
+Subproject commit 1e15d415f1a0768a1c07924c9bee8deb067fc7c0

From f61747a2c382317a57a681312e54b1bc8b2a9659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= <ggarra13@gmail.com>
Date: Thu, 26 Oct 2023 11:54:12 -0300
Subject: [PATCH 3/4] Reverted to v0.8.2 to re-release it.

---
 cmake/version.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/version.cmake b/cmake/version.cmake
index 8ef75becd..0b8768fbe 100644
--- a/cmake/version.cmake
+++ b/cmake/version.cmake
@@ -5,7 +5,7 @@
 
 set( mrv2_VERSION_MAJOR 0 )
 set( mrv2_VERSION_MINOR 8 )
-set( mrv2_VERSION_PATCH 3 )
+set( mrv2_VERSION_PATCH 2 )
 set( mrv2_VERSION
     "${mrv2_VERSION_MAJOR}.${mrv2_VERSION_MINOR}.${mrv2_VERSION_PATCH}"
 )

From 33d5e03a6468827170b5a113e370b73ae9b3e7f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= <ggarra13@gmail.com>
Date: Thu, 26 Oct 2023 12:06:13 -0300
Subject: [PATCH 4/4] Build fix.

---
 mrv2/lib/mrvEdit/mrvEditCallbacks.cpp | 10 +---------
 tlRender                              |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/mrv2/lib/mrvEdit/mrvEditCallbacks.cpp b/mrv2/lib/mrvEdit/mrvEditCallbacks.cpp
index 34ee37668..b5b65fe53 100644
--- a/mrv2/lib/mrvEdit/mrvEditCallbacks.cpp
+++ b/mrv2/lib/mrvEdit/mrvEditCallbacks.cpp
@@ -1304,11 +1304,6 @@ namespace mrv
                     skipAnnotations.insert(annotation);
                 }
             }
-            else if (previous)
-            {
-                if (annotation->time < range.start_time())
-                    skipAnnotations.insert(annotation);
-            }
         }
 
         // Finally, shift the other annotations.
@@ -1648,10 +1643,6 @@ namespace mrv
                 {
                     audioDuration = audioInfo.audioTime.duration();
                 }
-                else
-                {
-                    audioInfoDuration = audioInfo.audioTime.duration();
-                }
 
                 if (audioDuration.rate() > sampleRate)
                     sampleRate = audioDuration.rate();
@@ -1720,6 +1711,7 @@ namespace mrv
                             videoRange.duration().rescaled_to(sampleRate));
                         auto gapRange = TimeRange(
                             RationalTime(0.0, sampleRate), audioDuration);
+
                         auto gap = new otio::Gap(gapRange);
                         audioTrack->append_child(gap);
                     }
diff --git a/tlRender b/tlRender
index 324295e4a..8dd09e433 160000
--- a/tlRender
+++ b/tlRender
@@ -1 +1 @@
-Subproject commit 324295e4a3752d52f39c4c7541e3d446212d8846
+Subproject commit 8dd09e4335c2cc8edfc5837708a37bb6ef1ca43b