Build fix.

ggarra13 · Oct 26, 2023 · 33d5e03 · 33d5e03
1 parent 0418a19
commit 33d5e03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git 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
+1 −4		lib/tlApp/IApp.cpp
+2 −0		lib/tlIO/STB.cpp
+26 −14		lib/tlIO/STBRead.cpp
+16 −5		lib/tlIO/STBWrite.cpp
+0 −28		testme.sh
+1 −1		tests/tlAppTest/AppTest.cpp
+10 −0		tests/tlCoreTest/FileInfoTest.cpp
+0 −1		tests/tlIOTest/OpenEXRTest.cpp
+1 −1		tests/tlIOTest/STBTest.cpp