Refactoring

darbyjohnston · Feb 27, 2025 · 67a1b2f · 67a1b2f
1 parent 516406b
commit 67a1b2f
Show file tree

Hide file tree

Showing 127 changed files with 577 additions and 590 deletions.
diff --git a/bin/tlplay/main.cpp b/bin/tlplay/main.cpp
@@ -29,7 +29,7 @@ DTK_MAIN()
         tl::timelineui::init(context);
         tl::device::init(context);
         auto args = dtk::convert(argc, argv);
-        auto app = tl::play_app::App::create(context, args);
+        auto app = tl::play::App::create(context, args);
         r = app->getExit();
         if (0 == r)
         {

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_subdirectory(tlCore)
 add_subdirectory(tlDevice)
 add_subdirectory(tlIO)
-add_subdirectory(tlPlay)
 add_subdirectory(tlResource)
 add_subdirectory(tlTimeline)
 add_subdirectory(tlTimelineUI)

diff --git a/lib/tlPlay/CMakeLists.txt b/lib/tlPlay/CMakeLists.txt
diff --git a/lib/tlPlayApp/AudioActions.cpp → lib/tlPlayApp/Actions/AudioActions.cpp b/lib/tlPlayApp/AudioActions.cpp → lib/tlPlayApp/Actions/AudioActions.cpp
@@ -2,15 +2,14 @@
 // Copyright (c) 2021-2025 Darby Johnston
 // All rights reserved.
 
-#include <tlPlayApp/AudioActions.h>
+#include <tlPlayApp/Actions/AudioActions.h>
 
+#include <tlPlayApp/Models/AudioModel.h>
 #include <tlPlayApp/App.h>
 
-#include <tlPlay/AudioModel.h>
-
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         struct AudioActions::Private
         {

diff --git a/lib/tlPlayApp/AudioActions.h → lib/tlPlayApp/Actions/AudioActions.h b/lib/tlPlayApp/AudioActions.h → lib/tlPlayApp/Actions/AudioActions.h
@@ -8,7 +8,7 @@
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         class App;
 

diff --git a/lib/tlPlayApp/CompareActions.cpp → lib/tlPlayApp/Actions/CompareActions.cpp b/lib/tlPlayApp/CompareActions.cpp → lib/tlPlayApp/Actions/CompareActions.cpp
@@ -2,17 +2,16 @@
 // Copyright (c) 2021-2025 Darby Johnston
 // All rights reserved.
 
-#include <tlPlayApp/CompareActions.h>
+#include <tlPlayApp/Actions/CompareActions.h>
 
+#include <tlPlayApp/Models/FilesModel.h>
 #include <tlPlayApp/App.h>
 
-#include <tlPlay/FilesModel.h>
-
 #include <dtk/core/Format.h>
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         struct CompareActions::Private
         {

diff --git a/lib/tlPlayApp/CompareActions.h → lib/tlPlayApp/Actions/CompareActions.h b/lib/tlPlayApp/CompareActions.h → lib/tlPlayApp/Actions/CompareActions.h
@@ -8,7 +8,7 @@
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         class App;
 

diff --git a/lib/tlPlayApp/FileActions.cpp → lib/tlPlayApp/Actions/FileActions.cpp b/lib/tlPlayApp/FileActions.cpp → lib/tlPlayApp/Actions/FileActions.cpp
@@ -2,17 +2,16 @@
 // Copyright (c) 2021-2025 Darby Johnston
 // All rights reserved.
 
-#include <tlPlayApp/FileActions.h>
+#include <tlPlayApp/Actions/FileActions.h>
 
+#include <tlPlayApp/Models/FilesModel.h>
 #include <tlPlayApp/App.h>
 
-#include <tlPlay/FilesModel.h>
-
 #include <dtk/core/Format.h>
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         struct FileActions::Private
         {

diff --git a/lib/tlPlayApp/FileActions.h → lib/tlPlayApp/Actions/FileActions.h b/lib/tlPlayApp/FileActions.h → lib/tlPlayApp/Actions/FileActions.h
@@ -8,7 +8,7 @@
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         class App;
 

diff --git a/lib/tlPlayApp/FrameActions.cpp → lib/tlPlayApp/Actions/FrameActions.cpp b/lib/tlPlayApp/FrameActions.cpp → lib/tlPlayApp/Actions/FrameActions.cpp
@@ -2,7 +2,7 @@
 // Copyright (c) 2021-2025 Darby Johnston
 // All rights reserved.
 
-#include <tlPlayApp/FrameActions.h>
+#include <tlPlayApp/Actions/FrameActions.h>
 
 #include <tlPlayApp/App.h>
 #include <tlPlayApp/MainWindow.h>
@@ -11,7 +11,7 @@
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         struct FrameActions::Private
         {

diff --git a/lib/tlPlayApp/FrameActions.h → lib/tlPlayApp/Actions/FrameActions.h b/lib/tlPlayApp/FrameActions.h → lib/tlPlayApp/Actions/FrameActions.h
@@ -8,7 +8,7 @@
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         class App;
         class MainWindow;

diff --git a/lib/tlPlayApp/PlaybackActions.cpp → lib/tlPlayApp/Actions/PlaybackActions.cpp b/lib/tlPlayApp/PlaybackActions.cpp → lib/tlPlayApp/Actions/PlaybackActions.cpp
@@ -2,7 +2,7 @@
 // Copyright (c) 2021-2025 Darby Johnston
 // All rights reserved.
 
-#include <tlPlayApp/PlaybackActions.h>
+#include <tlPlayApp/Actions/PlaybackActions.h>
 
 #include <tlPlayApp/App.h>
 
@@ -12,7 +12,7 @@
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         struct PlaybackActions::Private
         {

diff --git a/lib/tlPlayApp/PlaybackActions.h → lib/tlPlayApp/Actions/PlaybackActions.h b/lib/tlPlayApp/PlaybackActions.h → lib/tlPlayApp/Actions/PlaybackActions.h
@@ -8,7 +8,7 @@
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         class App;
 

diff --git a/lib/tlPlayApp/RenderActions.cpp → lib/tlPlayApp/Actions/RenderActions.cpp b/lib/tlPlayApp/RenderActions.cpp → lib/tlPlayApp/Actions/RenderActions.cpp
@@ -2,18 +2,17 @@
 // Copyright (c) 2021-2025 Darby Johnston
 // All rights reserved.
 
-#include <tlPlayApp/RenderActions.h>
+#include <tlPlayApp/Actions/RenderActions.h>
 
+#include <tlPlayApp/Models/ColorModel.h>
+#include <tlPlayApp/Models/RenderModel.h>
 #include <tlPlayApp/App.h>
 
-#include <tlPlay/ColorModel.h>
-#include <tlPlay/RenderModel.h>
-
 #include <sstream>
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         struct RenderActions::Private
         {

diff --git a/lib/tlPlayApp/RenderActions.h → lib/tlPlayApp/Actions/RenderActions.h b/lib/tlPlayApp/RenderActions.h → lib/tlPlayApp/Actions/RenderActions.h
@@ -8,7 +8,7 @@
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         class App;
 

diff --git a/lib/tlPlayApp/TimelineActions.cpp → lib/tlPlayApp/Actions/TimelineActions.cpp b/lib/tlPlayApp/TimelineActions.cpp → lib/tlPlayApp/Actions/TimelineActions.cpp
@@ -2,7 +2,7 @@
 // Copyright (c) 2021-2025 Darby Johnston
 // All rights reserved.
 
-#include <tlPlayApp/TimelineActions.h>
+#include <tlPlayApp/Actions/TimelineActions.h>
 
 #include <tlPlayApp/App.h>
 #include <tlPlayApp/MainWindow.h>
@@ -11,7 +11,7 @@
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         struct TimelineActions::Private
         {

diff --git a/lib/tlPlayApp/TimelineActions.h → lib/tlPlayApp/Actions/TimelineActions.h b/lib/tlPlayApp/TimelineActions.h → lib/tlPlayApp/Actions/TimelineActions.h
@@ -8,7 +8,7 @@
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         class App;
         class MainWindow;

diff --git a/lib/tlPlayApp/ToolsActions.cpp → lib/tlPlayApp/Actions/ToolsActions.cpp b/lib/tlPlayApp/ToolsActions.cpp → lib/tlPlayApp/Actions/ToolsActions.cpp
@@ -2,16 +2,16 @@
 // Copyright (c) 2021-2025 Darby Johnston
 // All rights reserved.
 
-#include <tlPlayApp/ToolsActions.h>
+#include <tlPlayApp/Actions/ToolsActions.h>
 
+#include <tlPlayApp/Tools/Tools.h>
 #include <tlPlayApp/App.h>
-#include <tlPlayApp/Tools.h>
 
 #include <dtk/core/Format.h>
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         struct ToolsActions::Private
         {

diff --git a/lib/tlPlayApp/ToolsActions.h → lib/tlPlayApp/Actions/ToolsActions.h b/lib/tlPlayApp/ToolsActions.h → lib/tlPlayApp/Actions/ToolsActions.h
@@ -8,7 +8,7 @@
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         class App;
 

diff --git a/lib/tlPlayApp/ViewActions.cpp → lib/tlPlayApp/Actions/ViewActions.cpp b/lib/tlPlayApp/ViewActions.cpp → lib/tlPlayApp/Actions/ViewActions.cpp
@@ -2,17 +2,16 @@
 // Copyright (c) 2021-2025 Darby Johnston
 // All rights reserved.
 
-#include <tlPlayApp/ViewActions.h>
+#include <tlPlayApp/Actions/ViewActions.h>
 
+#include <tlPlayApp/Models/ViewportModel.h>
+#include <tlPlayApp/Widgets/Viewport.h>
 #include <tlPlayApp/App.h>
 #include <tlPlayApp/MainWindow.h>
-#include <tlPlayApp/Viewport.h>
-
-#include <tlPlay/ViewportModel.h>
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         struct ViewActions::Private
         {

diff --git a/lib/tlPlayApp/ViewActions.h → lib/tlPlayApp/Actions/ViewActions.h b/lib/tlPlayApp/ViewActions.h → lib/tlPlayApp/Actions/ViewActions.h
@@ -8,7 +8,7 @@
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         class App;
         class MainWindow;

diff --git a/lib/tlPlayApp/WindowActions.cpp → lib/tlPlayApp/Actions/WindowActions.cpp b/lib/tlPlayApp/WindowActions.cpp → lib/tlPlayApp/Actions/WindowActions.cpp
@@ -2,7 +2,7 @@
 // Copyright (c) 2021-2025 Darby Johnston
 // All rights reserved.
 
-#include <tlPlayApp/WindowActions.h>
+#include <tlPlayApp/Actions/WindowActions.h>
 
 #include <tlPlayApp/App.h>
 #include <tlPlayApp/MainWindow.h>
@@ -11,11 +11,11 @@
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         struct WindowActions::Private
         {
-            std::shared_ptr<play::SettingsModel> model;
+            std::shared_ptr<SettingsModel> model;
             std::map<std::string, std::shared_ptr<dtk::Action> > actions;
         };
 

diff --git a/lib/tlPlayApp/WindowActions.h → lib/tlPlayApp/Actions/WindowActions.h b/lib/tlPlayApp/WindowActions.h → lib/tlPlayApp/Actions/WindowActions.h
@@ -8,7 +8,7 @@
 
 namespace tl
 {
-    namespace play_app
+    namespace play
     {
         class App;
         class MainWindow;