Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ jobs:
echo "$PWD/install-Debug/bin" >> $GITHUB_PATH
echo "DYLD_LIBRARY_PATH=$PWD/install-Debug/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
cmake --version
system_profiler SPHardwareDataType

- name: Build
run: sh toucan/sbuild-macos.sh Debug
Expand Down Expand Up @@ -124,6 +125,7 @@ jobs:
echo "$PWD/install-Debug/bin" >> $GITHUB_PATH
echo "DYLD_LIBRARY_PATH=$PWD/install-Debug/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
cmake --version
system_profiler SPHardwareDataType

- name: Build
run: bash toucan/sbuild-macos.sh
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ find_package(OpenColorIO)
find_package(OpenImageIO)
find_package(OpenFX)
find_package(OpenTimelineIO)
find_package(feather-tk)
find_package(ftk)

include_directories(lib)
include_directories(tests)
Expand Down
2 changes: 1 addition & 1 deletion bin/toucan-filmstrip/App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <toucanRender/Util.h>

#include <feather-tk/core/Time.h>
#include <ftk/Core/Time.h>

#include <OpenImageIO/imagebufalgo.h>

Expand Down
4 changes: 2 additions & 2 deletions bin/toucan-filmstrip/App.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include <toucanRender/ImageGraph.h>
#include <toucanRender/TimelineWrapper.h>

#include <feather-tk/core/IApp.h>
#include <feather-tk/core/CmdLine.h>
#include <ftk/Core/IApp.h>
#include <ftk/Core/CmdLine.h>

#include <OpenImageIO/imagebuf.h>

Expand Down
2 changes: 1 addition & 1 deletion bin/toucan-filmstrip/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "App.h"

#include <feather-tk/core/Context.h>
#include <ftk/Core/Context.h>

#include <iostream>

Expand Down
2 changes: 1 addition & 1 deletion bin/toucan-render/App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <toucanRender/Read.h>
#include <toucanRender/Util.h>

#include <feather-tk/core/Time.h>
#include <ftk/Core/Time.h>

#include <OpenImageIO/imagebufalgo.h>

Expand Down
4 changes: 2 additions & 2 deletions bin/toucan-render/App.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include <toucanRender/ImageGraph.h>
#include <toucanRender/TimelineWrapper.h>

#include <feather-tk/core/CmdLine.h>
#include <feather-tk/core/IApp.h>
#include <ftk/Core/CmdLine.h>
#include <ftk/Core/IApp.h>

#include <OpenImageIO/imagebuf.h>

Expand Down
2 changes: 1 addition & 1 deletion bin/toucan-render/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "App.h"

#include <feather-tk/core/Context.h>
#include <ftk/Core/Context.h>

#include <iostream>

Expand Down
2 changes: 1 addition & 1 deletion bin/toucan-view/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "toucanView/App.h"

#include <feather-tk/core/Context.h>
#include <ftk/Core/Context.h>

#include <iostream>

Expand Down
2 changes: 1 addition & 1 deletion cmake/SuperBuild/Buildfeather-tk.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include(ExternalProject)

set(ftk_GIT_REPOSITORY "https://github.com/darbyjohnston/feather-tk.git")
set(ftk_GIT_TAG "038196681ad5825c431f7da22ff4d873c82b3acd")
set(ftk_GIT_TAG "d3d0eed9f1a77782f56d4ce3f74eb2260c0b49ca")

set(ftk_DEPS ZLIB nlohmann_json PNG Freetype lunasvg)

