Refactoring

OpenTimelineIO · Oct 15, 2024 · cf2c21d · cf2c21d
1 parent 003ec0c
commit cf2c21d
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,8 +21,10 @@ endif()
 if(NOT CMAKE_POSITION_INDEPENDENT_CODE)
     set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()
-if(WIN32)
+if(MSVC)
     set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$<CONFIG:Debug>:Debug>DLL)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
 endif()
 if(APPLE)
     set(CMAKE_FIND_FRAMEWORK LAST)
@@ -45,6 +47,7 @@ enable_testing()
 
 find_package(Imath)
 find_package(Freetype)
+find_package(lunasvg)
 find_package(ZLIB)
 find_package(PNG)
 find_package(JPEG)

diff --git a/bin/toucan-view/ClipItem.cpp b/bin/toucan-view/ClipItem.cpp
@@ -103,7 +103,7 @@ namespace toucan
         event.render->drawText(
             _draw.glyphs,
             _size.fontMetrics,
-            dtk::V2F(g3.min.x, g3.min.y + g3.h() / 2 - _size.fontMetrics.lineHeight / 2),
+            dtk::V2I(g3.min.x, g3.min.y + g3.h() / 2 - _size.fontMetrics.lineHeight / 2),
             event.style->getColorRole(dtk::ColorRole::Text));
     }
 }
diff --git a/bin/toucan-view/GapItem.cpp b/bin/toucan-view/GapItem.cpp
@@ -104,7 +104,7 @@ namespace toucan
         event.render->drawText(
             _draw.glyphs,
             _size.fontMetrics,
-            dtk::V2F(g3.min.x, g3.min.y + g3.h() / 2 - _size.fontMetrics.lineHeight / 2),
+            dtk::V2I(g3.min.x, g3.min.y + g3.h() / 2 - _size.fontMetrics.lineHeight / 2),
             event.style->getColorRole(dtk::ColorRole::Text));
     }
 }
diff --git a/bin/toucan-view/TimelineItem.cpp b/bin/toucan-view/TimelineItem.cpp
@@ -236,7 +236,7 @@ namespace toucan
 
         int pos = timeToPos(_currentTime);
         event.render->drawRect(
-            dtk::Box2F(pos, g.min.y + _size.scrollPos.y, _size.border * 2, g.h()),
+            dtk::Box2I(pos, g.min.y + _size.scrollPos.y, _size.border * 2, g.h()),
             event.style->getColorRole(dtk::ColorRole::Red));
 
         std::string s = _timeUnitsModel->getLabel(_currentTime);

diff --git a/bin/toucan-view/TrackItem.cpp b/bin/toucan-view/TrackItem.cpp
@@ -28,7 +28,7 @@ namespace toucan
             parent);
 
         _track = track;
-        _text = !track->name().empty() ? track->name() : track->kind();
+        _text = !track->name().empty() ? track->name() : (track->kind() + " Track");
         _color = OTIO_NS::Track::Kind::video == track->kind() ?
             dtk::Color4F(.2F, .2F, .3F) :
             dtk::Color4F(.2F, .3F, .2F);

diff --git a/bin/toucan-view/Viewport.cpp b/bin/toucan-view/Viewport.cpp
@@ -186,7 +186,7 @@ namespace toucan
             options.imageFilters.magnify = dtk::ImageFilter::Nearest;
             event.render->drawImage(
                 _image,
-                dtk::Box2F(0, 0, imageSize.w, imageSize.h),
+                dtk::Box2I(0, 0, imageSize.w, imageSize.h),
                 dtk::Color4F(1.F, 1.F, 1.F),
                 options);
             event.render->setTransform(m);

diff --git a/cmake/SuperBuild/CMakeLists.txt b/cmake/SuperBuild/CMakeLists.txt
@@ -34,8 +34,10 @@ endif()
 if(NOT CMAKE_POSITION_INDEPENDENT_CODE)
     set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()
-if(WIN32)
+if(MSVC)
     set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$<CONFIG:Debug>:Debug>DLL)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
 endif()
 if(APPLE)
     set(CMAKE_FIND_FRAMEWORK LAST)

diff --git a/data/CompositeTracks.otio b/data/CompositeTracks.otio
@@ -44,7 +44,7 @@
                                 "value": 0
                             }
                         },
-                        "name": "Blue"
+                        "name": "Blue Clip"
                     },
                     {
                         "OTIO_SCHEMA": "Clip.1",
@@ -82,11 +82,11 @@
                                 "value": 0
                             }
                         },
-                        "name": "Green"
+                        "name": "Green Clip"
                     }
                 ],
                 "kind": "Video", 
-                "name": "Video"
+                "name": "Video Track"
             },
             {
                 "OTIO_SCHEMA": "Track.1", 
@@ -130,11 +130,11 @@
                                 "value": 0
                             }
                         },
-                        "name": "Counter"
+                        "name": "Counter Clip"
                     }
                 ],
                 "kind": "Video", 
-                "name": "Video"
+                "name": "Video Track"
             }
         ], 
         "name": "Stack"

diff --git a/lib/toucanEdit/ClipWidget.cpp b/lib/toucanEdit/ClipWidget.cpp
@@ -108,7 +108,7 @@ namespace toucan
         event.render->drawText(
             _draw.glyphs,
             _size.fontMetrics,
-            dtk::V2F(g3.min.x, g3.min.y + g3.h() / 2 - _size.fontMetrics.lineHeight / 2),
+            dtk::V2I(g3.min.x, g3.min.y + g3.h() / 2 - _size.fontMetrics.lineHeight / 2),
             event.style->getColorRole(dtk::ColorRole::Text));
     }
 }
diff --git a/lib/toucanEdit/GapWidget.cpp b/lib/toucanEdit/GapWidget.cpp
@@ -107,7 +107,7 @@ namespace toucan
         event.render->drawText(
             _draw.glyphs,
             _size.fontMetrics,
-            dtk::V2F(g3.min.x, g3.min.y + g3.h() / 2 - _size.fontMetrics.lineHeight / 2),
+            dtk::V2I(g3.min.x, g3.min.y + g3.h() / 2 - _size.fontMetrics.lineHeight / 2),
             event.style->getColorRole(dtk::ColorRole::Text));
     }
 }
diff --git a/lib/toucanEdit/TimelineWidget.cpp b/lib/toucanEdit/TimelineWidget.cpp
@@ -265,7 +265,7 @@ namespace toucan
 
         int pos = timeToPos(_currentTime);
         event.render->drawRect(
-            dtk::Box2F(pos, g.min.y + _size.scrollPos.y, _size.border * 2, g.h()),
+            dtk::Box2I(pos, g.min.y + _size.scrollPos.y, _size.border * 2, g.h()),
             event.style->getColorRole(dtk::ColorRole::Red));
 
         std::string s = _timeUnitsModel->getLabel(_currentTime);