OpenTimelineIO · darbyjohnston · Aug 31, 2025 · Aug 31, 2025
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -24,16 +24,13 @@ jobs:
         sudo apt-get install xorg-dev libglu1-mesa-dev mesa-common-dev mesa-utils xvfb
 
     - name: Build
-      run: |
-        bash toucan/SuperBuild.sh Debug
+      run: sh toucan/sbuild-linux.sh Debug
 
     - name: Install
-      run: |
-        cmake --build build-Debug --config Debug --target install
+      run: cmake --build build-Debug --config Debug --target install
 
     - name: Tests
-      run: |
-        build-Debug/tests/toucan-test/toucan-test toucan/data
+      run: build-Debug/tests/toucan-test/toucan-test toucan/data
 
   linux-package:
     runs-on: ubuntu-latest
@@ -52,16 +49,13 @@ jobs:
         sudo apt-get install xorg-dev libglu1-mesa-dev mesa-common-dev mesa-utils xvfb
 
     - name: Build
-      run: |
-        bash toucan/SuperBuild.sh Release
+      run: sh toucan/sbuild-macos.sh
 
     - name: Install
-      run: |
-        cmake --build build-Release --config Release --target install
+      run: cmake --build build-Release --config Release --target install
 
     - name: Package
-      run: |
-        cmake --build build-Release --config Release --target package
+      run: cmake --build build-Release --config Release --target package
 
     - name: Upload artifact
       id: linux-package-artifact
@@ -92,16 +86,13 @@ jobs:
         echo "DYLD_LIBRARY_PATH=$PWD/install-Debug/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
 
     - name: Build
-      run: |
-        bash toucan/SuperBuild.sh Debug
+      run: sh toucan/sbuild-macos.sh Debug
 
     - name: Install
-      run: |
-        cmake --build build-Debug --config Debug --target install
+      run: cmake --build build-Debug --config Debug --target install
 
     - name: Tests
-      run: |
-        build-Debug/tests/toucan-test/toucan-test toucan/data
+      run: build-Debug/tests/toucan-test/toucan-test toucan/data
 
   macos-build:
     runs-on: macos-latest
@@ -119,16 +110,13 @@ jobs:
         echo "DYLD_LIBRARY_PATH=$PWD/install-Debug/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
 
     - name: Build
-      run: |
-        bash toucan/SuperBuild.sh Debug
+      run: sh toucan/sbuild-macos.sh Debug
 
     - name: Install
-      run: |
-        cmake --build build-Debug --config Debug --target install
+      run: cmake --build build-Debug --config Debug --target install
 
     - name: Tests
-      run: |
-        build-Debug/tests/toucan-test/toucan-test toucan/data
+      run: build-Debug/tests/toucan-test/toucan-test toucan/data
 
   macos-package:
     runs-on: macos-latest
@@ -146,16 +134,13 @@ jobs:
         echo "DYLD_LIBRARY_PATH=$PWD/install-Debug/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
 
     - name: Build
-      run: |
-        bash toucan/SuperBuild.sh Release
+      run: bash toucan/sbuild-macos.sh
 
     - name: Install
-      run: |
-        cmake --build build-Release --config Release --target install
+      run: cmake --build build-Release --config Release --target install
 
     - name: Package
-      run: |
-        cmake --build build-Release --config Release --target package
+      run: cmake --build build-Release --config Release --target package
 
     - name: Upload artifact
       id: macos-package-artifact
@@ -190,18 +175,15 @@ jobs:
 
     - name: Build
       shell: cmd
-      run: |
-        toucan\SuperBuild.bat Debug
+      run: toucan\sbuild-win.bat Debug
 
     - name: Install
       shell: cmd
-      run: |
-        cmake --build build-Debug --config Debug --target INSTALL
+      run: cmake --build build-Debug --config Debug --target INSTALL
 
     - name: Tests
       shell: cmd
-      run: |
-        build-Debug\tests\toucan-test\Debug\toucan-test.exe toucan\data
+      run: build-Debug\tests\toucan-test\Debug\toucan-test.exe toucan\data
 
   windows-package:
     runs-on: windows-latest
@@ -222,18 +204,15 @@ jobs:
 
     - name: Build
       shell: cmd