Expand Down
2 changes: 1 addition & 1 deletion lib/toucanRender/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ endif()
add_library(toucanRender ${HEADERS} ${HEADERS_PRIVATE} ${SOURCE})
set(LIBS_PUBLIC
toucanResource
ftk::feather-tk-core
ftk::ftkCore
OTIO::opentimelineio
OTIO::opentime
lunasvg::lunasvg
Expand Down
2 changes: 1 addition & 1 deletion lib/toucanRender/FFmpegRead.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "FFmpegRead.h"

#include <feather-tk/core/String.h>
#include <ftk/Core/String.h>

#include <iostream>
#include <sstream>
Expand Down
2 changes: 1 addition & 1 deletion lib/toucanRender/FFmpegWrite.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <OpenImageIO/imagebufalgo.h>

#include <feather-tk/core/Time.h>
#include <ftk/Core/Time.h>

#include <iostream>
#include <sstream>
Expand Down
2 changes: 1 addition & 1 deletion lib/toucanRender/ImageEffectHost.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "ImageEffect.h"

#include <feather-tk/core/LogSystem.h>
#include <ftk/Core/LogSystem.h>

#include <cstdarg>
#include <cstring>
Expand Down
2 changes: 1 addition & 1 deletion lib/toucanRender/ImageEffectHost.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <toucanRender/ImageEffect.h>

#include <feather-tk/core/Context.h>
#include <ftk/Core/Context.h>

#include <OpenImageIO/imagebuf.h>

Expand Down
2 changes: 1 addition & 1 deletion lib/toucanRender/ImageGraph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "TimelineAlgo.h"
#include "Util.h"

#include <feather-tk/core/LogSystem.h>
#include <ftk/Core/LogSystem.h>

#include <opentimelineio/clip.h>
#include <opentimelineio/externalReference.h>
Expand Down
4 changes: 2 additions & 2 deletions lib/toucanRender/ImageGraph.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <toucanRender/ImageNode.h>
#include <toucanRender/TimelineWrapper.h>

#include <feather-tk/core/Context.h>
#include <feather-tk/core/LRUCache.h>
#include <ftk/Core/Context.h>
#include <ftk/Core/LRUCache.h>

#include <opentimelineio/track.h>
#include <opentimelineio/transition.h>
Expand Down
2 changes: 1 addition & 1 deletion lib/toucanRender/TimelineWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <toucanRender/Read.h>

#include <feather-tk/core/String.h>
#include <ftk/Core/String.h>

#include <opentimelineio/clip.h>
#include <opentimelineio/externalReference.h>
Expand Down
2 changes: 1 addition & 1 deletion lib/toucanResource/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ foreach(RESOURCE ${RESOURCES})
get_filename_component(RESOURCE_BASE ${RESOURCE} NAME_WE)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_BASE}.cpp
COMMAND $<TARGET_FILE:ftk::feather-tk-resource> ${CMAKE_SOURCE_DIR}/${RESOURCE} ${RESOURCE_BASE} toucan_resource
COMMAND $<TARGET_FILE:ftk::ftk-resource> ${CMAKE_SOURCE_DIR}/${RESOURCE} ${RESOURCE_BASE} toucan_resource
DEPENDS ${CMAKE_SOURCE_DIR}/${RESOURCE})
list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_BASE}.cpp)
endforeach()
Expand Down
10 changes: 5 additions & 5 deletions lib/toucanView/App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@

#include <toucanRender/Util.h>

#include <feather-tk/ui/DialogSystem.h>
#include <feather-tk/ui/FileBrowser.h>
#include <feather-tk/ui/MessageDialog.h>
#include <feather-tk/ui/Settings.h>
#include <ftk/Ui/DialogSystem.h>
#include <ftk/Ui/FileBrowser.h>
#include <ftk/Ui/MessageDialog.h>
#include <ftk/Ui/Settings.h>

#include <feather-tk/core/CmdLine.h>
#include <ftk/Core/CmdLine.h>

#include <nlohmann/json.hpp>

Expand Down
4 changes: 2 additions & 2 deletions lib/toucanView/App.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#pragma once

#include <feather-tk/ui/App.h>
#include <feather-tk/ui/Settings.h>
#include <ftk/Ui/App.h>
#include <ftk/Ui/Settings.h>

#include <filesystem>

Expand Down
2 changes: 1 addition & 1 deletion lib/toucanView/AudioClipItem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <toucanRender/Util.h>

#include <feather-tk/ui/DrawUtil.h>
#include <ftk/Ui/DrawUtil.h>

#include <opentimelineio/externalReference.h>

Expand Down
2 changes: 1 addition & 1 deletion lib/toucanView/AudioClipItem.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <toucanView/ItemLabel.h>
#include <toucanView/MarkerItem.h>

#include <feather-tk/ui/RowLayout.h>
#include <ftk/Ui/RowLayout.h>

#include <opentimelineio/clip.h>

Expand Down
8 changes: 4 additions & 4 deletions lib/toucanView/BackgroundTool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

#include "App.h"

#include <feather-tk/ui/Divider.h>
#include <feather-tk/ui/Label.h>
#include <feather-tk/ui/Spacer.h>
#include <feather-tk/core/String.h>
#include <ftk/Ui/Divider.h>
#include <ftk/Ui/Label.h>
#include <ftk/Ui/Spacer.h>
#include <ftk/Core/String.h>

