Refactoring

Author: darbyjohnston

CMakeLists.txt

@@ -8,6 +8,7 @@ project(
     LANGUAGES CXX C)
 
 set(toucan_VIEW ON CACHE BOOL "Build viewer application")
+set(toucan_EDIT ON CACHE BOOL "Build editor application")
 
 list(PREPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
@@ -51,7 +52,7 @@ find_package(OpenColorIO)
 find_package(OpenImageIO)
 find_package(OTIO)
 find_package(OpenFX)
-if(toucan_VIEW)
+if(toucan_VIEW OR toucan_EDIT)
     find_package(dtk)
 endif()
 

bin/CMakeLists.txt

@@ -2,3 +2,6 @@ add_subdirectory(toucan-render)
 if(toucan_VIEW)
     add_subdirectory(toucan-view)
 endif()
+if(toucan_EDIT)
+    add_subdirectory(toucan-edit)
+endif()

bin/toucan-edit/App.cpp

@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (c) 2024 Darby Johnston
+// All rights reserved.
+
+#include "App.h"
+
+#include "Clip.h"
+#include "Stack.h"
+#include "Timeline.h"
+#include "Track.h"
+
+#include <dtk/core/CmdLine.h>
+
+namespace toucan
+{
+    void App::_init(
+        const std::shared_ptr<dtk::Context>& context,
+        std::vector<std::string>& argv)
+    {
+        dtk::App::_init(
+            context,
+            argv,
+            "toucan-edit",
+            "Toucan editor",
+            {
+                dtk::CmdLineValueArg<std::string>::create(
+                    _path,
+                    "input",
+                    "Input timeline.",
+                    true)
+            });
+
+        _window = Window::create(
+            context,
+            std::dynamic_pointer_cast<App>(shared_from_this()),
+            "toucan-edit",
+            dtk::Size2I(1920, 1080));
+        addWindow(_window);
+
+        _window->show();
+    }
+
+    App::~App()
+    {}
+
+    std::shared_ptr<App> App::create(
+        const std::shared_ptr<dtk::Context>& context,
+        std::vector<std::string>& argv)
+    {
+        auto out = std::shared_ptr<App>(new App);
+        out->_init(context, argv);
+        return out;
+    }
+}

bin/toucan-edit/App.h

@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (c) 2024 Darby Johnston
+// All rights reserved.
+
+#pragma once
+
+#include "Window.h"
+
+#include <dtk/ui/App.h>
+
+namespace toucan
+{
+    class App : public dtk::App
+    {
+    protected:
+        void _init(
+            const std::shared_ptr<dtk::Context>&,
+            std::vector<std::string>&);
+
+    public:
+        virtual ~App();
+
+        static std::shared_ptr<App> create(
+            const std::shared_ptr<dtk::Context>&,
+            std::vector<std::string>&);
+
+    private:
+        std::string _path;
+        std::shared_ptr<Window> _window;
+    };
+}
+

bin/toucan-edit/CMakeLists.txt

@@ -0,0 +1,29 @@
+set(HEADERS
+    App.h
+    Clip.h
+    IContainer.h
+    IItem.h
+    Stack.h
+    Timeline.h
+    Track.h
+    Window.h)
+
+set(SOURCE
+    App.cpp
+    Clip.cpp
+    IContainer.cpp
+    IItem.cpp
+    Stack.cpp
+    Timeline.cpp
+    Track.cpp
+    Window.cpp
+    main.cpp)
+
+add_executable(toucan-edit ${HEADERS} ${SOURCE})
+target_link_libraries(toucan-edit toucan dtk::dtkUI)
+set_target_properties(toucan-edit PROPERTIES FOLDER bin)
+add_dependencies(toucan-edit ${TOUCAN_PLUGINS})
+
+install(
+    TARGETS toucan-edit
+    RUNTIME DESTINATION bin)

bin/toucan-edit/Clip.cpp

@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (c) 2024 Darby Johnston
+// All rights reserved.
+
+#include "Clip.h"
+
+namespace toucan
+{
+}

bin/toucan-edit/Clip.h

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (c) 2024 Darby Johnston
+// All rights reserved.
+
+#pragma once
+
+#include "IItem.h"
+
+#include <vector>
+
+namespace toucan
+{
+    class Clip : public IItem
+    {
+    public:
+        Clip();
+
+        virtual ~Clip();
+    };
+}
+

bin/toucan-edit/IContainer.cpp

@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (c) 2024 Darby Johnston
+// All rights reserved.
+
+#include "IContainer.h"
+
+namespace toucan
+{
+    IContainer::IContainer()
+    {}
+
+    IContainer::~IContainer()
+    {}
+
+    const std::vector<std::shared_ptr<IItem> >& IContainer::getChildren() const
+    {
+        return _children;
+    }
+
+    void IContainer::addChild(const std::shared_ptr<IItem>& child)
+    {
+        if (auto prev = child->_parent.lock())
+        {
+            const auto i = std::find(prev->_children.begin(), prev->_children.end(), child);
+            if (i != prev->_children.end())
+            {
+                prev->_children.erase(i);
+            }
+        }
+        child->_parent = std::dynamic_pointer_cast<IContainer>(shared_from_this());
+        _children.push_back(child);
+    }
+
+    void IContainer::removeChild(const std::shared_ptr<IItem>& child)
+    {
+        const auto i = std::find(_children.begin(), _children.end(), child);
+        if (i != _children.end())
+        {
+            child->_parent.reset();
+            _children.erase(i);
+        }
+    }
+}

bin/toucan-edit/IContainer.h

@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (c) 2024 Darby Johnston
+// All rights reserved.
+
+#pragma once
+
+#include "IItem.h"
+
+#include <vector>
+
+namespace toucan
+{
+    class IContainer : public IItem
+    {
+    public:
+        IContainer();
+
+        virtual ~IContainer() = 0;
+
+        const std::vector<std::shared_ptr<IItem> >& getChildren() const;
+        void addChild(const std::shared_ptr<IItem>&);
+        void removeChild(const std::shared_ptr<IItem>&);
+
+    private:
+        std::vector<std::shared_ptr<IItem> > _children;
+    };
+}
+

bin/toucan-edit/IItem.cpp

@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (c) 2024 Darby Johnston
+// All rights reserved.
+
+#include "IItem.h"
+
+#include "IContainer.h"
+
+namespace toucan
+{
+    IItem::IItem()
+    {}
+
+    IItem::~IItem()
+    {}
+
+    const OTIO_NS::TimeRange& IItem::getRange() const
+    {
+        return _range;
+    }
+
+    void IItem::setRange(const OTIO_NS::TimeRange& range)
+    {
+        _range = range;
+    }
+
+    const std::weak_ptr<IContainer>& IItem::getParent() const
+    {
+        return _parent;
+    }
+}

bin/toucan-edit/IItem.h

@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (c) 2024 Darby Johnston
+// All rights reserved.
+
+#pragma once
+
+#include <opentimelineio/anyDictionary.h>
+
+#include <memory>
+
+namespace toucan
+{
+    class IContainer;
+
+    class IItem : public std::enable_shared_from_this<IItem>
+    {
+    public:
+        IItem();
+
+        virtual ~IItem() = 0;
+
+        const OTIO_NS::TimeRange& getRange() const;
+        void setRange(const OTIO_NS::TimeRange&);
+
+        const std::weak_ptr<IContainer>& getParent() const;
+
+    private:
+        OTIO_NS::TimeRange _range;
+        std::weak_ptr<IContainer> _parent;
+
+        friend class IContainer;
+    };
+}
+

bin/toucan-edit/Stack.cpp

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (c) 2024 Darby Johnston
+// All rights reserved.
+
+#include "Stack.h"
+
+namespace toucan
+{
+    Stack::Stack()
+    {}
+
+    Stack::~Stack()
+    {}
+}

bin/toucan-edit/Stack.h

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (c) 2024 Darby Johnston
+// All rights reserved.
+
+#pragma once
+
+#include "IContainer.h"
+
+#include <vector>
+
+namespace toucan
+{
+    class Stack : public IContainer
+    {
+    public:
+        Stack();
+
+        virtual ~Stack();
+    };
+}
+