Marker fixes

Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com>

Author: darbyjohnston

lib/toucanView/AudioClipItem.cpp

@@ -60,20 +60,22 @@ namespace toucan
             _markerLayout = TimeLayout::create(context, timeRange, _layout);
             for (const auto& marker : markers)
             {
-                OTIO_NS::TimeRange markerTimeRange = clip->transformed_time_range(
-                    marker->marked_range(),
-                    timeline->tracks());
+                const OTIO_NS::TimeRange trimmedRange = clip->trimmed_range();
+                OTIO_NS::TimeRange markerRange(
+                    marker->marked_range().start_time() + trimmedRange.start_time(),
+                    marker->marked_range().duration());
+                markerRange = clip->transformed_time_range(markerRange, timeline->tracks());
                 if (timeline->global_start_time().has_value())
                 {
-                    markerTimeRange = OTIO_NS::TimeRange(
-                        timeline->global_start_time().value() + markerTimeRange.start_time(),
-                        markerTimeRange.duration());
+                    markerRange = OTIO_NS::TimeRange(
+                        timeline->global_start_time().value() + markerRange.start_time(),
+                        markerRange.duration());
                 }
                 auto markerItem = MarkerItem::create(
                     context,
                     data,
                     marker,
-                    markerTimeRange,
+                    markerRange,
                     _markerLayout);
                 _markerItems.push_back(markerItem);
             }

lib/toucanView/MarkerItem.cpp

@@ -69,11 +69,11 @@ namespace toucan
             data,
             OTIO_NS::dynamic_retainer_cast<OTIO_NS::SerializableObjectWithMetadata>(marker),
             timeRange,
-            "toucan::ClipItem",
+            "toucan::MarkerItem",
             parent);
 
         _marker = marker;
-        _text = !marker->name().empty() ? marker->name() : "Clip";
+        _text = !marker->name().empty() ? marker->name() : "Marker";
         _color = getMarkerColor(marker->color());
 
         setTooltip(marker->schema_name() + ": " + _text);

lib/toucanView/VideoClipItem.cpp

@@ -69,20 +69,22 @@ namespace toucan
             _markerLayout = TimeLayout::create(context, timeRange, _layout);
             for (const auto& marker : markers)
             {
-                OTIO_NS::TimeRange markerTimeRange = clip->transformed_time_range(
-                    marker->marked_range(),
-                    timeline->tracks());
+                const OTIO_NS::TimeRange trimmedRange = clip->trimmed_range();
+                OTIO_NS::TimeRange markerRange(
+                    marker->marked_range().start_time() + trimmedRange.start_time(),
+                    marker->marked_range().duration());
+                markerRange = clip->transformed_time_range(markerRange, timeline->tracks());
                 if (timeline->global_start_time().has_value())
                 {
-                    markerTimeRange = OTIO_NS::TimeRange(
-                        timeline->global_start_time().value() + markerTimeRange.start_time(),
-                        markerTimeRange.duration());
+                    markerRange = OTIO_NS::TimeRange(
+                        timeline->global_start_time().value() + markerRange.start_time(),
+                        markerRange.duration());
                 }
                 auto markerItem = MarkerItem::create(
                     context,
                     data,
                     marker,
-                    markerTimeRange,
+                    markerRange,
                     _markerLayout);
                 _markerItems.push_back(markerItem);
             }