-      run: |
-        toucan\SuperBuild.bat Release
+      run: toucan\sbuild-win.bat
 
     - name: Install
       shell: cmd
-      run: |
-        cmake --build build-Release --config Release --target INSTALL
+      run: cmake --build build-Release --config Release --target INSTALL
 
     - name: Package
       shell: cmd
-      run: |
-        cmake --build build-Release --config Release --target PACKAGE
+      run: cmake --build build-Release --config Release --target PACKAGE
 
     - name: Upload artifact
       id: windows-package-artifact

diff --git a/README.md b/README.md
@@ -153,7 +153,7 @@ git clone https://github.com/OpenTimelineIO/toucan.git
 ```
 Run the super build:
 ```
-sh toucan/SuperBuild.sh Release
+sh toucan/sbuild-linux.sh
 ```
 Run the viewer application:
 ```
@@ -175,7 +175,7 @@ git clone https://github.com/OpenTimelineIO/toucan.git
 ```
 Run the super build:
 ```
-sh toucan/SuperBuild.sh Release
+sh toucan/sbuild-macos.sh
 ```
 Run the viewer application:
 ```
@@ -198,7 +198,7 @@ git clone https://github.com/OpenTimelineIO/toucan.git
 ```
 Run the super build:
 ```
-toucan\SuperBuild.bat Release
+toucan\sbuild-win.bat
 ```
 Run the viewer application:
 ```