namespace toucan
{
Expand Down
10 changes: 5 additions & 5 deletions lib/toucanView/BackgroundTool.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
#include <toucanView/ViewModel.h>
#include <toucanView/IToolWidget.h>

#include <feather-tk/ui/ColorWidget.h>
#include <feather-tk/ui/ComboBox.h>
#include <feather-tk/ui/IntEditSlider.h>
#include <feather-tk/ui/RowLayout.h>
#include <feather-tk/ui/ScrollWidget.h>
#include <ftk/Ui/ColorWidget.h>
#include <ftk/Ui/ComboBox.h>
#include <ftk/Ui/IntEditSlider.h>
#include <ftk/Ui/RowLayout.h>
#include <ftk/Ui/ScrollWidget.h>

namespace toucan
{
Expand Down
2 changes: 1 addition & 1 deletion lib/toucanView/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,6 @@ set(SOURCE
WindowToolBar.cpp)

add_library(toucanView ${HEADERS} ${SOURCE})
target_link_libraries(toucanView PUBLIC toucanRender ftk::feather-tk-ui)
target_link_libraries(toucanView PUBLIC toucanRender ftk::ftkUi)
set_target_properties(toucanView PROPERTIES FOLDER lib)
add_dependencies(toucanView ${TOUCAN_PLUGINS})
2 changes: 1 addition & 1 deletion lib/toucanView/CompareMenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "App.h"

#include <feather-tk/ui/Action.h>
#include <ftk/Ui/Action.h>

namespace toucan
{
Expand Down
2 changes: 1 addition & 1 deletion lib/toucanView/CompareMenu.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <toucanView/FilesModel.h>

#include <feather-tk/ui/Menu.h>
#include <ftk/Ui/Menu.h>

#include <map>

Expand Down
8 changes: 4 additions & 4 deletions lib/toucanView/CompareTool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
#include "App.h"
#include "SelectionModel.h"

#include <feather-tk/ui/Divider.h>
#include <feather-tk/ui/Label.h>
#include <feather-tk/ui/Spacer.h>
#include <feather-tk/core/String.h>
#include <ftk/Ui/Divider.h>
#include <ftk/Ui/Label.h>
#include <ftk/Ui/Spacer.h>
#include <ftk/Core/String.h>

namespace toucan
{
Expand Down
14 changes: 7 additions & 7 deletions lib/toucanView/CompareTool.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
#include <toucanView/FilesModel.h>
#include <toucanView/IToolWidget.h>

#include <feather-tk/ui/CheckBox.h>
#include <feather-tk/ui/ComboBox.h>
#include <feather-tk/ui/GridLayout.h>
#include <feather-tk/ui/RowLayout.h>
#include <feather-tk/ui/ScrollWidget.h>
#include <feather-tk/ui/ToolButton.h>
#include <feather-tk/core/ObservableList.h>
#include <ftk/Ui/CheckBox.h>
#include <ftk/Ui/ComboBox.h>
#include <ftk/Ui/GridLayout.h>
#include <ftk/Ui/RowLayout.h>
#include <ftk/Ui/ScrollWidget.h>
#include <ftk/Ui/ToolButton.h>
#include <ftk/Core/ObservableList.h>

namespace toucan
{
Expand Down
8 changes: 4 additions & 4 deletions lib/toucanView/DetailsTool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#include "FilesModel.h"
#include "PlaybackModel.h"

#include <feather-tk/ui/Divider.h>
#include <feather-tk/ui/Spacer.h>
#include <feather-tk/core/Format.h>
#include <feather-tk/core/String.h>
#include <ftk/Ui/Divider.h>
#include <ftk/Ui/Spacer.h>
#include <ftk/Core/Format.h>
#include <ftk/Core/String.h>

#include <opentimelineio/marker.h>

Expand Down
20 changes: 10 additions & 10 deletions lib/toucanView/DetailsTool.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@

#include <toucanRender/ImageGraph.h>

#include <feather-tk/ui/Bellows.h>
#include <feather-tk/ui/ButtonGroup.h>
#include <feather-tk/ui/GridLayout.h>
#include <feather-tk/ui/Label.h>
#include <feather-tk/ui/PushButton.h>
#include <feather-tk/ui/RowLayout.h>
#include <feather-tk/ui/ScrollWidget.h>
#include <feather-tk/ui/SearchBox.h>
#include <feather-tk/ui/ToolButton.h>
#include <feather-tk/core/ObservableList.h>
#include <ftk/Ui/Bellows.h>
#include <ftk/Ui/ButtonGroup.h>
#include <ftk/Ui/GridLayout.h>
#include <ftk/Ui/Label.h>
#include <ftk/Ui/PushButton.h>
#include <ftk/Ui/RowLayout.h>
#include <ftk/Ui/ScrollWidget.h>
#include <ftk/Ui/SearchBox.h>
#include <ftk/Ui/ToolButton.h>
#include <ftk/Core/ObservableList.h>

#include <utility>

Expand Down
12 changes: 6 additions & 6 deletions lib/toucanView/ExportTool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

#include <toucanRender/Util.h>

#include <feather-tk/ui/DialogSystem.h>
#include <feather-tk/ui/GridLayout.h>
#include <feather-tk/ui/Settings.h>
#include <feather-tk/ui/Window.h>
#include <feather-tk/core/Context.h>
#include <feather-tk/core/Format.h>
#include <ftk/Ui/DialogSystem.h>
#include <ftk/Ui/GridLayout.h>
#include <ftk/Ui/Settings.h>
#include <ftk/Ui/Window.h>
#include <ftk/Core/Context.h>
#include <ftk/Core/Format.h>

#include <OpenImageIO/imagebufalgo.h>

Expand Down
Loading