Output device fixes

Author: darbyjohnston

etc/SuperBuild/cmake/Modules/BuildtlRender.cmake

@@ -1,7 +1,7 @@
 include(ExternalProject)
 
 set(TLRENDER_GIT_REPOSITORY "https://github.com/darbyjohnston/tlRender.git")
-set(TLRENDER_GIT_TAG "322bb400531a52112541264f10392faebcb1128d")
+set(TLRENDER_GIT_TAG "ff9d7c2196a3005f3c02a8b63865315e4e650766")
 
 set(TLRENDER_DEPS)
 set(TLRENDER_ARGS

lib/djvApp/Models/BMDDevicesModel.cpp

@@ -4,23 +4,23 @@
 
 #include <djvApp/Models/BMDDevicesModel.h>
 
-#include <feather-tk/ui/Settings.h>
+#include <ftk/UI/Settings.h>
 
 namespace djv
 {
     namespace app
     {
         struct BMDDevicesModel::Private
         {
-            std::shared_ptr<feather_tk::Settings> settings;
+            std::shared_ptr<ftk::Settings> settings;
         };
 
         void BMDDevicesModel::_init(
-            const std::shared_ptr<feather_tk::Context>& context,
-            const std::shared_ptr<feather_tk::Settings>& settings)
+            const std::shared_ptr<ftk::Context>& context,
+            const std::shared_ptr<ftk::Settings>& settings)
         {
             tl::bmd::DevicesModel::_init(context);
-            FEATHER_TK_P();
+            FTK_P();
 
             p.settings = settings;
 
@@ -41,13 +41,13 @@ namespace djv
 
         BMDDevicesModel::~BMDDevicesModel()
         {
-            FEATHER_TK_P();
+            FTK_P();
             p.settings->setT("/BMD", observeData()->get());
         }
 
         std::shared_ptr<BMDDevicesModel> BMDDevicesModel::create(
-            const std::shared_ptr<feather_tk::Context>& context,
-            const std::shared_ptr<feather_tk::Settings>& settings)
+            const std::shared_ptr<ftk::Context>& context,
+            const std::shared_ptr<ftk::Settings>& settings)
         {
             auto out = std::shared_ptr<BMDDevicesModel>(new BMDDevicesModel);
             out->_init(context, settings);

lib/djvApp/Models/BMDDevicesModel.h

@@ -6,7 +6,7 @@
 
 #include <tlDevice/BMDDevicesModel.h>
 
-namespace feather_tk
+namespace ftk
 {
     class Settings;
 }
@@ -18,12 +18,12 @@ namespace djv
         //! BMD devices model.
         class BMDDevicesModel : public tl::bmd::DevicesModel
         {
-            FEATHER_TK_NON_COPYABLE(BMDDevicesModel);
+            FTK_NON_COPYABLE(BMDDevicesModel);
 
         protected:
             void _init(
-                const std::shared_ptr<feather_tk::Context>&,
-                const std::shared_ptr<feather_tk::Settings>&);
+                const std::shared_ptr<ftk::Context>&,
+                const std::shared_ptr<ftk::Settings>&);
 
             BMDDevicesModel();
 
@@ -32,11 +32,11 @@ namespace djv
 
             //! Create a new model.
             static std::shared_ptr<BMDDevicesModel> create(
-                const std::shared_ptr<feather_tk::Context>&,
-                const std::shared_ptr<feather_tk::Settings>&);
+                const std::shared_ptr<ftk::Context>&,
+                const std::shared_ptr<ftk::Settings>&);
 
         private:
-            FEATHER_TK_PRIVATE();
+            FTK_PRIVATE();
         };
     }
 }

lib/djvApp/Tools/FileButton.cpp

@@ -92,8 +92,8 @@ namespace djv
                 p.thumbnail.request.future.wait_for(std::chrono::seconds(0)) == std::future_status::ready)
             {
                 p.thumbnail.image = p.thumbnail.request.future.get();
-                _setSizeUpdate();
-                _setDrawUpdate();
+                setSizeUpdate();
+                setDrawUpdate();
             }
         }
 

lib/djvApp/Tools/ShortcutsWidget.cpp

@@ -166,26 +166,26 @@ namespace djv
         void ShortcutEdit::mouseEnterEvent(ftk::MouseEnterEvent& event)
         {
             IMouseWidget::mouseEnterEvent(event);
-            _setDrawUpdate();
+            setDrawUpdate();
         }
 
         void ShortcutEdit::mouseLeaveEvent()
         {
             IMouseWidget::mouseLeaveEvent();
-            _setDrawUpdate();
+            setDrawUpdate();
         }
 
         void ShortcutEdit::mousePressEvent(ftk::MouseClickEvent& event)
         {
             IMouseWidget::mousePressEvent(event);
             takeKeyFocus();
-            _setDrawUpdate();
+            setDrawUpdate();
         }
 
         void ShortcutEdit::keyFocusEvent(bool value)
         {
             IMouseWidget::keyFocusEvent(value);
-            _setDrawUpdate();
+            setDrawUpdate();
         }
 
         void ShortcutEdit::keyPressEvent(ftk::KeyEvent& event)

lib/djvApp/Widgets/ShuttleWidget.cpp

@@ -132,13 +132,13 @@ namespace djv
         void ShuttleWidget::mouseEnterEvent(ftk::MouseEnterEvent& event)
         {
             IMouseWidget::mouseEnterEvent(event);
-            _setDrawUpdate();
+            setDrawUpdate();
         }
 
         void ShuttleWidget::mouseLeaveEvent()
         {
             IMouseWidget::mouseLeaveEvent();
-            _setDrawUpdate();
+            setDrawUpdate();
         }
 
         void ShuttleWidget::mouseMoveEvent(ftk::MouseMoveEvent& event)
@@ -153,7 +153,7 @@ namespace djv
                 if (i != p.iconIndex)
                 {
                     p.iconIndex = i % p.iconImages.size();
-                    _setDrawUpdate();
+                    setDrawUpdate();
                     if (p.callback)
                     {
                         p.callback(i);
@@ -166,7 +166,7 @@ namespace djv
         {
             IMouseWidget::mousePressEvent(event);
             FTK_P();
-            _setDrawUpdate();
+            setDrawUpdate();
             if (p.activeCallback)
             {
                 p.activeCallback(true);
@@ -178,7 +178,7 @@ namespace djv
             IMouseWidget::mouseReleaseEvent(event);
             FTK_P();
             p.iconIndex = 0;
-            _setDrawUpdate();
+            setDrawUpdate();
             if (p.activeCallback)
             {
                 p.activeCallback(false);

lib/djvApp/Widgets/Viewport.cpp

@@ -89,9 +89,6 @@ namespace djv
             tl::timelineui::Viewport::_init(context, parent);
             FTK_P();
 
-            _setMouseHoverEnabled(true);
-            _setMousePressEnabled(true);
-
             p.app = app;
 
             p.fileNameLabel = ftk::Label::create(context);
@@ -371,7 +368,6 @@ namespace djv
         {
             tl::timelineui::Viewport::mousePressEvent(event);
             FTK_P();
-            takeKeyFocus();
             if (p.colorPickerBinding.button == event.button &&
                 ftk::checkKeyModifier(p.colorPickerBinding.modifier, event.modifiers))
             {