Refactoring

Author: darbyjohnston

bin/toucan-view/App.cpp

@@ -48,6 +48,8 @@ namespace toucan
 
         _documentsModel = std::make_shared<DocumentsModel>(context, _host);
 
+        _windowModel = std::make_shared<WindowModel>();
+
         _window = Window::create(
             context,
             std::dynamic_pointer_cast<App>(shared_from_this()),
@@ -91,4 +93,9 @@ namespace toucan
     {
         return _documentsModel;
     }
+
+    const std::shared_ptr<WindowModel>& App::getWindowModel() const
+    {
+        return _windowModel;
+    }
 }

bin/toucan-view/App.h

@@ -7,6 +7,7 @@
 #include "DocumentsModel.h"
 #include "TimeUnitsModel.h"
 #include "Window.h"
+#include "WindowModel.h"
 
 #include <dtk/ui/App.h>
 
@@ -30,12 +31,15 @@ namespace toucan
 
         const std::shared_ptr<DocumentsModel>& getDocumentsModel() const;
 
+        const std::shared_ptr<WindowModel>& getWindowModel() const;
+
     private:
         std::shared_ptr<MessageLog> _messageLog;
         std::filesystem::path _path;
         std::shared_ptr<TimeUnitsModel> _timeUnitsModel;
         std::shared_ptr<ImageEffectHost> _host;
         std::shared_ptr<DocumentsModel> _documentsModel;
+        std::shared_ptr<WindowModel> _windowModel;
         std::shared_ptr<Window> _window;
     };
 }

bin/toucan-view/BottomBar.cpp

@@ -26,8 +26,6 @@ namespace toucan
         _timeEdit = TimeEdit::create(context, app->getTimeUnitsModel(), _layout);
         _timeEdit->setTooltip("Current time");
 
-        _slider = dtk::IntSlider::create(context, nullptr, _layout);
-
         _durationLabel = TimeLabel::create(context, app->getTimeUnitsModel(), _layout);
         _durationLabel->setTooltip("Timeline duration");
 
@@ -62,17 +60,6 @@ namespace toucan
                 }
             });
 
-        _slider->setCallback(
-            [this](double value)
-            {
-                if (_document)
-                {
-                    _document->getPlaybackModel()->setCurrentTime(OTIO_NS::RationalTime(
-                        value,
-                        _timeRange.duration().rate()));
-                }
-            });
-
         std::weak_ptr<App> appWeak(app);
         _timeUnitsComboBox->setIndexCallback(
             [appWeak](int index)
@@ -132,7 +119,6 @@ namespace toucan
                 _frameButtons->setEnabled(document.get());
                 _playbackButtons->setEnabled(document.get());
                 _timeEdit->setEnabled(document.get());
-                _slider->setEnabled(document.get());
                 _durationLabel->setEnabled(document.get());
             });
 
@@ -176,18 +162,12 @@ namespace toucan
     {
         _timeEdit->setTimeRange(_timeRange);
 
-        _slider->setRange(dtk::RangeI(
-            _timeRange.start_time().value(),
-            _timeRange.end_time_inclusive().value()));
-
         _durationLabel->setTime(_timeRange.duration());
     }
 
     void BottomBar::_currentTimeUpdate()
     {
         _timeEdit->setTime(_currentTime);
-
-        _slider->setValue(_currentTime.value());
     }
 
     void BottomBar::_playbackUpdate()

bin/toucan-view/BottomBar.h

@@ -7,7 +7,6 @@
 #include "TimeWidgets.h"
 
 #include <dtk/ui/ComboBox.h>
-#include <dtk/ui/IntSlider.h>
 #include <dtk/ui/RowLayout.h>
 #include <dtk/ui/ToolButton.h>
 
@@ -50,7 +49,6 @@ namespace toucan
         std::shared_ptr<FrameButtons> _frameButtons;
         std::shared_ptr<PlaybackButtons> _playbackButtons;
         std::shared_ptr<TimeEdit> _timeEdit;
-        std::shared_ptr<dtk::IntSlider> _slider;
         std::shared_ptr<TimeLabel> _durationLabel;
         std::shared_ptr<dtk::ComboBox> _timeUnitsComboBox;
 

bin/toucan-view/CMakeLists.txt

@@ -13,7 +13,8 @@ set(HEADERS
     ToolBar.h
     ViewModel.h
     Viewport.h
-    Window.h)
+    Window.h
+    WindowModel.h)
 
 set(SOURCE
     App.cpp
@@ -31,6 +32,7 @@ set(SOURCE
     ViewModel.cpp
     Viewport.cpp
     Window.cpp
+    WindowModel.cpp
     main.cpp)
 
 add_executable(toucan-view ${HEADERS} ${SOURCE})

bin/toucan-view/Document.cpp

@@ -64,6 +64,11 @@ namespace toucan
         return _path;
     }
 
+    const OTIO_NS::SerializableObject::Retainer<OTIO_NS::Timeline>& Document::getTimeline() const
+    {
+        return _timeline;
+    }
+
     const std::shared_ptr<PlaybackModel>& Document::getPlaybackModel() const
     {
         return _playbackModel;

bin/toucan-view/Document.h

@@ -32,6 +32,8 @@ namespace toucan
 
         const std::filesystem::path& getPath() const;
 
+        const OTIO_NS::SerializableObject::Retainer<OTIO_NS::Timeline>& getTimeline() const;
+
         const std::shared_ptr<PlaybackModel>& getPlaybackModel() const;
 
         const std::shared_ptr<ViewModel>& getViewModel() const;