diff --git a/SuperBuild.bat b/SuperBuild.bat
diff --git a/SuperBuild.sh b/SuperBuild.sh
diff --git a/bin/toucan-filmstrip/App.cpp b/bin/toucan-filmstrip/App.cpp
@@ -12,13 +12,13 @@
 namespace toucan
 {
     void App::_init(
-        const std::shared_ptr<feather_tk::Context>& context,
+        const std::shared_ptr<ftk::Context>& context,
         std::vector<std::string>& argv)
     {
-        _cmdLine.input = feather_tk::CmdLineValueArg<std::string>::create(
+        _cmdLine.input = ftk::CmdLineValueArg<std::string>::create(
             "input",
             "Input .otio file.");
-        _cmdLine.output = feather_tk::CmdLineValueArg<std::string>::create(
+        _cmdLine.output = ftk::CmdLineValueArg<std::string>::create(
             "output",
             "Output image file.");
 
@@ -37,7 +37,7 @@ namespace toucan
     {}
 
     std::shared_ptr<App> App::create(
-        const std::shared_ptr<feather_tk::Context>&context,
+        const std::shared_ptr<ftk::Context>&context,
         std::vector<std::string>&argv)
     {
         auto out = std::shared_ptr<App>(new App);

diff --git a/bin/toucan-filmstrip/App.h b/bin/toucan-filmstrip/App.h
@@ -14,11 +14,11 @@
 
 namespace toucan
 {
-    class App : public feather_tk::IApp
+    class App : public ftk::IApp
     {
     protected:
         void _init(
-            const std::shared_ptr<feather_tk::Context>&,
+            const std::shared_ptr<ftk::Context>&,
             std::vector<std::string>&);
 
         App();
@@ -27,16 +27,16 @@ namespace toucan
         ~App();
 
         static std::shared_ptr<App> create(
-            const std::shared_ptr<feather_tk::Context>&,
+            const std::shared_ptr<ftk::Context>&,
             std::vector<std::string>&);
 
         void run() override;
 
     private:
         struct CmdLine
         {
-            std::shared_ptr<feather_tk::CmdLineValueArg<std::string> > input;
-            std::shared_ptr<feather_tk::CmdLineValueArg<std::string> > output;
+            std::shared_ptr<ftk::CmdLineValueArg<std::string> > input;
+            std::shared_ptr<ftk::CmdLineValueArg<std::string> > output;
         };
         CmdLine _cmdLine;
 

diff --git a/bin/toucan-filmstrip/main.cpp b/bin/toucan-filmstrip/main.cpp
@@ -19,7 +19,7 @@ int main(int argc, char** argv)
     }
     try
     {
-        auto context = feather_tk::Context::create();
+        auto context = ftk::Context::create();
         auto app = App::create(context, args);
         if (0 == app->getExit())
             app->run();

diff --git a/bin/toucan-render/App.cpp b/bin/toucan-render/App.cpp
@@ -44,13 +44,13 @@ namespace toucan
     }
 
     void App::_init(
-        const std::shared_ptr<feather_tk::Context>& context,
+        const std::shared_ptr<ftk::Context>& context,
         std::vector<std::string>& argv)
     {
-        _cmdLine.input = feather_tk::CmdLineValueArg<std::string>::create(
+        _cmdLine.input = ftk::CmdLineValueArg<std::string>::create(
             "input",
             "Input .otio file.");
-        _cmdLine.output = feather_tk::CmdLineValueArg<std::string>::create(
+        _cmdLine.output = ftk::CmdLineValueArg<std::string>::create(
             "output",
             "Output image or movie file. Use a dash ('-') to write raw frames or y4m to stdout.");
 
@@ -64,37 +64,37 @@ namespace toucan
         {
             y4mList.push_back(spec.first);
         }
-        _cmdLine.videoCodec = feather_tk::CmdLineValueOption<std::string>::create(
+        _cmdLine.videoCodec = ftk::CmdLineValueOption<std::string>::create(
             std::vector<std::string>{ "-vcodec" },
             "Set the video codec.",
             "",
             "MJPEG",
-            feather_tk::join(ffmpeg::getVideoCodecStrings(), ", "));
-        _cmdLine.printStart = feather_tk::CmdLineFlagOption::create(
+            ftk::join(ffmpeg::getVideoCodecStrings(), ", "));
+        _cmdLine.printStart = ftk::CmdLineFlagOption::create(
             std::vector<std::string>{ "-print_start" },
             "Print the timeline start time and exit.");
-        _cmdLine.printDuration = feather_tk::CmdLineFlagOption::create(
+        _cmdLine.printDuration = ftk::CmdLineFlagOption::create(
             std::vector<std::string>{ "-print_duration" },
             "Print the timeline duration and exit.");
-        _cmdLine.printRate = feather_tk::CmdLineFlagOption::create(
+        _cmdLine.printRate = ftk::CmdLineFlagOption::create(
             std::vector<std::string>{ "-print_rate" },
             "Print the timeline frame rate and exit.");
-        _cmdLine.printSize = feather_tk::CmdLineFlagOption::create(
+        _cmdLine.printSize = ftk::CmdLineFlagOption::create(
             std::vector<std::string>{ "-print_size" },
             "Print the timeline image size.");
-        _cmdLine.raw = feather_tk::CmdLineValueOption<std::string>::create(
+        _cmdLine.raw = ftk::CmdLineValueOption<std::string>::create(
             std::vector<std::string>{ "-raw" },
             "Raw pixel format to send to stdout.",
             "",
             std::optional<std::string>(),
-            feather_tk::join(rawList, ", "));
-        _cmdLine.y4m = feather_tk::CmdLineValueOption<std::string>::create(
+            ftk::join(rawList, ", "));
+        _cmdLine.y4m = ftk::CmdLineValueOption<std::string>::create(
             std::vector<std::string>{ "-y4m" },
             "y4m format to send to stdout.",
             "",
             std::optional<std::string>(),
-            feather_tk::join(y4mList, ", "));
-        _cmdLine.verbose = feather_tk::CmdLineFlagOption::create(
+            ftk::join(y4mList, ", "));
+        _cmdLine.verbose = ftk::CmdLineFlagOption::create(
             std::vector<std::string>{ "-v" },
             "Print verbose output.");
 
@@ -141,7 +141,7 @@ namespace toucan
     }
 
     std::shared_ptr<App> App::create(
-        const std::shared_ptr<feather_tk::Context>& context,
+        const std::shared_ptr<ftk::Context>& context,
         std::vector<std::string>& argv)
     {
         auto out = std::shared_ptr<App>(new App);
@@ -320,7 +320,7 @@ namespace toucan
 
         {
             const OTIO_NS::TimeRange timeRange = _timelineWrapper->getTimeRange();
-            const auto r = feather_tk::toRational(timeRange.duration().rate());
+            const auto r = ftk::toRational(timeRange.duration().rate());
             std::stringstream ss;
             ss << " F" << r.first << ":" << r.second;
             s = ss.str();