diff --git a/research/gtk-canvas-experiment.hpp b/research/gtk-canvas-experiment.hpp index 84a22509f..3a473ba61 100644 --- a/research/gtk-canvas-experiment.hpp +++ b/research/gtk-canvas-experiment.hpp @@ -31,7 +31,7 @@ #ifndef RESEARCH_GTK_CANVAS_EXPERIMENT_H #define RESEARCH_GTK_CANVAS_EXPERIMENT_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include diff --git a/research/gtk-canvas-main.cpp b/research/gtk-canvas-main.cpp index e949c675e..f8770dbc4 100644 --- a/research/gtk-canvas-main.cpp +++ b/research/gtk-canvas-main.cpp @@ -29,7 +29,7 @@ */ -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "gtk-canvas-experiment.hpp" #include "lib/error.hpp" diff --git a/src/common/guifacade.cpp b/src/common/guifacade.cpp index 212c431a1..37ef2653a 100644 --- a/src/common/guifacade.cpp +++ b/src/common/guifacade.cpp @@ -31,7 +31,7 @@ */ -#include "gui/guifacade.hpp" +#include "stage/guifacade.hpp" #include "include/gui-notification-facade.h" #include "lib/sync.hpp" #include "lib/error.hpp" diff --git a/src/common/ui-protocol.cpp b/src/common/ui-protocol.cpp index f0041692e..47d3e1d51 100644 --- a/src/common/ui-protocol.cpp +++ b/src/common/ui-protocol.cpp @@ -25,7 +25,7 @@ ** Storage for key constants and basic definitions used for interfacing with the GUI. */ -//#include "gui/gtk-base.hpp" /////////////////////TODO necessary? +//#include "stage/gtk-base.hpp" /////////////////////TODO necessary? #include "include/ui-protocol.hpp" diff --git a/src/include/play-facade.hpp b/src/include/play-facade.hpp index 26e423c66..c8c98a597 100644 --- a/src/include/play-facade.hpp +++ b/src/include/play-facade.hpp @@ -41,13 +41,13 @@ #include "lib/iter-source.hpp" ////////////////////TICKET #493 : only using the IterSource base interface here #include "lib/time/control.hpp" #include "lib/time/timevalue.hpp" -#include "proc/mobject/model-port.hpp" -#include "proc/mobject/output-designation.hpp" -#include "proc/mobject/session/clip.hpp" -#include "proc/mobject/session/fork.hpp" -#include "proc/play/output-manager.hpp" -#include "proc/asset/timeline.hpp" -#include "proc/asset/viewer.hpp" +#include "steam/mobject/model-port.hpp" +#include "steam/mobject/output-designation.hpp" +#include "steam/mobject/session/clip.hpp" +#include "steam/mobject/session/fork.hpp" +#include "steam/play/output-manager.hpp" +#include "steam/asset/timeline.hpp" +#include "steam/asset/viewer.hpp" diff --git a/src/lib/safeclib.c b/src/lib/safeclib.c index 72fb9688a..2444e7cfa 100644 --- a/src/lib/safeclib.c +++ b/src/lib/safeclib.c @@ -29,7 +29,7 @@ #include "lib/error.h" #include "lib/safeclib.h" -#include "backend/resourcecollector.h" +#include "vault/resourcecollector.h" #include #include diff --git a/src/lib/test/microbenchmark.hpp b/src/lib/test/microbenchmark.hpp index 463bbb8bf..8d60f8b4f 100644 --- a/src/lib/test/microbenchmark.hpp +++ b/src/lib/test/microbenchmark.hpp @@ -53,7 +53,7 @@ #define LIB_TEST_MICROBENCHMARK_H -#include "backend/thread-wrapper.hpp" +#include "vault/thread-wrapper.hpp" #include #include diff --git a/src/lib/test/run.hpp b/src/lib/test/run.hpp index 571f71a15..527c1d222 100644 --- a/src/lib/test/run.hpp +++ b/src/lib/test/run.hpp @@ -36,7 +36,7 @@ #ifndef TESTHELPER_RUN_H #define TESTHELPER_RUN_H -#include "proc/common.hpp" +#include "steam/common.hpp" #include "include/logging.h" #include "lib/test/suite.hpp" diff --git a/src/lib/wrapperptr.hpp b/src/lib/wrapperptr.hpp index 6c3dfb224..0dd1f4e9d 100644 --- a/src/lib/wrapperptr.hpp +++ b/src/lib/wrapperptr.hpp @@ -36,7 +36,7 @@ #include "lib/access-casted-o.hpp" #include "lib/meta/typelist.hpp" -#include "proc/mobject/placement.hpp" +#include "steam/mobject/placement.hpp" #include "lib/p.hpp" diff --git a/src/lumiera/main.cpp b/src/lumiera/main.cpp index 5dac8f32c..938850562 100644 --- a/src/lumiera/main.cpp +++ b/src/lumiera/main.cpp @@ -32,12 +32,12 @@ #include "common/appstate.hpp" #include "common/option.hpp" -#include "backend/enginefacade.hpp" -#include "backend/netnodefacade.hpp" -#include "backend/scriptrunnerfacade.hpp" +#include "vault/enginefacade.hpp" +#include "vault/netnodefacade.hpp" +#include "vault/scriptrunnerfacade.hpp" #include "include/dummy-player-facade.h" -#include "proc/facade.hpp" -#include "gui/guifacade.hpp" +#include "steam/facade.hpp" +#include "stage/guifacade.hpp" using lib::Cmdline; using lumiera::Subsys; diff --git a/src/stage/config-keys.cpp b/src/stage/config-keys.cpp index af53f6893..652e6c4e0 100644 --- a/src/stage/config-keys.cpp +++ b/src/stage/config-keys.cpp @@ -30,7 +30,7 @@ ** */ -#include "gui/config-keys.hpp" +#include "stage/config-keys.hpp" namespace gui { diff --git a/src/stage/ctrl/actions.hpp b/src/stage/ctrl/actions.hpp index 57d99d3ea..04fab2c29 100644 --- a/src/stage/ctrl/actions.hpp +++ b/src/stage/ctrl/actions.hpp @@ -41,11 +41,11 @@ #ifndef GUI_CTRL_ACTIONS_H #define GUI_CTRL_ACTIONS_H -#include "gui/gtk-base.hpp" -#include "gui/ctrl/global-ctx.hpp" -#include "gui/ctrl/window-locator.hpp" -#include "gui/workspace/workspace-window.hpp" -#include "gui/workspace/panel-manager.hpp" +#include "stage/gtk-base.hpp" +#include "stage/ctrl/global-ctx.hpp" +#include "stage/ctrl/window-locator.hpp" +#include "stage/workspace/workspace-window.hpp" +#include "stage/workspace/panel-manager.hpp" #include "lib/format-string.hpp" #include "lib/nocopy.hpp" diff --git a/src/stage/ctrl/core-service.hpp b/src/stage/ctrl/core-service.hpp index 7be2fff9e..c9b0ce357 100644 --- a/src/stage/ctrl/core-service.hpp +++ b/src/stage/ctrl/core-service.hpp @@ -90,9 +90,9 @@ #include "lib/idi/entry-id.hpp" #include "lib/diff/gen-node.hpp" #include "include/session-command-facade.h" -#include "gui/ctrl/state-recorder.hpp" -#include "gui/ctrl/bus-term.hpp" -#include "gui/ctrl/nexus.hpp" +#include "stage/ctrl/state-recorder.hpp" +#include "stage/ctrl/bus-term.hpp" +#include "stage/ctrl/nexus.hpp" namespace gui { diff --git a/src/stage/ctrl/facade.hpp b/src/stage/ctrl/facade.hpp index ce4eafdf4..7274cbb8c 100644 --- a/src/stage/ctrl/facade.hpp +++ b/src/stage/ctrl/facade.hpp @@ -42,8 +42,8 @@ #ifndef GUI_CTRL_FACADE_H #define GUI_CTRL_FACADE_H -#include "gui/notification-service.hpp" -#include "gui/display-service.hpp" +#include "stage/notification-service.hpp" +#include "stage/display-service.hpp" #include "lib/depend-inject.hpp" #include "lib/nocopy.hpp" diff --git a/src/stage/ctrl/global-ctx.hpp b/src/stage/ctrl/global-ctx.hpp index 8ee656c71..8b375a48f 100644 --- a/src/stage/ctrl/global-ctx.hpp +++ b/src/stage/ctrl/global-ctx.hpp @@ -53,12 +53,12 @@ #ifndef GUI_CTRL_GLOBAL_CTX_H #define GUI_CTRL_GLOBAL_CTX_H -#include "gui/gtk-base.hpp" -#include "gui/ui-bus.hpp" -#include "gui/ctrl/ui-manager.hpp" -#include "gui/ctrl/window-locator.hpp" -#include "gui/interact/wizard.hpp" -#include "gui/interact/interaction-director.hpp" +#include "stage/gtk-base.hpp" +#include "stage/ui-bus.hpp" +#include "stage/ctrl/ui-manager.hpp" +#include "stage/ctrl/window-locator.hpp" +#include "stage/interact/wizard.hpp" +#include "stage/interact/interaction-director.hpp" #include "lib/nocopy.hpp" diff --git a/src/stage/ctrl/nexus.hpp b/src/stage/ctrl/nexus.hpp index 205c88dd2..184d1cfdd 100644 --- a/src/stage/ctrl/nexus.hpp +++ b/src/stage/ctrl/nexus.hpp @@ -45,8 +45,8 @@ #include "lib/idi/genfunc.hpp" #include "lib/diff/mutation-message.hpp" #include "lib/diff/tree-diff-application.hpp" -#include "gui/ctrl/bus-term.hpp" -#include "gui/model/tangible.hpp" +#include "stage/ctrl/bus-term.hpp" +#include "stage/model/tangible.hpp" #include "lib/idi/entry-id.hpp" #include diff --git a/src/stage/ctrl/notification-hub.hpp b/src/stage/ctrl/notification-hub.hpp index 84b897ff1..973b637da 100644 --- a/src/stage/ctrl/notification-hub.hpp +++ b/src/stage/ctrl/notification-hub.hpp @@ -62,10 +62,10 @@ #ifndef GUI_CTRL_NOTIFICATION_HUB_H #define GUI_CTRL_NOTIFICATION_HUB_H -#include "gui/widget/error-log-display.hpp" +#include "stage/widget/error-log-display.hpp" #include "lib/diff/tree-mutator.hpp" -#include "gui/model/controller.hpp" -#include "gui/model/w-link.hpp" +#include "stage/model/controller.hpp" +#include "stage/model/w-link.hpp" #include diff --git a/src/stage/ctrl/panel-locator.hpp b/src/stage/ctrl/panel-locator.hpp index 2331dc664..5002330b4 100644 --- a/src/stage/ctrl/panel-locator.hpp +++ b/src/stage/ctrl/panel-locator.hpp @@ -49,8 +49,8 @@ #ifndef GUI_CTRL_PANEL_LOCATOR_H #define GUI_CTRL_PANEL_LOCATOR_H -#include "gui/gtk-base.hpp" -#include "gui/workspace/panel-manager.hpp" +#include "stage/gtk-base.hpp" +#include "stage/workspace/panel-manager.hpp" #include "lib/format-string.hpp" #include "lib/meta/util.hpp" #include "lib/nocopy.hpp" diff --git a/src/stage/ctrl/playback-controller.cpp b/src/stage/ctrl/playback-controller.cpp index 376600435..e8b3eaefd 100644 --- a/src/stage/ctrl/playback-controller.cpp +++ b/src/stage/ctrl/playback-controller.cpp @@ -29,8 +29,8 @@ */ -#include "gui/ctrl/playback-controller.hpp" -#include "gui/display-service.hpp" +#include "stage/ctrl/playback-controller.hpp" +#include "stage/display-service.hpp" #include "lib/error.hpp" #include "include/logging.h" diff --git a/src/stage/ctrl/playback-controller.hpp b/src/stage/ctrl/playback-controller.hpp index e745875a4..ad958025e 100644 --- a/src/stage/ctrl/playback-controller.hpp +++ b/src/stage/ctrl/playback-controller.hpp @@ -39,7 +39,7 @@ #ifndef PLAYBACK_CONTROLLER_HPP #define PLAYBACK_CONTROLLER_HPP -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "include/dummy-player-facade.h" #include "include/display-facade.h" #include "lib/nocopy.hpp" diff --git a/src/stage/ctrl/state-recorder.hpp b/src/stage/ctrl/state-recorder.hpp index b3b4ee8fc..5f7fa5c85 100644 --- a/src/stage/ctrl/state-recorder.hpp +++ b/src/stage/ctrl/state-recorder.hpp @@ -56,9 +56,9 @@ #include "lib/error.hpp" #include "lib/idi/entry-id.hpp" #include "lib/diff/gen-node.hpp" -#include "gui/ctrl/bus-term.hpp" -#include "gui/ctrl/state-manager.hpp" -#include "gui/ctrl/state-map-grouping-storage.hpp" +#include "stage/ctrl/bus-term.hpp" +#include "stage/ctrl/state-manager.hpp" +#include "stage/ctrl/state-map-grouping-storage.hpp" #include "include/ui-protocol.hpp" #include diff --git a/src/stage/ctrl/ui-dispatcher.hpp b/src/stage/ctrl/ui-dispatcher.hpp index 38eb70e23..77288326e 100644 --- a/src/stage/ctrl/ui-dispatcher.hpp +++ b/src/stage/ctrl/ui-dispatcher.hpp @@ -75,7 +75,7 @@ #ifndef GUI_CTRL_UI_DISPATCHER_H #define GUI_CTRL_UI_DISPATCHER_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "lib/call-queue.hpp" #include "lib/format-string.hpp" #include "lib/nocopy.hpp" diff --git a/src/stage/ctrl/ui-manager.cpp b/src/stage/ctrl/ui-manager.cpp index 958038953..75d52aaf3 100644 --- a/src/stage/ctrl/ui-manager.cpp +++ b/src/stage/ctrl/ui-manager.cpp @@ -33,13 +33,13 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/config-keys.hpp" -#include "gui/ctrl/ui-manager.hpp" -#include "gui/ctrl/global-ctx.hpp" -#include "gui/ctrl/actions.hpp" -#include "gui/ctrl/facade.hpp" -#include "gui/workspace/ui-style.hpp" +#include "stage/gtk-base.hpp" +#include "stage/config-keys.hpp" +#include "stage/ctrl/ui-manager.hpp" +#include "stage/ctrl/global-ctx.hpp" +#include "stage/ctrl/actions.hpp" +#include "stage/ctrl/facade.hpp" +#include "stage/workspace/ui-style.hpp" #include "lib/searchpath.hpp" #include "lib/util.hpp" diff --git a/src/stage/ctrl/ui-manager.hpp b/src/stage/ctrl/ui-manager.hpp index 7506b1506..eb1ecbdab 100644 --- a/src/stage/ctrl/ui-manager.hpp +++ b/src/stage/ctrl/ui-manager.hpp @@ -47,7 +47,7 @@ #ifndef GUI_CTRL_UI_MANAGER_H #define GUI_CTRL_UI_MANAGER_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "lib/nocopy.hpp" #include diff --git a/src/stage/ctrl/ui-state.cpp b/src/stage/ctrl/ui-state.cpp index e80228c64..502bf7f60 100644 --- a/src/stage/ctrl/ui-state.cpp +++ b/src/stage/ctrl/ui-state.cpp @@ -27,10 +27,10 @@ */ -#include "gui/ctrl/ui-state.hpp" -#include "gui/ctrl/state-manager.hpp" -#include "gui/interact/focus-tracker.hpp" -//#include "gui/ctrl/global-ctx.hpp" +#include "stage/ctrl/ui-state.hpp" +#include "stage/ctrl/state-manager.hpp" +#include "stage/interact/focus-tracker.hpp" +//#include "stage/ctrl/global-ctx.hpp" //#include "lib/util.hpp" //using util::cStr; diff --git a/src/stage/ctrl/ui-state.hpp b/src/stage/ctrl/ui-state.hpp index 2cbb6859f..8109dad21 100644 --- a/src/stage/ctrl/ui-state.hpp +++ b/src/stage/ctrl/ui-state.hpp @@ -54,7 +54,7 @@ #ifndef GUI__H #define GUI__H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "lib/nocopy.hpp" //#include diff --git a/src/stage/ctrl/window-locator.cpp b/src/stage/ctrl/window-locator.cpp index 0338b6b1e..16dc56688 100644 --- a/src/stage/ctrl/window-locator.cpp +++ b/src/stage/ctrl/window-locator.cpp @@ -27,11 +27,11 @@ */ -#include "gui/ctrl/global-ctx.hpp" -#include "gui/ctrl/panel-locator.hpp" -#include "gui/ctrl/window-locator.hpp" -#include "gui/interact/elem-access-dir.hpp" -#include "gui/workspace/workspace-window.hpp" +#include "stage/ctrl/global-ctx.hpp" +#include "stage/ctrl/panel-locator.hpp" +#include "stage/ctrl/window-locator.hpp" +#include "stage/interact/elem-access-dir.hpp" +#include "stage/workspace/workspace-window.hpp" #include "lib/util.hpp" #include diff --git a/src/stage/ctrl/window-locator.hpp b/src/stage/ctrl/window-locator.hpp index c00d36083..ef1cf1b3b 100644 --- a/src/stage/ctrl/window-locator.hpp +++ b/src/stage/ctrl/window-locator.hpp @@ -35,8 +35,8 @@ #ifndef GUI_CTRL_WINDOW_LOCATOR_H #define GUI_CTRL_WINDOW_LOCATOR_H -#include "gui/gtk-base.hpp" -#include "gui/ctrl/panel-locator.hpp" +#include "stage/gtk-base.hpp" +#include "stage/ctrl/panel-locator.hpp" #include "lib/depend-inject.hpp" #include "lib/nocopy.hpp" diff --git a/src/stage/dialog/name-chooser.cpp b/src/stage/dialog/name-chooser.cpp index 100925cb3..bd93b4169 100644 --- a/src/stage/dialog/name-chooser.cpp +++ b/src/stage/dialog/name-chooser.cpp @@ -27,9 +27,9 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/dialog/name-chooser.hpp" -#include "gui/dialog/dialog.hpp" +#include "stage/gtk-base.hpp" +#include "stage/dialog/name-chooser.hpp" +#include "stage/dialog/dialog.hpp" using namespace Gtk; //////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! using namespace Glib; //////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! diff --git a/src/stage/dialog/name-chooser.hpp b/src/stage/dialog/name-chooser.hpp index b70e6e8d0..a3136b7cc 100644 --- a/src/stage/dialog/name-chooser.hpp +++ b/src/stage/dialog/name-chooser.hpp @@ -29,7 +29,7 @@ #ifndef GUI_DIALOG_NAME_CHOOSER_H #define GUI_DIALOG_NAME_CHOOSER_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" namespace gui { diff --git a/src/stage/dialog/preferences-dialog.hpp b/src/stage/dialog/preferences-dialog.hpp index 0cd64a350..08fb1a34f 100644 --- a/src/stage/dialog/preferences-dialog.hpp +++ b/src/stage/dialog/preferences-dialog.hpp @@ -33,8 +33,8 @@ #define GUI_DIALOG_PREFERENCES_DIALOG_H -#include "gui/gtk-base.hpp" -#include "gui/dialog/dialog.hpp" +#include "stage/gtk-base.hpp" +#include "stage/dialog/dialog.hpp" namespace gui { namespace dialog { diff --git a/src/stage/dialog/render.cpp b/src/stage/dialog/render.cpp index ffe714add..d7a147c5b 100644 --- a/src/stage/dialog/render.cpp +++ b/src/stage/dialog/render.cpp @@ -27,10 +27,10 @@ */ -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" -#include "gui/dialog/render.hpp" -#include "gui/dialog/dialog.hpp" +#include "stage/dialog/render.hpp" +#include "stage/dialog/dialog.hpp" #include "include/logging.h" diff --git a/src/stage/dialog/render.hpp b/src/stage/dialog/render.hpp index 6d38780ce..bc93dbf8f 100644 --- a/src/stage/dialog/render.hpp +++ b/src/stage/dialog/render.hpp @@ -29,7 +29,7 @@ #ifndef GUI_DIALOG_RENDER_H #define GUI_DIALOG_RENDER_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" namespace gui { diff --git a/src/stage/dialog/test-control.hpp b/src/stage/dialog/test-control.hpp index 98a1c9734..64f56adc6 100644 --- a/src/stage/dialog/test-control.hpp +++ b/src/stage/dialog/test-control.hpp @@ -39,15 +39,15 @@ #define GUI_DIALOG_TEST_CONTROL_H -#include "gui/gtk-base.hpp" -#include "gui/dialog/dialog.hpp" -#include "gui/ctrl/bus-term.hpp" -#include "gui/model/tangible.hpp" +#include "stage/gtk-base.hpp" +#include "stage/dialog/dialog.hpp" +#include "stage/ctrl/bus-term.hpp" +#include "stage/model/tangible.hpp" #include "include/ui-protocol.hpp" -#include "proc/cmd.hpp" +#include "steam/cmd.hpp" #include "include/gui-notification-facade.h" -#include "proc/mobject/session/dummy-session-connection.hpp" +#include "steam/mobject/session/dummy-session-connection.hpp" #include "lib/test/test-helper.hpp" #include "lib/diff/gen-node.hpp" diff --git a/src/stage/display-service.cpp b/src/stage/display-service.cpp index 0aa975c59..b6de50ad9 100644 --- a/src/stage/display-service.cpp +++ b/src/stage/display-service.cpp @@ -32,7 +32,7 @@ */ -#include "gui/display-service.hpp" +#include "stage/display-service.hpp" #include "lib/depend.hpp" extern "C" { diff --git a/src/stage/draw/cairo-util.cpp b/src/stage/draw/cairo-util.cpp index 227b7acb6..961656128 100644 --- a/src/stage/draw/cairo-util.cpp +++ b/src/stage/draw/cairo-util.cpp @@ -26,7 +26,7 @@ */ -#include "gui/draw/cairo-util.hpp" +#include "stage/draw/cairo-util.hpp" namespace gui { namespace draw { diff --git a/src/stage/draw/rectangle.cpp b/src/stage/draw/rectangle.cpp index 4f2215efc..d497772b9 100644 --- a/src/stage/draw/rectangle.cpp +++ b/src/stage/draw/rectangle.cpp @@ -25,7 +25,7 @@ ** Implementation of functions to work with rectangular screen ranges */ -#include "gui/draw/rectangle.hpp" +#include "stage/draw/rectangle.hpp" #include diff --git a/src/stage/draw/rectangle.hpp b/src/stage/draw/rectangle.hpp index 5d8fb4ef8..6aafcd83a 100644 --- a/src/stage/draw/rectangle.hpp +++ b/src/stage/draw/rectangle.hpp @@ -29,7 +29,7 @@ #ifndef GUI_DRAW_RECTANGLE_H #define GUI_DRAW_RECTANGLE_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" namespace gui { namespace draw { diff --git a/src/stage/gtk-lumiera.cpp b/src/stage/gtk-lumiera.cpp index 887824d89..658d3438d 100644 --- a/src/stage/gtk-lumiera.cpp +++ b/src/stage/gtk-lumiera.cpp @@ -46,13 +46,13 @@ ** @see ui-manager.hpp */ -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "lib/error.hpp" -#include "gui/ui-bus.hpp" -#include "gui/guifacade.hpp" -#include "gui/ctrl/ui-manager.hpp" -#include "backend/thread-wrapper.hpp" +#include "stage/ui-bus.hpp" +#include "stage/guifacade.hpp" +#include "stage/ctrl/ui-manager.hpp" +#include "vault/thread-wrapper.hpp" #include "common/subsys.hpp" #include "lib/nocopy.hpp" diff --git a/src/stage/id-scheme.hpp b/src/stage/id-scheme.hpp index ff10add1b..4c69f7362 100644 --- a/src/stage/id-scheme.hpp +++ b/src/stage/id-scheme.hpp @@ -56,7 +56,7 @@ #include "lib/symbol.hpp" #include "lib/idi/entry-id.hpp" -#include "gui/interact/view-spec-dsl.hpp" +#include "stage/interact/view-spec-dsl.hpp" /* === forward declarations === */ diff --git a/src/stage/interact/cmd-context.cpp b/src/stage/interact/cmd-context.cpp index b95c7bece..6036c8546 100644 --- a/src/stage/interact/cmd-context.cpp +++ b/src/stage/interact/cmd-context.cpp @@ -32,7 +32,7 @@ //#include "lib/util.hpp" //#include "lib/symbol.hpp" //#include "include/logging.h" -#include "gui/interact/cmd-context.hpp" +#include "stage/interact/cmd-context.hpp" //#include //#include diff --git a/src/stage/interact/cmd-context.hpp b/src/stage/interact/cmd-context.hpp index 5adbdb279..9662bf5de 100644 --- a/src/stage/interact/cmd-context.hpp +++ b/src/stage/interact/cmd-context.hpp @@ -56,7 +56,7 @@ #include "lib/error.hpp" #include "lib/nocopy.hpp" -//#include "gui/ctrl/bus-term.hpp" +//#include "stage/ctrl/bus-term.hpp" //#include "lib/idi/entry-id.hpp" #include "lib/hash-indexed.hpp" #include "lib/symbol.hpp" diff --git a/src/stage/interact/elem-access-dir.hpp b/src/stage/interact/elem-access-dir.hpp index 5aa5d0cb4..3f38c6fc5 100644 --- a/src/stage/interact/elem-access-dir.hpp +++ b/src/stage/interact/elem-access-dir.hpp @@ -43,9 +43,9 @@ #include "lib/error.hpp" -#include "gui/model/element-access.hpp" -#include "gui/ctrl/window-locator.hpp" -#include "gui/ctrl/panel-locator.hpp" +#include "stage/model/element-access.hpp" +#include "stage/ctrl/window-locator.hpp" +#include "stage/ctrl/panel-locator.hpp" //#include "lib/symbol.hpp" //#include "lib/util.hpp" diff --git a/src/stage/interact/focus-tracker.cpp b/src/stage/interact/focus-tracker.cpp index b387bded3..362f4ed05 100644 --- a/src/stage/interact/focus-tracker.cpp +++ b/src/stage/interact/focus-tracker.cpp @@ -29,9 +29,9 @@ */ -#include "gui/interact/focus-tracker.hpp" -#include "gui/interact/navigator.hpp" -//#include "gui/ctrl/global-ctx.hpp" +#include "stage/interact/focus-tracker.hpp" +#include "stage/interact/navigator.hpp" +//#include "stage/ctrl/global-ctx.hpp" //#include "lib/util.hpp" //using util::cStr; diff --git a/src/stage/interact/focus-tracker.hpp b/src/stage/interact/focus-tracker.hpp index 862194e6c..52a542c52 100644 --- a/src/stage/interact/focus-tracker.hpp +++ b/src/stage/interact/focus-tracker.hpp @@ -54,7 +54,7 @@ #ifndef GUI_INTERACT_FOCUS_TRACKER_H #define GUI_INTERACT_FOCUS_TRACKER_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "lib/nocopy.hpp" //#include diff --git a/src/stage/interact/interaction-director.cpp b/src/stage/interact/interaction-director.cpp index d4dcff6ff..9d76c33c3 100644 --- a/src/stage/interact/interaction-director.cpp +++ b/src/stage/interact/interaction-director.cpp @@ -26,34 +26,34 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/ui-bus.hpp" -#include "gui/ctrl/bus-term.hpp" -#include "gui/ctrl/global-ctx.hpp" -#include "gui/interact/interaction-director.hpp" -#include "gui/interact/view-locator.hpp" -#include "gui/interact/spot-locator.hpp" -#include "gui/interact/navigator.hpp" -#include "gui/interact/focus-tracker.hpp" -#include "gui/interact/ui-coord-resolver.hpp" -#include "gui/dialog/preferences-dialog.hpp" -#include "gui/dialog/render.hpp" -#include "gui/workspace/workspace-window.hpp" -#include "gui/ctrl/ui-state.hpp" -#include "gui/setting/asset-controller.hpp" -#include "gui/panel/timeline-panel.hpp" -//#include "gui/timeline/timeline-widget.hpp" -//#include "gui/timeline/timeline-controller.hpp" /////////////////TODO still required? +#include "stage/gtk-base.hpp" +#include "stage/ui-bus.hpp" +#include "stage/ctrl/bus-term.hpp" +#include "stage/ctrl/global-ctx.hpp" +#include "stage/interact/interaction-director.hpp" +#include "stage/interact/view-locator.hpp" +#include "stage/interact/spot-locator.hpp" +#include "stage/interact/navigator.hpp" +#include "stage/interact/focus-tracker.hpp" +#include "stage/interact/ui-coord-resolver.hpp" +#include "stage/dialog/preferences-dialog.hpp" +#include "stage/dialog/render.hpp" +#include "stage/workspace/workspace-window.hpp" +#include "stage/ctrl/ui-state.hpp" +#include "stage/setting/asset-controller.hpp" +#include "stage/panel/timeline-panel.hpp" +//#include "stage/timeline/timeline-widget.hpp" +//#include "stage/timeline/timeline-controller.hpp" /////////////////TODO still required? #include "include/ui-protocol.hpp" -#include "proc/mobject/session/root.hpp" -#include "proc/asset/sequence.hpp" ///////////////////////////////////////////////////////////TICKET #1096 : avoid direct inclusion to reduce compile times -#include "proc/mobject/session/fork.hpp" ///////////////////////////////////////////////////////////TICKET #1096 : avoid direct inclusion to reduce compile times -#include "proc/cmd.hpp" -#include "backend/real-clock.hpp" +#include "steam/mobject/session/root.hpp" +#include "steam/asset/sequence.hpp" ///////////////////////////////////////////////////////////TICKET #1096 : avoid direct inclusion to reduce compile times +#include "steam/mobject/session/fork.hpp" ///////////////////////////////////////////////////////////TICKET #1096 : avoid direct inclusion to reduce compile times +#include "steam/cmd.hpp" +#include "vault/real-clock.hpp" #include "lib/diff/tree-mutator.hpp" #include "lib/format-string.hpp" #include "lib/format-obj.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/util.hpp" //#include diff --git a/src/stage/interact/interaction-director.hpp b/src/stage/interact/interaction-director.hpp index 676bd05ff..df493fdba 100644 --- a/src/stage/interact/interaction-director.hpp +++ b/src/stage/interact/interaction-director.hpp @@ -53,8 +53,8 @@ #ifndef GUI_INTERACT_INTERACTION_DIRECTOR_H #define GUI_INTERACT_INTERACTION_DIRECTOR_H -#include "gui/model/controller.hpp" -#include "gui/timeline/timeline-gui.hpp" +#include "stage/model/controller.hpp" +#include "stage/timeline/timeline-gui.hpp" #include "lib/depend-inject.hpp" //#include diff --git a/src/stage/interact/interaction-state.cpp b/src/stage/interact/interaction-state.cpp index 1f70fc529..97ed689bb 100644 --- a/src/stage/interact/interaction-state.cpp +++ b/src/stage/interact/interaction-state.cpp @@ -32,7 +32,7 @@ //#include "lib/util.hpp" //#include "lib/symbol.hpp" //#include "include/logging.h" -#include "gui/interact/interaction-state.hpp" +#include "stage/interact/interaction-state.hpp" //#include //#include diff --git a/src/stage/interact/interaction-state.hpp b/src/stage/interact/interaction-state.hpp index 0c287d336..b45004c97 100644 --- a/src/stage/interact/interaction-state.hpp +++ b/src/stage/interact/interaction-state.hpp @@ -40,7 +40,7 @@ #include "lib/error.hpp" #include "lib/nocopy.hpp" -#include "gui/ctrl/bus-term.hpp" +#include "stage/ctrl/bus-term.hpp" #include "lib/idi/entry-id.hpp" //#include "lib/symbol.hpp" //#include "lib/util.hpp" diff --git a/src/stage/interact/navigator.cpp b/src/stage/interact/navigator.cpp index dce9e238f..70cc16831 100644 --- a/src/stage/interact/navigator.cpp +++ b/src/stage/interact/navigator.cpp @@ -34,9 +34,9 @@ */ -#include "gui/interact/navigator.hpp" -#include "gui/interact/spot-locator.hpp" -//#include "gui/ctrl/global-ctx.hpp" +#include "stage/interact/navigator.hpp" +#include "stage/interact/spot-locator.hpp" +//#include "stage/ctrl/global-ctx.hpp" //#include "lib/util.hpp" //using util::cStr; diff --git a/src/stage/interact/navigator.hpp b/src/stage/interact/navigator.hpp index 93b80603f..c9bce98e6 100644 --- a/src/stage/interact/navigator.hpp +++ b/src/stage/interact/navigator.hpp @@ -38,8 +38,8 @@ #ifndef GUI_INTERACT_NAVIGATOR_H #define GUI_INTERACT_NAVIGATOR_H -#include "gui/gtk-base.hpp" -#include "gui/interact/ui-coord-resolver.hpp" +#include "stage/gtk-base.hpp" +#include "stage/interact/ui-coord-resolver.hpp" #include "lib/nocopy.hpp" //#include diff --git a/src/stage/interact/spot-locator.cpp b/src/stage/interact/spot-locator.cpp index 6f5097cef..4e74bc81e 100644 --- a/src/stage/interact/spot-locator.cpp +++ b/src/stage/interact/spot-locator.cpp @@ -28,8 +28,8 @@ */ -#include "gui/interact/spot-locator.hpp" -//#include "gui/ctrl/global-ctx.hpp" +#include "stage/interact/spot-locator.hpp" +//#include "stage/ctrl/global-ctx.hpp" //#include "lib/util.hpp" //using util::cStr; diff --git a/src/stage/interact/spot-locator.hpp b/src/stage/interact/spot-locator.hpp index fe5ccbef9..f827ede38 100644 --- a/src/stage/interact/spot-locator.hpp +++ b/src/stage/interact/spot-locator.hpp @@ -39,7 +39,7 @@ #ifndef GUI_INTERACT_SPOT_LOCATOR_H #define GUI_INTERACT_SPOT_LOCATOR_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "lib/nocopy.hpp" //#include diff --git a/src/stage/interact/ui-coord-resolver.cpp b/src/stage/interact/ui-coord-resolver.cpp index 9ce33e6ff..0e8d75c24 100644 --- a/src/stage/interact/ui-coord-resolver.cpp +++ b/src/stage/interact/ui-coord-resolver.cpp @@ -28,7 +28,7 @@ */ -#include "gui/interact/ui-coord-resolver.hpp" +#include "stage/interact/ui-coord-resolver.hpp" #include "lib/util.hpp" using util::isnil; diff --git a/src/stage/interact/ui-coord-resolver.hpp b/src/stage/interact/ui-coord-resolver.hpp index 27635c58f..41e74d592 100644 --- a/src/stage/interact/ui-coord-resolver.hpp +++ b/src/stage/interact/ui-coord-resolver.hpp @@ -118,7 +118,7 @@ #include "lib/error.hpp" #include "lib/symbol.hpp" #include "lib/format-string.hpp" -#include "gui/interact/ui-coord.hpp" +#include "stage/interact/ui-coord.hpp" #include "lib/iter-tree-explorer.hpp" #include "lib/iter-source.hpp" #include "lib/depend.hpp" diff --git a/src/stage/interact/ui-location-solver.hpp b/src/stage/interact/ui-location-solver.hpp index cf869d896..46ce89051 100644 --- a/src/stage/interact/ui-location-solver.hpp +++ b/src/stage/interact/ui-location-solver.hpp @@ -71,8 +71,8 @@ #include "lib/error.hpp" #include "lib/symbol.hpp" #include "lib/format-util.hpp" -#include "gui/interact/ui-coord.hpp" -#include "gui/interact/ui-coord-resolver.hpp" +#include "stage/interact/ui-coord.hpp" +#include "stage/interact/ui-coord-resolver.hpp" #include "lib/nocopy.hpp" #include diff --git a/src/stage/interact/view-locator.cpp b/src/stage/interact/view-locator.cpp index 350864201..d66b0f85b 100644 --- a/src/stage/interact/view-locator.cpp +++ b/src/stage/interact/view-locator.cpp @@ -39,13 +39,13 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/interact/view-locator.hpp" -#include "gui/interact/view-spec-dsl.hpp" -#include "gui/interact/ui-location-solver.hpp" -#include "gui/ctrl/panel-locator.hpp" -#include "gui/model/element-access.hpp" -#include "gui/interact/ui-coord-resolver.hpp" +#include "stage/gtk-base.hpp" +#include "stage/interact/view-locator.hpp" +#include "stage/interact/view-spec-dsl.hpp" +#include "stage/interact/ui-location-solver.hpp" +#include "stage/ctrl/panel-locator.hpp" +#include "stage/model/element-access.hpp" +#include "stage/interact/ui-coord-resolver.hpp" #include "lib/depend.hpp" #include "lib/symbol.hpp" //#include "lib/util.hpp" diff --git a/src/stage/interact/view-locator.hpp b/src/stage/interact/view-locator.hpp index 607ae411a..4b0d66cd5 100644 --- a/src/stage/interact/view-locator.hpp +++ b/src/stage/interact/view-locator.hpp @@ -65,9 +65,9 @@ #define GUI_INTERACT_VIEW_LOCATOR_H #include "lib/depend-inject.hpp" -#include "gui/id-scheme.hpp" -#include "gui/interact/view-spec-dsl.hpp" -#include "gui/model/element-access.hpp" +#include "stage/id-scheme.hpp" +#include "stage/interact/view-spec-dsl.hpp" +#include "stage/model/element-access.hpp" #include "lib/idi/genfunc.hpp" #include "lib/symbol.hpp" #include "lib/nocopy.hpp" diff --git a/src/stage/interact/view-spec-dsl.hpp b/src/stage/interact/view-spec-dsl.hpp index 1a0dd6b2e..df468d081 100644 --- a/src/stage/interact/view-spec-dsl.hpp +++ b/src/stage/interact/view-spec-dsl.hpp @@ -103,8 +103,8 @@ #include "lib/meta/function.hpp" #include "lib/meta/tuple-helper.hpp" #include "lib/meta/function-closure.hpp" -#include "gui/interact/ui-location-solver.hpp" -#include "gui/interact/ui-coord.hpp" +#include "stage/interact/ui-location-solver.hpp" +#include "stage/interact/ui-coord.hpp" #include #include diff --git a/src/stage/interact/wizard.cpp b/src/stage/interact/wizard.cpp index accf9ccac..f44260304 100644 --- a/src/stage/interact/wizard.cpp +++ b/src/stage/interact/wizard.cpp @@ -28,15 +28,15 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/config-keys.hpp" -#include "gui/interact/wizard.hpp" -#include "gui/interact/spot-locator.hpp" -#include "gui/workspace/workspace-window.hpp" -#include "gui/panel/infobox-panel.hpp" -#include "gui/dialog/test-control.hpp" -#include "gui/ctrl/notification-hub.hpp" -#include "gui/ctrl/global-ctx.hpp" +#include "stage/gtk-base.hpp" +#include "stage/config-keys.hpp" +#include "stage/interact/wizard.hpp" +#include "stage/interact/spot-locator.hpp" +#include "stage/workspace/workspace-window.hpp" +#include "stage/panel/infobox-panel.hpp" +#include "stage/dialog/test-control.hpp" +#include "stage/ctrl/notification-hub.hpp" +#include "stage/ctrl/global-ctx.hpp" #include "lib/format-string.hpp" //#include "lib/util.hpp" diff --git a/src/stage/interact/work-site-trail.cpp b/src/stage/interact/work-site-trail.cpp index 6a2fcd442..efcc9ab92 100644 --- a/src/stage/interact/work-site-trail.cpp +++ b/src/stage/interact/work-site-trail.cpp @@ -28,8 +28,8 @@ */ -#include "gui/interact/work-site-trail.hpp" -//#include "gui/ctrl/global-ctx.hpp" +#include "stage/interact/work-site-trail.hpp" +//#include "stage/ctrl/global-ctx.hpp" //#include "lib/util.hpp" //using util::cStr; diff --git a/src/stage/interact/work-site-trail.hpp b/src/stage/interact/work-site-trail.hpp index c136696a4..ce915a071 100644 --- a/src/stage/interact/work-site-trail.hpp +++ b/src/stage/interact/work-site-trail.hpp @@ -40,7 +40,7 @@ #ifndef GUI_INTERACT_WORK_SITE_TRAIL_H #define GUI_INTERACT_WORK_SITE_TRAIL_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "lib/nocopy.hpp" //#include diff --git a/src/stage/interact/work-site.cpp b/src/stage/interact/work-site.cpp index aadf163b9..b3d5ec90e 100644 --- a/src/stage/interact/work-site.cpp +++ b/src/stage/interact/work-site.cpp @@ -29,8 +29,8 @@ */ -#include "gui/interact/work-site.hpp" -//#include "gui/ctrl/global-ctx.hpp" +#include "stage/interact/work-site.hpp" +//#include "stage/ctrl/global-ctx.hpp" //#include "lib/util.hpp" //using util::cStr; diff --git a/src/stage/interact/work-site.hpp b/src/stage/interact/work-site.hpp index ac7a69da3..0b168951c 100644 --- a/src/stage/interact/work-site.hpp +++ b/src/stage/interact/work-site.hpp @@ -45,7 +45,7 @@ #ifndef GUI_INTERACT_WORK_SITE_H #define GUI_INTERACT_WORK_SITE_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "lib/nocopy.hpp" //#include diff --git a/src/stage/model/clip-track.hpp b/src/stage/model/clip-track.hpp index 4441cb16a..79f66d350 100644 --- a/src/stage/model/clip-track.hpp +++ b/src/stage/model/clip-track.hpp @@ -31,7 +31,7 @@ #ifndef CLIP_TRACK_HPP #define CLIP_TRACK_HPP -#include "gui/model/track.hpp" +#include "stage/model/track.hpp" #include "lib/observable-list.hpp" namespace gui { diff --git a/src/stage/model/clip.cpp b/src/stage/model/clip.cpp index c95b6125a..7c2299063 100644 --- a/src/stage/model/clip.cpp +++ b/src/stage/model/clip.cpp @@ -29,7 +29,7 @@ */ -#include "gui/model/clip.hpp" +#include "stage/model/clip.hpp" #include "lib/time/mutation.hpp" using lib::time::FSecs; diff --git a/src/stage/model/clip.hpp b/src/stage/model/clip.hpp index 7d4a8ee3a..028cbb421 100644 --- a/src/stage/model/clip.hpp +++ b/src/stage/model/clip.hpp @@ -30,7 +30,7 @@ #ifndef GUI_MODEL_CLIP_H #define GUI_MODEL_CLIP_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "lib/time/timevalue.hpp" #include diff --git a/src/stage/model/controller.hpp b/src/stage/model/controller.hpp index a6df8f52d..7290ce53d 100644 --- a/src/stage/model/controller.hpp +++ b/src/stage/model/controller.hpp @@ -40,7 +40,7 @@ #include "lib/error.hpp" -#include "gui/model/tangible.hpp" +#include "stage/model/tangible.hpp" //#include "lib/symbol.hpp" //#include "lib/util.hpp" diff --git a/src/stage/model/element-access.hpp b/src/stage/model/element-access.hpp index 166569cd3..1b25f68e1 100644 --- a/src/stage/model/element-access.hpp +++ b/src/stage/model/element-access.hpp @@ -59,7 +59,7 @@ #include "lib/variant.hpp" #include "lib/meta/typelist-manip.hpp" #include "lib/access-casted.hpp" -#include "gui/interact/ui-coord.hpp" +#include "stage/interact/ui-coord.hpp" #include diff --git a/src/stage/model/flash-deco.hpp b/src/stage/model/flash-deco.hpp index 15889a76c..fbd836bc3 100644 --- a/src/stage/model/flash-deco.hpp +++ b/src/stage/model/flash-deco.hpp @@ -41,8 +41,8 @@ #define GUI_MODEL_FLASH_DECO_H -#include "gui/gtk-base.hpp" -#include "gui/style-scheme.hpp" +#include "stage/gtk-base.hpp" +#include "stage/style-scheme.hpp" namespace gui { diff --git a/src/stage/model/group-track.hpp b/src/stage/model/group-track.hpp index 10327bde8..270bf18e9 100644 --- a/src/stage/model/group-track.hpp +++ b/src/stage/model/group-track.hpp @@ -31,7 +31,7 @@ #ifndef GROUP_TRACK_HPP #define GROUP_TRACK_HPP -#include "gui/model/parent-track.hpp" +#include "stage/model/parent-track.hpp" namespace gui { diff --git a/src/stage/model/parent-track.hpp b/src/stage/model/parent-track.hpp index e197f90fe..b86bd5a38 100644 --- a/src/stage/model/parent-track.hpp +++ b/src/stage/model/parent-track.hpp @@ -31,7 +31,7 @@ #ifndef PARENT_TRACK_HPP #define PARENT_TRACK_HPP -#include "gui/model/track.hpp" +#include "stage/model/track.hpp" #include "lib/observable-list.hpp" namespace gui { diff --git a/src/stage/model/project.cpp b/src/stage/model/project.cpp index 1f3b7d1b3..a34c834e8 100644 --- a/src/stage/model/project.cpp +++ b/src/stage/model/project.cpp @@ -30,8 +30,8 @@ */ -#include "gui/model/project.hpp" -#include "gui/model/sequence.hpp" +#include "stage/model/project.hpp" +#include "stage/model/sequence.hpp" #include diff --git a/src/stage/model/project.hpp b/src/stage/model/project.hpp index e1236dabc..263b47886 100644 --- a/src/stage/model/project.hpp +++ b/src/stage/model/project.hpp @@ -34,7 +34,7 @@ #define PROJECT_HPP -#include "gui/model/sequence.hpp" +#include "stage/model/sequence.hpp" #include "lib/observable-list.hpp" namespace gui { diff --git a/src/stage/model/sequence.cpp b/src/stage/model/sequence.cpp index 90ae4b6f5..1270fc865 100644 --- a/src/stage/model/sequence.cpp +++ b/src/stage/model/sequence.cpp @@ -27,14 +27,14 @@ ** and will be replaced in entirety by UI-Bus and diff framework. */ -#include "gui/model/sequence.hpp" +#include "stage/model/sequence.hpp" #include "include/logging.h" #include // TEST CODE -#include "gui/model/group-track.hpp" -#include "gui/model/clip-track.hpp" +#include "stage/model/group-track.hpp" +#include "stage/model/clip-track.hpp" namespace gui { diff --git a/src/stage/model/sequence.hpp b/src/stage/model/sequence.hpp index ff0934079..0cc09baf1 100644 --- a/src/stage/model/sequence.hpp +++ b/src/stage/model/sequence.hpp @@ -34,7 +34,7 @@ #ifndef SEQUENCE_HPP #define SEQUENCE_HPP -#include "gui/model/parent-track.hpp" +#include "stage/model/parent-track.hpp" #include "lib/hash-indexed.hpp" #include diff --git a/src/stage/model/session-facade.cpp b/src/stage/model/session-facade.cpp index c9f0b0402..95514583e 100644 --- a/src/stage/model/session-facade.cpp +++ b/src/stage/model/session-facade.cpp @@ -38,7 +38,7 @@ //#include "lib/util.hpp" //#include "lib/symbol.hpp" //#include "include/logging.h" -#include "gui/model/session-facade.hpp" +#include "stage/model/session-facade.hpp" #include "lib/depend.hpp" //#include diff --git a/src/stage/model/tangible.cpp b/src/stage/model/tangible.cpp index 0070bc029..1014f5dc4 100644 --- a/src/stage/model/tangible.cpp +++ b/src/stage/model/tangible.cpp @@ -30,9 +30,9 @@ */ -#include "gui/model/tangible.hpp" -#include "gui/model/widget.hpp" -#include "gui/model/controller.hpp" +#include "stage/model/tangible.hpp" +#include "stage/model/widget.hpp" +#include "stage/model/controller.hpp" #include "include/ui-protocol.hpp" #include "lib/diff/gen-node.hpp" diff --git a/src/stage/model/tangible.hpp b/src/stage/model/tangible.hpp index f8e06fe99..74e59c414 100644 --- a/src/stage/model/tangible.hpp +++ b/src/stage/model/tangible.hpp @@ -132,8 +132,8 @@ #include "lib/error.hpp" #include "lib/nocopy.hpp" -#include "gui/ctrl/bus-term.hpp" -#include "gui/model/expander-revealer.hpp" +#include "stage/ctrl/bus-term.hpp" +#include "stage/model/expander-revealer.hpp" #include "lib/diff/diff-mutable.hpp" #include "lib/idi/entry-id.hpp" #include "lib/symbol.hpp" diff --git a/src/stage/model/track.cpp b/src/stage/model/track.cpp index ed3190134..06f093f98 100644 --- a/src/stage/model/track.cpp +++ b/src/stage/model/track.cpp @@ -29,8 +29,8 @@ */ -#include "gui/model/track.hpp" -#include "gui/model/parent-track.hpp" +#include "stage/model/track.hpp" +#include "stage/model/parent-track.hpp" #include #include diff --git a/src/stage/model/track.hpp b/src/stage/model/track.hpp index 9410fefe2..caf47e723 100644 --- a/src/stage/model/track.hpp +++ b/src/stage/model/track.hpp @@ -28,7 +28,7 @@ */ -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include #include diff --git a/src/stage/model/widget.hpp b/src/stage/model/widget.hpp index 2abfa875e..e7b3b2a89 100644 --- a/src/stage/model/widget.hpp +++ b/src/stage/model/widget.hpp @@ -37,7 +37,7 @@ #include "lib/error.hpp" -#include "gui/model/tangible.hpp" +#include "stage/model/tangible.hpp" //#include "lib/symbol.hpp" //#include "lib/util.hpp" diff --git a/src/stage/notification-service.cpp b/src/stage/notification-service.cpp index 41cff9361..1e4467aba 100644 --- a/src/stage/notification-service.cpp +++ b/src/stage/notification-service.cpp @@ -52,10 +52,10 @@ -#include "gui/ctrl/ui-manager.hpp" -#include "gui/ctrl/ui-dispatcher.hpp" -#include "gui/notification-service.hpp" -#include "gui/interact/wizard.hpp" +#include "stage/ctrl/ui-manager.hpp" +#include "stage/ctrl/ui-dispatcher.hpp" +#include "stage/notification-service.hpp" +#include "stage/interact/wizard.hpp" #include "include/ui-protocol.hpp" #include "lib/diff/mutation-message.hpp" diff --git a/src/stage/notification-service.hpp b/src/stage/notification-service.hpp index b3390fa5c..8a909acbd 100644 --- a/src/stage/notification-service.hpp +++ b/src/stage/notification-service.hpp @@ -42,7 +42,7 @@ #include "include/gui-notification-facade.h" #include "common/instancehandle.hpp" -#include "gui/ctrl/bus-term.hpp" +#include "stage/ctrl/bus-term.hpp" #include diff --git a/src/stage/output/displayer.cpp b/src/stage/output/displayer.cpp index 0eadb3506..470ab3461 100644 --- a/src/stage/output/displayer.cpp +++ b/src/stage/output/displayer.cpp @@ -35,10 +35,10 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/output/displayer.hpp" -#include "gui/output/xvdisplayer.hpp" -#include "gui/output/gdkdisplayer.hpp" +#include "stage/gtk-base.hpp" +#include "stage/output/displayer.hpp" +#include "stage/output/xvdisplayer.hpp" +#include "stage/output/gdkdisplayer.hpp" namespace gui { namespace output { diff --git a/src/stage/output/gdkdisplayer.cpp b/src/stage/output/gdkdisplayer.cpp index 63079e5c5..46ef6bc8a 100644 --- a/src/stage/output/gdkdisplayer.cpp +++ b/src/stage/output/gdkdisplayer.cpp @@ -30,8 +30,8 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/output/gdkdisplayer.hpp" +#include "stage/gtk-base.hpp" +#include "stage/output/gdkdisplayer.hpp" #if false ///////////////////////////////////////////////////////////////////////////////////////////////////TICKET #950 : new solution for video display #include diff --git a/src/stage/output/gdkdisplayer.hpp b/src/stage/output/gdkdisplayer.hpp index e04864199..0b097cd46 100644 --- a/src/stage/output/gdkdisplayer.hpp +++ b/src/stage/output/gdkdisplayer.hpp @@ -33,8 +33,8 @@ #ifndef GUI_OUTPUT_GDKDISPLAYER_H #define GUI_OUTPUT_GDKDISPLAYER_H -#include "gui/gtk-base.hpp" -#include "gui/output/displayer.hpp" +#include "stage/gtk-base.hpp" +#include "stage/output/displayer.hpp" namespace Gtk { class Widget; diff --git a/src/stage/output/xvdisplayer.cpp b/src/stage/output/xvdisplayer.cpp index 806b9bc24..e83e76c89 100644 --- a/src/stage/output/xvdisplayer.cpp +++ b/src/stage/output/xvdisplayer.cpp @@ -33,8 +33,8 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/output/xvdisplayer.hpp" +#include "stage/gtk-base.hpp" +#include "stage/output/xvdisplayer.hpp" #include "include/logging.h" #include diff --git a/src/stage/output/xvdisplayer.hpp b/src/stage/output/xvdisplayer.hpp index 3b7af42d8..6877718c7 100644 --- a/src/stage/output/xvdisplayer.hpp +++ b/src/stage/output/xvdisplayer.hpp @@ -38,8 +38,8 @@ #define GUI_OUTPUT_XVDISPLAYER_H -#include "gui/output/displayer.hpp" -#include "gui/gtk-base.hpp" +#include "stage/output/displayer.hpp" +#include "stage/gtk-base.hpp" #include #include diff --git a/src/stage/panel/assets-panel.cpp b/src/stage/panel/assets-panel.cpp index f2f4a0be6..cd5807e7e 100644 --- a/src/stage/panel/assets-panel.cpp +++ b/src/stage/panel/assets-panel.cpp @@ -25,8 +25,8 @@ ** Implementation of a (dockable) panel to organise the assets of a project. */ -#include "gui/gtk-base.hpp" -#include "gui/panel/assets-panel.hpp" +#include "stage/gtk-base.hpp" +#include "stage/panel/assets-panel.hpp" namespace gui { namespace panel{ diff --git a/src/stage/panel/assets-panel.hpp b/src/stage/panel/assets-panel.hpp index b4a1aed86..dc2b702ba 100644 --- a/src/stage/panel/assets-panel.hpp +++ b/src/stage/panel/assets-panel.hpp @@ -37,7 +37,7 @@ #define GUI_PANEL_ASSETS_PANEL_H -#include "gui/panel/panel.hpp" +#include "stage/panel/panel.hpp" namespace gui { namespace panel{ diff --git a/src/stage/panel/infobox-panel.cpp b/src/stage/panel/infobox-panel.cpp index 24f1bcd5c..380c5341e 100644 --- a/src/stage/panel/infobox-panel.cpp +++ b/src/stage/panel/infobox-panel.cpp @@ -25,9 +25,9 @@ ** Implementation of a (dockable) panel to display and manipulate parameters. */ -#include "gui/gtk-base.hpp" -#include "gui/panel/infobox-panel.hpp" -#include "gui/widget/error-log-display.hpp" +#include "stage/gtk-base.hpp" +#include "stage/panel/infobox-panel.hpp" +#include "stage/widget/error-log-display.hpp" namespace gui { diff --git a/src/stage/panel/infobox-panel.hpp b/src/stage/panel/infobox-panel.hpp index 4ef8c1b0f..7560a0523 100644 --- a/src/stage/panel/infobox-panel.hpp +++ b/src/stage/panel/infobox-panel.hpp @@ -35,7 +35,7 @@ #define GUI_PANEL_INFOBOX_PANEL_H -#include "gui/panel/panel.hpp" +#include "stage/panel/panel.hpp" #include diff --git a/src/stage/panel/panel.cpp b/src/stage/panel/panel.cpp index 1b740d2af..11b4635c0 100644 --- a/src/stage/panel/panel.cpp +++ b/src/stage/panel/panel.cpp @@ -26,10 +26,10 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/panel/panel.hpp" -#include "gui/workspace/panel-manager.hpp" -#include "gui/workspace/workspace-window.hpp" +#include "stage/gtk-base.hpp" +#include "stage/panel/panel.hpp" +#include "stage/workspace/panel-manager.hpp" +#include "stage/workspace/workspace-window.hpp" #include diff --git a/src/stage/panel/panel.hpp b/src/stage/panel/panel.hpp index 8b34e9bdc..4a647edeb 100644 --- a/src/stage/panel/panel.hpp +++ b/src/stage/panel/panel.hpp @@ -30,8 +30,8 @@ #ifndef GUI_PANEL_PANEL_H #define GUI_PANEL_PANEL_H -#include "gui/gtk-base.hpp" -#include "gui/widget/panel-bar.hpp" +#include "stage/gtk-base.hpp" +#include "stage/widget/panel-bar.hpp" #include diff --git a/src/stage/panel/timeline-panel-obsolete.cpp b/src/stage/panel/timeline-panel-obsolete.cpp index 02ab44d98..a3847e0c4 100644 --- a/src/stage/panel/timeline-panel-obsolete.cpp +++ b/src/stage/panel/timeline-panel-obsolete.cpp @@ -21,13 +21,13 @@ * *****************************************************/ -#include "gui/gtk-base.hpp" -#include "gui/panel/timeline-panel-obsolete.hpp" -#include "gui/widget/timeline/timeline-zoom-scale.hpp" -#include "gui/workspace/workspace-window.hpp" -#include "gui/ctrl/playback-controller.hpp" -#include "gui/model/project.hpp" -#include "gui/ui-bus.hpp" +#include "stage/gtk-base.hpp" +#include "stage/panel/timeline-panel-obsolete.hpp" +#include "stage/widget/timeline/timeline-zoom-scale.hpp" +#include "stage/workspace/workspace-window.hpp" +#include "stage/ctrl/playback-controller.hpp" +#include "stage/model/project.hpp" +#include "stage/ui-bus.hpp" #include "lib/util.hpp" diff --git a/src/stage/panel/timeline-panel-obsolete.hpp b/src/stage/panel/timeline-panel-obsolete.hpp index 475b10e7e..516961e4c 100644 --- a/src/stage/panel/timeline-panel-obsolete.hpp +++ b/src/stage/panel/timeline-panel-obsolete.hpp @@ -29,12 +29,12 @@ #ifndef GUI_PANEL_TIMELINE_PANEL_OBSOLETE_H #define GUI_PANEL_TIMELINE_PANEL_OBSOLETE_H -#include "gui/panel/panel.hpp" -#include "gui/widget/timecode-widget.hpp" -#include "gui/widget/timeline-widget.hpp" -#include "gui/widget/timeline/timeline-zoom-scale.hpp" -#include "gui/model/project.hpp" -#include "gui/ui-bus.hpp" ////////////TODO for the obsolete Controller +#include "stage/panel/panel.hpp" +#include "stage/widget/timecode-widget.hpp" +#include "stage/widget/timeline-widget.hpp" +#include "stage/widget/timeline/timeline-zoom-scale.hpp" +#include "stage/model/project.hpp" +#include "stage/ui-bus.hpp" ////////////TODO for the obsolete Controller #include "lib/time/timevalue.hpp" #include "lib/util-coll.hpp" diff --git a/src/stage/panel/timeline-panel.cpp b/src/stage/panel/timeline-panel.cpp index 7bd68d0b7..de8d650d3 100644 --- a/src/stage/panel/timeline-panel.cpp +++ b/src/stage/panel/timeline-panel.cpp @@ -31,10 +31,10 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/panel/timeline-panel.hpp" -#include "gui/timeline/timeline-widget.hpp" -#include "gui/timeline/timeline-widget-empty.hpp" +#include "stage/gtk-base.hpp" +#include "stage/panel/timeline-panel.hpp" +#include "stage/timeline/timeline-widget.hpp" +#include "stage/timeline/timeline-widget-empty.hpp" using std::make_unique; diff --git a/src/stage/panel/timeline-panel.hpp b/src/stage/panel/timeline-panel.hpp index 4691cd133..9e02cd1e3 100644 --- a/src/stage/panel/timeline-panel.hpp +++ b/src/stage/panel/timeline-panel.hpp @@ -41,8 +41,8 @@ #ifndef GUI_PANEL_TIMELINE_PANEL_H #define GUI_PANEL_TIMELINE_PANEL_H -#include "gui/panel/panel.hpp" -#include "gui/timeline/timeline-widget.hpp" +#include "stage/panel/panel.hpp" +#include "stage/timeline/timeline-widget.hpp" #include #include diff --git a/src/stage/panel/viewer-panel.cpp b/src/stage/panel/viewer-panel.cpp index bbf552e8b..4903fd487 100644 --- a/src/stage/panel/viewer-panel.cpp +++ b/src/stage/panel/viewer-panel.cpp @@ -25,12 +25,12 @@ ** Implementation of a dockable panel to hold the video viewers */ -#include "gui/gtk-base.hpp" -#include "gui/panel/viewer-panel.hpp" +#include "stage/gtk-base.hpp" +#include "stage/panel/viewer-panel.hpp" -#include "gui/workspace/workspace-window.hpp" -#include "gui/ui-bus.hpp" ///////////////////////////////////TODO why are we forced to include this after workspace-window.hpp ?? Ambiguity between std::ref and boost::reference_wrapper -#include "gui/display-service.hpp" +#include "stage/workspace/workspace-window.hpp" +#include "stage/ui-bus.hpp" ///////////////////////////////////TODO why are we forced to include this after workspace-window.hpp ?? Ambiguity between std::ref and boost::reference_wrapper +#include "stage/display-service.hpp" using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! diff --git a/src/stage/panel/viewer-panel.hpp b/src/stage/panel/viewer-panel.hpp index f45d94b4f..01e85e7c3 100644 --- a/src/stage/panel/viewer-panel.hpp +++ b/src/stage/panel/viewer-panel.hpp @@ -29,9 +29,9 @@ #define GUI_PANEL_VIEWER_PANEL_H -#include "gui/panel/panel.hpp" -#include "gui/widget/video-display-widget.hpp" -#include "gui/ctrl/playback-controller.hpp" +#include "stage/panel/panel.hpp" +#include "stage/widget/video-display-widget.hpp" +#include "stage/ctrl/playback-controller.hpp" namespace gui { namespace panel{ diff --git a/src/stage/setting/asset-controller.cpp b/src/stage/setting/asset-controller.cpp index bda517cdd..d54d3a418 100644 --- a/src/stage/setting/asset-controller.cpp +++ b/src/stage/setting/asset-controller.cpp @@ -29,8 +29,8 @@ */ -#include "gui/setting/asset-controller.hpp" -//#include "gui/ctrl/global-ctx.hpp" +#include "stage/setting/asset-controller.hpp" +//#include "stage/ctrl/global-ctx.hpp" #include "lib/diff/tree-mutator.hpp" //#include "lib/util.hpp" diff --git a/src/stage/setting/asset-controller.hpp b/src/stage/setting/asset-controller.hpp index d4e6ad67e..5ed841ab9 100644 --- a/src/stage/setting/asset-controller.hpp +++ b/src/stage/setting/asset-controller.hpp @@ -51,8 +51,8 @@ #ifndef GUI_SETTING_ASSET_CONTROLLER_H #define GUI_SETTING_ASSET_CONTROLLER_H -//#include "gui/gtk-base.hpp" -#include "gui/model/controller.hpp" +//#include "stage/gtk-base.hpp" +#include "stage/model/controller.hpp" //#include //#include diff --git a/src/stage/style-scheme.cpp b/src/stage/style-scheme.cpp index 1dd8cf8c6..14c2d5ae8 100644 --- a/src/stage/style-scheme.cpp +++ b/src/stage/style-scheme.cpp @@ -28,8 +28,8 @@ ** */ -#include "gui/gtk-base.hpp" -#include "gui/style-scheme.hpp" +#include "stage/gtk-base.hpp" +#include "stage/style-scheme.hpp" namespace gui { diff --git a/src/stage/timeline/body-canvas-widget.cpp b/src/stage/timeline/body-canvas-widget.cpp index 284688036..31ea944b1 100644 --- a/src/stage/timeline/body-canvas-widget.cpp +++ b/src/stage/timeline/body-canvas-widget.cpp @@ -29,11 +29,11 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/timeline/body-canvas-widget.hpp" -#include "gui/timeline/track-body.hpp" +#include "stage/gtk-base.hpp" +#include "stage/timeline/body-canvas-widget.hpp" +#include "stage/timeline/track-body.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/timeline/body-canvas-widget.hpp b/src/stage/timeline/body-canvas-widget.hpp index 47b1743e6..837b2a494 100644 --- a/src/stage/timeline/body-canvas-widget.hpp +++ b/src/stage/timeline/body-canvas-widget.hpp @@ -57,7 +57,7 @@ #ifndef GUI_TIMELINE_BODY_CANVAS_WIDGET_H #define GUI_TIMELINE_BODY_CANVAS_WIDGET_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" //#include "lib/util.hpp" diff --git a/src/stage/timeline/clip-presenter.cpp b/src/stage/timeline/clip-presenter.cpp index 19e30f7c7..735521aeb 100644 --- a/src/stage/timeline/clip-presenter.cpp +++ b/src/stage/timeline/clip-presenter.cpp @@ -30,12 +30,12 @@ */ -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "include/ui-protocol.hpp" -#include "gui/timeline/clip-presenter.hpp" -#include "gui/timeline/marker-widget.hpp" +#include "stage/timeline/clip-presenter.hpp" +#include "stage/timeline/marker-widget.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/timeline/clip-presenter.hpp b/src/stage/timeline/clip-presenter.hpp index 5ecd0df1d..be14ece6d 100644 --- a/src/stage/timeline/clip-presenter.hpp +++ b/src/stage/timeline/clip-presenter.hpp @@ -52,9 +52,9 @@ #ifndef GUI_TIMELINE_CLIP_PRESENTER_H #define GUI_TIMELINE_CLIP_PRESENTER_H -#include "gui/gtk-base.hpp" -#include "gui/model/controller.hpp" -#include "gui/timeline/clip-widget.hpp" +#include "stage/gtk-base.hpp" +#include "stage/model/controller.hpp" +#include "stage/timeline/clip-widget.hpp" //#include "lib/util.hpp" diff --git a/src/stage/timeline/clip-widget.cpp b/src/stage/timeline/clip-widget.cpp index 5b2316524..676096ae2 100644 --- a/src/stage/timeline/clip-widget.cpp +++ b/src/stage/timeline/clip-widget.cpp @@ -34,10 +34,10 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/timeline/clip-widget.hpp" +#include "stage/gtk-base.hpp" +#include "stage/timeline/clip-widget.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/timeline/clip-widget.hpp b/src/stage/timeline/clip-widget.hpp index ae8057846..c1e2ed360 100644 --- a/src/stage/timeline/clip-widget.hpp +++ b/src/stage/timeline/clip-widget.hpp @@ -101,7 +101,7 @@ #ifndef GUI_TIMELINE_CLIP_WIDGET_H #define GUI_TIMELINE_CLIP_WIDGET_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" //#include "lib/util.hpp" diff --git a/src/stage/timeline/header-pane-widget.hpp b/src/stage/timeline/header-pane-widget.hpp index e18cbc2fa..c2875b03d 100644 --- a/src/stage/timeline/header-pane-widget.hpp +++ b/src/stage/timeline/header-pane-widget.hpp @@ -49,9 +49,9 @@ #ifndef GUI_TIMELINE_HEADER_PANE_WIDGET_H #define GUI_TIMELINE_HEADER_PANE_WIDGET_H -#include "gui/gtk-base.hpp" -#include "gui/timeline/navigator-widget.hpp" -#include "gui/timeline/patchbay-widget.hpp" +#include "stage/gtk-base.hpp" +#include "stage/timeline/navigator-widget.hpp" +#include "stage/timeline/patchbay-widget.hpp" //#include "lib/util.hpp" diff --git a/src/stage/timeline/marker-widget.cpp b/src/stage/timeline/marker-widget.cpp index 530a30c02..c18413f49 100644 --- a/src/stage/timeline/marker-widget.cpp +++ b/src/stage/timeline/marker-widget.cpp @@ -30,11 +30,11 @@ */ -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "include/ui-protocol.hpp" -#include "gui/timeline/marker-widget.hpp" +#include "stage/timeline/marker-widget.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/timeline/marker-widget.hpp b/src/stage/timeline/marker-widget.hpp index 45ee015e3..1debdd267 100644 --- a/src/stage/timeline/marker-widget.hpp +++ b/src/stage/timeline/marker-widget.hpp @@ -38,9 +38,9 @@ #ifndef GUI_TIMELINE_MARKER_WIDGET_H #define GUI_TIMELINE_MARKER_WIDGET_H -#include "gui/gtk-base.hpp" -#include "gui/model/widget.hpp" -#include "gui/widget/element-box-widget.hpp" +#include "stage/gtk-base.hpp" +#include "stage/model/widget.hpp" +#include "stage/widget/element-box-widget.hpp" //#include "lib/util.hpp" diff --git a/src/stage/timeline/navigator-widget.cpp b/src/stage/timeline/navigator-widget.cpp index eade9c30f..244a3b32e 100644 --- a/src/stage/timeline/navigator-widget.cpp +++ b/src/stage/timeline/navigator-widget.cpp @@ -30,10 +30,10 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/timeline/navigator-widget.hpp" +#include "stage/gtk-base.hpp" +#include "stage/timeline/navigator-widget.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/timeline/navigator-widget.hpp b/src/stage/timeline/navigator-widget.hpp index 791798a30..d69aa401c 100644 --- a/src/stage/timeline/navigator-widget.hpp +++ b/src/stage/timeline/navigator-widget.hpp @@ -41,7 +41,7 @@ #ifndef GUI_TIMELINE_NAVIGATOR_WIDGET_H #define GUI_TIMELINE_NAVIGATOR_WIDGET_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" //#include "lib/util.hpp" diff --git a/src/stage/timeline/patchbay-widget.cpp b/src/stage/timeline/patchbay-widget.cpp index e40d049d8..390cc93cd 100644 --- a/src/stage/timeline/patchbay-widget.cpp +++ b/src/stage/timeline/patchbay-widget.cpp @@ -30,10 +30,10 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/timeline/patchbay-widget.hpp" -#include "gui/timeline/track-head-widget.hpp" -//#include "gui/ui-bus.hpp" +#include "stage/gtk-base.hpp" +#include "stage/timeline/patchbay-widget.hpp" +#include "stage/timeline/track-head-widget.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/timeline/patchbay-widget.hpp b/src/stage/timeline/patchbay-widget.hpp index 03728a763..b073321ec 100644 --- a/src/stage/timeline/patchbay-widget.hpp +++ b/src/stage/timeline/patchbay-widget.hpp @@ -37,7 +37,7 @@ #ifndef GUI_TIMELINE_PATCHBAY_WIDGET_H #define GUI_TIMELINE_PATCHBAY_WIDGET_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" //#include "lib/util.hpp" diff --git a/src/stage/timeline/pipe-widget.cpp b/src/stage/timeline/pipe-widget.cpp index 577e29650..a8f82fbff 100644 --- a/src/stage/timeline/pipe-widget.cpp +++ b/src/stage/timeline/pipe-widget.cpp @@ -29,10 +29,10 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/timeline/pipe-widget.hpp" +#include "stage/gtk-base.hpp" +#include "stage/timeline/pipe-widget.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/timeline/pipe-widget.hpp b/src/stage/timeline/pipe-widget.hpp index 1a8af19f9..3858a8f19 100644 --- a/src/stage/timeline/pipe-widget.hpp +++ b/src/stage/timeline/pipe-widget.hpp @@ -39,7 +39,7 @@ #ifndef GUI_TIMELINE_PIPE_WIDGET_H #define GUI_TIMELINE_PIPE_WIDGET_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" //#include "lib/util.hpp" diff --git a/src/stage/timeline/ruler-widget.cpp b/src/stage/timeline/ruler-widget.cpp index b9f178d1b..29edb9aed 100644 --- a/src/stage/timeline/ruler-widget.cpp +++ b/src/stage/timeline/ruler-widget.cpp @@ -29,10 +29,10 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/timeline/ruler-widget.hpp" +#include "stage/gtk-base.hpp" +#include "stage/timeline/ruler-widget.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/timeline/ruler-widget.hpp b/src/stage/timeline/ruler-widget.hpp index 9c0279d72..cc3ef8633 100644 --- a/src/stage/timeline/ruler-widget.hpp +++ b/src/stage/timeline/ruler-widget.hpp @@ -32,7 +32,7 @@ #ifndef GUI_TIMELINE_RULER_WIDGET_H #define GUI_TIMELINE_RULER_WIDGET_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" //#include "lib/util.hpp" diff --git a/src/stage/timeline/timeline-controller.cpp b/src/stage/timeline/timeline-controller.cpp index 5634a301c..894f8eaf7 100644 --- a/src/stage/timeline/timeline-controller.cpp +++ b/src/stage/timeline/timeline-controller.cpp @@ -38,15 +38,15 @@ */ -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "include/ui-protocol.hpp" -#include "gui/timeline/timeline-layout.hpp" -#include "gui/timeline/timeline-controller.hpp" -#include "gui/timeline/track-presenter.hpp" -#include "gui/timeline/marker-widget.hpp" +#include "stage/timeline/timeline-layout.hpp" +#include "stage/timeline/timeline-controller.hpp" +#include "stage/timeline/track-presenter.hpp" +#include "stage/timeline/marker-widget.hpp" -//#include "gui/workspace/workspace-window.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/workspace/workspace-window.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/timeline/timeline-controller.hpp b/src/stage/timeline/timeline-controller.hpp index eb157626e..3810d689d 100644 --- a/src/stage/timeline/timeline-controller.hpp +++ b/src/stage/timeline/timeline-controller.hpp @@ -53,8 +53,8 @@ #ifndef GUI_TIMELINE_TIMELINE_CONTROLLER_H #define GUI_TIMELINE_TIMELINE_CONTROLLER_H -#include "gui/gtk-base.hpp" -#include "gui/model/controller.hpp" +#include "stage/gtk-base.hpp" +#include "stage/model/controller.hpp" #include "lib/time/timevalue.hpp" diff --git a/src/stage/timeline/timeline-gui.cpp b/src/stage/timeline/timeline-gui.cpp index f68a385e7..cd5cadc28 100644 --- a/src/stage/timeline/timeline-gui.cpp +++ b/src/stage/timeline/timeline-gui.cpp @@ -33,10 +33,10 @@ */ -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "include/ui-protocol.hpp" -#include "gui/timeline/timeline-gui.hpp" -#include "gui/timeline/timeline-widget.hpp" +#include "stage/timeline/timeline-gui.hpp" +#include "stage/timeline/timeline-widget.hpp" #include diff --git a/src/stage/timeline/timeline-gui.hpp b/src/stage/timeline/timeline-gui.hpp index 495645cde..36ebf3827 100644 --- a/src/stage/timeline/timeline-gui.hpp +++ b/src/stage/timeline/timeline-gui.hpp @@ -52,8 +52,8 @@ #ifndef GUI_TIMELINE_TIMELINE_GUI_H #define GUI_TIMELINE_TIMELINE_GUI_H -#include "gui/ctrl/bus-term.hpp" -#include "gui/model/w-link.hpp" +#include "stage/ctrl/bus-term.hpp" +#include "stage/model/w-link.hpp" #include "lib/diff/diff-mutable.hpp" #include "lib/nocopy.hpp" diff --git a/src/stage/timeline/timeline-layout.cpp b/src/stage/timeline/timeline-layout.cpp index 3028bce8f..77bd08c0f 100644 --- a/src/stage/timeline/timeline-layout.cpp +++ b/src/stage/timeline/timeline-layout.cpp @@ -30,10 +30,10 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/timeline/timeline-layout.hpp" +#include "stage/gtk-base.hpp" +#include "stage/timeline/timeline-layout.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/timeline/timeline-layout.hpp b/src/stage/timeline/timeline-layout.hpp index 6a14b359d..6450580c4 100644 --- a/src/stage/timeline/timeline-layout.hpp +++ b/src/stage/timeline/timeline-layout.hpp @@ -82,9 +82,9 @@ #ifndef GUI_TIMELINE_TIMELINE_LAYOUT_H #define GUI_TIMELINE_TIMELINE_LAYOUT_H -#include "gui/gtk-base.hpp" -#include "gui/timeline/header-pane-widget.hpp" -#include "gui/timeline/body-canvas-widget.hpp" +#include "stage/gtk-base.hpp" +#include "stage/timeline/header-pane-widget.hpp" +#include "stage/timeline/body-canvas-widget.hpp" //#include "lib/util.hpp" diff --git a/src/stage/timeline/timeline-widget-empty.hpp b/src/stage/timeline/timeline-widget-empty.hpp index 6d587427f..391f58e3e 100644 --- a/src/stage/timeline/timeline-widget-empty.hpp +++ b/src/stage/timeline/timeline-widget-empty.hpp @@ -36,8 +36,8 @@ #ifndef GUI_TIMELINE_TIMELINE_WIDGET_EMPTY_H #define GUI_TIMELINE_TIMELINE_WIDGET_EMPTY_H -#include "gui/gtk-base.hpp" -#include "gui/timeline/timeline-widget.hpp" +#include "stage/gtk-base.hpp" +#include "stage/timeline/timeline-widget.hpp" namespace gui { diff --git a/src/stage/timeline/timeline-widget.cpp b/src/stage/timeline/timeline-widget.cpp index 6ae5c7e63..9f393d7ad 100644 --- a/src/stage/timeline/timeline-widget.cpp +++ b/src/stage/timeline/timeline-widget.cpp @@ -30,13 +30,13 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/timeline/timeline-widget.hpp" -#include "gui/timeline/timeline-controller.hpp" -#include "gui/timeline/timeline-layout.hpp" +#include "stage/gtk-base.hpp" +#include "stage/timeline/timeline-widget.hpp" +#include "stage/timeline/timeline-controller.hpp" +#include "stage/timeline/timeline-layout.hpp" -//#include "gui/workspace/workspace-window.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/workspace/workspace-window.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/timeline/timeline-widget.hpp b/src/stage/timeline/timeline-widget.hpp index 12f39757e..359cb6f85 100644 --- a/src/stage/timeline/timeline-widget.hpp +++ b/src/stage/timeline/timeline-widget.hpp @@ -55,10 +55,10 @@ #ifndef GUI_TIMELINE_TIMELINE_WIDGET_H #define GUI_TIMELINE_TIMELINE_WIDGET_H -#include "gui/gtk-base.hpp" -//#include "gui/timeline/timeline-controller.hpp" /////TODO possible to push that into the implementation? -//#include "gui/timeline/layout-manager.hpp" -#include "gui/ctrl/bus-term.hpp" +#include "stage/gtk-base.hpp" +//#include "stage/timeline/timeline-controller.hpp" /////TODO possible to push that into the implementation? +//#include "stage/timeline/layout-manager.hpp" +#include "stage/ctrl/bus-term.hpp" #include "lib/time/timevalue.hpp" #include "lib/diff/diff-mutable.hpp" diff --git a/src/stage/timeline/track-body.cpp b/src/stage/timeline/track-body.cpp index ac485de3a..e81c238ac 100644 --- a/src/stage/timeline/track-body.cpp +++ b/src/stage/timeline/track-body.cpp @@ -30,10 +30,10 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/timeline/track-body.hpp" +#include "stage/gtk-base.hpp" +#include "stage/timeline/track-body.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/timeline/track-body.hpp b/src/stage/timeline/track-body.hpp index f9f60401c..fc87988a8 100644 --- a/src/stage/timeline/track-body.hpp +++ b/src/stage/timeline/track-body.hpp @@ -40,8 +40,8 @@ #ifndef GUI_TIMELINE_TRACK_BODY_H #define GUI_TIMELINE_TRACK_BODY_H -#include "gui/gtk-base.hpp" -#include "gui/ctrl/bus-term.hpp" +#include "stage/gtk-base.hpp" +#include "stage/ctrl/bus-term.hpp" //#include "lib/util.hpp" diff --git a/src/stage/timeline/track-head-widget.cpp b/src/stage/timeline/track-head-widget.cpp index e4748e996..673c129b8 100644 --- a/src/stage/timeline/track-head-widget.cpp +++ b/src/stage/timeline/track-head-widget.cpp @@ -29,10 +29,10 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/timeline/track-head-widget.hpp" +#include "stage/gtk-base.hpp" +#include "stage/timeline/track-head-widget.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/timeline/track-head-widget.hpp b/src/stage/timeline/track-head-widget.hpp index 19d158ca4..b5b855268 100644 --- a/src/stage/timeline/track-head-widget.hpp +++ b/src/stage/timeline/track-head-widget.hpp @@ -45,8 +45,8 @@ #ifndef GUI_TIMELINE_TRACK_HEAD_WIDGET_H #define GUI_TIMELINE_TRACK_HEAD_WIDGET_H -#include "gui/gtk-base.hpp" -#include "gui/ctrl/bus-term.hpp" +#include "stage/gtk-base.hpp" +#include "stage/ctrl/bus-term.hpp" //#include "lib/util.hpp" diff --git a/src/stage/timeline/track-presenter.cpp b/src/stage/timeline/track-presenter.cpp index e84610543..a337abc7b 100644 --- a/src/stage/timeline/track-presenter.cpp +++ b/src/stage/timeline/track-presenter.cpp @@ -30,11 +30,11 @@ */ -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "include/ui-protocol.hpp" -#include "gui/timeline/track-presenter.hpp" +#include "stage/timeline/track-presenter.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/timeline/track-presenter.hpp b/src/stage/timeline/track-presenter.hpp index 70b4d8c97..a0a4602ef 100644 --- a/src/stage/timeline/track-presenter.hpp +++ b/src/stage/timeline/track-presenter.hpp @@ -47,12 +47,12 @@ #ifndef GUI_TIMELINE_TRACK_PRESENTER_H #define GUI_TIMELINE_TRACK_PRESENTER_H -#include "gui/gtk-base.hpp" -#include "gui/model/controller.hpp" -#include "gui/timeline/marker-widget.hpp" -#include "gui/timeline/clip-presenter.hpp" -#include "gui/timeline/track-head-widget.hpp" -#include "gui/timeline/track-body.hpp" +#include "stage/gtk-base.hpp" +#include "stage/model/controller.hpp" +#include "stage/timeline/marker-widget.hpp" +#include "stage/timeline/clip-presenter.hpp" +#include "stage/timeline/track-head-widget.hpp" +#include "stage/timeline/track-body.hpp" #include "lib/nocopy.hpp" //#include "lib/util.hpp" diff --git a/src/stage/timeline/transition-widget.cpp b/src/stage/timeline/transition-widget.cpp index e2cc1350e..4b0906794 100644 --- a/src/stage/timeline/transition-widget.cpp +++ b/src/stage/timeline/transition-widget.cpp @@ -29,10 +29,10 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/timeline/transition-widget.hpp" +#include "stage/gtk-base.hpp" +#include "stage/timeline/transition-widget.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/timeline/transition-widget.hpp b/src/stage/timeline/transition-widget.hpp index 54363b0b2..123c71952 100644 --- a/src/stage/timeline/transition-widget.hpp +++ b/src/stage/timeline/transition-widget.hpp @@ -32,7 +32,7 @@ #ifndef GUI_TIMELINE_TRANSITION_WIDGET_H #define GUI_TIMELINE_TRANSITION_WIDGET_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" //#include "lib/util.hpp" diff --git a/src/stage/ui-bus.cpp b/src/stage/ui-bus.cpp index d6c3233f7..ee91b4fc9 100644 --- a/src/stage/ui-bus.cpp +++ b/src/stage/ui-bus.cpp @@ -36,8 +36,8 @@ */ -#include "gui/ui-bus.hpp" -#include "gui/ctrl/core-service.hpp" +#include "stage/ui-bus.hpp" +#include "stage/ctrl/core-service.hpp" namespace gui { diff --git a/src/stage/ui-bus.hpp b/src/stage/ui-bus.hpp index ad77dc791..f6869ffed 100644 --- a/src/stage/ui-bus.hpp +++ b/src/stage/ui-bus.hpp @@ -103,8 +103,8 @@ #define GUI_UI_BUS_H -#include "gui/gtk-base.hpp" //////////////////////////////////////////////////////TODO remove any GTK dependency if possible -#include "gui/ctrl/playback-controller.hpp" +#include "stage/gtk-base.hpp" //////////////////////////////////////////////////////TODO remove any GTK dependency if possible +#include "stage/ctrl/playback-controller.hpp" #include "lib/nocopy.hpp" #include diff --git a/src/stage/widget/bin-widget.cpp b/src/stage/widget/bin-widget.cpp index 7f6f4583e..d5a6fe1d6 100644 --- a/src/stage/widget/bin-widget.cpp +++ b/src/stage/widget/bin-widget.cpp @@ -29,10 +29,10 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/widget/bin-widget.hpp" +#include "stage/gtk-base.hpp" +#include "stage/widget/bin-widget.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/widget/bin-widget.hpp b/src/stage/widget/bin-widget.hpp index f9fc1cdbb..bb19b7379 100644 --- a/src/stage/widget/bin-widget.hpp +++ b/src/stage/widget/bin-widget.hpp @@ -48,7 +48,7 @@ #ifndef GUI_WIDGET_BIN_WIDGET_H #define GUI_WIDGET_BIN_WIDGET_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" //#include "lib/util.hpp" diff --git a/src/stage/widget/button-bar.cpp b/src/stage/widget/button-bar.cpp index 2ac8b1195..4852a8873 100644 --- a/src/stage/widget/button-bar.cpp +++ b/src/stage/widget/button-bar.cpp @@ -26,7 +26,7 @@ */ -#include "gui/widget/button-bar.hpp" +#include "stage/widget/button-bar.hpp" #include "include/logging.h" diff --git a/src/stage/widget/button-bar.hpp b/src/stage/widget/button-bar.hpp index b83f0e486..2410fcb82 100644 --- a/src/stage/widget/button-bar.hpp +++ b/src/stage/widget/button-bar.hpp @@ -29,7 +29,7 @@ #ifndef GUI_WIDGET_BUTTON_BAR_H #define GUI_WIDGET_BUTTON_BAR_H -#include "gui/widget/mini-button.hpp" +#include "stage/widget/mini-button.hpp" namespace gui { namespace widget { diff --git a/src/stage/widget/element-box-widget.cpp b/src/stage/widget/element-box-widget.cpp index 7156a0e92..001f226b3 100644 --- a/src/stage/widget/element-box-widget.cpp +++ b/src/stage/widget/element-box-widget.cpp @@ -29,10 +29,10 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/widget/element-box-widget.hpp" +#include "stage/gtk-base.hpp" +#include "stage/widget/element-box-widget.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/widget/element-box-widget.hpp b/src/stage/widget/element-box-widget.hpp index 530961ef0..f2572bdae 100644 --- a/src/stage/widget/element-box-widget.hpp +++ b/src/stage/widget/element-box-widget.hpp @@ -40,7 +40,7 @@ #ifndef GUI_WIDGET_ELEMENT_BOX_WIDGET_H #define GUI_WIDGET_ELEMENT_BOX_WIDGET_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" //#include "lib/util.hpp" diff --git a/src/stage/widget/error-log-display.hpp b/src/stage/widget/error-log-display.hpp index 9e75b0977..d700823c3 100644 --- a/src/stage/widget/error-log-display.hpp +++ b/src/stage/widget/error-log-display.hpp @@ -59,10 +59,10 @@ #ifndef GUI_WIDGET_ERROR_LOG_DISPLAY_H #define GUI_WIDGET_ERROR_LOG_DISPLAY_H -#include "gui/gtk-base.hpp" -#include "gui/style-scheme.hpp" -#include "gui/model/flash-deco.hpp" -#include "gui/model/expander-revealer.hpp" +#include "stage/gtk-base.hpp" +#include "stage/style-scheme.hpp" +#include "stage/model/flash-deco.hpp" +#include "stage/model/expander-revealer.hpp" #include "include/gui-notification-facade.h" #include "lib/format-string.hpp" #include "lib/symbol.hpp" diff --git a/src/stage/widget/menu-button.cpp b/src/stage/widget/menu-button.cpp index d4ebd14c7..8b3483f69 100644 --- a/src/stage/widget/menu-button.cpp +++ b/src/stage/widget/menu-button.cpp @@ -26,7 +26,7 @@ */ -#include "gui/widget/menu-button.hpp" +#include "stage/widget/menu-button.hpp" using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! diff --git a/src/stage/widget/menu-button.hpp b/src/stage/widget/menu-button.hpp index 11092331f..617640216 100644 --- a/src/stage/widget/menu-button.hpp +++ b/src/stage/widget/menu-button.hpp @@ -29,7 +29,7 @@ #ifndef GUI_WIDGET_MENU_BUTTON_H #define GUI_WIDGET_MENU_BUTTON_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" diff --git a/src/stage/widget/mini-button.hpp b/src/stage/widget/mini-button.hpp index 6ddcbe36b..1dfb44d90 100644 --- a/src/stage/widget/mini-button.hpp +++ b/src/stage/widget/mini-button.hpp @@ -30,7 +30,7 @@ #ifndef GUI_WIDGET_MINI_BUTTON_H #define GUI_WIDGET_MINI_BUTTON_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" namespace gui { diff --git a/src/stage/widget/mixer-widget.cpp b/src/stage/widget/mixer-widget.cpp index e691045df..b78672538 100644 --- a/src/stage/widget/mixer-widget.cpp +++ b/src/stage/widget/mixer-widget.cpp @@ -29,10 +29,10 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/widget/mixer-widget.hpp" +#include "stage/gtk-base.hpp" +#include "stage/widget/mixer-widget.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/widget/mixer-widget.hpp b/src/stage/widget/mixer-widget.hpp index 4b99cf2fb..4d11364c5 100644 --- a/src/stage/widget/mixer-widget.hpp +++ b/src/stage/widget/mixer-widget.hpp @@ -51,7 +51,7 @@ #ifndef GUI_WIDGET_MIXER_WIDGET_H #define GUI_WIDGET_MIXER_WIDGET_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" //#include "lib/util.hpp" diff --git a/src/stage/widget/panel-bar.cpp b/src/stage/widget/panel-bar.cpp index 7f8c870df..e86ae3b05 100644 --- a/src/stage/widget/panel-bar.cpp +++ b/src/stage/widget/panel-bar.cpp @@ -27,11 +27,11 @@ */ -#include "gui/widget/panel-bar.hpp" -#include "gui/workspace/workspace-window.hpp" -#include "gui/workspace/panel-manager.hpp" -#include "gui/panel/panel.hpp" -#include "gui/draw/rectangle.hpp" +#include "stage/widget/panel-bar.hpp" +#include "stage/workspace/workspace-window.hpp" +#include "stage/workspace/panel-manager.hpp" +#include "stage/panel/panel.hpp" +#include "stage/draw/rectangle.hpp" #include "include/logging.h" #include diff --git a/src/stage/widget/panel-bar.hpp b/src/stage/widget/panel-bar.hpp index 2511e3448..e5a3cdbf2 100644 --- a/src/stage/widget/panel-bar.hpp +++ b/src/stage/widget/panel-bar.hpp @@ -33,7 +33,7 @@ #define GUI_WIDGET_PANEL_BAR_H -#include "gui/widget/menu-button.hpp" +#include "stage/widget/menu-button.hpp" #include diff --git a/src/stage/widget/player-widget.cpp b/src/stage/widget/player-widget.cpp index 15edc21be..d5694582b 100644 --- a/src/stage/widget/player-widget.cpp +++ b/src/stage/widget/player-widget.cpp @@ -29,10 +29,10 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/widget/player-widget.hpp" +#include "stage/gtk-base.hpp" +#include "stage/widget/player-widget.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/widget/player-widget.hpp b/src/stage/widget/player-widget.hpp index 6f23e9aa4..e6c9e4b87 100644 --- a/src/stage/widget/player-widget.hpp +++ b/src/stage/widget/player-widget.hpp @@ -50,7 +50,7 @@ #ifndef GUI_WIDGET_PLAYER_WIDGET_H #define GUI_WIDGET_PLAYER_WIDGET_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" //#include "lib/util.hpp" diff --git a/src/stage/widget/switchboard-widget.cpp b/src/stage/widget/switchboard-widget.cpp index 1743cfd6f..54a799af0 100644 --- a/src/stage/widget/switchboard-widget.cpp +++ b/src/stage/widget/switchboard-widget.cpp @@ -30,10 +30,10 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/widget/switchboard-widget.hpp" +#include "stage/gtk-base.hpp" +#include "stage/widget/switchboard-widget.hpp" -//#include "gui/ui-bus.hpp" +//#include "stage/ui-bus.hpp" //#include "lib/format-string.hpp" //#include "lib/format-cout.hpp" diff --git a/src/stage/widget/switchboard-widget.hpp b/src/stage/widget/switchboard-widget.hpp index b94c35cf6..127f5e503 100644 --- a/src/stage/widget/switchboard-widget.hpp +++ b/src/stage/widget/switchboard-widget.hpp @@ -54,7 +54,7 @@ #ifndef GUI_WIDGET_SWITCHBOARD_WIDGET_H #define GUI_WIDGET_SWITCHBOARD_WIDGET_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" //#include "lib/util.hpp" diff --git a/src/stage/widget/timecode-widget.cpp b/src/stage/widget/timecode-widget.cpp index a99b4a466..edac1e5ac 100644 --- a/src/stage/widget/timecode-widget.cpp +++ b/src/stage/widget/timecode-widget.cpp @@ -30,7 +30,7 @@ */ -#include "gui/widget/timecode-widget.hpp" +#include "stage/widget/timecode-widget.hpp" #include "lib/time/diagnostics.hpp" ////////////TODO: temporary solution to get H:M:S components. Use TimeCode instead! diff --git a/src/stage/widget/timecode-widget.hpp b/src/stage/widget/timecode-widget.hpp index 3ff2fefe6..e5a2db1fd 100644 --- a/src/stage/widget/timecode-widget.hpp +++ b/src/stage/widget/timecode-widget.hpp @@ -35,7 +35,7 @@ #ifndef GUI_WIDGET_TIMECODE_WIDGET_H #define GUI_WIDGET_TIMECODE_WIDGET_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "lib/time/timevalue.hpp" #include diff --git a/src/stage/widget/timeline-widget.cpp b/src/stage/widget/timeline-widget.cpp index caef692fd..e5d0025d7 100644 --- a/src/stage/widget/timeline-widget.cpp +++ b/src/stage/widget/timeline-widget.cpp @@ -29,7 +29,7 @@ */ -#include "gui/widget/timeline-widget.hpp" +#include "stage/widget/timeline-widget.hpp" #include #include diff --git a/src/stage/widget/timeline-widget.hpp b/src/stage/widget/timeline-widget.hpp index 5b42bc1a1..37e5ce9b3 100644 --- a/src/stage/widget/timeline-widget.hpp +++ b/src/stage/widget/timeline-widget.hpp @@ -37,18 +37,18 @@ #ifndef GUI_WIDGET_TIMELINE_WIDGET_H #define GUI_WIDGET_TIMELINE_WIDGET_H -#include "gui/widget/timeline/timeline-state.hpp" -#include "gui/widget/timeline/timeline-header-container.hpp" -#include "gui/widget/timeline/timeline-body.hpp" -#include "gui/widget/timeline/timeline-ruler.hpp" -#include "gui/widget/timeline/timeline-tool.hpp" -#include "gui/widget/timeline/timeline-arrow-tool.hpp" -#include "gui/widget/timeline/timeline-ibeam-tool.hpp" -#include "gui/widget/timeline/timeline-group-track.hpp" -#include "gui/widget/timeline/timeline-clip-track.hpp" -#include "gui/widget/timeline/timeline-layout-helper.hpp" +#include "stage/widget/timeline/timeline-state.hpp" +#include "stage/widget/timeline/timeline-header-container.hpp" +#include "stage/widget/timeline/timeline-body.hpp" +#include "stage/widget/timeline/timeline-ruler.hpp" +#include "stage/widget/timeline/timeline-tool.hpp" +#include "stage/widget/timeline/timeline-arrow-tool.hpp" +#include "stage/widget/timeline/timeline-ibeam-tool.hpp" +#include "stage/widget/timeline/timeline-group-track.hpp" +#include "stage/widget/timeline/timeline-clip-track.hpp" +#include "stage/widget/timeline/timeline-layout-helper.hpp" -#include "gui/model/sequence.hpp" +#include "stage/model/sequence.hpp" #include "lib/time/timevalue.hpp" diff --git a/src/stage/widget/timeline/basic-draw-strategy.hpp b/src/stage/widget/timeline/basic-draw-strategy.hpp index 571cf1b26..6981064b2 100644 --- a/src/stage/widget/timeline/basic-draw-strategy.hpp +++ b/src/stage/widget/timeline/basic-draw-strategy.hpp @@ -30,7 +30,7 @@ #ifndef GUI_WIDGET_TIMELINE_BASIC_DRAW_STRATEGY_H #define GUI_WIDGET_TIMELINE_BASIC_DRAW_STRATEGY_H -#include "gui/widget/timeline/draw-strategy.hpp" +#include "stage/widget/timeline/draw-strategy.hpp" namespace gui { diff --git a/src/stage/widget/timeline/draw-strategy.cpp b/src/stage/widget/timeline/draw-strategy.cpp index b0730989c..7446ec3a0 100644 --- a/src/stage/widget/timeline/draw-strategy.cpp +++ b/src/stage/widget/timeline/draw-strategy.cpp @@ -27,7 +27,7 @@ */ -#include "gui/widget/timeline/basic-draw-strategy.hpp" +#include "stage/widget/timeline/basic-draw-strategy.hpp" namespace gui { namespace widget { diff --git a/src/stage/widget/timeline/draw-strategy.hpp b/src/stage/widget/timeline/draw-strategy.hpp index 7cbb77d10..0d5328054 100644 --- a/src/stage/widget/timeline/draw-strategy.hpp +++ b/src/stage/widget/timeline/draw-strategy.hpp @@ -33,9 +33,9 @@ #ifndef GUI_WIDGET_TIMELINE_DRAW_STRATEGY_HPP #define GUI_WIDGET_TIMELINE_DRAW_STRATEGY_HPP -#include "gui/gtk-base.hpp" -#include "gui/widget/timeline/timeline-entity.hpp" -#include "gui/widget/timeline/timeline-view-window.hpp" +#include "stage/gtk-base.hpp" +#include "stage/widget/timeline/timeline-entity.hpp" +#include "stage/widget/timeline/timeline-view-window.hpp" namespace gui { namespace widget { diff --git a/src/stage/widget/timeline/timeline-arrow-tool.cpp b/src/stage/widget/timeline/timeline-arrow-tool.cpp index a64cff2fe..b83297e6f 100644 --- a/src/stage/widget/timeline/timeline-arrow-tool.cpp +++ b/src/stage/widget/timeline/timeline-arrow-tool.cpp @@ -26,7 +26,7 @@ */ -#include "gui/widget/timeline/timeline-arrow-tool.hpp" +#include "stage/widget/timeline/timeline-arrow-tool.hpp" namespace gui { namespace widget { diff --git a/src/stage/widget/timeline/timeline-arrow-tool.hpp b/src/stage/widget/timeline/timeline-arrow-tool.hpp index cc95695d9..458bce4ee 100644 --- a/src/stage/widget/timeline/timeline-arrow-tool.hpp +++ b/src/stage/widget/timeline/timeline-arrow-tool.hpp @@ -29,11 +29,11 @@ #define GUI_WIDGET_TIMELINE_ARROW_TOOL_H -#include "gui/gtk-base.hpp" -#include "gui/widget/timeline-widget.hpp" -#include "gui/widget/timeline/timeline-tool.hpp" -#include "gui/widget/timeline/timeline-body.hpp" -#include "gui/widget/timeline/timeline-track.hpp" +#include "stage/gtk-base.hpp" +#include "stage/widget/timeline-widget.hpp" +#include "stage/widget/timeline/timeline-tool.hpp" +#include "stage/widget/timeline/timeline-body.hpp" +#include "stage/widget/timeline/timeline-track.hpp" #include "lib/time/timevalue.hpp" diff --git a/src/stage/widget/timeline/timeline-body.cpp b/src/stage/widget/timeline/timeline-body.cpp index 0c653b04a..f54aec9b5 100644 --- a/src/stage/widget/timeline/timeline-body.cpp +++ b/src/stage/widget/timeline/timeline-body.cpp @@ -26,10 +26,10 @@ */ -#include "gui/widget/timeline/timeline-body.hpp" -#include "gui/widget/timeline-widget.hpp" -#include "gui/workspace/ui-style.hpp" -#include "gui/draw/cairo-util.hpp" +#include "stage/widget/timeline/timeline-body.hpp" +#include "stage/widget/timeline-widget.hpp" +#include "stage/workspace/ui-style.hpp" +#include "stage/draw/cairo-util.hpp" #include "timeline-arrow-tool.hpp" #include "timeline-ibeam-tool.hpp" diff --git a/src/stage/widget/timeline/timeline-body.hpp b/src/stage/widget/timeline/timeline-body.hpp index 198d8fa6f..b4e2c2fb1 100644 --- a/src/stage/widget/timeline/timeline-body.hpp +++ b/src/stage/widget/timeline/timeline-body.hpp @@ -28,8 +28,8 @@ #ifndef GUI_WIDGET_TIMELINE_BODY_H #define GUI_WIDGET_TIMELINE_BODY_H -#include "gui/gtk-base.hpp" -#include "gui/widget/timeline/timeline-tool.hpp" +#include "stage/gtk-base.hpp" +#include "stage/widget/timeline/timeline-tool.hpp" #include "lib/time/timevalue.hpp" #include diff --git a/src/stage/widget/timeline/timeline-clip-track.cpp b/src/stage/widget/timeline/timeline-clip-track.cpp index 6b169c5b9..dc133b493 100644 --- a/src/stage/widget/timeline/timeline-clip-track.cpp +++ b/src/stage/widget/timeline/timeline-clip-track.cpp @@ -26,9 +26,9 @@ */ -#include "gui/widget/timeline/timeline-clip.hpp" -#include "gui/widget/timeline/timeline-clip-track.hpp" -#include "gui/widget/timeline/timeline-view-window.hpp" +#include "stage/widget/timeline/timeline-clip.hpp" +#include "stage/widget/timeline/timeline-clip-track.hpp" +#include "stage/widget/timeline/timeline-view-window.hpp" #include diff --git a/src/stage/widget/timeline/timeline-clip-track.hpp b/src/stage/widget/timeline/timeline-clip-track.hpp index 7c84f8333..af9992ebb 100644 --- a/src/stage/widget/timeline/timeline-clip-track.hpp +++ b/src/stage/widget/timeline/timeline-clip-track.hpp @@ -29,9 +29,9 @@ #ifndef GUI_WIDGET_TIMELINE_CLIP_TRACK_H #define GUI_WIDGET_TIMELINE_CLIP_TRACK_H -#include "gui/widget/timeline/basic-draw-strategy.hpp" -#include "gui/widget/timeline/timeline-track.hpp" -#include "gui/model/clip-track.hpp" +#include "stage/widget/timeline/basic-draw-strategy.hpp" +#include "stage/widget/timeline/timeline-track.hpp" +#include "stage/model/clip-track.hpp" #include "lib/time/timevalue.hpp" #include diff --git a/src/stage/widget/timeline/timeline-clip.cpp b/src/stage/widget/timeline/timeline-clip.cpp index 38ee1339a..7c61bf42a 100644 --- a/src/stage/widget/timeline/timeline-clip.cpp +++ b/src/stage/widget/timeline/timeline-clip.cpp @@ -26,7 +26,7 @@ */ -#include "gui/widget/timeline/timeline-clip.hpp" +#include "stage/widget/timeline/timeline-clip.hpp" namespace gui { namespace widget { diff --git a/src/stage/widget/timeline/timeline-clip.hpp b/src/stage/widget/timeline/timeline-clip.hpp index fbca71d9b..2de91c3f2 100644 --- a/src/stage/widget/timeline/timeline-clip.hpp +++ b/src/stage/widget/timeline/timeline-clip.hpp @@ -28,13 +28,13 @@ #ifndef GUI_WIDGET_TIMELINE_CLIP_H #define GUI_WIDGET_TIMELINE_CLIP_H -#include "gui/gtk-base.hpp" -#include "gui/model/clip.hpp" +#include "stage/gtk-base.hpp" +#include "stage/model/clip.hpp" #include "include/logging.h" #include "lib/time/timevalue.hpp" -#include "gui/widget/timeline/draw-strategy.hpp" -#include "gui/widget/timeline/timeline-entity.hpp" +#include "stage/widget/timeline/draw-strategy.hpp" +#include "stage/widget/timeline/timeline-entity.hpp" #include diff --git a/src/stage/widget/timeline/timeline-entity.cpp b/src/stage/widget/timeline/timeline-entity.cpp index 765e2acc1..4e2f32e72 100644 --- a/src/stage/widget/timeline/timeline-entity.cpp +++ b/src/stage/widget/timeline/timeline-entity.cpp @@ -27,9 +27,9 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/widget/timeline/timeline-entity.hpp" -#include "gui/widget/timeline/draw-strategy.hpp" +#include "stage/gtk-base.hpp" +#include "stage/widget/timeline/timeline-entity.hpp" +#include "stage/widget/timeline/draw-strategy.hpp" namespace gui { namespace widget { diff --git a/src/stage/widget/timeline/timeline-entity.hpp b/src/stage/widget/timeline/timeline-entity.hpp index 381962f37..6ef7df663 100644 --- a/src/stage/widget/timeline/timeline-entity.hpp +++ b/src/stage/widget/timeline/timeline-entity.hpp @@ -29,7 +29,7 @@ #ifndef GUI_WIDGET_TIMELINE_ENTITY_H #define GUI_WIDGET_TIMELINE_ENTITY_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "lib/time/timevalue.hpp" #include diff --git a/src/stage/widget/timeline/timeline-group-track.cpp b/src/stage/widget/timeline/timeline-group-track.cpp index f8b3c4c42..cdbe34a4c 100644 --- a/src/stage/widget/timeline/timeline-group-track.cpp +++ b/src/stage/widget/timeline/timeline-group-track.cpp @@ -27,8 +27,8 @@ */ -#include "gui/widget/timeline/timeline-group-track.hpp" -#include "gui/widget/timeline-widget.hpp" +#include "stage/widget/timeline/timeline-group-track.hpp" +#include "stage/widget/timeline-widget.hpp" using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! using namespace sigc; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! diff --git a/src/stage/widget/timeline/timeline-group-track.hpp b/src/stage/widget/timeline/timeline-group-track.hpp index 6120116f6..9f848c5c7 100644 --- a/src/stage/widget/timeline/timeline-group-track.hpp +++ b/src/stage/widget/timeline/timeline-group-track.hpp @@ -31,8 +31,8 @@ #ifndef GUI_WIDGET_TIMELINE_GROUP_TRACK_H #define GUI_WIDGET_TIMELINE_GROUP_TRACK_H -#include "gui/widget/timeline/timeline-track.hpp" -#include "gui/model/group-track.hpp" +#include "stage/widget/timeline/timeline-track.hpp" +#include "stage/model/group-track.hpp" namespace gui { namespace widget { diff --git a/src/stage/widget/timeline/timeline-header-container.cpp b/src/stage/widget/timeline/timeline-header-container.cpp index 6a463d462..71fe03960 100644 --- a/src/stage/widget/timeline/timeline-header-container.cpp +++ b/src/stage/widget/timeline/timeline-header-container.cpp @@ -26,10 +26,10 @@ */ -#include "gui/widget/timeline/timeline-header-container.hpp" -#include "gui/widget/timeline/timeline-track.hpp" -#include "gui/widget/timeline-widget.hpp" -#include "gui/draw/rectangle.hpp" +#include "stage/widget/timeline/timeline-header-container.hpp" +#include "stage/widget/timeline/timeline-track.hpp" +#include "stage/widget/timeline-widget.hpp" +#include "stage/draw/rectangle.hpp" #include #include diff --git a/src/stage/widget/timeline/timeline-header-container.hpp b/src/stage/widget/timeline/timeline-header-container.hpp index 85acb01d6..03d9ee376 100644 --- a/src/stage/widget/timeline/timeline-header-container.hpp +++ b/src/stage/widget/timeline/timeline-header-container.hpp @@ -32,7 +32,7 @@ #ifndef GUI_WIDGET_TIMELINE_HEADER_CONTAINER_H #define GUI_WIDGET_TIMELINE_HEADER_CONTAINER_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "timeline-layout-helper.hpp" namespace gui { diff --git a/src/stage/widget/timeline/timeline-header-widget.cpp b/src/stage/widget/timeline/timeline-header-widget.cpp index cd54a6e0c..99f530f04 100644 --- a/src/stage/widget/timeline/timeline-header-widget.cpp +++ b/src/stage/widget/timeline/timeline-header-widget.cpp @@ -26,8 +26,8 @@ */ -#include "gui/widget/timeline-widget.hpp" -#include "gui/draw/rectangle.hpp" +#include "stage/widget/timeline-widget.hpp" +#include "stage/draw/rectangle.hpp" #include diff --git a/src/stage/widget/timeline/timeline-header-widget.hpp b/src/stage/widget/timeline/timeline-header-widget.hpp index ca9e7cec4..0606c681d 100644 --- a/src/stage/widget/timeline/timeline-header-widget.hpp +++ b/src/stage/widget/timeline/timeline-header-widget.hpp @@ -30,7 +30,7 @@ #ifndef GUI_WIDGET_HEADER_WIDGET_H #define GUI_WIDGET_HEADER_WIDGET_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" namespace gui { namespace widget { diff --git a/src/stage/widget/timeline/timeline-ibeam-tool.cpp b/src/stage/widget/timeline/timeline-ibeam-tool.cpp index b0f6f937b..9bdf3e5b8 100644 --- a/src/stage/widget/timeline/timeline-ibeam-tool.cpp +++ b/src/stage/widget/timeline/timeline-ibeam-tool.cpp @@ -26,8 +26,8 @@ */ -#include "gui/widget/timeline/timeline-ibeam-tool.hpp" -#include "gui/widget/timeline-widget.hpp" +#include "stage/widget/timeline/timeline-ibeam-tool.hpp" +#include "stage/widget/timeline-widget.hpp" #include "lib/time/mutation.hpp" using namespace gui::widget; ///////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! diff --git a/src/stage/widget/timeline/timeline-ibeam-tool.hpp b/src/stage/widget/timeline/timeline-ibeam-tool.hpp index f35778cd4..e634b328c 100644 --- a/src/stage/widget/timeline/timeline-ibeam-tool.hpp +++ b/src/stage/widget/timeline/timeline-ibeam-tool.hpp @@ -29,7 +29,7 @@ #ifndef GUI_WIDGET_TIMELINE_IBEAM_TOOL_H #define GUI_WIDGET_TIMELINE_IBEAM_TOOL_H -#include "gui/widget/timeline/timeline-tool.hpp" +#include "stage/widget/timeline/timeline-tool.hpp" #include "lib/time/timevalue.hpp" #include "lib/time/timequant.hpp" #include "lib/time/control.hpp" diff --git a/src/stage/widget/timeline/timeline-layout-helper.cpp b/src/stage/widget/timeline/timeline-layout-helper.cpp index 2e8c9bac5..ceb6a54f4 100644 --- a/src/stage/widget/timeline/timeline-layout-helper.cpp +++ b/src/stage/widget/timeline/timeline-layout-helper.cpp @@ -27,10 +27,10 @@ */ -#include "gui/widget/timeline/timeline-layout-helper.hpp" -#include "gui/widget/timeline-widget.hpp" -#include "gui/model/sequence.hpp" -#include "gui/draw/rectangle.hpp" +#include "stage/widget/timeline/timeline-layout-helper.hpp" +#include "stage/widget/timeline-widget.hpp" +#include "stage/model/sequence.hpp" +#include "stage/draw/rectangle.hpp" #include #include diff --git a/src/stage/widget/timeline/timeline-layout-helper.hpp b/src/stage/widget/timeline/timeline-layout-helper.hpp index b9c9fe514..719edfd00 100644 --- a/src/stage/widget/timeline/timeline-layout-helper.hpp +++ b/src/stage/widget/timeline/timeline-layout-helper.hpp @@ -29,7 +29,7 @@ #ifndef GUI_WIDGET_TIMELINE_LAYOUT_HELPER_H #define GUI_WIDGET_TIMELINE_LAYOUT_HELPER_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "lib/util-coll.hpp" #include "lib/tree.hpp" diff --git a/src/stage/widget/timeline/timeline-ruler.cpp b/src/stage/widget/timeline/timeline-ruler.cpp index cc80e4ca3..caceb0eb4 100644 --- a/src/stage/widget/timeline/timeline-ruler.cpp +++ b/src/stage/widget/timeline/timeline-ruler.cpp @@ -27,10 +27,10 @@ */ -#include "gui/widget/timeline/timeline-ruler.hpp" -#include "gui/widget/timeline-widget.hpp" -#include "gui/workspace/ui-style.hpp" -#include "gui/draw/cairo-util.hpp" +#include "stage/widget/timeline/timeline-ruler.hpp" +#include "stage/widget/timeline-widget.hpp" +#include "stage/workspace/ui-style.hpp" +#include "stage/draw/cairo-util.hpp" #include "lib/time/timevalue.hpp" #include "lib/time.h" diff --git a/src/stage/widget/timeline/timeline-ruler.hpp b/src/stage/widget/timeline/timeline-ruler.hpp index ec556444c..b343e0cd3 100644 --- a/src/stage/widget/timeline/timeline-ruler.hpp +++ b/src/stage/widget/timeline/timeline-ruler.hpp @@ -30,9 +30,9 @@ #ifndef GUI_WIDGET_TIMELINE_RULER_H #define GUI_WIDGET_TIMELINE_RULER_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "lib/time/timevalue.hpp" -#include "gui/widget/timeline/timeline-state.hpp" +#include "stage/widget/timeline/timeline-state.hpp" namespace gui { diff --git a/src/stage/widget/timeline/timeline-state.cpp b/src/stage/widget/timeline/timeline-state.cpp index 5f886d1d6..cb9034600 100644 --- a/src/stage/widget/timeline/timeline-state.cpp +++ b/src/stage/widget/timeline/timeline-state.cpp @@ -27,7 +27,7 @@ */ -#include "gui/widget/timeline/timeline-state.hpp" +#include "stage/widget/timeline/timeline-state.hpp" #include "lib/time/timevalue.hpp" #include "lib/time/mutation.hpp" #include "lib/time/control.hpp" diff --git a/src/stage/widget/timeline/timeline-state.hpp b/src/stage/widget/timeline/timeline-state.hpp index 1cd2e0d3c..0fd56364e 100644 --- a/src/stage/widget/timeline/timeline-state.hpp +++ b/src/stage/widget/timeline/timeline-state.hpp @@ -32,7 +32,7 @@ #ifndef GUI_WIDGET_TIMELINE_STATE_H #define GUI_WIDGET_TIMELINE_STATE_H -#include "gui/widget/timeline/timeline-view-window.hpp" +#include "stage/widget/timeline/timeline-view-window.hpp" #include "lib/time/mutation.hpp" #include "lib/time/control.hpp" diff --git a/src/stage/widget/timeline/timeline-tool.cpp b/src/stage/widget/timeline/timeline-tool.cpp index 68b7625b0..c102a7274 100644 --- a/src/stage/widget/timeline/timeline-tool.cpp +++ b/src/stage/widget/timeline/timeline-tool.cpp @@ -27,8 +27,8 @@ */ -#include "gui/widget/timeline/timeline-tool.hpp" -#include "gui/widget/timeline-widget.hpp" +#include "stage/widget/timeline/timeline-tool.hpp" +#include "stage/widget/timeline-widget.hpp" using namespace Gdk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! using std::shared_ptr; diff --git a/src/stage/widget/timeline/timeline-tool.hpp b/src/stage/widget/timeline/timeline-tool.hpp index c54a55d69..1d7a925b7 100644 --- a/src/stage/widget/timeline/timeline-tool.hpp +++ b/src/stage/widget/timeline/timeline-tool.hpp @@ -32,7 +32,7 @@ #ifndef GUI_WIDGET_TIMELINE_TOOL_H #define GUI_WIDGET_TIMELINE_TOOL_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include diff --git a/src/stage/widget/timeline/timeline-track.cpp b/src/stage/widget/timeline/timeline-track.cpp index a10ccb0ff..79e287382 100644 --- a/src/stage/widget/timeline/timeline-track.cpp +++ b/src/stage/widget/timeline/timeline-track.cpp @@ -28,10 +28,10 @@ */ -#include "gui/widget/timeline/timeline-track.hpp" -#include "gui/widget/timeline-widget.hpp" -#include "gui/workspace/ui-style.hpp" -#include "gui/dialog/name-chooser.hpp" +#include "stage/widget/timeline/timeline-track.hpp" +#include "stage/widget/timeline-widget.hpp" +#include "stage/workspace/ui-style.hpp" +#include "stage/dialog/name-chooser.hpp" #include "include/logging.h" using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! diff --git a/src/stage/widget/timeline/timeline-track.hpp b/src/stage/widget/timeline/timeline-track.hpp index fc233e4b0..99b55462b 100644 --- a/src/stage/widget/timeline/timeline-track.hpp +++ b/src/stage/widget/timeline/timeline-track.hpp @@ -33,14 +33,14 @@ #define GUI_WIDGET_TIMELINE_TRACK_H -#include "gui/gtk-base.hpp" -#include "gui/model/track.hpp" -#include "gui/widget/menu-button.hpp" -#include "gui/widget/mini-button.hpp" -#include "gui/widget/button-bar.hpp" -#include "gui/widget/timeline/timeline-clip.hpp" -#include "gui/widget/timeline/timeline-header-container.hpp" -#include "gui/widget/timeline/timeline-header-widget.hpp" +#include "stage/gtk-base.hpp" +#include "stage/model/track.hpp" +#include "stage/widget/menu-button.hpp" +#include "stage/widget/mini-button.hpp" +#include "stage/widget/button-bar.hpp" +#include "stage/widget/timeline/timeline-clip.hpp" +#include "stage/widget/timeline/timeline-header-container.hpp" +#include "stage/widget/timeline/timeline-header-widget.hpp" #include "lib/time/timevalue.hpp" #include diff --git a/src/stage/widget/timeline/timeline-view-window.cpp b/src/stage/widget/timeline/timeline-view-window.cpp index 65b68c040..a93313fe8 100644 --- a/src/stage/widget/timeline/timeline-view-window.cpp +++ b/src/stage/widget/timeline/timeline-view-window.cpp @@ -27,8 +27,8 @@ */ -#include "gui/widget/timeline/timeline-view-window.hpp" -#include "gui/widget/timeline-widget.hpp" +#include "stage/widget/timeline/timeline-view-window.hpp" +#include "stage/widget/timeline-widget.hpp" using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! diff --git a/src/stage/widget/timeline/timeline-view-window.hpp b/src/stage/widget/timeline/timeline-view-window.hpp index 049b8dc9e..453304b7e 100644 --- a/src/stage/widget/timeline/timeline-view-window.hpp +++ b/src/stage/widget/timeline/timeline-view-window.hpp @@ -31,7 +31,7 @@ #ifndef GUI_WIDGET_TIMELINE_VIEW_WINDOW_H #define GUI_WIDGET_TIMELINE_VIEW_WINDOW_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "lib/time/timevalue.hpp" namespace gui { diff --git a/src/stage/widget/timeline/timeline-zoom-scale.cpp b/src/stage/widget/timeline/timeline-zoom-scale.cpp index 694b6c428..3b97ed393 100644 --- a/src/stage/widget/timeline/timeline-zoom-scale.cpp +++ b/src/stage/widget/timeline/timeline-zoom-scale.cpp @@ -27,8 +27,8 @@ */ -#include "gui/widget/timeline-widget.hpp" -#include "gui/widget/timeline/timeline-zoom-scale.hpp" +#include "stage/widget/timeline-widget.hpp" +#include "stage/widget/timeline/timeline-zoom-scale.hpp" using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! diff --git a/src/stage/widget/timeline/timeline-zoom-scale.hpp b/src/stage/widget/timeline/timeline-zoom-scale.hpp index 01393674b..fb32f1581 100644 --- a/src/stage/widget/timeline/timeline-zoom-scale.hpp +++ b/src/stage/widget/timeline/timeline-zoom-scale.hpp @@ -31,10 +31,10 @@ #ifndef GUI_WIDGET_TIMELINE_ZOOM_SCALE_H #define GUI_WIDGET_TIMELINE_ZOOM_SCALE_H -#include "gui/gtk-base.hpp" -#include "gui/widget/mini-button.hpp" -#include "gui/widget/timeline-widget.hpp" -#include "gui/widget/timeline/timeline-state.hpp" +#include "stage/gtk-base.hpp" +#include "stage/widget/mini-button.hpp" +#include "stage/widget/timeline-widget.hpp" +#include "stage/widget/timeline/timeline-state.hpp" using namespace Gtk; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! using namespace gui::widget; ////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! diff --git a/src/stage/widget/video-display-widget.cpp b/src/stage/widget/video-display-widget.cpp index cb0beb506..e50a30979 100644 --- a/src/stage/widget/video-display-widget.cpp +++ b/src/stage/widget/video-display-widget.cpp @@ -27,9 +27,9 @@ */ -#include "gui/gtk-base.hpp" -#include "gui/output/xvdisplayer.hpp" -#include "gui/output/gdkdisplayer.hpp" +#include "stage/gtk-base.hpp" +#include "stage/output/xvdisplayer.hpp" +#include "stage/output/gdkdisplayer.hpp" #include "video-display-widget.hpp" diff --git a/src/stage/widget/video-display-widget.hpp b/src/stage/widget/video-display-widget.hpp index 4cc35d33a..718385a33 100644 --- a/src/stage/widget/video-display-widget.hpp +++ b/src/stage/widget/video-display-widget.hpp @@ -32,8 +32,8 @@ #ifndef GUI_WIDGET_VIDEO_DISPLAY_WIDGET_H #define GUI_WIDGET_VIDEO_DISPLAY_WIDGET_H -#include "gui/gtk-base.hpp" -#include "gui/output/displayer.hpp" +#include "stage/gtk-base.hpp" +#include "stage/output/displayer.hpp" using namespace gui::output; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please! diff --git a/src/stage/workspace/dock-area.cpp b/src/stage/workspace/dock-area.cpp index e4e5abaff..4e076ef67 100644 --- a/src/stage/workspace/dock-area.cpp +++ b/src/stage/workspace/dock-area.cpp @@ -33,13 +33,13 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1144 - rewrite it in clean shape /////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1145 NOTE: not populate the UI with content anymore!!!! -#include "gui/workspace/dock-area.hpp" +#include "stage/workspace/dock-area.hpp" -#include "gui/panel/assets-panel.hpp" -#include "gui/panel/viewer-panel.hpp" -#include "gui/panel/infobox-panel.hpp" -#include "gui/panel/timeline-panel.hpp" -#include "gui/panel/timeline-panel-obsolete.hpp" +#include "stage/panel/assets-panel.hpp" +#include "stage/panel/viewer-panel.hpp" +#include "stage/panel/infobox-panel.hpp" +#include "stage/panel/timeline-panel.hpp" +#include "stage/panel/timeline-panel-obsolete.hpp" #include "include/logging.h" #include "lib/util-foreach.hpp" diff --git a/src/stage/workspace/dock-area.hpp b/src/stage/workspace/dock-area.hpp index 683d4cf91..54ccd3c88 100644 --- a/src/stage/workspace/dock-area.hpp +++ b/src/stage/workspace/dock-area.hpp @@ -39,7 +39,7 @@ #ifndef GUI_WORKSPACE_DOCK_AREA_H #define GUI_WORKSPACE_DOCK_AREA_H -#include "gui/panel/panel.hpp" +#include "stage/panel/panel.hpp" #include #include diff --git a/src/stage/workspace/panel-manager.cpp b/src/stage/workspace/panel-manager.cpp index 87194261c..ad53fdc83 100644 --- a/src/stage/workspace/panel-manager.cpp +++ b/src/stage/workspace/panel-manager.cpp @@ -28,13 +28,13 @@ */ -#include "gui/workspace/panel-manager.hpp" +#include "stage/workspace/panel-manager.hpp" -#include "gui/panel/assets-panel.hpp" -#include "gui/panel/viewer-panel.hpp" -#include "gui/panel/infobox-panel.hpp" -#include "gui/panel/timeline-panel.hpp" -#include "gui/panel/timeline-panel-obsolete.hpp" +#include "stage/panel/assets-panel.hpp" +#include "stage/panel/viewer-panel.hpp" +#include "stage/panel/infobox-panel.hpp" +#include "stage/panel/timeline-panel.hpp" +#include "stage/panel/timeline-panel-obsolete.hpp" #include "include/logging.h" #include "lib/util-foreach.hpp" diff --git a/src/stage/workspace/panel-manager.hpp b/src/stage/workspace/panel-manager.hpp index 1c136edd0..ead17d766 100644 --- a/src/stage/workspace/panel-manager.hpp +++ b/src/stage/workspace/panel-manager.hpp @@ -34,7 +34,7 @@ #ifndef GUI_WORKSPACE_PANEL_MANAGER_H #define GUI_WORKSPACE_PANEL_MANAGER_H -#include "gui/panel/panel.hpp" +#include "stage/panel/panel.hpp" #include #include diff --git a/src/stage/workspace/ui-style.cpp b/src/stage/workspace/ui-style.cpp index 065c2215b..e57796bb0 100644 --- a/src/stage/workspace/ui-style.cpp +++ b/src/stage/workspace/ui-style.cpp @@ -31,8 +31,8 @@ */ -#include "gui/workspace/ui-style.hpp" -#include "gui/config-keys.hpp" +#include "stage/workspace/ui-style.hpp" +#include "stage/config-keys.hpp" #include "lib/searchpath.hpp" #include "lib/util.hpp" diff --git a/src/stage/workspace/ui-style.hpp b/src/stage/workspace/ui-style.hpp index ae423200a..c260d09ca 100644 --- a/src/stage/workspace/ui-style.hpp +++ b/src/stage/workspace/ui-style.hpp @@ -36,7 +36,7 @@ #ifndef GUI_WORKSPACE_UI_STYLE_H #define GUI_WORKSPACE_UI_STYLE_H -#include "gui/gtk-base.hpp" +#include "stage/gtk-base.hpp" #include "lib/nocopy.hpp" #include diff --git a/src/stage/workspace/workspace-window.cpp b/src/stage/workspace/workspace-window.cpp index dc6a5fb26..56a95fda0 100644 --- a/src/stage/workspace/workspace-window.cpp +++ b/src/stage/workspace/workspace-window.cpp @@ -25,11 +25,11 @@ ** Implementation of base functionality for workspace windows. */ -#include "gui/gtk-base.hpp" -#include "gui/config-keys.hpp" -#include "gui/workspace/workspace-window.hpp" -#include "gui/workspace/panel-manager.hpp" -#include "gui/ctrl/ui-manager.hpp" +#include "stage/gtk-base.hpp" +#include "stage/config-keys.hpp" +#include "stage/workspace/workspace-window.hpp" +#include "stage/workspace/panel-manager.hpp" +#include "stage/ctrl/ui-manager.hpp" #include "include/logging.h" diff --git a/src/stage/workspace/workspace-window.hpp b/src/stage/workspace/workspace-window.hpp index 3763e5831..aaa67607d 100644 --- a/src/stage/workspace/workspace-window.hpp +++ b/src/stage/workspace/workspace-window.hpp @@ -32,8 +32,8 @@ #define GUI_WORKSPACE_WORKSPACE_WINDOW_H -#include "gui/gtk-base.hpp" -#include "gui/workspace/panel-manager.hpp" +#include "stage/gtk-base.hpp" +#include "stage/workspace/panel-manager.hpp" namespace gui { diff --git a/src/steam/asset.cpp b/src/steam/asset.cpp index 0d4ba4ee1..bf1556c7d 100644 --- a/src/steam/asset.cpp +++ b/src/steam/asset.cpp @@ -26,8 +26,8 @@ */ -#include "proc/asset.hpp" -#include "proc/assetmanager.hpp" +#include "steam/asset.hpp" +#include "steam/assetmanager.hpp" #include "lib/format-string.hpp" #include "lib/util-foreach.hpp" #include "lib/util.hpp" diff --git a/src/steam/asset.hpp b/src/steam/asset.hpp index 013d85ea5..7abf1aebf 100644 --- a/src/steam/asset.hpp +++ b/src/steam/asset.hpp @@ -59,7 +59,7 @@ #include "lib/error.hpp" #include "lib/nocopy.hpp" #include "include/logging.h" -#include "proc/asset/category.hpp" +#include "steam/asset/category.hpp" #include "lib/hash-value.h" #include "lib/p.hpp" diff --git a/src/steam/asset/category.cpp b/src/steam/asset/category.cpp index 99c2e5d86..1d0406a67 100644 --- a/src/steam/asset/category.cpp +++ b/src/steam/asset/category.cpp @@ -26,7 +26,7 @@ */ -#include "proc/asset/category.hpp" +#include "steam/asset/category.hpp" #include "lib/util.hpp" #include "include/logging.h" diff --git a/src/steam/asset/clip.cpp b/src/steam/asset/clip.cpp index dace81843..db9f52ea3 100644 --- a/src/steam/asset/clip.cpp +++ b/src/steam/asset/clip.cpp @@ -26,8 +26,8 @@ */ -#include "proc/asset/clip.hpp" -#include "proc/mobject/session/mobjectfactory.hpp" ////TODO: avoidable? +#include "steam/asset/clip.hpp" +#include "steam/mobject/session/mobjectfactory.hpp" ////TODO: avoidable? using std::static_pointer_cast; diff --git a/src/steam/asset/clip.hpp b/src/steam/asset/clip.hpp index 64188c54d..a36815fab 100644 --- a/src/steam/asset/clip.hpp +++ b/src/steam/asset/clip.hpp @@ -29,7 +29,7 @@ #ifndef ASSET_CLIP_H #define ASSET_CLIP_H -#include "proc/asset/media.hpp" +#include "steam/asset/media.hpp" diff --git a/src/steam/asset/codec.hpp b/src/steam/asset/codec.hpp index eac62f1e4..5b42211d9 100644 --- a/src/steam/asset/codec.hpp +++ b/src/steam/asset/codec.hpp @@ -31,7 +31,7 @@ #ifndef ASSET_CODEC_H #define ASSET_CODEC_H -#include "proc/asset/proc.hpp" +#include "steam/asset/proc.hpp" diff --git a/src/steam/asset/compoundmedia.hpp b/src/steam/asset/compoundmedia.hpp index 2533bc5fa..d24060b89 100644 --- a/src/steam/asset/compoundmedia.hpp +++ b/src/steam/asset/compoundmedia.hpp @@ -31,7 +31,7 @@ #ifndef ASSET_COMPOUNDMEDIA_H #define ASSET_COMPOUNDMEDIA_H -#include "proc/asset/media.hpp" +#include "steam/asset/media.hpp" #include diff --git a/src/steam/asset/dataset.hpp b/src/steam/asset/dataset.hpp index 0188ef778..65bcf56be 100644 --- a/src/steam/asset/dataset.hpp +++ b/src/steam/asset/dataset.hpp @@ -31,7 +31,7 @@ #ifndef ASSET_DATASET_H #define ASSET_DATASET_H -#include "proc/asset/meta.hpp" +#include "steam/asset/meta.hpp" diff --git a/src/steam/asset/db.hpp b/src/steam/asset/db.hpp index 22a729db4..44d163a52 100644 --- a/src/steam/asset/db.hpp +++ b/src/steam/asset/db.hpp @@ -34,7 +34,7 @@ #include "lib/sync.hpp" #include "lib/error.hpp" -#include "proc/asset.hpp" +#include "steam/asset.hpp" #include "lib/depend-inject.hpp" #include diff --git a/src/steam/asset/effect.cpp b/src/steam/asset/effect.cpp index db6316e10..a6d84d3dd 100644 --- a/src/steam/asset/effect.cpp +++ b/src/steam/asset/effect.cpp @@ -27,7 +27,7 @@ */ -#include "proc/asset/effect.hpp" +#include "steam/asset/effect.hpp" namespace proc { namespace asset { diff --git a/src/steam/asset/effect.hpp b/src/steam/asset/effect.hpp index 5b1cb5465..5bfcc5a19 100644 --- a/src/steam/asset/effect.hpp +++ b/src/steam/asset/effect.hpp @@ -29,7 +29,7 @@ #ifndef ASSET_EFFECT_H #define ASSET_EFFECT_H -#include "proc/asset/proc.hpp" +#include "steam/asset/proc.hpp" diff --git a/src/steam/asset/inventory.hpp b/src/steam/asset/inventory.hpp index a0e34c119..8602fd840 100644 --- a/src/steam/asset/inventory.hpp +++ b/src/steam/asset/inventory.hpp @@ -31,7 +31,7 @@ #ifndef ASSET_INVENTORY_H #define ASSET_INVENTORY_H -#include "proc/asset/meta.hpp" +#include "steam/asset/meta.hpp" diff --git a/src/steam/asset/media.cpp b/src/steam/asset/media.cpp index be5c5ccfd..5c523d983 100644 --- a/src/steam/asset/media.cpp +++ b/src/steam/asset/media.cpp @@ -27,12 +27,12 @@ #include "lib/error.hpp" -#include "proc/common.hpp" -#include "proc/assetmanager.hpp" -#include "proc/asset/media.hpp" -#include "proc/asset/clip.hpp" -#include "proc/asset/unknown.hpp" -#include "backend/media-access-facade.hpp" +#include "steam/common.hpp" +#include "steam/assetmanager.hpp" +#include "steam/asset/media.hpp" +#include "steam/asset/clip.hpp" +#include "steam/asset/unknown.hpp" +#include "vault/media-access-facade.hpp" #include "lib/time/timevalue.hpp" #include "lib/format-string.hpp" #include "lib/util.hpp" diff --git a/src/steam/asset/media.hpp b/src/steam/asset/media.hpp index d1bac7333..c4fad67d3 100644 --- a/src/steam/asset/media.hpp +++ b/src/steam/asset/media.hpp @@ -36,10 +36,10 @@ #ifndef ASSET_MEDIA_H #define ASSET_MEDIA_H -#include "proc/asset.hpp" +#include "steam/asset.hpp" #include "lib/time/timevalue.hpp" -#include "proc/mobject/mobject.hpp" -#include "proc/mobject/session/clip.hpp" +#include "steam/mobject/mobject.hpp" +#include "steam/mobject/session/clip.hpp" #include "lib/nocopy.hpp" diff --git a/src/steam/asset/meta.cpp b/src/steam/asset/meta.cpp index b30eb1590..afe35adc1 100644 --- a/src/steam/asset/meta.cpp +++ b/src/steam/asset/meta.cpp @@ -26,8 +26,8 @@ */ -#include "proc/assetmanager.hpp" -#include "proc/asset/meta.hpp" +#include "steam/assetmanager.hpp" +#include "steam/asset/meta.hpp" #include "lib/util.hpp" using lib::idi::EntryID; @@ -95,8 +95,8 @@ namespace asset { /* explicit instantiations of the factory methods */ /**************************************************/ -#include "proc/asset/meta/time-grid.hpp" -#include "proc/asset/meta/error-log.hpp" +#include "steam/asset/meta/time-grid.hpp" +#include "steam/asset/meta/error-log.hpp" namespace proc { diff --git a/src/steam/asset/meta.hpp b/src/steam/asset/meta.hpp index 245d13da9..ed737af65 100644 --- a/src/steam/asset/meta.hpp +++ b/src/steam/asset/meta.hpp @@ -60,8 +60,8 @@ #ifndef ASSET_META_H #define ASSET_META_H -#include "proc/asset.hpp" -#include "proc/asset/struct-scheme.hpp" +#include "steam/asset.hpp" +#include "steam/asset/struct-scheme.hpp" #include "lib/idi/entry-id.hpp" #include "lib/nocopy.hpp" diff --git a/src/steam/asset/meta/error-log.cpp b/src/steam/asset/meta/error-log.cpp index 60639a7f2..528dcf0f1 100644 --- a/src/steam/asset/meta/error-log.cpp +++ b/src/steam/asset/meta/error-log.cpp @@ -26,9 +26,9 @@ */ -#include "proc/asset/meta/error-log.hpp" -#include "proc/asset/struct-scheme.hpp" -#include "proc/assetmanager.hpp" +#include "steam/asset/meta/error-log.hpp" +#include "steam/asset/struct-scheme.hpp" +#include "steam/assetmanager.hpp" //#include "lib/time/timevalue.hpp" //#include "lib/format-string.hpp" //#include "lib/util.hpp" diff --git a/src/steam/asset/meta/error-log.hpp b/src/steam/asset/meta/error-log.hpp index cd856528e..61ca8efb3 100644 --- a/src/steam/asset/meta/error-log.hpp +++ b/src/steam/asset/meta/error-log.hpp @@ -39,7 +39,7 @@ #ifndef ASSET_META_ERROR_LOG_H #define ASSET_META_ERROR_LOG_H -#include "proc/asset/meta.hpp" +#include "steam/asset/meta.hpp" #include "lib/idi/entry-id.hpp" //#include "lib/time/timevalue.hpp" //#include "lib/symbol.hpp" diff --git a/src/steam/asset/meta/time-grid.cpp b/src/steam/asset/meta/time-grid.cpp index 52b000553..cb4c65922 100644 --- a/src/steam/asset/meta/time-grid.cpp +++ b/src/steam/asset/meta/time-grid.cpp @@ -26,9 +26,9 @@ */ -#include "proc/asset/meta/time-grid.hpp" -#include "proc/asset/struct-scheme.hpp" -#include "proc/assetmanager.hpp" +#include "steam/asset/meta/time-grid.hpp" +#include "steam/asset/struct-scheme.hpp" +#include "steam/assetmanager.hpp" #include "lib/time/quantiser.hpp" #include "lib/time/timevalue.hpp" #include "lib/format-string.hpp" diff --git a/src/steam/asset/meta/time-grid.hpp b/src/steam/asset/meta/time-grid.hpp index dd341b5b6..81be167ba 100644 --- a/src/steam/asset/meta/time-grid.hpp +++ b/src/steam/asset/meta/time-grid.hpp @@ -48,7 +48,7 @@ #ifndef ASSET_META_TIME_GRID_H #define ASSET_META_TIME_GRID_H -#include "proc/asset/meta.hpp" +#include "steam/asset/meta.hpp" #include "lib/idi/entry-id.hpp" #include "lib/time/grid.hpp" #include "lib/time/timevalue.hpp" diff --git a/src/steam/asset/pipe.cpp b/src/steam/asset/pipe.cpp index 5380a7ec5..9cb93ac5b 100644 --- a/src/steam/asset/pipe.cpp +++ b/src/steam/asset/pipe.cpp @@ -26,8 +26,8 @@ */ -#include "proc/asset/pipe.hpp" -#include "proc/assetmanager.hpp" +#include "steam/asset/pipe.hpp" +#include "steam/assetmanager.hpp" #include "lib/util.hpp" using util::isnil; diff --git a/src/steam/asset/pipe.hpp b/src/steam/asset/pipe.hpp index eb89ea964..9ac3657ba 100644 --- a/src/steam/asset/pipe.hpp +++ b/src/steam/asset/pipe.hpp @@ -33,9 +33,9 @@ #ifndef ASSET_PIPE_H #define ASSET_PIPE_H -#include "proc/asset/struct.hpp" -#include "proc/asset/procpatt.hpp" -#include "proc/streamtype.hpp" +#include "steam/asset/struct.hpp" +#include "steam/asset/procpatt.hpp" +#include "steam/streamtype.hpp" #include "common/query.hpp" #include diff --git a/src/steam/asset/preview.cpp b/src/steam/asset/preview.cpp index bce74421c..b0788092d 100644 --- a/src/steam/asset/preview.cpp +++ b/src/steam/asset/preview.cpp @@ -26,7 +26,7 @@ */ -#include "proc/asset/preview.hpp" +#include "steam/asset/preview.hpp" namespace proc { namespace asset { diff --git a/src/steam/asset/preview.hpp b/src/steam/asset/preview.hpp index a09562b83..ed309b0c7 100644 --- a/src/steam/asset/preview.hpp +++ b/src/steam/asset/preview.hpp @@ -29,7 +29,7 @@ #ifndef ASSET_PREVIEW_H #define ASSET_PREVIEW_H -#include "proc/asset/unknown.hpp" +#include "steam/asset/unknown.hpp" diff --git a/src/steam/asset/proc.cpp b/src/steam/asset/proc.cpp index 84242787c..d3d6a722f 100644 --- a/src/steam/asset/proc.cpp +++ b/src/steam/asset/proc.cpp @@ -26,8 +26,8 @@ */ -#include "proc/assetmanager.hpp" -#include "proc/asset/proc.hpp" +#include "steam/assetmanager.hpp" +#include "steam/asset/proc.hpp" #include "lib/util.hpp" #include "include/logging.h" diff --git a/src/steam/asset/proc.hpp b/src/steam/asset/proc.hpp index 30c08e821..071b9beba 100644 --- a/src/steam/asset/proc.hpp +++ b/src/steam/asset/proc.hpp @@ -36,8 +36,8 @@ #ifndef ASSET_PROC_H #define ASSET_PROC_H -#include "proc/asset.hpp" -#include "proc/streamtype.hpp" +#include "steam/asset.hpp" +#include "steam/streamtype.hpp" #include "lib/nocopy.hpp" diff --git a/src/steam/asset/procpatt.cpp b/src/steam/asset/procpatt.cpp index 3de87b1fe..5b19d6f82 100644 --- a/src/steam/asset/procpatt.cpp +++ b/src/steam/asset/procpatt.cpp @@ -26,10 +26,10 @@ */ -#include "proc/asset/procpatt.hpp" -#include "proc/asset/proc.hpp" -#include "proc/assetmanager.hpp" -#include "proc/asset/buildinstruct.hpp" +#include "steam/asset/procpatt.hpp" +#include "steam/asset/proc.hpp" +#include "steam/assetmanager.hpp" +#include "steam/asset/buildinstruct.hpp" #include "lib/util.hpp" using util::isnil; diff --git a/src/steam/asset/procpatt.hpp b/src/steam/asset/procpatt.hpp index c692d6fb8..dd5c6f76b 100644 --- a/src/steam/asset/procpatt.hpp +++ b/src/steam/asset/procpatt.hpp @@ -32,7 +32,7 @@ #ifndef ASSET_PROCPATT_H #define ASSET_PROCPATT_H -#include "proc/asset/struct.hpp" +#include "steam/asset/struct.hpp" #include diff --git a/src/steam/asset/sequence.cpp b/src/steam/asset/sequence.cpp index 917de6bc7..95c4d4eaf 100644 --- a/src/steam/asset/sequence.cpp +++ b/src/steam/asset/sequence.cpp @@ -26,11 +26,11 @@ */ -#include "proc/asset/sequence.hpp" -//#include "proc/mobject/session/fork.hpp" -#include "proc/assetmanager.hpp" -//#include "proc/mobject/placement.hpp" -//#include "proc/mobject/session/mobjectfactory.hpp" +#include "steam/asset/sequence.hpp" +//#include "steam/mobject/session/fork.hpp" +#include "steam/assetmanager.hpp" +//#include "steam/mobject/placement.hpp" +//#include "steam/mobject/session/mobjectfactory.hpp" namespace proc { namespace asset { diff --git a/src/steam/asset/sequence.hpp b/src/steam/asset/sequence.hpp index 03db4ab05..5ff40e95e 100644 --- a/src/steam/asset/sequence.hpp +++ b/src/steam/asset/sequence.hpp @@ -56,10 +56,10 @@ #define ASSET_SEQUENCE_H -#include "proc/asset/struct.hpp" -//#include "proc/mobject/mobject.hpp" -//#include "proc/mobject/placement.hpp" -#include "proc/mobject/mobject-ref.hpp" +#include "steam/asset/struct.hpp" +//#include "steam/mobject/mobject.hpp" +//#include "steam/mobject/placement.hpp" +#include "steam/mobject/mobject-ref.hpp" #include "lib/p.hpp" #include "lib/element-tracker.hpp" diff --git a/src/steam/asset/struct-factory-impl.hpp b/src/steam/asset/struct-factory-impl.hpp index 16239874c..a2abdd991 100644 --- a/src/steam/asset/struct-factory-impl.hpp +++ b/src/steam/asset/struct-factory-impl.hpp @@ -36,20 +36,20 @@ #define ASSET_STRUCT_FACTORY_IMPL_H -#include "proc/mobject/session.hpp" -#include "proc/mobject/session/binding.hpp" -#include "proc/mobject/session/mobjectfactory.hpp" -#include "proc/mobject/session/element-query.hpp" -#include "proc/mobject/session/session-query.hpp" -#include "proc/mobject/session/scope.hpp" +#include "steam/mobject/session.hpp" +#include "steam/mobject/session/binding.hpp" +#include "steam/mobject/session/mobjectfactory.hpp" +#include "steam/mobject/session/element-query.hpp" +#include "steam/mobject/session/session-query.hpp" +#include "steam/mobject/session/scope.hpp" #include "common/config-rules.hpp" #include "common/query.hpp" -#include "proc/asset/timeline.hpp" -#include "proc/asset/sequence.hpp" -#include "proc/asset/procpatt.hpp" -#include "proc/asset/pipe.hpp" +#include "steam/asset/timeline.hpp" +#include "steam/asset/sequence.hpp" +#include "steam/asset/procpatt.hpp" +#include "steam/asset/pipe.hpp" -#include "proc/asset/struct-scheme.hpp" +#include "steam/asset/struct-scheme.hpp" #include "lib/format-string.hpp" #include "lib/query-util.hpp" diff --git a/src/steam/asset/struct-scheme.hpp b/src/steam/asset/struct-scheme.hpp index c807ed5b4..364428da2 100644 --- a/src/steam/asset/struct-scheme.hpp +++ b/src/steam/asset/struct-scheme.hpp @@ -37,7 +37,7 @@ #include "lib/symbol.hpp" -#include "proc/asset.hpp" +#include "steam/asset.hpp" #include "lib/idi/entry-id.hpp" #include "lib/meta/util.hpp" #include "lib/format-string.hpp" diff --git a/src/steam/asset/struct.cpp b/src/steam/asset/struct.cpp index d0aa7836d..bdc18dc23 100644 --- a/src/steam/asset/struct.cpp +++ b/src/steam/asset/struct.cpp @@ -37,11 +37,11 @@ */ -#include "proc/asset/struct.hpp" -#include "proc/assetmanager.hpp" -#include "proc/config-resolver.hpp" +#include "steam/asset/struct.hpp" +#include "steam/assetmanager.hpp" +#include "steam/config-resolver.hpp" -#include "proc/asset/struct-factory-impl.hpp" +#include "steam/asset/struct-factory-impl.hpp" #include "lib/util.hpp" #include "lib/symbol.hpp" @@ -184,10 +184,10 @@ namespace asset { /* explicit instantiations of the factory methods */ /**************************************************/ -#include "proc/asset/pipe.hpp" -#include "proc/asset/procpatt.hpp" -#include "proc/asset/timeline.hpp" -#include "proc/asset/sequence.hpp" +#include "steam/asset/pipe.hpp" +#include "steam/asset/procpatt.hpp" +#include "steam/asset/timeline.hpp" +#include "steam/asset/sequence.hpp" namespace proc { diff --git a/src/steam/asset/struct.hpp b/src/steam/asset/struct.hpp index bf5e58a2f..af263708d 100644 --- a/src/steam/asset/struct.hpp +++ b/src/steam/asset/struct.hpp @@ -62,7 +62,7 @@ #define ASSET_STRUCT_H #include "lib/symbol.hpp" -#include "proc/asset.hpp" +#include "steam/asset.hpp" #include "common/query.hpp" #include "lib/nocopy.hpp" diff --git a/src/steam/asset/timeline.cpp b/src/steam/asset/timeline.cpp index 49c9ae395..48ee32f72 100644 --- a/src/steam/asset/timeline.cpp +++ b/src/steam/asset/timeline.cpp @@ -26,9 +26,9 @@ */ -#include "proc/asset/timeline.hpp" -#include "proc/mobject/session/binding.hpp" -#include "proc/assetmanager.hpp" +#include "steam/asset/timeline.hpp" +#include "steam/mobject/session/binding.hpp" +#include "steam/assetmanager.hpp" namespace proc { diff --git a/src/steam/asset/timeline.hpp b/src/steam/asset/timeline.hpp index 1877d3674..e203e2a61 100644 --- a/src/steam/asset/timeline.hpp +++ b/src/steam/asset/timeline.hpp @@ -60,11 +60,11 @@ #ifndef ASSET_TIMELINE_H #define ASSET_TIMELINE_H -#include "proc/asset/struct.hpp" -//#include "proc/mobject/mobject.hpp" -//#include "proc/mobject/placement.hpp" -#include "proc/mobject/mobject-ref.hpp" -//#include "proc/mobject/session/binding.hpp" ////TODO avoidable?? +#include "steam/asset/struct.hpp" +//#include "steam/mobject/mobject.hpp" +//#include "steam/mobject/placement.hpp" +#include "steam/mobject/mobject-ref.hpp" +//#include "steam/mobject/session/binding.hpp" ////TODO avoidable?? #include "lib/p.hpp" #include "lib/element-tracker.hpp" diff --git a/src/steam/asset/typed-id.hpp b/src/steam/asset/typed-id.hpp index 414974f07..b6013cc5d 100644 --- a/src/steam/asset/typed-id.hpp +++ b/src/steam/asset/typed-id.hpp @@ -48,8 +48,8 @@ #include "lib/error.hpp" -//#include "proc/asset.hpp" -//#include "proc/asset/struct-scheme.hpp" +//#include "steam/asset.hpp" +//#include "steam/asset/struct-scheme.hpp" //#include "lib/hash-indexed.hpp" //#include "lib/util.hpp" #include "lib/symbol.hpp" diff --git a/src/steam/asset/typed-lookup.cpp b/src/steam/asset/typed-lookup.cpp index 3754756bc..b09ea1593 100644 --- a/src/steam/asset/typed-lookup.cpp +++ b/src/steam/asset/typed-lookup.cpp @@ -29,7 +29,7 @@ */ -#include "proc/asset/typed-id.hpp" +#include "steam/asset/typed-id.hpp" namespace proc { diff --git a/src/steam/asset/unknown.cpp b/src/steam/asset/unknown.cpp index da79d941f..cfc8ef2db 100644 --- a/src/steam/asset/unknown.cpp +++ b/src/steam/asset/unknown.cpp @@ -26,7 +26,7 @@ */ -#include "proc/asset/unknown.hpp" +#include "steam/asset/unknown.hpp" #include "lib/format-string.hpp" using util::_Fmt; diff --git a/src/steam/asset/unknown.hpp b/src/steam/asset/unknown.hpp index 4116ebfbb..cba6b4e86 100644 --- a/src/steam/asset/unknown.hpp +++ b/src/steam/asset/unknown.hpp @@ -32,7 +32,7 @@ #ifndef ASSET_UNKNOWN_H #define ASSET_UNKNOWN_H -#include "proc/asset/media.hpp" +#include "steam/asset/media.hpp" #include "lib/time/timevalue.hpp" diff --git a/src/steam/asset/viewer.cpp b/src/steam/asset/viewer.cpp index f111cdab7..e0dfa0790 100644 --- a/src/steam/asset/viewer.cpp +++ b/src/steam/asset/viewer.cpp @@ -27,12 +27,12 @@ */ -#include "proc/asset/viewer.hpp" -//#include "proc/mobject/session/fork.hpp" -//#include "proc/mobject/placement.hpp" -//#include "proc/mobject/session/mobjectfactory.hpp" -//#include "proc/mobject/session/binding.hpp" -//#include "proc/assetmanager.hpp" +#include "steam/asset/viewer.hpp" +//#include "steam/mobject/session/fork.hpp" +//#include "steam/mobject/placement.hpp" +//#include "steam/mobject/session/mobjectfactory.hpp" +//#include "steam/mobject/session/binding.hpp" +//#include "steam/assetmanager.hpp" namespace proc { diff --git a/src/steam/asset/viewer.hpp b/src/steam/asset/viewer.hpp index 9420f8b96..a52de14bf 100644 --- a/src/steam/asset/viewer.hpp +++ b/src/steam/asset/viewer.hpp @@ -47,11 +47,11 @@ #ifndef ASSET_VIEWER_H #define ASSET_VIEWER_H -#include "proc/asset/struct.hpp" -//#include "proc/mobject/mobject.hpp" -//#include "proc/mobject/placement.hpp" -#include "proc/mobject/mobject-ref.hpp" -//#include "proc/mobject/session/binding.hpp" ////TODO avoidable?? +#include "steam/asset/struct.hpp" +//#include "steam/mobject/mobject.hpp" +//#include "steam/mobject/placement.hpp" +#include "steam/mobject/mobject-ref.hpp" +//#include "steam/mobject/session/binding.hpp" ////TODO avoidable?? #include "lib/p.hpp" #include "lib/element-tracker.hpp" diff --git a/src/steam/assetmanager.cpp b/src/steam/assetmanager.cpp index 8b572f72a..71d57bfeb 100644 --- a/src/steam/assetmanager.cpp +++ b/src/steam/assetmanager.cpp @@ -26,8 +26,8 @@ */ -#include "proc/assetmanager.hpp" -#include "proc/asset/db.hpp" +#include "steam/assetmanager.hpp" +#include "steam/asset/db.hpp" #include "lib/sync.hpp" #include "lib/util-foreach.hpp" @@ -244,17 +244,17 @@ namespace asset { /* explicit template instantiations for various Asset Kinds */ /************************************************************/ -#include "proc/asset/media.hpp" -#include "proc/asset/clip.hpp" -#include "proc/asset/proc.hpp" -#include "proc/asset/struct.hpp" -#include "proc/asset/pipe.hpp" -#include "proc/asset/meta.hpp" -#include "proc/asset/procpatt.hpp" -#include "proc/asset/timeline.hpp" -#include "proc/asset/sequence.hpp" -#include "proc/asset/meta/time-grid.hpp" -#include "proc/asset/meta/error-log.hpp" +#include "steam/asset/media.hpp" +#include "steam/asset/clip.hpp" +#include "steam/asset/proc.hpp" +#include "steam/asset/struct.hpp" +#include "steam/asset/pipe.hpp" +#include "steam/asset/meta.hpp" +#include "steam/asset/procpatt.hpp" +#include "steam/asset/timeline.hpp" +#include "steam/asset/sequence.hpp" +#include "steam/asset/meta/time-grid.hpp" +#include "steam/asset/meta/error-log.hpp" namespace proc { namespace asset { diff --git a/src/steam/assetmanager.hpp b/src/steam/assetmanager.hpp index 1ca4245ab..8fcde9973 100644 --- a/src/steam/assetmanager.hpp +++ b/src/steam/assetmanager.hpp @@ -44,7 +44,7 @@ #define PROC_INTERFACE_ASSETMANAGER_H -#include "proc/asset.hpp" +#include "steam/asset.hpp" #include "lib/error.hpp" #include "lib/depend.hpp" diff --git a/src/steam/cmd.hpp b/src/steam/cmd.hpp index 72278771f..1e19983ff 100644 --- a/src/steam/cmd.hpp +++ b/src/steam/cmd.hpp @@ -38,9 +38,9 @@ #ifndef PROC_CMD_H #define PROC_CMD_H -#include "proc/control/command-setup.hpp" +#include "steam/control/command-setup.hpp" //#include "lib/symbol.hpp" -//#include "proc/common.hpp" +//#include "steam/common.hpp" //#include diff --git a/src/steam/cmd/meta-cmd.cpp b/src/steam/cmd/meta-cmd.cpp index ed1ce6b48..1ac74e48b 100644 --- a/src/steam/cmd/meta-cmd.cpp +++ b/src/steam/cmd/meta-cmd.cpp @@ -35,12 +35,12 @@ */ -#include "proc/cmd.hpp" -#include "proc/control/command-def.hpp" -//#include "proc/mobject/session.hpp" +#include "steam/cmd.hpp" +#include "steam/control/command-def.hpp" +//#include "steam/mobject/session.hpp" #include "include/ui-protocol.hpp" //////////////////////////////////////////////////////////////TICKET #1140 : verify if this include is required #include "include/gui-notification-facade.h" -#include "gui/interact/wizard.hpp" //////////////////////////////////////////////////////////////TICKET #1140 : include needed temporarily +#include "stage/interact/wizard.hpp" //////////////////////////////////////////////////////////////TICKET #1140 : include needed temporarily #include "lib/diff/gen-node.hpp" #include "lib/idi/entry-id.hpp" #include "lib/format-string.hpp" //////////////////////////////////////////////////////////////TICKET #1140 : include needed temporarily diff --git a/src/steam/cmd/scope-cmd.cpp b/src/steam/cmd/scope-cmd.cpp index 9bc1bf4e3..88354b19f 100644 --- a/src/steam/cmd/scope-cmd.cpp +++ b/src/steam/cmd/scope-cmd.cpp @@ -38,9 +38,9 @@ */ -#include "proc/cmd.hpp" -#include "proc/control/command-def.hpp" -//#include "proc/mobject/session.hpp" +#include "steam/cmd.hpp" +#include "steam/control/command-def.hpp" +//#include "steam/mobject/session.hpp" //#include "lib/symbol.hpp" #include "lib/idi/entry-id.hpp" //#include "lib/format-string.hpp" diff --git a/src/steam/cmd/sequence-cmd.cpp b/src/steam/cmd/sequence-cmd.cpp index f9db100a1..1d43a7218 100644 --- a/src/steam/cmd/sequence-cmd.cpp +++ b/src/steam/cmd/sequence-cmd.cpp @@ -35,9 +35,9 @@ */ -#include "proc/cmd.hpp" -#include "proc/control/command-def.hpp" -//#include "proc/mobject/session.hpp" +#include "steam/cmd.hpp" +#include "steam/control/command-def.hpp" +//#include "steam/mobject/session.hpp" //#include "lib/symbol.hpp" #include "lib/idi/entry-id.hpp" //#include "lib/format-string.hpp" diff --git a/src/steam/cmd/session-cmd.cpp b/src/steam/cmd/session-cmd.cpp index 6dfeb8051..e79545d96 100644 --- a/src/steam/cmd/session-cmd.cpp +++ b/src/steam/cmd/session-cmd.cpp @@ -34,9 +34,9 @@ */ -#include "proc/cmd.hpp" -#include "proc/control/command-def.hpp" -#include "proc/mobject/session.hpp" +#include "steam/cmd.hpp" +#include "steam/control/command-def.hpp" +#include "steam/mobject/session.hpp" //#include "lib/symbol.hpp" #include "lib/idi/entry-id.hpp" //#include "lib/format-string.hpp" diff --git a/src/steam/config-resolver.cpp b/src/steam/config-resolver.cpp index 30b38feb0..804d64610 100644 --- a/src/steam/config-resolver.cpp +++ b/src/steam/config-resolver.cpp @@ -31,8 +31,8 @@ #include "lib/error.hpp" #include "include/lifecycle.h" -#include "proc/config-resolver.hpp" -#include "proc/mobject/session/query/fake-configrules.hpp" +#include "steam/config-resolver.hpp" +#include "steam/mobject/session/query/fake-configrules.hpp" #include "lib/depend-inject.hpp" using lumiera::LifecycleHook; @@ -83,11 +83,11 @@ namespace proc { /* explicit template instantiations for querying various Types */ /***************************************************************/ -#include "proc/asset/procpatt.hpp" -#include "proc/asset/pipe.hpp" -#include "proc/asset/timeline.hpp" -#include "proc/asset/sequence.hpp" -#include "proc/mobject/session/fork.hpp" +#include "steam/asset/procpatt.hpp" +#include "steam/asset/pipe.hpp" +#include "steam/asset/timeline.hpp" +#include "steam/asset/sequence.hpp" +#include "steam/mobject/session/fork.hpp" namespace lumiera{ namespace query { diff --git a/src/steam/config-resolver.hpp b/src/steam/config-resolver.hpp index 1e4381bb3..b99a09e36 100644 --- a/src/steam/config-resolver.hpp +++ b/src/steam/config-resolver.hpp @@ -51,11 +51,11 @@ #include "lib/depend.hpp" // types for explicit specialisations.... -#include "proc/mobject/session/fork.hpp" -#include "proc/asset/procpatt.hpp" -#include "proc/asset/pipe.hpp" -#include "proc/asset/timeline.hpp" -#include "proc/asset/sequence.hpp" +#include "steam/mobject/session/fork.hpp" +#include "steam/asset/procpatt.hpp" +#include "steam/asset/pipe.hpp" +#include "steam/asset/timeline.hpp" +#include "steam/asset/sequence.hpp" diff --git a/src/steam/control/command-closure.hpp b/src/steam/control/command-closure.hpp index 8c7a32ade..8e6b00244 100644 --- a/src/steam/control/command-closure.hpp +++ b/src/steam/control/command-closure.hpp @@ -69,7 +69,7 @@ #define CONTROL_COMMAND_CLOSURE_H #include "lib/meta/function-erasure.hpp" -#include "proc/control/argument-erasure.hpp" +#include "steam/control/argument-erasure.hpp" #include "lib/diff/gen-node.hpp" #include diff --git a/src/steam/control/command-def.hpp b/src/steam/control/command-def.hpp index 7371c0d8c..94aa2a949 100644 --- a/src/steam/control/command-def.hpp +++ b/src/steam/control/command-def.hpp @@ -57,12 +57,12 @@ #include "lib/nocopy.hpp" #include "include/logging.h" #include "lib/symbol.hpp" -#include "proc/control/command.hpp" -#include "proc/control/command-impl.hpp" // note: at command definition site we need to know the full type -#include "proc/control/command-registry.hpp" -#include "proc/control/command-signature.hpp" -#include "proc/control/command-mutation.hpp" -#include "proc/control/argument-tuple-accept.hpp" +#include "steam/control/command.hpp" +#include "steam/control/command-impl.hpp" // note: at command definition site we need to know the full type +#include "steam/control/command-registry.hpp" +#include "steam/control/command-signature.hpp" +#include "steam/control/command-mutation.hpp" +#include "steam/control/argument-tuple-accept.hpp" #include "lib/meta/function.hpp" #include "lib/meta/typelist.hpp" #include "lib/meta/typelist-manip.hpp" diff --git a/src/steam/control/command-dispatch.hpp b/src/steam/control/command-dispatch.hpp index 462c19c74..3b20160de 100644 --- a/src/steam/control/command-dispatch.hpp +++ b/src/steam/control/command-dispatch.hpp @@ -35,7 +35,7 @@ #ifndef PROC_CONTROL_COMMAND_DISPATCH_H #define PROC_CONTROL_COMMAND_DISPATCH_H -#include "proc/control/command.hpp" +#include "steam/control/command.hpp" diff --git a/src/steam/control/command-impl-clone-builder.hpp b/src/steam/control/command-impl-clone-builder.hpp index 6c8fe2565..0e685c41a 100644 --- a/src/steam/control/command-impl-clone-builder.hpp +++ b/src/steam/control/command-impl-clone-builder.hpp @@ -46,7 +46,7 @@ #ifndef CONTROL_COMMAND_IMPL_CLONE_BUILDER_H #define CONTROL_COMMAND_IMPL_CLONE_BUILDER_H -#include "proc/control/command-mutation.hpp" +#include "steam/control/command-mutation.hpp" #include "lib/typed-allocation-manager.hpp" #include "lib/opaque-holder.hpp" #include "lib/nocopy.hpp" diff --git a/src/steam/control/command-impl.hpp b/src/steam/control/command-impl.hpp index b85a30b24..595ebdf51 100644 --- a/src/steam/control/command-impl.hpp +++ b/src/steam/control/command-impl.hpp @@ -42,9 +42,9 @@ #ifndef CONTROL_COMMAND_IMPL_H #define CONTROL_COMMAND_IMPL_H -#include "proc/control/command.hpp" -#include "proc/control/command-closure.hpp" -#include "proc/control/command-mutation.hpp" +#include "steam/control/command.hpp" +#include "steam/control/command-closure.hpp" +#include "steam/control/command-mutation.hpp" #include "lib/format-string.hpp" #include "lib/nocopy.hpp" diff --git a/src/steam/control/command-instance-manager.hpp b/src/steam/control/command-instance-manager.hpp index 2e83f81c0..161def068 100644 --- a/src/steam/control/command-instance-manager.hpp +++ b/src/steam/control/command-instance-manager.hpp @@ -59,8 +59,8 @@ #include "lib/error.hpp" #include "lib/nocopy.hpp" -#include "proc/control/command.hpp" -#include "proc/control/command-dispatch.hpp" +#include "steam/control/command.hpp" +#include "steam/control/command-dispatch.hpp" #include "lib/diff/gen-node.hpp" #include "lib/symbol.hpp" diff --git a/src/steam/control/command-invocation.hpp b/src/steam/control/command-invocation.hpp index 6c1fcbc03..f40dfd1ed 100644 --- a/src/steam/control/command-invocation.hpp +++ b/src/steam/control/command-invocation.hpp @@ -46,9 +46,9 @@ #ifndef CONTROL_COMMAND_INVOCACTION_H #define CONTROL_COMMAND_INVOCACTION_H -#include "proc/control/command.hpp" -#include "proc/control/handling-pattern.hpp" -#include "proc/control/argument-tuple-accept.hpp" +#include "steam/control/command.hpp" +#include "steam/control/handling-pattern.hpp" +#include "steam/control/argument-tuple-accept.hpp" #include diff --git a/src/steam/control/command-mutation.hpp b/src/steam/control/command-mutation.hpp index 9c33380ca..a8142c2ff 100644 --- a/src/steam/control/command-mutation.hpp +++ b/src/steam/control/command-mutation.hpp @@ -46,8 +46,8 @@ #define CONTROL_COMMAND_MUTATION_H #include "lib/error.hpp" -#include "proc/control/command-closure.hpp" -#include "proc/control/memento-tie.hpp" +#include "steam/control/command-closure.hpp" +#include "steam/control/memento-tie.hpp" diff --git a/src/steam/control/command-op-closure.hpp b/src/steam/control/command-op-closure.hpp index af01aed07..4bd86488e 100644 --- a/src/steam/control/command-op-closure.hpp +++ b/src/steam/control/command-op-closure.hpp @@ -41,8 +41,8 @@ #include "lib/meta/tuple-helper.hpp" #include "lib/meta/tuple-record-init.hpp" #include "lib/meta/maybe-compare.hpp" -#include "proc/control/command-closure.hpp" -#include "proc/control/argument-erasure.hpp" +#include "steam/control/command-closure.hpp" +#include "steam/control/argument-erasure.hpp" #include "lib/typed-allocation-manager.hpp" #include "lib/format-cout.hpp" diff --git a/src/steam/control/command-queue.hpp b/src/steam/control/command-queue.hpp index 60150966a..0a744bdb5 100644 --- a/src/steam/control/command-queue.hpp +++ b/src/steam/control/command-queue.hpp @@ -42,7 +42,7 @@ #ifndef PROC_CONTROL_COMMAND_QUEUE_H #define PROC_CONTROL_COMMAND_QUEUE_H -#include "proc/control/command.hpp" +#include "steam/control/command.hpp" #include "lib/iter-stack.hpp" #include "lib/format-string.hpp" #include "lib/util.hpp" diff --git a/src/steam/control/command-registry.hpp b/src/steam/control/command-registry.hpp index 2ea56a2ce..68eee3a09 100644 --- a/src/steam/control/command-registry.hpp +++ b/src/steam/control/command-registry.hpp @@ -65,9 +65,9 @@ #include "lib/nocopy.hpp" #include "lib/util.hpp" -#include "proc/control/command.hpp" -#include "proc/control/command-signature.hpp" -#include "proc/control/command-storage-holder.hpp" +#include "steam/control/command.hpp" +#include "steam/control/command-signature.hpp" +#include "steam/control/command-storage-holder.hpp" #include "lib/typed-allocation-manager.hpp" #include diff --git a/src/steam/control/command-setup.cpp b/src/steam/control/command-setup.cpp index 5aba7f167..b62d9ed3b 100644 --- a/src/steam/control/command-setup.cpp +++ b/src/steam/control/command-setup.cpp @@ -38,10 +38,10 @@ #include "lib/error.hpp" #include "include/logging.h" #include "include/lifecycle.h" -#include "proc/control/command.hpp" -#include "proc/control/command-setup.hpp" -#include "proc/control/command-instance-manager.hpp" -#include "proc/control/command-def.hpp" +#include "steam/control/command.hpp" +#include "steam/control/command-setup.hpp" +#include "steam/control/command-instance-manager.hpp" +#include "steam/control/command-def.hpp" #include "lib/symbol.hpp" #include "lib/format-string.hpp" #include "lib/util.hpp" diff --git a/src/steam/control/command-setup.hpp b/src/steam/control/command-setup.hpp index 879ab150d..6ff87bdf7 100644 --- a/src/steam/control/command-setup.hpp +++ b/src/steam/control/command-setup.hpp @@ -54,7 +54,7 @@ #include "lib/error.hpp" #include "lib/nocopy.hpp" -#include "proc/control/command.hpp" +#include "steam/control/command.hpp" #include "lib/symbol.hpp" #include diff --git a/src/steam/control/command-simple-closure.hpp b/src/steam/control/command-simple-closure.hpp index 317da7ad4..571d3b55d 100644 --- a/src/steam/control/command-simple-closure.hpp +++ b/src/steam/control/command-simple-closure.hpp @@ -47,7 +47,7 @@ #define CONTROL_COMMAND_SIMPLE_CLOSURE_H #include "lib/typed-allocation-manager.hpp" -#include "proc/control/command-op-closure.hpp" +#include "steam/control/command-op-closure.hpp" #include "lib/opaque-holder.hpp" #include diff --git a/src/steam/control/command-storage-holder.hpp b/src/steam/control/command-storage-holder.hpp index 297842f75..c3c8636db 100644 --- a/src/steam/control/command-storage-holder.hpp +++ b/src/steam/control/command-storage-holder.hpp @@ -45,9 +45,9 @@ #define CONTROL_COMMAND_STORAGE_HOLDER_H #include "lib/typed-allocation-manager.hpp" -#include "proc/control/command-op-closure.hpp" -#include "proc/control/memento-tie.hpp" -#include "proc/control/command-impl-clone-builder.hpp" +#include "steam/control/command-op-closure.hpp" +#include "steam/control/memento-tie.hpp" +#include "steam/control/command-impl-clone-builder.hpp" #include "lib/opaque-holder.hpp" #include diff --git a/src/steam/control/command.cpp b/src/steam/control/command.cpp index 036f9a800..680dcb954 100644 --- a/src/steam/control/command.cpp +++ b/src/steam/control/command.cpp @@ -43,12 +43,12 @@ #include "lib/error.hpp" #include "lib/symbol.hpp" #include "lib/format-string.hpp" -#include "proc/control/command.hpp" -#include "proc/control/command-def.hpp" -#include "proc/control/command-impl.hpp" -#include "proc/control/command-registry.hpp" -#include "proc/control/command-impl-clone-builder.hpp" -#include "proc/control/handling-pattern.hpp" +#include "steam/control/command.hpp" +#include "steam/control/command-def.hpp" +#include "steam/control/command-impl.hpp" +#include "steam/control/command-registry.hpp" +#include "steam/control/command-impl-clone-builder.hpp" +#include "steam/control/handling-pattern.hpp" #include #include diff --git a/src/steam/control/command.hpp b/src/steam/control/command.hpp index cecdc10dd..baaa89c29 100644 --- a/src/steam/control/command.hpp +++ b/src/steam/control/command.hpp @@ -70,10 +70,10 @@ #include "lib/error.hpp" #include "lib/symbol.hpp" -#include "proc/common.hpp" -#include "proc/control/argument-erasure.hpp" -#include "proc/control/argument-tuple-accept.hpp" -#include "proc/control/handling-pattern.hpp" +#include "steam/common.hpp" +#include "steam/control/argument-erasure.hpp" +#include "steam/control/argument-tuple-accept.hpp" +#include "steam/control/handling-pattern.hpp" #include "lib/meta/tuple-helper.hpp" #include "lib/diff/gen-node.hpp" #include "lib/handle.hpp" diff --git a/src/steam/control/handling-pattern.cpp b/src/steam/control/handling-pattern.cpp index deaf19555..d197192bd 100644 --- a/src/steam/control/handling-pattern.cpp +++ b/src/steam/control/handling-pattern.cpp @@ -29,8 +29,8 @@ #include "lib/error.hpp" -#include "proc/control/handling-pattern.hpp" -#include "proc/control/handling-patterns.hpp" +#include "steam/control/handling-pattern.hpp" +#include "steam/control/handling-patterns.hpp" #include "lib/format-string.hpp" #include "lib/util.hpp" diff --git a/src/steam/control/handling-patterns.hpp b/src/steam/control/handling-patterns.hpp index e05c5ed8b..2ac27d426 100644 --- a/src/steam/control/handling-patterns.hpp +++ b/src/steam/control/handling-patterns.hpp @@ -44,8 +44,8 @@ #include "lib/error.hpp" #include "lib/multifact.hpp" -#include "proc/control/handling-pattern.hpp" -#include "proc/control/command-impl.hpp" +#include "steam/control/handling-pattern.hpp" +#include "steam/control/command-impl.hpp" diff --git a/src/steam/control/looper.hpp b/src/steam/control/looper.hpp index d5e2fadb8..1f1a59bf3 100644 --- a/src/steam/control/looper.hpp +++ b/src/steam/control/looper.hpp @@ -50,7 +50,7 @@ #define PROC_CONTROL_LOOPER_H #include "lib/time/timevalue.hpp" -#include "backend/real-clock.hpp" +#include "vault/real-clock.hpp" #include diff --git a/src/steam/control/media-impl-lib.hpp b/src/steam/control/media-impl-lib.hpp index d151d4954..e8742b3af 100644 --- a/src/steam/control/media-impl-lib.hpp +++ b/src/steam/control/media-impl-lib.hpp @@ -37,7 +37,7 @@ #define PROC_CONTROL_MEDIA_IMPL_LIB_H -#include "proc/streamtype.hpp" +#include "steam/streamtype.hpp" diff --git a/src/steam/control/memento-tie.hpp b/src/steam/control/memento-tie.hpp index 1f70e44a0..a86207528 100644 --- a/src/steam/control/memento-tie.hpp +++ b/src/steam/control/memento-tie.hpp @@ -42,7 +42,7 @@ #include "lib/meta/maybe-compare.hpp" #include "lib/meta/function-closure.hpp" -#include "proc/control/command-signature.hpp" +#include "steam/control/command-signature.hpp" #include "lib/replaceable-item.hpp" #include "lib/functor-util.hpp" #include "lib/format-obj.hpp" diff --git a/src/steam/control/pathmanager.cpp b/src/steam/control/pathmanager.cpp index 46d97ff64..3587c9a85 100644 --- a/src/steam/control/pathmanager.cpp +++ b/src/steam/control/pathmanager.cpp @@ -28,7 +28,7 @@ */ -#include "proc/control/pathmanager.hpp" +#include "steam/control/pathmanager.hpp" namespace proc { namespace control { diff --git a/src/steam/control/proc-dispatcher.cpp b/src/steam/control/proc-dispatcher.cpp index d40807ea5..3101e59ac 100644 --- a/src/steam/control/proc-dispatcher.cpp +++ b/src/steam/control/proc-dispatcher.cpp @@ -82,13 +82,13 @@ #include "lib/error.hpp" #include "include/logging.h" -#include "proc/control/proc-dispatcher.hpp" -#include "proc/control/command-dispatch.hpp" -#include "proc/control/command-queue.hpp" -#include "proc/control/looper.hpp" -#include "proc/control/session-command-service.hpp" -#include "proc/mobject/session.hpp" -#include "backend/thread-wrapper.hpp" +#include "steam/control/proc-dispatcher.hpp" +#include "steam/control/command-dispatch.hpp" +#include "steam/control/command-queue.hpp" +#include "steam/control/looper.hpp" +#include "steam/control/session-command-service.hpp" +#include "steam/mobject/session.hpp" +#include "vault/thread-wrapper.hpp" #include "lib/depend-inject.hpp" #include "lib/util.hpp" ///////////////TODO for test command invocation diff --git a/src/steam/control/session-command-service.cpp b/src/steam/control/session-command-service.cpp index b2d8141a7..8969163ae 100644 --- a/src/steam/control/session-command-service.cpp +++ b/src/steam/control/session-command-service.cpp @@ -31,8 +31,8 @@ ** */ -#include "proc/control/session-command-service.hpp" -#include "proc/control/command.hpp" +#include "steam/control/session-command-service.hpp" +#include "steam/control/command.hpp" #include "include/logging.h" #include "lib/depend.hpp" #include "lib/symbol.hpp" diff --git a/src/steam/control/session-command-service.hpp b/src/steam/control/session-command-service.hpp index f8522c114..689ac8f69 100644 --- a/src/steam/control/session-command-service.hpp +++ b/src/steam/control/session-command-service.hpp @@ -43,8 +43,8 @@ #include "include/session-command-facade.h" -#include "proc/control/command-dispatch.hpp" -#include "proc/control/command-instance-manager.hpp" +#include "steam/control/command-dispatch.hpp" +#include "steam/control/command-instance-manager.hpp" #include "common/instancehandle.hpp" #include "lib/diff/gen-node.hpp" #include "lib/nocopy.hpp" diff --git a/src/steam/control/stypemanager.cpp b/src/steam/control/stypemanager.cpp index 2fce854b9..714d1f824 100644 --- a/src/steam/control/stypemanager.cpp +++ b/src/steam/control/stypemanager.cpp @@ -26,9 +26,9 @@ */ -#include "proc/common.hpp" -#include "proc/control/stypemanager.hpp" -#include "proc/control/styperegistry.hpp" +#include "steam/common.hpp" +#include "steam/control/stypemanager.hpp" +#include "steam/control/styperegistry.hpp" #include "include/lifecycle.h" diff --git a/src/steam/control/stypemanager.hpp b/src/steam/control/stypemanager.hpp index 67d812fd9..973d63627 100644 --- a/src/steam/control/stypemanager.hpp +++ b/src/steam/control/stypemanager.hpp @@ -32,7 +32,7 @@ #define PROC_CONTROL_STYPEMANAGER_H -#include "proc/streamtype.hpp" +#include "steam/streamtype.hpp" #include "lib/depend.hpp" #include diff --git a/src/steam/control/styperegistry.hpp b/src/steam/control/styperegistry.hpp index 3c1963bff..1250e7080 100644 --- a/src/steam/control/styperegistry.hpp +++ b/src/steam/control/styperegistry.hpp @@ -37,7 +37,7 @@ #define CONTROL_STYPEREGISTRY_H -#include "proc/control/stypemanager.hpp" +#include "steam/control/stypemanager.hpp" #include "lib/nocopy.hpp" //#include "common/query.hpp" //#include "lib/util.hpp" diff --git a/src/steam/engine/buffer-metadata.hpp b/src/steam/engine/buffer-metadata.hpp index 90a5589df..e3fc421f0 100644 --- a/src/steam/engine/buffer-metadata.hpp +++ b/src/steam/engine/buffer-metadata.hpp @@ -59,8 +59,8 @@ #include "lib/hash-value.h" #include "lib/util-foreach.hpp" #include "include/logging.h" -#include "proc/engine/type-handler.hpp" -#include "proc/engine/buffer-local-key.hpp" +#include "steam/engine/type-handler.hpp" +#include "steam/engine/buffer-local-key.hpp" #include "lib/nocopy.hpp" #include diff --git a/src/steam/engine/buffer-provider.cpp b/src/steam/engine/buffer-provider.cpp index 59bb5c215..073c1ecdb 100644 --- a/src/steam/engine/buffer-provider.cpp +++ b/src/steam/engine/buffer-provider.cpp @@ -27,8 +27,8 @@ #include "lib/error.hpp" -#include "proc/engine/buffer-provider.hpp" -#include "proc/engine/buffer-metadata.hpp" +#include "steam/engine/buffer-provider.hpp" +#include "steam/engine/buffer-metadata.hpp" #include "lib/util.hpp" using util::isSameObject; diff --git a/src/steam/engine/buffer-provider.hpp b/src/steam/engine/buffer-provider.hpp index 610573473..2dfbea700 100644 --- a/src/steam/engine/buffer-provider.hpp +++ b/src/steam/engine/buffer-provider.hpp @@ -45,9 +45,9 @@ #include "lib/error.hpp" #include "lib/symbol.hpp" #include "lib/hash-value.h" -#include "proc/engine/buffhandle.hpp" -#include "proc/engine/type-handler.hpp" -#include "proc/engine/buffer-local-key.hpp" +#include "steam/engine/buffhandle.hpp" +#include "steam/engine/type-handler.hpp" +#include "steam/engine/buffer-local-key.hpp" #include "lib/nocopy.hpp" #include diff --git a/src/steam/engine/buffhandle-attach.hpp b/src/steam/engine/buffhandle-attach.hpp index 9a26aad06..6f8630cbb 100644 --- a/src/steam/engine/buffhandle-attach.hpp +++ b/src/steam/engine/buffhandle-attach.hpp @@ -46,8 +46,8 @@ #include "lib/error.hpp" -#include "proc/engine/buffer-provider.hpp" -#include "proc/engine/buffhandle.hpp" +#include "steam/engine/buffer-provider.hpp" +#include "steam/engine/buffhandle.hpp" namespace proc { diff --git a/src/steam/engine/buffhandle.hpp b/src/steam/engine/buffhandle.hpp index fb437f2db..9bfd2f7e1 100644 --- a/src/steam/engine/buffhandle.hpp +++ b/src/steam/engine/buffhandle.hpp @@ -53,7 +53,7 @@ #include "lib/error.hpp" #include "lib/hash-value.h" -#include "proc/streamtype.hpp" +#include "steam/streamtype.hpp" namespace proc { diff --git a/src/steam/engine/bufftable-obsolete.hpp b/src/steam/engine/bufftable-obsolete.hpp index fad9c3a80..49b428b0e 100644 --- a/src/steam/engine/bufftable-obsolete.hpp +++ b/src/steam/engine/bufftable-obsolete.hpp @@ -33,8 +33,8 @@ #include "lib/error.hpp" #include "lib/nocopy.hpp" -#include "proc/engine/channel-descriptor.hpp" -#include "proc/engine/procnode.hpp" +#include "steam/engine/channel-descriptor.hpp" +#include "steam/engine/procnode.hpp" #include #include diff --git a/src/steam/engine/bufftable.hpp b/src/steam/engine/bufftable.hpp index 6199f662c..bec3f17c7 100644 --- a/src/steam/engine/bufftable.hpp +++ b/src/steam/engine/bufftable.hpp @@ -35,8 +35,8 @@ #include "lib/error.hpp" -#include "proc/engine/buffhandle.hpp" -#include "proc/engine/procnode.hpp" +#include "steam/engine/buffhandle.hpp" +#include "steam/engine/procnode.hpp" #include "lib/iter-adapter.hpp" #include diff --git a/src/steam/engine/calc-plan-continuation.cpp b/src/steam/engine/calc-plan-continuation.cpp index 84aaaa463..451e685fd 100644 --- a/src/steam/engine/calc-plan-continuation.cpp +++ b/src/steam/engine/calc-plan-continuation.cpp @@ -27,12 +27,12 @@ */ -#include "proc/engine/calc-plan-continuation.hpp" -#include "proc/engine/frame-coord.hpp" -#include "proc/engine/job-ticket.hpp" +#include "steam/engine/calc-plan-continuation.hpp" +#include "steam/engine/frame-coord.hpp" +#include "steam/engine/job-ticket.hpp" #include "lib/time/timevalue.hpp" //#include "lib/frameid.hpp" -//#include "proc/state.hpp" +//#include "steam/state.hpp" #include diff --git a/src/steam/engine/calc-plan-continuation.hpp b/src/steam/engine/calc-plan-continuation.hpp index dda85c2df..0b9402a9c 100644 --- a/src/steam/engine/calc-plan-continuation.hpp +++ b/src/steam/engine/calc-plan-continuation.hpp @@ -36,12 +36,12 @@ #ifndef PROC_ENGINE_CALC_PLAN_CONTINUATION_H #define PROC_ENGINE_CALC_PLAN_CONTINUATION_H -#include "proc/common.hpp" -#include "proc/mobject/model-port.hpp" -#include "proc/engine/time-anchor.hpp" -#include "proc/engine/dispatcher.hpp" -#include "proc/play/timings.hpp" -#include "backend/engine/job.h" +#include "steam/common.hpp" +#include "steam/mobject/model-port.hpp" +#include "steam/engine/time-anchor.hpp" +#include "steam/engine/dispatcher.hpp" +#include "steam/play/timings.hpp" +#include "vault/engine/job.h" namespace proc { diff --git a/src/steam/engine/calc-stream.hpp b/src/steam/engine/calc-stream.hpp index 727b08121..abcceba71 100644 --- a/src/steam/engine/calc-stream.hpp +++ b/src/steam/engine/calc-stream.hpp @@ -46,9 +46,9 @@ #include "lib/error.hpp" -#include "proc/play/timings.hpp" -#include "proc/play/output-slot.hpp" -#include "proc/engine/calc-plan-continuation.hpp" +#include "steam/play/timings.hpp" +#include "steam/play/output-slot.hpp" +#include "steam/engine/calc-plan-continuation.hpp" //#include "include/dummy-player-facade.h" //#include "include/display-facade.h" //#include "common/instancehandle.hpp" diff --git a/src/steam/engine/channel-descriptor.hpp b/src/steam/engine/channel-descriptor.hpp index 4b155a153..a0fb74f46 100644 --- a/src/steam/engine/channel-descriptor.hpp +++ b/src/steam/engine/channel-descriptor.hpp @@ -38,7 +38,7 @@ #include "lib/error.hpp" #include "lib/hash-value.h" -#include "proc/streamtype.hpp" +#include "steam/streamtype.hpp" namespace proc { diff --git a/src/steam/engine/diagnostic-buffer-provider.cpp b/src/steam/engine/diagnostic-buffer-provider.cpp index 53123b640..2c4ddd908 100644 --- a/src/steam/engine/diagnostic-buffer-provider.cpp +++ b/src/steam/engine/diagnostic-buffer-provider.cpp @@ -32,8 +32,8 @@ #include "lib/error.hpp" #include "lib/meta/function.hpp" -#include "proc/engine/diagnostic-buffer-provider.hpp" -#include "proc/engine/tracking-heap-block-provider.hpp" +#include "steam/engine/diagnostic-buffer-provider.hpp" +#include "steam/engine/tracking-heap-block-provider.hpp" namespace proc { diff --git a/src/steam/engine/diagnostic-buffer-provider.hpp b/src/steam/engine/diagnostic-buffer-provider.hpp index 7e74c77da..2973059f2 100644 --- a/src/steam/engine/diagnostic-buffer-provider.hpp +++ b/src/steam/engine/diagnostic-buffer-provider.hpp @@ -33,8 +33,8 @@ #include "lib/error.hpp" #include "lib/depend.hpp" #include "lib/util.hpp" -#include "proc/engine/type-handler.hpp" -#include "proc/engine/buffer-provider.hpp" +#include "steam/engine/type-handler.hpp" +#include "steam/engine/buffer-provider.hpp" #include "lib/nocopy.hpp" #include diff --git a/src/steam/engine/dispatch-table.cpp b/src/steam/engine/dispatch-table.cpp index e7b603df0..b6b7c89c2 100644 --- a/src/steam/engine/dispatch-table.cpp +++ b/src/steam/engine/dispatch-table.cpp @@ -27,9 +27,9 @@ */ -#include "proc/engine/dispatch-table.hpp" +#include "steam/engine/dispatch-table.hpp" //#include "lib/frameid.hpp" -//#include "proc/state.hpp" +//#include "steam/state.hpp" diff --git a/src/steam/engine/dispatch-table.hpp b/src/steam/engine/dispatch-table.hpp index cf34825b5..5364af5e2 100644 --- a/src/steam/engine/dispatch-table.hpp +++ b/src/steam/engine/dispatch-table.hpp @@ -30,8 +30,8 @@ #ifndef PROC_ENGINE_DISPATCH_TABLE_H #define PROC_ENGINE_DISPATCH_TABLE_H -#include "proc/common.hpp" -#include "proc/engine/dispatcher.hpp" +#include "steam/common.hpp" +#include "steam/engine/dispatcher.hpp" diff --git a/src/steam/engine/dispatcher.cpp b/src/steam/engine/dispatcher.cpp index 0c160f0f2..30d991e2e 100644 --- a/src/steam/engine/dispatcher.cpp +++ b/src/steam/engine/dispatcher.cpp @@ -27,9 +27,9 @@ */ -#include "proc/engine/dispatcher.hpp" +#include "steam/engine/dispatcher.hpp" //#include "lib/frameid.hpp" -//#include "proc/state.hpp" +//#include "steam/state.hpp" diff --git a/src/steam/engine/dispatcher.hpp b/src/steam/engine/dispatcher.hpp index 440037837..535a21a90 100644 --- a/src/steam/engine/dispatcher.hpp +++ b/src/steam/engine/dispatcher.hpp @@ -35,12 +35,12 @@ #ifndef PROC_ENGINE_DISPATCHER_H #define PROC_ENGINE_DISPATCHER_H -#include "proc/common.hpp" -#include "proc/mobject/model-port.hpp" -#include "proc/engine/time-anchor.hpp" -#include "proc/engine/frame-coord.hpp" -#include "proc/engine/job-ticket.hpp" -#include "proc/engine/job-planning.hpp" +#include "steam/common.hpp" +#include "steam/mobject/model-port.hpp" +#include "steam/engine/time-anchor.hpp" +#include "steam/engine/frame-coord.hpp" +#include "steam/engine/job-ticket.hpp" +#include "steam/engine/job-planning.hpp" #include "lib/time/timevalue.hpp" #include diff --git a/src/steam/engine/engine-diagnostics.hpp b/src/steam/engine/engine-diagnostics.hpp index 1f0020ac3..1ea30b462 100644 --- a/src/steam/engine/engine-diagnostics.hpp +++ b/src/steam/engine/engine-diagnostics.hpp @@ -39,13 +39,13 @@ #include "lib/error.hpp" #include "lib/nocopy.hpp" -#include "proc/engine/engine-service.hpp" +#include "steam/engine/engine-service.hpp" //#include "include/dummy-player-facade.h" //#include "include/display-facade.h" -//#include "proc/engine/calc-stream.hpp" -//#include "proc/mobject/model-port.hpp" -#include "proc/play/timings.hpp" -//#include "proc/play/output-slot.hpp" +//#include "steam/engine/calc-stream.hpp" +//#include "steam/mobject/model-port.hpp" +#include "steam/play/timings.hpp" +//#include "steam/play/output-slot.hpp" //#include "common/instancehandle.hpp" //#include "lib/singleton-ref.hpp" //#include "lib/polymorphic-value.hpp" diff --git a/src/steam/engine/engine-service-mock.cpp b/src/steam/engine/engine-service-mock.cpp index 8fd7e96fa..0e6c91304 100644 --- a/src/steam/engine/engine-service-mock.cpp +++ b/src/steam/engine/engine-service-mock.cpp @@ -27,8 +27,8 @@ */ -#include "proc/engine/engine-service-mock.hpp" -#include "proc/engine/worker/dummy-tick.hpp" +#include "steam/engine/engine-service-mock.hpp" +#include "steam/engine/worker/dummy-tick.hpp" //#include //#include diff --git a/src/steam/engine/engine-service-mock.hpp b/src/steam/engine/engine-service-mock.hpp index b04223790..f410140ee 100644 --- a/src/steam/engine/engine-service-mock.hpp +++ b/src/steam/engine/engine-service-mock.hpp @@ -44,13 +44,13 @@ #include "lib/error.hpp" //#include "include/dummy-player-facade.h" //#include "include/display-facade.h" -#include "proc/engine/calc-stream.hpp" -#include "proc/mobject/model-port.hpp" -#include "proc/play/timings.hpp" -#include "proc/play/output-slot.hpp" +#include "steam/engine/calc-stream.hpp" +#include "steam/mobject/model-port.hpp" +#include "steam/play/timings.hpp" +#include "steam/play/output-slot.hpp" //#include "common/instancehandle.hpp" //#include "lib/singleton-ref.hpp" -#include "proc/engine/engine-service.hpp" +#include "steam/engine/engine-service.hpp" #include "lib/scoped-ptrvect.hpp" diff --git a/src/steam/engine/engine-service.cpp b/src/steam/engine/engine-service.cpp index 56a7e8362..343adb17a 100644 --- a/src/steam/engine/engine-service.cpp +++ b/src/steam/engine/engine-service.cpp @@ -26,7 +26,7 @@ */ -#include "proc/engine/engine-service.hpp" +#include "steam/engine/engine-service.hpp" #include "lib/itertools.hpp" //#include diff --git a/src/steam/engine/engine-service.hpp b/src/steam/engine/engine-service.hpp index 95060137f..130b63db2 100644 --- a/src/steam/engine/engine-service.hpp +++ b/src/steam/engine/engine-service.hpp @@ -56,10 +56,10 @@ #include "lib/nocopy.hpp" //#include "include/dummy-player-facade.h" //#include "include/display-facade.h" -#include "proc/engine/calc-stream.hpp" -#include "proc/mobject/model-port.hpp" -#include "proc/play/timings.hpp" -#include "proc/play/output-slot.hpp" +#include "steam/engine/calc-stream.hpp" +#include "steam/mobject/model-port.hpp" +#include "steam/play/timings.hpp" +#include "steam/play/output-slot.hpp" //#include "common/instancehandle.hpp" //#include "lib/singleton-ref.hpp" #include "lib/polymorphic-value.hpp" diff --git a/src/steam/engine/frame-coord.hpp b/src/steam/engine/frame-coord.hpp index 57c1723cc..f2afb4d08 100644 --- a/src/steam/engine/frame-coord.hpp +++ b/src/steam/engine/frame-coord.hpp @@ -29,8 +29,8 @@ #ifndef PROC_ENGINE_FRAME_COORD_H #define PROC_ENGINE_FRAME_COORD_H -#include "proc/common.hpp" -#include "proc/mobject/model-port.hpp" +#include "steam/common.hpp" +#include "steam/mobject/model-port.hpp" #include "lib/time/timevalue.hpp" #include "lib/time/timequant.hpp" diff --git a/src/steam/engine/job-planning.hpp b/src/steam/engine/job-planning.hpp index 011a0e0ff..f6a8df2d2 100644 --- a/src/steam/engine/job-planning.hpp +++ b/src/steam/engine/job-planning.hpp @@ -64,10 +64,10 @@ #ifndef PROC_ENGINE_JOB_PLANNING_H #define PROC_ENGINE_JOB_PLANNING_H -#include "proc/common.hpp" -#include "backend/engine/job.h" -#include "proc/engine/job-ticket.hpp" -#include "proc/engine/frame-coord.hpp" +#include "steam/common.hpp" +#include "vault/engine/job.h" +#include "steam/engine/job-ticket.hpp" +#include "steam/engine/frame-coord.hpp" #include "lib/time/timevalue.hpp" #include "lib/iter-explorer.hpp" #include "lib/iter-adapter.hpp" diff --git a/src/steam/engine/job-ticket.cpp b/src/steam/engine/job-ticket.cpp index b5d6f5afb..b01dc2c0f 100644 --- a/src/steam/engine/job-ticket.cpp +++ b/src/steam/engine/job-ticket.cpp @@ -30,7 +30,7 @@ */ -#include "proc/engine/job-ticket.hpp" +#include "steam/engine/job-ticket.hpp" namespace proc { diff --git a/src/steam/engine/job-ticket.hpp b/src/steam/engine/job-ticket.hpp index 80d23f4d1..4e8e58ff0 100644 --- a/src/steam/engine/job-ticket.hpp +++ b/src/steam/engine/job-ticket.hpp @@ -32,10 +32,10 @@ #ifndef PROC_ENGINE_JOB_TICKET_H #define PROC_ENGINE_JOB_TICKET_H -#include "proc/common.hpp" -//#include "proc/state.hpp" -#include "backend/engine/job.h" -#include "proc/engine/frame-coord.hpp" +#include "steam/common.hpp" +//#include "steam/state.hpp" +#include "vault/engine/job.h" +#include "steam/engine/frame-coord.hpp" //#include "lib/time/timevalue.hpp" //#include "lib/time/timequant.hpp" #include "lib/hierarchy-orientation-indicator.hpp" diff --git a/src/steam/engine/mask.cpp b/src/steam/engine/mask.cpp index bb9750b61..0100130a9 100644 --- a/src/steam/engine/mask.cpp +++ b/src/steam/engine/mask.cpp @@ -28,7 +28,7 @@ #include "lib/error.hpp" -#include "proc/engine/mask.hpp" +#include "steam/engine/mask.hpp" namespace proc { namespace engine { diff --git a/src/steam/engine/mask.hpp b/src/steam/engine/mask.hpp index 53637619d..f8dd6aa5e 100644 --- a/src/steam/engine/mask.hpp +++ b/src/steam/engine/mask.hpp @@ -33,7 +33,7 @@ #ifndef PROC_ENGINE_MASK_H #define PROC_ENGINE_MASK_H -#include "proc/engine/procnode.hpp" +#include "steam/engine/procnode.hpp" diff --git a/src/steam/engine/nodefactory.cpp b/src/steam/engine/nodefactory.cpp index d36dfff2c..c75810530 100644 --- a/src/steam/engine/nodefactory.cpp +++ b/src/steam/engine/nodefactory.cpp @@ -29,11 +29,11 @@ */ -#include "proc/engine/nodefactory.hpp" -#include "proc/mobject/session/effect.hpp" +#include "steam/engine/nodefactory.hpp" +#include "steam/mobject/session/effect.hpp" #include "lib/allocation-cluster.hpp" -#include "proc/engine/nodewiring.hpp" +#include "steam/engine/nodewiring.hpp" namespace proc { namespace engine { diff --git a/src/steam/engine/nodefactory.hpp b/src/steam/engine/nodefactory.hpp index 5782a898b..37818572d 100644 --- a/src/steam/engine/nodefactory.hpp +++ b/src/steam/engine/nodefactory.hpp @@ -32,9 +32,9 @@ #ifndef ENGINE_NODEFACTORY_H #define ENGINE_NODEFACTORY_H -#include "proc/engine/procnode.hpp" -#include "proc/mobject/placement.hpp" -#include "proc/engine/nodewiring.hpp" +#include "steam/engine/procnode.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/engine/nodewiring.hpp" ////////////////////////////////////TODO: make inclusions / forward definitions a bit more orthogonal.... diff --git a/src/steam/engine/nodeinvocation.hpp b/src/steam/engine/nodeinvocation.hpp index 196ddebeb..5a41d44a6 100644 --- a/src/steam/engine/nodeinvocation.hpp +++ b/src/steam/engine/nodeinvocation.hpp @@ -55,10 +55,10 @@ #define ENGINE_NODEINVOCATION_H -#include "proc/state.hpp" -#include "proc/engine/procnode.hpp" -#include "proc/engine/channel-descriptor.hpp" -#include "proc/engine/bufftable-obsolete.hpp" +#include "steam/state.hpp" +#include "steam/engine/procnode.hpp" +#include "steam/engine/channel-descriptor.hpp" +#include "steam/engine/bufftable-obsolete.hpp" diff --git a/src/steam/engine/nodeoperation.hpp b/src/steam/engine/nodeoperation.hpp index f0965ff21..58d88d52d 100644 --- a/src/steam/engine/nodeoperation.hpp +++ b/src/steam/engine/nodeoperation.hpp @@ -57,11 +57,11 @@ #define ENGINE_NODEOPERATION_H -#include "proc/state.hpp" -#include "proc/engine/procnode.hpp" -#include "proc/engine/channel-descriptor.hpp" -#include "proc/engine/bufftable-obsolete.hpp" -#include "proc/engine/nodeinvocation.hpp" +#include "steam/state.hpp" +#include "steam/engine/procnode.hpp" +#include "steam/engine/channel-descriptor.hpp" +#include "steam/engine/bufftable-obsolete.hpp" +#include "steam/engine/nodeinvocation.hpp" #include "lib/meta/util.hpp" #include "lib/meta/configflags.hpp" diff --git a/src/steam/engine/nodewiring-def.hpp b/src/steam/engine/nodewiring-def.hpp index eea639136..da7c40929 100644 --- a/src/steam/engine/nodewiring-def.hpp +++ b/src/steam/engine/nodewiring-def.hpp @@ -40,7 +40,7 @@ #define ENGINE_NODEWIRING_DEF_H -#include "proc/engine/procnode.hpp" +#include "steam/engine/procnode.hpp" #include "lib/ref-array.hpp" #include "lib/util-foreach.hpp" #include "lib/nocopy.hpp" diff --git a/src/steam/engine/nodewiring.cpp b/src/steam/engine/nodewiring.cpp index 7a837352e..e18cb46fc 100644 --- a/src/steam/engine/nodewiring.cpp +++ b/src/steam/engine/nodewiring.cpp @@ -27,10 +27,10 @@ */ -#include "proc/engine/procnode.hpp" -#include "proc/engine/nodewiring.hpp" -#include "proc/engine/nodeoperation.hpp" -#include "proc/engine/nodewiring-config.hpp" +#include "steam/engine/procnode.hpp" +#include "steam/engine/nodewiring.hpp" +#include "steam/engine/nodeoperation.hpp" +#include "steam/engine/nodewiring-config.hpp" #include "lib/meta/typelist-manip.hpp" diff --git a/src/steam/engine/nodewiring.hpp b/src/steam/engine/nodewiring.hpp index e493e6ca8..16cca35ce 100644 --- a/src/steam/engine/nodewiring.hpp +++ b/src/steam/engine/nodewiring.hpp @@ -31,9 +31,9 @@ #define ENGINE_NODEWIRING_H -#include "proc/engine/procnode.hpp" +#include "steam/engine/procnode.hpp" #include "lib/allocation-cluster.hpp" -#include "proc/engine/nodewiring-def.hpp" +#include "steam/engine/nodewiring-def.hpp" #include diff --git a/src/steam/engine/procnode.hpp b/src/steam/engine/procnode.hpp index 48f99a153..e5d7bb308 100644 --- a/src/steam/engine/procnode.hpp +++ b/src/steam/engine/procnode.hpp @@ -41,11 +41,11 @@ #define ENGINE_PROCNODE_H #include "lib/error.hpp" -#include "proc/common.hpp" -#include "proc/state.hpp" -#include "proc/asset/proc.hpp" -#include "proc/mobject/parameter.hpp" -#include "proc/engine/channel-descriptor.hpp" +#include "steam/common.hpp" +#include "steam/state.hpp" +#include "steam/asset/proc.hpp" +#include "steam/mobject/parameter.hpp" +#include "steam/engine/channel-descriptor.hpp" #include "lib/frameid.hpp" #include "lib/ref-array.hpp" diff --git a/src/steam/engine/render-invocation.cpp b/src/steam/engine/render-invocation.cpp index 8e0a39c86..88940a9dd 100644 --- a/src/steam/engine/render-invocation.cpp +++ b/src/steam/engine/render-invocation.cpp @@ -28,8 +28,8 @@ */ -#include "proc/engine/render-invocation.hpp" -#include "proc/engine/stateproxy.hpp" +#include "steam/engine/render-invocation.hpp" +#include "steam/engine/stateproxy.hpp" namespace proc { diff --git a/src/steam/engine/render-invocation.hpp b/src/steam/engine/render-invocation.hpp index 8e3ae256e..b03379918 100644 --- a/src/steam/engine/render-invocation.hpp +++ b/src/steam/engine/render-invocation.hpp @@ -36,10 +36,10 @@ #define ENGINE_RENDER_INVOCATION_H -//#include "proc/state.hpp" -#include "proc/engine/procnode.hpp" -#include "proc/engine/buffhandle.hpp" -//#include "proc/engine/bufftable-obsolete.hpp" +//#include "steam/state.hpp" +#include "steam/engine/procnode.hpp" +#include "steam/engine/buffhandle.hpp" +//#include "steam/engine/bufftable-obsolete.hpp" diff --git a/src/steam/engine/renderengine.cpp b/src/steam/engine/renderengine.cpp index 8cbdb7e21..9f68c9f50 100644 --- a/src/steam/engine/renderengine.cpp +++ b/src/steam/engine/renderengine.cpp @@ -27,7 +27,7 @@ #include "lib/error.hpp" -#include "proc/engine/renderengine.hpp" +#include "steam/engine/renderengine.hpp" namespace proc { namespace engine { diff --git a/src/steam/engine/renderengine.hpp b/src/steam/engine/renderengine.hpp index 5915ecc7c..526b8ae5b 100644 --- a/src/steam/engine/renderengine.hpp +++ b/src/steam/engine/renderengine.hpp @@ -30,7 +30,7 @@ #ifndef PROC_ENGINE_RENDERENGINE_H #define PROC_ENGINE_RENDERENGINE_H -#include "proc/engine/rendergraph.hpp" +#include "steam/engine/rendergraph.hpp" #include diff --git a/src/steam/engine/rendergraph.cpp b/src/steam/engine/rendergraph.cpp index b04f6686f..3b1cbf348 100644 --- a/src/steam/engine/rendergraph.cpp +++ b/src/steam/engine/rendergraph.cpp @@ -26,9 +26,9 @@ */ -#include "proc/engine/rendergraph.hpp" +#include "steam/engine/rendergraph.hpp" #include "lib/frameid.hpp" -#include "proc/state.hpp" +#include "steam/state.hpp" namespace lumiera { diff --git a/src/steam/engine/rendergraph.hpp b/src/steam/engine/rendergraph.hpp index 50fe228de..b10eb4d74 100644 --- a/src/steam/engine/rendergraph.hpp +++ b/src/steam/engine/rendergraph.hpp @@ -29,8 +29,8 @@ #ifndef PROC_ENGINE_RENDERGRAPH_H #define PROC_ENGINE_RENDERGRAPH_H -#include "proc/common.hpp" -#include "proc/state.hpp" +#include "steam/common.hpp" +#include "steam/state.hpp" #include "lib/time/timevalue.hpp" diff --git a/src/steam/engine/source.cpp b/src/steam/engine/source.cpp index d63ab9a72..df8d07a62 100644 --- a/src/steam/engine/source.cpp +++ b/src/steam/engine/source.cpp @@ -26,7 +26,7 @@ */ -#include "proc/engine/source.hpp" +#include "steam/engine/source.hpp" namespace proc { namespace engine { diff --git a/src/steam/engine/source.hpp b/src/steam/engine/source.hpp index 1f85bffd5..63c938b45 100644 --- a/src/steam/engine/source.hpp +++ b/src/steam/engine/source.hpp @@ -36,7 +36,7 @@ #ifndef ENGINE_SOURCE_H #define ENGINE_SOURCE_H -#include "proc/engine/procnode.hpp" +#include "steam/engine/procnode.hpp" diff --git a/src/steam/engine/stateproxy.cpp b/src/steam/engine/stateproxy.cpp index 9fed46358..ea289c4b1 100644 --- a/src/steam/engine/stateproxy.cpp +++ b/src/steam/engine/stateproxy.cpp @@ -27,7 +27,7 @@ */ -#include "proc/engine/stateproxy.hpp" +#include "steam/engine/stateproxy.hpp" namespace proc { namespace engine { diff --git a/src/steam/engine/stateproxy.hpp b/src/steam/engine/stateproxy.hpp index 99fc5319b..bb458fe5d 100644 --- a/src/steam/engine/stateproxy.hpp +++ b/src/steam/engine/stateproxy.hpp @@ -37,7 +37,7 @@ #define ENGINE_STATEPROXY_H -#include "proc/state.hpp" +#include "steam/state.hpp" namespace proc { diff --git a/src/steam/engine/time-anchor.hpp b/src/steam/engine/time-anchor.hpp index 211f8860f..0e0ee8c4f 100644 --- a/src/steam/engine/time-anchor.hpp +++ b/src/steam/engine/time-anchor.hpp @@ -36,11 +36,11 @@ #ifndef PROC_ENGINE_TIME_ANCHOR_H #define PROC_ENGINE_TIME_ANCHOR_H -#include "proc/common.hpp" -#include "backend/real-clock.hpp" +#include "steam/common.hpp" +#include "vault/real-clock.hpp" #include "lib/time/timevalue.hpp" -#include "proc/play/timings.hpp" -#include "proc/engine/frame-coord.hpp" +#include "steam/play/timings.hpp" +#include "steam/engine/frame-coord.hpp" diff --git a/src/steam/engine/tracking-heap-block-provider.cpp b/src/steam/engine/tracking-heap-block-provider.cpp index 5b88f995e..09cfc1bda 100644 --- a/src/steam/engine/tracking-heap-block-provider.cpp +++ b/src/steam/engine/tracking-heap-block-provider.cpp @@ -32,7 +32,7 @@ #include "lib/scoped-holder.hpp" #include "lib/util-foreach.hpp" -#include "proc/engine/tracking-heap-block-provider.hpp" +#include "steam/engine/tracking-heap-block-provider.hpp" #include #include diff --git a/src/steam/engine/tracking-heap-block-provider.hpp b/src/steam/engine/tracking-heap-block-provider.hpp index 8ad98ef6f..fb0807126 100644 --- a/src/steam/engine/tracking-heap-block-provider.hpp +++ b/src/steam/engine/tracking-heap-block-provider.hpp @@ -45,7 +45,7 @@ #include "lib/error.hpp" #include "lib/hash-value.h" -#include "proc/engine/buffer-provider.hpp" +#include "steam/engine/buffer-provider.hpp" #include "lib/scoped-ptrvect.hpp" #include diff --git a/src/steam/engine/worker/dummy-image-generator.cpp b/src/steam/engine/worker/dummy-image-generator.cpp index e08c13d6a..746b705b7 100644 --- a/src/steam/engine/worker/dummy-image-generator.cpp +++ b/src/steam/engine/worker/dummy-image-generator.cpp @@ -28,7 +28,7 @@ */ -#include "proc/engine/worker/dummy-image-generator.hpp" +#include "steam/engine/worker/dummy-image-generator.hpp" namespace proc { diff --git a/src/steam/engine/worker/dummy-tick.hpp b/src/steam/engine/worker/dummy-tick.hpp index 75182400b..4fe8ebe0d 100644 --- a/src/steam/engine/worker/dummy-tick.hpp +++ b/src/steam/engine/worker/dummy-tick.hpp @@ -39,7 +39,7 @@ #include "lib/error.hpp" -#include "backend/thread-wrapper.hpp" +#include "vault/thread-wrapper.hpp" #include #include diff --git a/src/steam/engine/worker/tick-service.hpp b/src/steam/engine/worker/tick-service.hpp index 837b20167..880c99f7b 100644 --- a/src/steam/engine/worker/tick-service.hpp +++ b/src/steam/engine/worker/tick-service.hpp @@ -39,7 +39,7 @@ #include "lib/error.hpp" -#include "backend/thread-wrapper.hpp" +#include "vault/thread-wrapper.hpp" #include // for usleep() diff --git a/src/steam/external/libgavl.cpp b/src/steam/external/libgavl.cpp index 99864d482..891e65eac 100644 --- a/src/steam/external/libgavl.cpp +++ b/src/steam/external/libgavl.cpp @@ -27,9 +27,9 @@ */ -#include "proc/common.hpp" -#include "proc/external/libgavl.hpp" -#include "proc/control/stypemanager.hpp" +#include "steam/common.hpp" +#include "steam/external/libgavl.hpp" +#include "steam/control/stypemanager.hpp" extern "C" { #include diff --git a/src/steam/external/libgavl.hpp b/src/steam/external/libgavl.hpp index 1189c0abb..0578470ca 100644 --- a/src/steam/external/libgavl.hpp +++ b/src/steam/external/libgavl.hpp @@ -34,7 +34,7 @@ #define PROC_EXTERNAL_LIBGAVL_H -#include "proc/control/media-impl-lib.hpp" +#include "steam/control/media-impl-lib.hpp" diff --git a/src/steam/facade.cpp b/src/steam/facade.cpp index 66995d54f..faa60dabf 100644 --- a/src/steam/facade.cpp +++ b/src/steam/facade.cpp @@ -44,10 +44,10 @@ */ -#include "proc/facade.hpp" +#include "steam/facade.hpp" #include "lib/depend.hpp" -#include "proc/control/proc-dispatcher.hpp" -#include "proc/play/output-director.hpp" +#include "steam/control/proc-dispatcher.hpp" +#include "steam/play/output-director.hpp" #include diff --git a/src/steam/mobject/builder/applicable-builder-target-types.hpp b/src/steam/mobject/builder/applicable-builder-target-types.hpp index 58058f027..dd16848b7 100644 --- a/src/steam/mobject/builder/applicable-builder-target-types.hpp +++ b/src/steam/mobject/builder/applicable-builder-target-types.hpp @@ -51,14 +51,14 @@ #ifndef MOBJECT_BUILDER_APPLICABLEBUILDERTARGETTYPES_H #define MOBJECT_BUILDER_APPLICABLEBUILDERTARGETTYPES_H -#include "proc/mobject/builder/buildertool.hpp" +#include "steam/mobject/builder/buildertool.hpp" // NOTE:  need to include *all* classes using DEFINE_PROCESSABLE_BY(BuilderTool) -#include "proc/mobject/session/root.hpp" -#include "proc/mobject/session/clip.hpp" -#include "proc/mobject/session/effect.hpp" -#include "proc/mobject/session/auto.hpp" -#include "proc/mobject/session/binding.hpp" +#include "steam/mobject/session/root.hpp" +#include "steam/mobject/session/clip.hpp" +#include "steam/mobject/session/effect.hpp" +#include "steam/mobject/session/auto.hpp" +#include "steam/mobject/session/binding.hpp" /////////////////////////////////TICKET #414 diff --git a/src/steam/mobject/builder/assembler.cpp b/src/steam/mobject/builder/assembler.cpp index 4bce7ad07..e0c14b3c7 100644 --- a/src/steam/mobject/builder/assembler.cpp +++ b/src/steam/mobject/builder/assembler.cpp @@ -27,7 +27,7 @@ #include "lib/error.hpp" -#include "proc/mobject/builder/assembler.hpp" +#include "steam/mobject/builder/assembler.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/builder/assembler.hpp b/src/steam/mobject/builder/assembler.hpp index 404df7560..1899dd912 100644 --- a/src/steam/mobject/builder/assembler.hpp +++ b/src/steam/mobject/builder/assembler.hpp @@ -29,7 +29,7 @@ #ifndef MOBJECT_BUILDER_ASSEMBLER_H #define MOBJECT_BUILDER_ASSEMBLER_H -#include "proc/engine/renderengine.hpp" +#include "steam/engine/renderengine.hpp" namespace proc { diff --git a/src/steam/mobject/builder/buildertool.hpp b/src/steam/mobject/builder/buildertool.hpp index 26683b3f8..61d92a017 100644 --- a/src/steam/mobject/builder/buildertool.hpp +++ b/src/steam/mobject/builder/buildertool.hpp @@ -56,8 +56,8 @@ #include "lib/wrapperptr.hpp" #include "lib/p.hpp" -#include "proc/mobject/placement.hpp" -#include "proc/mobject/explicitplacement.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/mobject/explicitplacement.hpp" namespace proc { diff --git a/src/steam/mobject/builder/conmanager.cpp b/src/steam/mobject/builder/conmanager.cpp index 01941e5b3..e3a30375a 100644 --- a/src/steam/mobject/builder/conmanager.cpp +++ b/src/steam/mobject/builder/conmanager.cpp @@ -27,8 +27,8 @@ #include "lib/error.hpp" -#include "proc/mobject/builder/conmanager.hpp" -#include "proc/control/stypemanager.hpp" +#include "steam/mobject/builder/conmanager.hpp" +#include "steam/control/stypemanager.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/builder/fixture-change-detector.hpp b/src/steam/mobject/builder/fixture-change-detector.hpp index e1800d02c..21dc79209 100644 --- a/src/steam/mobject/builder/fixture-change-detector.hpp +++ b/src/steam/mobject/builder/fixture-change-detector.hpp @@ -45,9 +45,9 @@ #include "lib/error.hpp" //#include "lib/optional-ref.hpp" -#include "proc/asset/pipe.hpp" -//#include "proc/asset/struct.hpp" -//#include "proc/mobject/model-port.hpp" +#include "steam/asset/pipe.hpp" +//#include "steam/asset/struct.hpp" +//#include "steam/mobject/model-port.hpp" //#include diff --git a/src/steam/mobject/builder/model-port-registry.cpp b/src/steam/mobject/builder/model-port-registry.cpp index f19ef1b2a..2c58368e0 100644 --- a/src/steam/mobject/builder/model-port-registry.cpp +++ b/src/steam/mobject/builder/model-port-registry.cpp @@ -39,9 +39,9 @@ #include "lib/error.hpp" #include "include/logging.h" #include "lib/sync-classlock.hpp" -#include "proc/mobject/builderfacade.hpp" -#include "proc/mobject/model-port.hpp" -#include "proc/mobject/builder/model-port-registry.hpp" +#include "steam/mobject/builderfacade.hpp" +#include "steam/mobject/model-port.hpp" +#include "steam/mobject/builder/model-port-registry.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/builder/model-port-registry.hpp b/src/steam/mobject/builder/model-port-registry.hpp index bf913be38..fa006c928 100644 --- a/src/steam/mobject/builder/model-port-registry.hpp +++ b/src/steam/mobject/builder/model-port-registry.hpp @@ -51,9 +51,9 @@ #include "lib/error.hpp" #include "lib/optional-ref.hpp" -#include "proc/asset/pipe.hpp" -#include "proc/asset/struct.hpp" -#include "proc/mobject/model-port.hpp" +#include "steam/asset/pipe.hpp" +#include "steam/asset/struct.hpp" +#include "steam/mobject/model-port.hpp" #include diff --git a/src/steam/mobject/builder/mould.hpp b/src/steam/mobject/builder/mould.hpp index 371482d3b..80274e48e 100644 --- a/src/steam/mobject/builder/mould.hpp +++ b/src/steam/mobject/builder/mould.hpp @@ -36,8 +36,8 @@ #define MOBJECT_BUILDER_MOULD_H -#include "proc/asset/procpatt.hpp" -#include "proc/mobject/builder/operationpoint.hpp" +#include "steam/asset/procpatt.hpp" +#include "steam/mobject/builder/operationpoint.hpp" #include diff --git a/src/steam/mobject/builder/nodecreatortool.cpp b/src/steam/mobject/builder/nodecreatortool.cpp index fcec1ac82..4ff550751 100644 --- a/src/steam/mobject/builder/nodecreatortool.cpp +++ b/src/steam/mobject/builder/nodecreatortool.cpp @@ -28,7 +28,7 @@ #include "lib/error.hpp" -#include "proc/mobject/builder/nodecreatortool.hpp" +#include "steam/mobject/builder/nodecreatortool.hpp" diff --git a/src/steam/mobject/builder/nodecreatortool.hpp b/src/steam/mobject/builder/nodecreatortool.hpp index a6c79045b..28763fccc 100644 --- a/src/steam/mobject/builder/nodecreatortool.hpp +++ b/src/steam/mobject/builder/nodecreatortool.hpp @@ -31,9 +31,9 @@ #define MOBJECT_BUILDER_NODECREATORTOOL_H -#include "proc/mobject/builder/applicable-builder-target-types.hpp" +#include "steam/mobject/builder/applicable-builder-target-types.hpp" -#include "proc/engine/rendergraph.hpp" +#include "steam/engine/rendergraph.hpp" diff --git a/src/steam/mobject/builder/operationpoint.cpp b/src/steam/mobject/builder/operationpoint.cpp index b3ef74831..19b909921 100644 --- a/src/steam/mobject/builder/operationpoint.cpp +++ b/src/steam/mobject/builder/operationpoint.cpp @@ -27,12 +27,12 @@ */ -#include "proc/mobject/builder/operationpoint.hpp" -#include "proc/engine/procnode.hpp" -#include "proc/asset/media.hpp" -#include "proc/asset/proc.hpp" -#include "proc/engine/nodefactory.hpp" -#include "proc/streamtype.hpp" +#include "steam/mobject/builder/operationpoint.hpp" +#include "steam/engine/procnode.hpp" +#include "steam/asset/media.hpp" +#include "steam/asset/proc.hpp" +#include "steam/engine/nodefactory.hpp" +#include "steam/streamtype.hpp" //#include "common/util.hpp" //#include diff --git a/src/steam/mobject/builder/operationpoint.hpp b/src/steam/mobject/builder/operationpoint.hpp index 7f08b1218..fe9229a81 100644 --- a/src/steam/mobject/builder/operationpoint.hpp +++ b/src/steam/mobject/builder/operationpoint.hpp @@ -36,7 +36,7 @@ #ifndef MOBJECT_BUILDER_OPERATIONPOINT_H #define MOBJECT_BUILDER_OPERATIONPOINT_H -//#include "proc/engine/procnode.hpp" /////TODO can we get rid of this header here? +//#include "steam/engine/procnode.hpp" /////TODO can we get rid of this header here? //#include "common/query.hpp" #include "lib/hash-standard.hpp" diff --git a/src/steam/mobject/builder/renderstate.hpp b/src/steam/mobject/builder/renderstate.hpp index 10e9b68c1..20fc09e6d 100644 --- a/src/steam/mobject/builder/renderstate.hpp +++ b/src/steam/mobject/builder/renderstate.hpp @@ -33,7 +33,7 @@ #ifndef MOBJECT_BUILDER_RENDERSTATE_H #define MOBJECT_BUILDER_RENDERSTATE_H -#include "proc/state.hpp" +#include "steam/state.hpp" diff --git a/src/steam/mobject/builder/segmentation-tool.cpp b/src/steam/mobject/builder/segmentation-tool.cpp index be65f0627..751638932 100644 --- a/src/steam/mobject/builder/segmentation-tool.cpp +++ b/src/steam/mobject/builder/segmentation-tool.cpp @@ -27,7 +27,7 @@ */ -#include "proc/mobject/builder/segmentation-tool.hpp" +#include "steam/mobject/builder/segmentation-tool.hpp" namespace proc { diff --git a/src/steam/mobject/builder/segmentation-tool.hpp b/src/steam/mobject/builder/segmentation-tool.hpp index d281f0c54..25ec7902b 100644 --- a/src/steam/mobject/builder/segmentation-tool.hpp +++ b/src/steam/mobject/builder/segmentation-tool.hpp @@ -35,10 +35,10 @@ #define MOBJECT_BUILDER_SEGMENTATION_TOOL_H -#include "proc/mobject/builder/applicable-builder-target-types.hpp" +#include "steam/mobject/builder/applicable-builder-target-types.hpp" -#include "proc/mobject/session/segmentation.hpp" -#include "proc/mobject/session/fixture.hpp" //////TODO really on the header?? +#include "steam/mobject/session/segmentation.hpp" +#include "steam/mobject/session/fixture.hpp" //////TODO really on the header?? #include diff --git a/src/steam/mobject/builder/toolfactory.cpp b/src/steam/mobject/builder/toolfactory.cpp index ed9815667..2795a2874 100644 --- a/src/steam/mobject/builder/toolfactory.cpp +++ b/src/steam/mobject/builder/toolfactory.cpp @@ -27,7 +27,7 @@ */ -#include "proc/mobject/builder/toolfactory.hpp" +#include "steam/mobject/builder/toolfactory.hpp" #include "lib/util.hpp" #include diff --git a/src/steam/mobject/builder/toolfactory.hpp b/src/steam/mobject/builder/toolfactory.hpp index f82bed45b..abd354167 100644 --- a/src/steam/mobject/builder/toolfactory.hpp +++ b/src/steam/mobject/builder/toolfactory.hpp @@ -33,11 +33,11 @@ #ifndef MOBJECT_BUILDER_TOOLFACTORY_H #define MOBJECT_BUILDER_TOOLFACTORY_H -#include "proc/mobject/session/fixture.hpp" -#include "proc/mobject/builder/segmentation-tool.hpp" -#include "proc/mobject/builder/nodecreatortool.hpp" -#include "proc/mobject/builder/mould.hpp" -#include "proc/engine/rendergraph.hpp" +#include "steam/mobject/session/fixture.hpp" +#include "steam/mobject/builder/segmentation-tool.hpp" +#include "steam/mobject/builder/nodecreatortool.hpp" +#include "steam/mobject/builder/mould.hpp" +#include "steam/engine/rendergraph.hpp" #include diff --git a/src/steam/mobject/builderfacade.cpp b/src/steam/mobject/builderfacade.cpp index 3d670f1da..72521199f 100644 --- a/src/steam/mobject/builderfacade.cpp +++ b/src/steam/mobject/builderfacade.cpp @@ -26,9 +26,9 @@ */ -#include "proc/mobject/builder/common.hpp" -#include "proc/mobject/builderfacade.hpp" -#include "proc/mobject/session/fixture.hpp" +#include "steam/mobject/builder/common.hpp" +#include "steam/mobject/builderfacade.hpp" +#include "steam/mobject/session/fixture.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/builderfacade.hpp b/src/steam/mobject/builderfacade.hpp index 4ff700ca9..e883a17cc 100644 --- a/src/steam/mobject/builderfacade.hpp +++ b/src/steam/mobject/builderfacade.hpp @@ -36,7 +36,7 @@ #define PROC_MOBJECT_BUILDERFACADE_H #include "lib/error.hpp" -#include "proc/mobject/builder/common.hpp" +#include "steam/mobject/builder/common.hpp" namespace proc { diff --git a/src/steam/mobject/explicitplacement.hpp b/src/steam/mobject/explicitplacement.hpp index 3d1110994..6e46bb55d 100644 --- a/src/steam/mobject/explicitplacement.hpp +++ b/src/steam/mobject/explicitplacement.hpp @@ -39,7 +39,7 @@ #ifndef PROC_MOBJECT_EXPLICITPLACEMENT_H #define PROC_MOBJECT_EXPLICITPLACEMENT_H -#include "proc/mobject/placement.hpp" +#include "steam/mobject/placement.hpp" diff --git a/src/steam/mobject/mobject-ref.cpp b/src/steam/mobject/mobject-ref.cpp index 5c6197da1..a206bf79e 100644 --- a/src/steam/mobject/mobject-ref.cpp +++ b/src/steam/mobject/mobject-ref.cpp @@ -34,9 +34,9 @@ */ -#include "proc/mobject/mobject-ref.hpp" -#include "proc/mobject/mobject.hpp" -#include "proc/mobject/placement.hpp" +#include "steam/mobject/mobject-ref.hpp" +#include "steam/mobject/mobject.hpp" +#include "steam/mobject/placement.hpp" namespace proc { diff --git a/src/steam/mobject/mobject-ref.hpp b/src/steam/mobject/mobject-ref.hpp index 282ff0efa..21ef52e7c 100644 --- a/src/steam/mobject/mobject-ref.hpp +++ b/src/steam/mobject/mobject-ref.hpp @@ -60,9 +60,9 @@ #define MOBJECT_MOBJECT_REF_H #include "lib/handle.hpp" -#include "proc/mobject/placement.hpp" -#include "proc/mobject/placement-ref.hpp" -#include "proc/mobject/session/session-service-mutate.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/mobject/placement-ref.hpp" +#include "steam/mobject/session/session-service-mutate.hpp" #include diff --git a/src/steam/mobject/mobject.cpp b/src/steam/mobject/mobject.cpp index e4f1047d7..10ca3a971 100644 --- a/src/steam/mobject/mobject.cpp +++ b/src/steam/mobject/mobject.cpp @@ -26,8 +26,8 @@ */ -#include "proc/mobject/mobject.hpp" -#include "proc/mobject/session/mobjectfactory.hpp" +#include "steam/mobject/mobject.hpp" +#include "steam/mobject/session/mobjectfactory.hpp" #include "lib/time/timevalue.hpp" #include "lib/util.hpp" diff --git a/src/steam/mobject/mobject.hpp b/src/steam/mobject/mobject.hpp index 9f6fca05b..8aaa1bea5 100644 --- a/src/steam/mobject/mobject.hpp +++ b/src/steam/mobject/mobject.hpp @@ -39,10 +39,10 @@ #ifndef PROC_MOBJECT_MOBJECT_H #define PROC_MOBJECT_MOBJECT_H -#include "proc/common.hpp" -#include "proc/mobject/builder/buildertool.hpp" -#include "proc/mobject/placement.hpp" -#include "proc/asset.hpp" //TODO finally not needed? +#include "steam/common.hpp" +#include "steam/mobject/builder/buildertool.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/asset.hpp" //TODO finally not needed? #include "lib/p.hpp" #include "lib/time/timevalue.hpp" @@ -51,7 +51,7 @@ -#include "proc/assetmanager.hpp" +#include "steam/assetmanager.hpp" using proc_interface::IDA; //TODO finally not needed? //using proc_interface::PAsset; //TODO: only temporarily using proc_interface::AssetManager; diff --git a/src/steam/mobject/model-port.hpp b/src/steam/mobject/model-port.hpp index f7878967e..82e1c2cc5 100644 --- a/src/steam/mobject/model-port.hpp +++ b/src/steam/mobject/model-port.hpp @@ -66,8 +66,8 @@ #ifndef PROC_MOBJECT_MODEL_PORT_H #define PROC_MOBJECT_MODEL_PORT_H -#include "proc/asset/pipe.hpp" -#include "proc/streamtype.hpp" +#include "steam/asset/pipe.hpp" +#include "steam/streamtype.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/output-designation.cpp b/src/steam/mobject/output-designation.cpp index 582ce02df..4875f7ad2 100644 --- a/src/steam/mobject/output-designation.cpp +++ b/src/steam/mobject/output-designation.cpp @@ -41,11 +41,11 @@ #include "lib/symbol.hpp" #include "lib/query-util.hpp" #include "common/query/query-resolver.hpp" -#include "proc/mobject/mobject.hpp" -#include "proc/mobject/placement-ref.hpp" -#include "proc/mobject/output-designation.hpp" -#include "proc/mobject/output-mapping.hpp" -#include "proc/config-resolver.hpp" +#include "steam/mobject/mobject.hpp" +#include "steam/mobject/placement-ref.hpp" +#include "steam/mobject/output-designation.hpp" +#include "steam/mobject/output-mapping.hpp" +#include "steam/config-resolver.hpp" #include "lib/util.hpp" #include diff --git a/src/steam/mobject/output-designation.hpp b/src/steam/mobject/output-designation.hpp index ccbf18b55..e316ec69a 100644 --- a/src/steam/mobject/output-designation.hpp +++ b/src/steam/mobject/output-designation.hpp @@ -40,7 +40,7 @@ #ifndef PROC_MOBJECT_OUTPUT_DESIGNATION_H #define PROC_MOBJECT_OUTPUT_DESIGNATION_H -#include "proc/asset/pipe.hpp" +#include "steam/asset/pipe.hpp" #include "lib/hash-value.h" #include "lib/opaque-holder.hpp" #include "lib/meta/typelist-manip.hpp" diff --git a/src/steam/mobject/output-mapping.hpp b/src/steam/mobject/output-mapping.hpp index 1cdec240c..1c69433fd 100644 --- a/src/steam/mobject/output-mapping.hpp +++ b/src/steam/mobject/output-mapping.hpp @@ -55,7 +55,7 @@ #include "lib/error.hpp" #include "lib/util.hpp" #include "lib/hash-value.h" -#include "proc/asset/pipe.hpp" +#include "steam/asset/pipe.hpp" #include "common/query.hpp" #include diff --git a/src/steam/mobject/parameter.cpp b/src/steam/mobject/parameter.cpp index 25cd61034..0ca66bc4e 100644 --- a/src/steam/mobject/parameter.cpp +++ b/src/steam/mobject/parameter.cpp @@ -29,8 +29,8 @@ #include "lib/error.hpp" -#include "proc/mobject/parameter.hpp" -#include "proc/mobject/paramprovider.hpp" +#include "steam/mobject/parameter.hpp" +#include "steam/mobject/paramprovider.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/paramprovider.cpp b/src/steam/mobject/paramprovider.cpp index 617ac4618..502b595dd 100644 --- a/src/steam/mobject/paramprovider.cpp +++ b/src/steam/mobject/paramprovider.cpp @@ -28,9 +28,9 @@ */ -#include "proc/mobject/paramprovider.hpp" -#include "proc/mobject/parameter.hpp" -#include "proc/mobject/interpolator.hpp" +#include "steam/mobject/paramprovider.hpp" +#include "steam/mobject/parameter.hpp" +#include "steam/mobject/interpolator.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/placement-ref.hpp b/src/steam/mobject/placement-ref.hpp index 100c6633b..761ceb3c6 100644 --- a/src/steam/mobject/placement-ref.hpp +++ b/src/steam/mobject/placement-ref.hpp @@ -66,9 +66,9 @@ #define MOBJECT_PLACEMENT_REF_H #include "lib/error.hpp" -#include "proc/mobject/placement.hpp" -#include "proc/mobject/explicitplacement.hpp" /////////////TODO this is ugly! Why can't placement::resolve() return a reference?? -#include "proc/mobject/session/session-service-fetch.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/mobject/explicitplacement.hpp" /////////////TODO this is ugly! Why can't placement::resolve() return a reference?? +#include "steam/mobject/session/session-service-fetch.hpp" diff --git a/src/steam/mobject/placement.cpp b/src/steam/mobject/placement.cpp index 200811d36..9d0f5423d 100644 --- a/src/steam/mobject/placement.cpp +++ b/src/steam/mobject/placement.cpp @@ -26,9 +26,9 @@ */ -#include "proc/mobject/placement.hpp" -#include "proc/mobject/explicitplacement.hpp" -#include "proc/mobject/mobject.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/mobject/explicitplacement.hpp" +#include "steam/mobject/mobject.hpp" #include "lib/format-string.hpp" #include diff --git a/src/steam/mobject/placement.hpp b/src/steam/mobject/placement.hpp index 1f77ad14b..955172ffd 100644 --- a/src/steam/mobject/placement.hpp +++ b/src/steam/mobject/placement.hpp @@ -73,9 +73,9 @@ #include "lib/error.hpp" #include "lib/hash-indexed.hpp" #include "lib/time/timevalue.hpp" -#include "proc/mobject/session/locatingpin.hpp" +#include "steam/mobject/session/locatingpin.hpp" -#include "proc/asset/pipe.hpp" //////////////TICKET #109 : get rid of this +#include "steam/asset/pipe.hpp" //////////////TICKET #109 : get rid of this #include diff --git a/src/steam/mobject/session.hpp b/src/steam/mobject/session.hpp index ce0e9355d..72d7f533e 100644 --- a/src/steam/mobject/session.hpp +++ b/src/steam/mobject/session.hpp @@ -50,8 +50,8 @@ #ifndef MOBJECT_SESSION_H #define MOBJECT_SESSION_H -#include "proc/mobject/placement.hpp" -#include "proc/mobject/mobject-ref.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/mobject/mobject-ref.hpp" #include "common/query/defs-manager.hpp" ////////////////////////////TICKET #643 forward declare this? #include "lib/ref-array.hpp" #include "lib/depend.hpp" diff --git a/src/steam/mobject/session/abstractmo.cpp b/src/steam/mobject/session/abstractmo.cpp index aeb4af956..e4a5dabad 100644 --- a/src/steam/mobject/session/abstractmo.cpp +++ b/src/steam/mobject/session/abstractmo.cpp @@ -26,7 +26,7 @@ */ -#include "proc/mobject/session/abstractmo.hpp" +#include "steam/mobject/session/abstractmo.hpp" #include "lib/format-string.hpp" #include "lib/util.hpp" diff --git a/src/steam/mobject/session/abstractmo.hpp b/src/steam/mobject/session/abstractmo.hpp index 093cfaeef..fe86a2b71 100644 --- a/src/steam/mobject/session/abstractmo.hpp +++ b/src/steam/mobject/session/abstractmo.hpp @@ -29,7 +29,7 @@ #ifndef MOBJECT_SESSION_ABSTRACTMO_H #define MOBJECT_SESSION_ABSTRACTMO_H -#include "proc/mobject/mobject.hpp" +#include "steam/mobject/mobject.hpp" #include "lib/symbol.hpp" diff --git a/src/steam/mobject/session/allocation.cpp b/src/steam/mobject/session/allocation.cpp index 3e8912eb7..1b6354392 100644 --- a/src/steam/mobject/session/allocation.cpp +++ b/src/steam/mobject/session/allocation.cpp @@ -26,7 +26,7 @@ */ -#include "proc/mobject/session/allocation.hpp" +#include "steam/mobject/session/allocation.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/session/allocation.hpp b/src/steam/mobject/session/allocation.hpp index 6f6881422..f27cd2b41 100644 --- a/src/steam/mobject/session/allocation.hpp +++ b/src/steam/mobject/session/allocation.hpp @@ -30,7 +30,7 @@ #ifndef PROC_MOBJECT_SESSION_ALLOCATION_H #define PROC_MOBJECT_SESSION_ALLOCATION_H -#include "proc/mobject/session/locatingpin.hpp" +#include "steam/mobject/session/locatingpin.hpp" #include using std::string; diff --git a/src/steam/mobject/session/auto.cpp b/src/steam/mobject/session/auto.cpp index e3e0ede12..b783b3276 100644 --- a/src/steam/mobject/session/auto.cpp +++ b/src/steam/mobject/session/auto.cpp @@ -26,7 +26,7 @@ */ -#include "proc/mobject/session/auto.hpp" +#include "steam/mobject/session/auto.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/session/auto.hpp b/src/steam/mobject/session/auto.hpp index 69136380b..782151b39 100644 --- a/src/steam/mobject/session/auto.hpp +++ b/src/steam/mobject/session/auto.hpp @@ -29,8 +29,8 @@ #ifndef PROC_MOBJECT_SESSION_AUTO_H #define PROC_MOBJECT_SESSION_AUTO_H -#include "proc/mobject/session/meta.hpp" -#include "proc/mobject/paramprovider.hpp" +#include "steam/mobject/session/meta.hpp" +#include "steam/mobject/paramprovider.hpp" diff --git a/src/steam/mobject/session/binding.cpp b/src/steam/mobject/session/binding.cpp index 43f45ccd5..1d02bad21 100644 --- a/src/steam/mobject/session/binding.cpp +++ b/src/steam/mobject/session/binding.cpp @@ -28,8 +28,8 @@ */ -#include "proc/mobject/session/binding.hpp" -#include "proc/asset/sequence.hpp" +#include "steam/mobject/session/binding.hpp" +#include "steam/asset/sequence.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/session/binding.hpp b/src/steam/mobject/session/binding.hpp index e7e815e6f..0a2040ce8 100644 --- a/src/steam/mobject/session/binding.hpp +++ b/src/steam/mobject/session/binding.hpp @@ -32,8 +32,8 @@ #ifndef PROC_MOBJECT_SESSION_BINDING_H #define PROC_MOBJECT_SESSION_BINDING_H -#include "proc/mobject/session/meta.hpp" -#include "proc/mobject/builder/buildertool.hpp" +#include "steam/mobject/session/meta.hpp" +#include "steam/mobject/builder/buildertool.hpp" namespace proc { diff --git a/src/steam/mobject/session/bus-mo.cpp b/src/steam/mobject/session/bus-mo.cpp index 1f8faf21e..5e0613249 100644 --- a/src/steam/mobject/session/bus-mo.cpp +++ b/src/steam/mobject/session/bus-mo.cpp @@ -28,7 +28,7 @@ */ -#include "proc/mobject/session/bus-mo.hpp" +#include "steam/mobject/session/bus-mo.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/session/bus-mo.hpp b/src/steam/mobject/session/bus-mo.hpp index 24f591539..e8f2ddaad 100644 --- a/src/steam/mobject/session/bus-mo.hpp +++ b/src/steam/mobject/session/bus-mo.hpp @@ -34,8 +34,8 @@ #ifndef PROC_MOBJECT_SESSION_BUS_MO_H #define PROC_MOBJECT_SESSION_BUS_MO_H -#include "proc/mobject/session/meta.hpp" -#include "proc/mobject/builder/buildertool.hpp" +#include "steam/mobject/session/meta.hpp" +#include "steam/mobject/builder/buildertool.hpp" namespace proc { diff --git a/src/steam/mobject/session/clip.cpp b/src/steam/mobject/session/clip.cpp index 298922cc7..b1b0ae924 100644 --- a/src/steam/mobject/session/clip.cpp +++ b/src/steam/mobject/session/clip.cpp @@ -28,10 +28,10 @@ */ -#include "proc/mobject/session/clip.hpp" -#include "proc/assetmanager.hpp" -#include "proc/asset/media.hpp" -#include "proc/asset/clip.hpp" +#include "steam/mobject/session/clip.hpp" +#include "steam/assetmanager.hpp" +#include "steam/asset/media.hpp" +#include "steam/asset/clip.hpp" #include "lib/time/mutation.hpp" #include "lib/util.hpp" diff --git a/src/steam/mobject/session/clip.hpp b/src/steam/mobject/session/clip.hpp index 7451323e2..594883dda 100644 --- a/src/steam/mobject/session/clip.hpp +++ b/src/steam/mobject/session/clip.hpp @@ -31,7 +31,7 @@ #ifndef PROC_MOBJECT_SESSION_CLIP_H #define PROC_MOBJECT_SESSION_CLIP_H -#include "proc/mobject/session/abstractmo.hpp" +#include "steam/mobject/session/abstractmo.hpp" #include "lib/time/timevalue.hpp" #include "lib/p.hpp" diff --git a/src/steam/mobject/session/constraint.cpp b/src/steam/mobject/session/constraint.cpp index 48cc7d6e4..f15bb669a 100644 --- a/src/steam/mobject/session/constraint.cpp +++ b/src/steam/mobject/session/constraint.cpp @@ -26,7 +26,7 @@ */ -#include "proc/mobject/session/constraint.hpp" +#include "steam/mobject/session/constraint.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/session/constraint.hpp b/src/steam/mobject/session/constraint.hpp index 766382064..b3028149f 100644 --- a/src/steam/mobject/session/constraint.hpp +++ b/src/steam/mobject/session/constraint.hpp @@ -30,7 +30,7 @@ #ifndef PROC_MOBJECT_SESSION_CONSTRAINT_H #define PROC_MOBJECT_SESSION_CONSTRAINT_H -#include "proc/mobject/session/allocation.hpp" +#include "steam/mobject/session/allocation.hpp" diff --git a/src/steam/mobject/session/dummy-session-connection.cpp b/src/steam/mobject/session/dummy-session-connection.cpp index 748e56c2b..6c5664785 100644 --- a/src/steam/mobject/session/dummy-session-connection.cpp +++ b/src/steam/mobject/session/dummy-session-connection.cpp @@ -38,9 +38,9 @@ #include "lib/util.hpp" //#include "lib/symbol.hpp" //#include "include/logging.h" -#include "proc/mobject/session/dummy-session-connection.hpp" -#include "proc/mobject/session/root.hpp" -#include "proc/control/command-def.hpp" +#include "steam/mobject/session/dummy-session-connection.hpp" +#include "steam/mobject/session/root.hpp" +#include "steam/control/command-def.hpp" #include "include/ui-protocol.hpp" #include "include/gui-notification-facade.h" #include "lib/diff/tree-diff-application.hpp" diff --git a/src/steam/mobject/session/dummy-session-connection.hpp b/src/steam/mobject/session/dummy-session-connection.hpp index 0e5f38ff2..bb8f7916a 100644 --- a/src/steam/mobject/session/dummy-session-connection.hpp +++ b/src/steam/mobject/session/dummy-session-connection.hpp @@ -49,7 +49,7 @@ #include "lib/util.hpp" #include "lib/diff/tree-diff.hpp" -#include "proc/control/command-setup.hpp" +#include "steam/control/command-setup.hpp" #include diff --git a/src/steam/mobject/session/effect.cpp b/src/steam/mobject/session/effect.cpp index 39a3350ff..8e16152bd 100644 --- a/src/steam/mobject/session/effect.cpp +++ b/src/steam/mobject/session/effect.cpp @@ -26,7 +26,7 @@ */ -#include "proc/mobject/session/effect.hpp" +#include "steam/mobject/session/effect.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/session/effect.hpp b/src/steam/mobject/session/effect.hpp index 9eb2647f1..5c18700b0 100644 --- a/src/steam/mobject/session/effect.hpp +++ b/src/steam/mobject/session/effect.hpp @@ -30,8 +30,8 @@ #define PROC_MOBJECT_SESSION_EFFECT_H -#include "proc/mobject/session/abstractmo.hpp" -#include "proc/asset/effect.hpp" +#include "steam/mobject/session/abstractmo.hpp" +#include "steam/asset/effect.hpp" #include diff --git a/src/steam/mobject/session/element-query.hpp b/src/steam/mobject/session/element-query.hpp index c2afe4a01..873cc7ec2 100644 --- a/src/steam/mobject/session/element-query.hpp +++ b/src/steam/mobject/session/element-query.hpp @@ -33,10 +33,10 @@ #define PROC_MOBJECT_SESSION_ELEMENT_QUERY_H -#include "proc/mobject/placement.hpp" -#include "proc/mobject/mobject-ref.hpp" -#include "proc/mobject/session/specific-contents-query.hpp" -#include "proc/mobject/session/session-service-explore-scope.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/mobject/mobject-ref.hpp" +#include "steam/mobject/session/specific-contents-query.hpp" +#include "steam/mobject/session/session-service-explore-scope.hpp" #include "lib/nocopy.hpp" #include diff --git a/src/steam/mobject/session/fixedlocation.cpp b/src/steam/mobject/session/fixedlocation.cpp index 4cc323da2..562b604d6 100644 --- a/src/steam/mobject/session/fixedlocation.cpp +++ b/src/steam/mobject/session/fixedlocation.cpp @@ -27,7 +27,7 @@ */ -#include "proc/mobject/session/fixedlocation.hpp" +#include "steam/mobject/session/fixedlocation.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/session/fixedlocation.hpp b/src/steam/mobject/session/fixedlocation.hpp index 7790a00b8..0adf4f321 100644 --- a/src/steam/mobject/session/fixedlocation.hpp +++ b/src/steam/mobject/session/fixedlocation.hpp @@ -35,7 +35,7 @@ #ifndef PROC_MOBJECT_SESSION_FIXEDLOCATION_H #define PROC_MOBJECT_SESSION_FIXEDLOCATION_H -#include "proc/mobject/session/locatingpin.hpp" +#include "steam/mobject/session/locatingpin.hpp" diff --git a/src/steam/mobject/session/fixture.cpp b/src/steam/mobject/session/fixture.cpp index 70b705580..0fa69e8c5 100644 --- a/src/steam/mobject/session/fixture.cpp +++ b/src/steam/mobject/session/fixture.cpp @@ -28,7 +28,7 @@ */ -#include "proc/mobject/session/fixture.hpp" +#include "steam/mobject/session/fixture.hpp" #include "include/logging.h" namespace proc { diff --git a/src/steam/mobject/session/fixture.hpp b/src/steam/mobject/session/fixture.hpp index 79ffb3e2c..11dc0371b 100644 --- a/src/steam/mobject/session/fixture.hpp +++ b/src/steam/mobject/session/fixture.hpp @@ -43,10 +43,10 @@ #ifndef MOBJECT_SESSION_FIXTURE_H #define MOBJECT_SESSION_FIXTURE_H -#include "proc/mobject/session/segmentation.hpp" -#include "proc/mobject/session/fork.hpp" -#include "proc/mobject/explicitplacement.hpp" -#include "proc/mobject/session/auto.hpp" +#include "steam/mobject/session/segmentation.hpp" +#include "steam/mobject/session/fork.hpp" +#include "steam/mobject/explicitplacement.hpp" +#include "steam/mobject/session/auto.hpp" #include "lib/nocopy.hpp" #include diff --git a/src/steam/mobject/session/fork.cpp b/src/steam/mobject/session/fork.cpp index e6fd9b1ff..a3586b3c0 100644 --- a/src/steam/mobject/session/fork.cpp +++ b/src/steam/mobject/session/fork.cpp @@ -28,7 +28,7 @@ */ -#include "proc/mobject/session/fork.hpp" +#include "steam/mobject/session/fork.hpp" namespace proc { diff --git a/src/steam/mobject/session/fork.hpp b/src/steam/mobject/session/fork.hpp index fb25f2fa4..3891dd073 100644 --- a/src/steam/mobject/session/fork.hpp +++ b/src/steam/mobject/session/fork.hpp @@ -54,7 +54,7 @@ #ifndef MOBJECT_SESSION_FORK_H #define MOBJECT_SESSION_FORK_H -#include "proc/mobject/session/meta.hpp" +#include "steam/mobject/session/meta.hpp" #include "lib/idi/entry-id.hpp" #include "lib/time/timevalue.hpp" diff --git a/src/steam/mobject/session/generator-mo.cpp b/src/steam/mobject/session/generator-mo.cpp index f7f56449e..edb6ab77f 100644 --- a/src/steam/mobject/session/generator-mo.cpp +++ b/src/steam/mobject/session/generator-mo.cpp @@ -27,10 +27,10 @@ */ -#include "proc/mobject/session/generator-mo.hpp" -//#include "proc/assetmanager.hpp" -//#include "proc/asset/media.hpp" -//#include "proc/asset/clip.hpp" +#include "steam/mobject/session/generator-mo.hpp" +//#include "steam/assetmanager.hpp" +//#include "steam/asset/media.hpp" +//#include "steam/asset/clip.hpp" //#include "lib/time/mutation.hpp" //#include "lib/util.hpp" diff --git a/src/steam/mobject/session/generator-mo.hpp b/src/steam/mobject/session/generator-mo.hpp index 35bef01af..5b13a9be5 100644 --- a/src/steam/mobject/session/generator-mo.hpp +++ b/src/steam/mobject/session/generator-mo.hpp @@ -32,7 +32,7 @@ #ifndef PROC_MOBJECT_SESSION_GENERATOR_MO_H #define PROC_MOBJECT_SESSION_GENERATOR_MO_H -#include "proc/mobject/session/abstractmo.hpp" +#include "steam/mobject/session/abstractmo.hpp" #include "lib/time/timevalue.hpp" diff --git a/src/steam/mobject/session/label.cpp b/src/steam/mobject/session/label.cpp index c83b90d87..542d21c2e 100644 --- a/src/steam/mobject/session/label.cpp +++ b/src/steam/mobject/session/label.cpp @@ -26,7 +26,7 @@ */ -#include "proc/mobject/session/label.hpp" +#include "steam/mobject/session/label.hpp" #include "lib/util.hpp" using util::isnil; diff --git a/src/steam/mobject/session/label.hpp b/src/steam/mobject/session/label.hpp index c32960913..0d83f093b 100644 --- a/src/steam/mobject/session/label.hpp +++ b/src/steam/mobject/session/label.hpp @@ -36,7 +36,7 @@ #ifndef PROC_MOBJECT_SESSION_LABEL_H #define PROC_MOBJECT_SESSION_LABEL_H -#include "proc/mobject/session/meta.hpp" +#include "steam/mobject/session/meta.hpp" #include "lib/symbol.hpp" diff --git a/src/steam/mobject/session/lifecycle-advisor.hpp b/src/steam/mobject/session/lifecycle-advisor.hpp index dc123fa44..c4e38d0eb 100644 --- a/src/steam/mobject/session/lifecycle-advisor.hpp +++ b/src/steam/mobject/session/lifecycle-advisor.hpp @@ -52,7 +52,7 @@ #include "lib/error.hpp" #include "lib/nocopy.hpp" #include "include/lifecycle.h" -#include "proc/mobject/session.hpp" +#include "steam/mobject/session.hpp" #include "lib/symbol.hpp" diff --git a/src/steam/mobject/session/locatingpin.cpp b/src/steam/mobject/session/locatingpin.cpp index d1424dbe2..84be763db 100644 --- a/src/steam/mobject/session/locatingpin.cpp +++ b/src/steam/mobject/session/locatingpin.cpp @@ -30,11 +30,11 @@ */ -#include "proc/mobject/mobject.hpp" -#include "proc/mobject/placement.hpp" -#include "proc/mobject/session/locatingpin.hpp" -#include "proc/mobject/session/fixedlocation.hpp" -#include "proc/mobject/session/relativelocation.hpp" +#include "steam/mobject/mobject.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/mobject/session/locatingpin.hpp" +#include "steam/mobject/session/fixedlocation.hpp" +#include "steam/mobject/session/relativelocation.hpp" using std::unique_ptr; diff --git a/src/steam/mobject/session/locatingpin.hpp b/src/steam/mobject/session/locatingpin.hpp index 025e29a3b..6758bb747 100644 --- a/src/steam/mobject/session/locatingpin.hpp +++ b/src/steam/mobject/session/locatingpin.hpp @@ -47,7 +47,7 @@ #define PROC_MOBJECT_SESSION_LOCATINGPIN_H -#include "proc/common.hpp" +#include "steam/common.hpp" #include "lib/time/timevalue.hpp" #include diff --git a/src/steam/mobject/session/meta.cpp b/src/steam/mobject/session/meta.cpp index e5b7a337a..91c758dea 100644 --- a/src/steam/mobject/session/meta.cpp +++ b/src/steam/mobject/session/meta.cpp @@ -29,7 +29,7 @@ */ -#include "proc/mobject/session/meta.hpp" +#include "steam/mobject/session/meta.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/session/meta.hpp b/src/steam/mobject/session/meta.hpp index 81e7c22b4..23450c318 100644 --- a/src/steam/mobject/session/meta.hpp +++ b/src/steam/mobject/session/meta.hpp @@ -31,7 +31,7 @@ #ifndef PROC_MOBJECT_SESSION_META_H #define PROC_MOBJECT_SESSION_META_H -#include "proc/mobject/session/abstractmo.hpp" +#include "steam/mobject/session/abstractmo.hpp" namespace proc { diff --git a/src/steam/mobject/session/mobjectfactory.cpp b/src/steam/mobject/session/mobjectfactory.cpp index 82e6bb764..7683a069b 100644 --- a/src/steam/mobject/session/mobjectfactory.cpp +++ b/src/steam/mobject/session/mobjectfactory.cpp @@ -27,15 +27,15 @@ */ -#include "proc/mobject/session/mobjectfactory.hpp" -#include "proc/mobject/session/root.hpp" -#include "proc/mobject/session/clip.hpp" -#include "proc/mobject/session/fork.hpp" -#include "proc/mobject/session/effect.hpp" -#include "proc/mobject/session/label.hpp" -#include "proc/mobject/session/binding.hpp" -#include "proc/asset/clip.hpp" -#include "proc/asset/effect.hpp" +#include "steam/mobject/session/mobjectfactory.hpp" +#include "steam/mobject/session/root.hpp" +#include "steam/mobject/session/clip.hpp" +#include "steam/mobject/session/fork.hpp" +#include "steam/mobject/session/effect.hpp" +#include "steam/mobject/session/label.hpp" +#include "steam/mobject/session/binding.hpp" +#include "steam/asset/clip.hpp" +#include "steam/asset/effect.hpp" #include "common/query/defs-manager.hpp" using lumiera::query::DefsManager; diff --git a/src/steam/mobject/session/mobjectfactory.hpp b/src/steam/mobject/session/mobjectfactory.hpp index 5edcefe3e..92feaf23e 100644 --- a/src/steam/mobject/session/mobjectfactory.hpp +++ b/src/steam/mobject/session/mobjectfactory.hpp @@ -32,7 +32,7 @@ #ifndef PROC_MOBJECT_SESSION_MOBJECTFACTORY_H #define PROC_MOBJECT_SESSION_MOBJECTFACTORY_H -#include "proc/mobject/mobject.hpp" +#include "steam/mobject/mobject.hpp" #include "lib/idi/entry-id.hpp" #include "lib/symbol.hpp" diff --git a/src/steam/mobject/session/placement-index-query-resolver.cpp b/src/steam/mobject/session/placement-index-query-resolver.cpp index b8975c20c..21c41d51d 100644 --- a/src/steam/mobject/session/placement-index-query-resolver.cpp +++ b/src/steam/mobject/session/placement-index-query-resolver.cpp @@ -27,13 +27,13 @@ */ -#include "proc/mobject/session/placement-index-query-resolver.hpp" -#include "proc/mobject/session/scope-query.hpp" -#include "proc/mobject/placement.hpp" -#include "proc/mobject/session/clip.hpp" -#include "proc/mobject/session/effect.hpp" +#include "steam/mobject/session/placement-index-query-resolver.hpp" +#include "steam/mobject/session/scope-query.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/mobject/session/clip.hpp" +#include "steam/mobject/session/effect.hpp" -#include "proc/mobject/test-dummy-mobject.hpp" /////////////////////////////////////TICKET #532 +#include "steam/mobject/test-dummy-mobject.hpp" /////////////////////////////////////TICKET #532 #include #include diff --git a/src/steam/mobject/session/placement-index-query-resolver.hpp b/src/steam/mobject/session/placement-index-query-resolver.hpp index bd6877702..4c88c0480 100644 --- a/src/steam/mobject/session/placement-index-query-resolver.hpp +++ b/src/steam/mobject/session/placement-index-query-resolver.hpp @@ -56,8 +56,8 @@ #ifndef MOBJECT_SESSION_PLACEMENT_INDEX_QUERY_RESOLVER_H #define MOBJECT_SESSION_PLACEMENT_INDEX_QUERY_RESOLVER_H -#include "proc/mobject/session/placement-index.hpp" -#include "proc/mobject/session/scope-query.hpp" +#include "steam/mobject/session/placement-index.hpp" +#include "steam/mobject/session/scope-query.hpp" #include "common/query.hpp" diff --git a/src/steam/mobject/session/placement-index.cpp b/src/steam/mobject/session/placement-index.cpp index 1779754d8..c48d58e3d 100644 --- a/src/steam/mobject/session/placement-index.cpp +++ b/src/steam/mobject/session/placement-index.cpp @@ -50,9 +50,9 @@ */ -#include "proc/mobject/session/placement-index.hpp" -#include "proc/mobject/session/session-impl.hpp" -#include "proc/mobject/session/scope.hpp" +#include "steam/mobject/session/placement-index.hpp" +#include "steam/mobject/session/session-impl.hpp" +#include "steam/mobject/session/scope.hpp" #include "lib/typed-allocation-manager.hpp" #include "lib/iter-adapter-stl.hpp" #include "lib/util-foreach.hpp" diff --git a/src/steam/mobject/session/placement-index.hpp b/src/steam/mobject/session/placement-index.hpp index d8a37337f..553759abd 100644 --- a/src/steam/mobject/session/placement-index.hpp +++ b/src/steam/mobject/session/placement-index.hpp @@ -110,8 +110,8 @@ #include "lib/error.hpp" #include "lib/symbol.hpp" #include "lib/itertools.hpp" -#include "proc/mobject/placement.hpp" -#include "proc/mobject/placement-ref.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/mobject/placement-ref.hpp" #include "lib/nocopy.hpp" #include diff --git a/src/steam/mobject/session/plug.cpp b/src/steam/mobject/session/plug.cpp index 0b6520684..cbff047f6 100644 --- a/src/steam/mobject/session/plug.cpp +++ b/src/steam/mobject/session/plug.cpp @@ -26,8 +26,8 @@ */ -#include "proc/mobject/session/plug.hpp" -#include "proc/asset/pipe.hpp" +#include "steam/mobject/session/plug.hpp" +#include "steam/asset/pipe.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/session/plug.hpp b/src/steam/mobject/session/plug.hpp index f7d5f574f..fa963b99b 100644 --- a/src/steam/mobject/session/plug.hpp +++ b/src/steam/mobject/session/plug.hpp @@ -29,7 +29,7 @@ #ifndef MOBJECT_SESSION_PLUG_H #define MOBJECT_SESSION_PLUG_H -#include "proc/mobject/session/wish.hpp" +#include "steam/mobject/session/wish.hpp" diff --git a/src/steam/mobject/session/query-focus-stack.hpp b/src/steam/mobject/session/query-focus-stack.hpp index e6a077c76..11683acac 100644 --- a/src/steam/mobject/session/query-focus-stack.hpp +++ b/src/steam/mobject/session/query-focus-stack.hpp @@ -31,7 +31,7 @@ #ifndef MOBJECT_SESSION_QUERY_FOCUS_STACK_H #define MOBJECT_SESSION_QUERY_FOCUS_STACK_H -#include "proc/mobject/session/scope-path.hpp" +#include "steam/mobject/session/scope-path.hpp" #include "lib/nocopy.hpp" #include diff --git a/src/steam/mobject/session/query-focus.cpp b/src/steam/mobject/session/query-focus.cpp index 9d4baa51b..cce4f3497 100644 --- a/src/steam/mobject/session/query-focus.cpp +++ b/src/steam/mobject/session/query-focus.cpp @@ -27,8 +27,8 @@ */ -#include "proc/mobject/session/query-focus.hpp" -#include "proc/mobject/mobject.hpp" +#include "steam/mobject/session/query-focus.hpp" +#include "steam/mobject/mobject.hpp" #include "lib/format-string.hpp" using util::_Fmt; diff --git a/src/steam/mobject/session/query-focus.hpp b/src/steam/mobject/session/query-focus.hpp index da1987bd0..dcfb34324 100644 --- a/src/steam/mobject/session/query-focus.hpp +++ b/src/steam/mobject/session/query-focus.hpp @@ -47,10 +47,10 @@ #ifndef MOBJECT_SESSION_QUERY_FOCUS_H #define MOBJECT_SESSION_QUERY_FOCUS_H -#include "proc/mobject/session/scope-path.hpp" -#include "proc/mobject/session/scope-query.hpp" -#include "proc/mobject/session/scope-locator.hpp" -#include "proc/mobject/placement-ref.hpp" +#include "steam/mobject/session/scope-path.hpp" +#include "steam/mobject/session/scope-query.hpp" +#include "steam/mobject/session/scope-locator.hpp" +#include "steam/mobject/placement-ref.hpp" #include #include diff --git a/src/steam/mobject/session/query/fake-configrules.cpp b/src/steam/mobject/session/query/fake-configrules.cpp index 30c81ab7a..8353fba11 100644 --- a/src/steam/mobject/session/query/fake-configrules.cpp +++ b/src/steam/mobject/session/query/fake-configrules.cpp @@ -36,12 +36,12 @@ */ -#include "proc/mobject/session/query/fake-configrules.hpp" +#include "steam/mobject/session/query/fake-configrules.hpp" -#include "proc/mobject/session.hpp" -#include "proc/mobject/session/fork.hpp" -#include "proc/asset/procpatt.hpp" -#include "proc/asset/pipe.hpp" +#include "steam/mobject/session.hpp" +#include "steam/mobject/session/fork.hpp" +#include "steam/asset/procpatt.hpp" +#include "steam/asset/pipe.hpp" #include "lib/query-util.hpp" #include "common/query.hpp" diff --git a/src/steam/mobject/session/query/fake-configrules.hpp b/src/steam/mobject/session/query/fake-configrules.hpp index 868146c3e..808b381b1 100644 --- a/src/steam/mobject/session/query/fake-configrules.hpp +++ b/src/steam/mobject/session/query/fake-configrules.hpp @@ -46,8 +46,8 @@ #ifndef MOBJECT_SESSION_QUERY_FAKECONFIGRULES_H #define MOBJECT_SESSION_QUERY_FAKECONFIGRULES_H -#include "proc/mobject/session.hpp" -#include "proc/config-resolver.hpp" +#include "steam/mobject/session.hpp" +#include "steam/config-resolver.hpp" #include "lib/depend-inject.hpp" #include "lib/query-util.hpp" #include "lib/util.hpp" diff --git a/src/steam/mobject/session/relativelocation.cpp b/src/steam/mobject/session/relativelocation.cpp index bcb2002d1..b23e107df 100644 --- a/src/steam/mobject/session/relativelocation.cpp +++ b/src/steam/mobject/session/relativelocation.cpp @@ -28,8 +28,8 @@ */ -#include "proc/mobject/session/relativelocation.hpp" -#include "proc/mobject/mobject.hpp" +#include "steam/mobject/session/relativelocation.hpp" +#include "steam/mobject/mobject.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/session/relativelocation.hpp b/src/steam/mobject/session/relativelocation.hpp index d106b0751..ed7c6c6fb 100644 --- a/src/steam/mobject/session/relativelocation.hpp +++ b/src/steam/mobject/session/relativelocation.hpp @@ -30,8 +30,8 @@ #ifndef MOBJECT_SESSION_RELATIVELOCATION_H #define MOBJECT_SESSION_RELATIVELOCATION_H -#include "proc/mobject/placement-ref.hpp" -#include "proc/mobject/session/locatingpin.hpp" +#include "steam/mobject/placement-ref.hpp" +#include "steam/mobject/session/locatingpin.hpp" diff --git a/src/steam/mobject/session/root.cpp b/src/steam/mobject/session/root.cpp index bb435d123..9fb79aa8f 100644 --- a/src/steam/mobject/session/root.cpp +++ b/src/steam/mobject/session/root.cpp @@ -27,7 +27,7 @@ */ -#include "proc/mobject/session/root.hpp" +#include "steam/mobject/session/root.hpp" #include "common/query/defs-manager.hpp" using lumiera::query::DefsManager; diff --git a/src/steam/mobject/session/root.hpp b/src/steam/mobject/session/root.hpp index 854dfc4d6..fb093e066 100644 --- a/src/steam/mobject/session/root.hpp +++ b/src/steam/mobject/session/root.hpp @@ -37,8 +37,8 @@ #ifndef PROC_MOBJECT_SESSION_ROOT_H #define PROC_MOBJECT_SESSION_ROOT_H -#include "proc/mobject/session/meta.hpp" -#include "proc/mobject/builder/buildertool.hpp" +#include "steam/mobject/session/meta.hpp" +#include "steam/mobject/builder/buildertool.hpp" #include "lib/idi/entry-id.hpp" diff --git a/src/steam/mobject/session/scope-locator.hpp b/src/steam/mobject/session/scope-locator.hpp index 735ab2699..4839eec9e 100644 --- a/src/steam/mobject/session/scope-locator.hpp +++ b/src/steam/mobject/session/scope-locator.hpp @@ -31,9 +31,9 @@ #ifndef PROC_MOBJECT_SESSION_SCOPE_LOCATOR_H #define PROC_MOBJECT_SESSION_SCOPE_LOCATOR_H -#include "proc/mobject/session/scope.hpp" -#include "proc/mobject/session/scope-query.hpp" -#include "proc/mobject/placement.hpp" +#include "steam/mobject/session/scope.hpp" +#include "steam/mobject/session/scope-query.hpp" +#include "steam/mobject/placement.hpp" #include "lib/iter-source.hpp" ////////////////////TICKET #493 : the bare interface would be sufficient here #include "lib/depend.hpp" diff --git a/src/steam/mobject/session/scope-path.cpp b/src/steam/mobject/session/scope-path.cpp index d660d2ca7..52e23116f 100644 --- a/src/steam/mobject/session/scope-path.cpp +++ b/src/steam/mobject/session/scope-path.cpp @@ -28,10 +28,10 @@ #include "include/logging.h" -#include "proc/mobject/session/scope-path.hpp" -#include "proc/mobject/session/scope-locator.hpp" -#include "proc/mobject/session/session-service-explore-scope.hpp" -#include "proc/mobject/mobject.hpp" +#include "steam/mobject/session/scope-path.hpp" +#include "steam/mobject/session/scope-locator.hpp" +#include "steam/mobject/session/session-service-explore-scope.hpp" +#include "steam/mobject/mobject.hpp" #include "lib/itertools.hpp" #include "lib/symbol.hpp" #include "lib/error.hpp" diff --git a/src/steam/mobject/session/scope-path.hpp b/src/steam/mobject/session/scope-path.hpp index 7c27db7f9..a0ee69a16 100644 --- a/src/steam/mobject/session/scope-path.hpp +++ b/src/steam/mobject/session/scope-path.hpp @@ -87,7 +87,7 @@ #ifndef PROC_MOBJECT_SESSION_SCOPE_PATH_H #define PROC_MOBJECT_SESSION_SCOPE_PATH_H -#include "proc/mobject/session/scope.hpp" +#include "steam/mobject/session/scope.hpp" #include "lib/iter-adapter.hpp" #include "lib/error.hpp" diff --git a/src/steam/mobject/session/scope-query.hpp b/src/steam/mobject/session/scope-query.hpp index 4b0b36baa..13b80c37c 100644 --- a/src/steam/mobject/session/scope-query.hpp +++ b/src/steam/mobject/session/scope-query.hpp @@ -42,7 +42,7 @@ #define PROC_MOBJECT_SESSION_SCOPE_QUERY_H -#include "proc/mobject/placement.hpp" +#include "steam/mobject/placement.hpp" #include "common/query/query-resolver.hpp" #include "lib/format-string.hpp" diff --git a/src/steam/mobject/session/scope.cpp b/src/steam/mobject/session/scope.cpp index d54f11b87..085ad292f 100644 --- a/src/steam/mobject/session/scope.cpp +++ b/src/steam/mobject/session/scope.cpp @@ -38,11 +38,11 @@ */ -#include "proc/mobject/session/scope.hpp" -#include "proc/mobject/session/scope-locator.hpp" -#include "proc/mobject/session/query-focus-stack.hpp" -#include "proc/mobject/session/session-service-explore-scope.hpp" -#include "proc/mobject/mobject.hpp" +#include "steam/mobject/session/scope.hpp" +#include "steam/mobject/session/scope-locator.hpp" +#include "steam/mobject/session/query-focus-stack.hpp" +#include "steam/mobject/session/session-service-explore-scope.hpp" +#include "steam/mobject/mobject.hpp" #include "lib/iter-source.hpp" ////////////////////TICKET #493 : only using the IterSource wrapIter adapter here #include "common/query/query-resolver.hpp" diff --git a/src/steam/mobject/session/scope.hpp b/src/steam/mobject/session/scope.hpp index f25eea594..37cf3168e 100644 --- a/src/steam/mobject/session/scope.hpp +++ b/src/steam/mobject/session/scope.hpp @@ -30,8 +30,8 @@ #ifndef PROC_MOBJECT_SESSION_SCOPE_H #define PROC_MOBJECT_SESSION_SCOPE_H -#include "proc/mobject/placement.hpp" -#include "proc/mobject/placement-ref.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/mobject/placement-ref.hpp" #include "lib/error.hpp" #include diff --git a/src/steam/mobject/session/segment.cpp b/src/steam/mobject/session/segment.cpp index 9f601809a..962098f0e 100644 --- a/src/steam/mobject/session/segment.cpp +++ b/src/steam/mobject/session/segment.cpp @@ -26,8 +26,8 @@ ** @todo 2016 likely to stay, but expect some extensive rework */ -#include "proc/mobject/session/segment.hpp" -#include "proc/mobject/explicitplacement.hpp" +#include "steam/mobject/session/segment.hpp" +#include "steam/mobject/explicitplacement.hpp" diff --git a/src/steam/mobject/session/segment.hpp b/src/steam/mobject/session/segment.hpp index 7eba07412..8eaea136a 100644 --- a/src/steam/mobject/session/segment.hpp +++ b/src/steam/mobject/session/segment.hpp @@ -33,8 +33,8 @@ #include -#include "proc/common.hpp" -#include "proc/mobject/explicitplacement.hpp" +#include "steam/common.hpp" +#include "steam/mobject/explicitplacement.hpp" #include "lib/time/timevalue.hpp" using std::list; diff --git a/src/steam/mobject/session/segmentation.cpp b/src/steam/mobject/session/segmentation.cpp index cd88eec32..ebaedfb76 100644 --- a/src/steam/mobject/session/segmentation.cpp +++ b/src/steam/mobject/session/segmentation.cpp @@ -27,8 +27,8 @@ */ #include "lib/error.hpp" -#include "proc/mobject/session/segmentation.hpp" -#include "proc/mobject/builder/fixture-change-detector.hpp" +#include "steam/mobject/session/segmentation.hpp" +#include "steam/mobject/builder/fixture-change-detector.hpp" diff --git a/src/steam/mobject/session/segmentation.hpp b/src/steam/mobject/session/segmentation.hpp index bdc1ab6eb..2fa2219e1 100644 --- a/src/steam/mobject/session/segmentation.hpp +++ b/src/steam/mobject/session/segmentation.hpp @@ -47,7 +47,7 @@ #define MOBJECT_SESSION_SEGMENTATION_H -#include "proc/mobject/session/segment.hpp" +#include "steam/mobject/session/segment.hpp" #include diff --git a/src/steam/mobject/session/sess-manager-impl.cpp b/src/steam/mobject/session/sess-manager-impl.cpp index 5b1a0b428..10359ed35 100644 --- a/src/steam/mobject/session/sess-manager-impl.cpp +++ b/src/steam/mobject/session/sess-manager-impl.cpp @@ -39,12 +39,12 @@ #include "lib/error.hpp" -#include "proc/mobject/session.hpp" -#include "proc/mobject/session/sess-manager-impl.hpp" -#include "proc/mobject/session/lifecycle-advisor.hpp" -#include "proc/control/proc-dispatcher.hpp" -#include "proc/config-resolver.hpp" -#include "proc/asset/timeline.hpp" +#include "steam/mobject/session.hpp" +#include "steam/mobject/session/sess-manager-impl.hpp" +#include "steam/mobject/session/lifecycle-advisor.hpp" +#include "steam/control/proc-dispatcher.hpp" +#include "steam/config-resolver.hpp" +#include "steam/asset/timeline.hpp" #include "common/query/defs-manager.hpp" #include "common/query.hpp" diff --git a/src/steam/mobject/session/sess-manager-impl.hpp b/src/steam/mobject/session/sess-manager-impl.hpp index f728888b3..5fdfc8dac 100644 --- a/src/steam/mobject/session/sess-manager-impl.hpp +++ b/src/steam/mobject/session/sess-manager-impl.hpp @@ -40,7 +40,7 @@ #ifndef MOBJECT_SESSION_SESS_MANAGER_IMPL_H #define MOBJECT_SESSION_SESS_MANAGER_IMPL_H -#include "proc/mobject/session/session-impl.hpp" +#include "steam/mobject/session/session-impl.hpp" #include "lib/sync.hpp" diff --git a/src/steam/mobject/session/session-impl.cpp b/src/steam/mobject/session/session-impl.cpp index c176e897f..875e5f742 100644 --- a/src/steam/mobject/session/session-impl.cpp +++ b/src/steam/mobject/session/session-impl.cpp @@ -28,11 +28,11 @@ */ -#include "proc/mobject/session/session-impl.hpp" -#include "proc/mobject/session/mobjectfactory.hpp" -#include "proc/mobject/session/query-focus.hpp" -#include "proc/mobject/placement.hpp" -#include "proc/mobject/mobject.hpp" +#include "steam/mobject/session/session-impl.hpp" +#include "steam/mobject/session/mobjectfactory.hpp" +#include "steam/mobject/session/query-focus.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/mobject/mobject.hpp" #include "lib/error.hpp" diff --git a/src/steam/mobject/session/session-impl.hpp b/src/steam/mobject/session/session-impl.hpp index 54f8c3d41..14307d440 100644 --- a/src/steam/mobject/session/session-impl.hpp +++ b/src/steam/mobject/session/session-impl.hpp @@ -46,18 +46,18 @@ #ifndef PROC_MOBJECT_SESSION_SESSIONIMPL_H #define PROC_MOBJECT_SESSION_SESSIONIMPL_H -#include "proc/mobject/session.hpp" -#include "proc/mobject/session/fixture.hpp" -#include "proc/mobject/session/placement-index.hpp" -#include "proc/mobject/session/session-services.hpp" -#include "proc/mobject/session/session-interface-modules.hpp" +#include "steam/mobject/session.hpp" +#include "steam/mobject/session/fixture.hpp" +#include "steam/mobject/session/placement-index.hpp" +#include "steam/mobject/session/session-services.hpp" +#include "steam/mobject/session/session-interface-modules.hpp" -#include "proc/mobject/session/session-service-fetch.hpp" -#include "proc/mobject/session/session-service-explore-scope.hpp" -#include "proc/mobject/session/session-service-mock-index.hpp" -#include "proc/mobject/session/session-service-defaults.hpp" +#include "steam/mobject/session/session-service-fetch.hpp" +#include "steam/mobject/session/session-service-explore-scope.hpp" +#include "steam/mobject/session/session-service-mock-index.hpp" +#include "steam/mobject/session/session-service-defaults.hpp" -#include "proc/mobject/session/placement-index-query-resolver.hpp" +#include "steam/mobject/session/placement-index-query-resolver.hpp" diff --git a/src/steam/mobject/session/session-interface-modules.hpp b/src/steam/mobject/session/session-interface-modules.hpp index 6d85c2950..91a72f49e 100644 --- a/src/steam/mobject/session/session-interface-modules.hpp +++ b/src/steam/mobject/session/session-interface-modules.hpp @@ -71,9 +71,9 @@ #define PROC_MOBJECT_SESSION_INTERFACE_MODULES_H #include "lib/element-tracker.hpp" -#include "proc/asset/timeline.hpp" -#include "proc/asset/sequence.hpp" -#include "proc/mobject/session/element-query.hpp" +#include "steam/asset/timeline.hpp" +#include "steam/asset/sequence.hpp" +#include "steam/mobject/session/element-query.hpp" #include "common/query/defs-manager.hpp" diff --git a/src/steam/mobject/session/session-query.hpp b/src/steam/mobject/session/session-query.hpp index 603f456a1..e8376edd8 100644 --- a/src/steam/mobject/session/session-query.hpp +++ b/src/steam/mobject/session/session-query.hpp @@ -40,9 +40,9 @@ #ifndef MOBJECT_SESSION_SESSION_QUERY_H #define MOBJECT_SESSION_SESSION_QUERY_H -#include "proc/mobject/session.hpp" -#include "proc/mobject/placement.hpp" -#include "proc/mobject/session/fork.hpp" +#include "steam/mobject/session.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/mobject/session/fork.hpp" #include diff --git a/src/steam/mobject/session/session-service-defaults.hpp b/src/steam/mobject/session/session-service-defaults.hpp index 623c0aee8..295ae80de 100644 --- a/src/steam/mobject/session/session-service-defaults.hpp +++ b/src/steam/mobject/session/session-service-defaults.hpp @@ -35,7 +35,7 @@ #ifndef MOBJECT_SESSION_SESSION_SERVICE_DEFAULTS_H #define MOBJECT_SESSION_SESSION_SERVICE_DEFAULTS_H -//#include "proc/mobject/session.hpp" +//#include "steam/mobject/session.hpp" //#include "lib/meta/generator.hpp" diff --git a/src/steam/mobject/session/session-service-explore-scope.hpp b/src/steam/mobject/session/session-service-explore-scope.hpp index b92283b96..91deff56d 100644 --- a/src/steam/mobject/session/session-service-explore-scope.hpp +++ b/src/steam/mobject/session/session-service-explore-scope.hpp @@ -46,7 +46,7 @@ #ifndef MOBJECT_SESSION_SESSION_SERVICE_EXPLORE_SCOPE_H #define MOBJECT_SESSION_SESSION_SERVICE_EXPLORE_SCOPE_H -#include "proc/mobject/placement.hpp" +#include "steam/mobject/placement.hpp" #include "common/query/query-resolver.hpp" diff --git a/src/steam/mobject/session/session-service-fetch.hpp b/src/steam/mobject/session/session-service-fetch.hpp index 004668778..0c679b012 100644 --- a/src/steam/mobject/session/session-service-fetch.hpp +++ b/src/steam/mobject/session/session-service-fetch.hpp @@ -37,9 +37,9 @@ #ifndef MOBJECT_SESSION_SESSION_SERVICE_FETCH_H #define MOBJECT_SESSION_SESSION_SERVICE_FETCH_H -//#include "proc/mobject/session.hpp" +//#include "steam/mobject/session.hpp" //#include "lib/meta/generator.hpp" -#include "proc/mobject/placement.hpp" +#include "steam/mobject/placement.hpp" diff --git a/src/steam/mobject/session/session-service-mock-index.hpp b/src/steam/mobject/session/session-service-mock-index.hpp index e3ad609bf..d01b02afe 100644 --- a/src/steam/mobject/session/session-service-mock-index.hpp +++ b/src/steam/mobject/session/session-service-mock-index.hpp @@ -44,7 +44,7 @@ #ifndef MOBJECT_SESSION_SESSION_SERVICE_MOCK_INDEX_H #define MOBJECT_SESSION_SESSION_SERVICE_MOCK_INDEX_H -#include "proc/mobject/session/placement-index.hpp" +#include "steam/mobject/session/placement-index.hpp" #include diff --git a/src/steam/mobject/session/session-service-mutate.hpp b/src/steam/mobject/session/session-service-mutate.hpp index 54db65c36..029bf0073 100644 --- a/src/steam/mobject/session/session-service-mutate.hpp +++ b/src/steam/mobject/session/session-service-mutate.hpp @@ -39,9 +39,9 @@ #ifndef MOBJECT_SESSION_SESSION_SERVICE_MUTATE_H #define MOBJECT_SESSION_SESSION_SERVICE_MUTATE_H -//#include "proc/mobject/session.hpp" +//#include "steam/mobject/session.hpp" //#include "lib/meta/generator.hpp" -#include "proc/mobject/placement.hpp" +#include "steam/mobject/placement.hpp" diff --git a/src/steam/mobject/session/session-services.cpp b/src/steam/mobject/session/session-services.cpp index 078322d87..7e4b9d563 100644 --- a/src/steam/mobject/session/session-services.cpp +++ b/src/steam/mobject/session/session-services.cpp @@ -41,17 +41,17 @@ */ -#include "proc/mobject/session/session-service-fetch.hpp" -#include "proc/mobject/session/session-service-mutate.hpp" -#include "proc/mobject/session/session-service-explore-scope.hpp" -#include "proc/mobject/session/session-service-mock-index.hpp" -#include "proc/mobject/session/session-service-defaults.hpp" +#include "steam/mobject/session/session-service-fetch.hpp" +#include "steam/mobject/session/session-service-mutate.hpp" +#include "steam/mobject/session/session-service-explore-scope.hpp" +#include "steam/mobject/session/session-service-mock-index.hpp" +#include "steam/mobject/session/session-service-defaults.hpp" -#include "proc/mobject/session/session-services.hpp" -#include "proc/mobject/session/session-impl.hpp" -#include "proc/mobject/session/sess-manager-impl.hpp" +#include "steam/mobject/session/session-services.hpp" +#include "steam/mobject/session/session-impl.hpp" +#include "steam/mobject/session/sess-manager-impl.hpp" -#include "proc/mobject/session/mobjectfactory.hpp" +#include "steam/mobject/session/mobjectfactory.hpp" #include "lib/symbol.hpp" using lib::Symbol; diff --git a/src/steam/mobject/session/session-services.hpp b/src/steam/mobject/session/session-services.hpp index e0f79e0ec..ee5ee8fd0 100644 --- a/src/steam/mobject/session/session-services.hpp +++ b/src/steam/mobject/session/session-services.hpp @@ -76,7 +76,7 @@ #ifndef MOBJECT_SESSION_SESSION_SERVICES_H #define MOBJECT_SESSION_SESSION_SERVICES_H -#include "proc/mobject/session.hpp" +#include "steam/mobject/session.hpp" #include "lib/meta/generator.hpp" diff --git a/src/steam/mobject/session/session.cpp b/src/steam/mobject/session/session.cpp index 3b84db651..6d96ce825 100644 --- a/src/steam/mobject/session/session.cpp +++ b/src/steam/mobject/session/session.cpp @@ -31,9 +31,9 @@ */ -#include "proc/mobject/session.hpp" -#include "proc/mobject/session/session-impl.hpp" -#include "proc/mobject/session/sess-manager-impl.hpp" +#include "steam/mobject/session.hpp" +#include "steam/mobject/session/session-impl.hpp" +#include "steam/mobject/session/sess-manager-impl.hpp" //#include "common/query/defs-manager.hpp" #include "lib/symbol.hpp" diff --git a/src/steam/mobject/session/specific-contents-query.hpp b/src/steam/mobject/session/specific-contents-query.hpp index 08303fae3..01b17e109 100644 --- a/src/steam/mobject/session/specific-contents-query.hpp +++ b/src/steam/mobject/session/specific-contents-query.hpp @@ -35,8 +35,8 @@ #define MOBJECT_SESSION_SPECIFIC_CONTENTS_QUERY_H -#include "proc/mobject/session/scope-query.hpp" -#include "proc/mobject/placement.hpp" +#include "steam/mobject/session/scope-query.hpp" +#include "steam/mobject/placement.hpp" #include "common/query/query-resolver.hpp" #include diff --git a/src/steam/mobject/session/wish.cpp b/src/steam/mobject/session/wish.cpp index dd538ca65..5aa45734b 100644 --- a/src/steam/mobject/session/wish.cpp +++ b/src/steam/mobject/session/wish.cpp @@ -26,7 +26,7 @@ */ -#include "proc/mobject/session/wish.hpp" +#include "steam/mobject/session/wish.hpp" namespace proc { namespace mobject { diff --git a/src/steam/mobject/session/wish.hpp b/src/steam/mobject/session/wish.hpp index 3b3c27392..3ef26ca9c 100644 --- a/src/steam/mobject/session/wish.hpp +++ b/src/steam/mobject/session/wish.hpp @@ -30,7 +30,7 @@ #ifndef MOBJECT_SESSION_WISH_H #define MOBJECT_SESSION_WISH_H -#include "proc/mobject/session/allocation.hpp" +#include "steam/mobject/session/allocation.hpp" diff --git a/src/steam/mobject/test-dummy-mobject.hpp b/src/steam/mobject/test-dummy-mobject.hpp index 8a02b552b..552999e2e 100644 --- a/src/steam/mobject/test-dummy-mobject.hpp +++ b/src/steam/mobject/test-dummy-mobject.hpp @@ -42,9 +42,9 @@ #include "lib/test/run.hpp" -#include "proc/mobject/builder/buildertool.hpp" -#include "proc/mobject/session/abstractmo.hpp" -#include "proc/mobject/placement.hpp" +#include "steam/mobject/builder/buildertool.hpp" +#include "steam/mobject/session/abstractmo.hpp" +#include "steam/mobject/placement.hpp" #include "lib/format-string.hpp" #include "lib/format-cout.hpp" #include "lib/symbol.hpp" diff --git a/src/steam/play/dummy-play-connection.cpp b/src/steam/play/dummy-play-connection.cpp index 2810726bf..97afd8a31 100644 --- a/src/steam/play/dummy-play-connection.cpp +++ b/src/steam/play/dummy-play-connection.cpp @@ -26,9 +26,9 @@ */ -#include "proc/play/dummy-play-connection.hpp" -//#include "proc/play/dummy-image-generator.hpp" -//#include "proc/play/tick-service.hpp" +#include "steam/play/dummy-play-connection.hpp" +//#include "steam/play/dummy-image-generator.hpp" +//#include "steam/play/tick-service.hpp" //#include "lib/depend.hpp" //#include diff --git a/src/steam/play/dummy-play-connection.hpp b/src/steam/play/dummy-play-connection.hpp index d059b0aad..91e382842 100644 --- a/src/steam/play/dummy-play-connection.hpp +++ b/src/steam/play/dummy-play-connection.hpp @@ -82,13 +82,13 @@ //#include "include/display-facade.h" //#include "common/instancehandle.hpp" //#include "lib/singleton-ref.hpp" -#include "proc/play/output-manager.hpp" -#include "proc/mobject/model-port.hpp" +#include "steam/play/output-manager.hpp" +#include "steam/mobject/model-port.hpp" #include "lib/time/timequant.hpp" //#include "lib/scoped-collection.hpp" -#include "proc/mobject/builder/model-port-registry.hpp" -#include "proc/asset/timeline.hpp" -#include "proc/asset/pipe.hpp" +#include "steam/mobject/builder/model-port-registry.hpp" +#include "steam/asset/timeline.hpp" +#include "steam/asset/pipe.hpp" #include "common/query.hpp" #include "lib/iter-source.hpp" diff --git a/src/steam/play/dummy-player-service.cpp b/src/steam/play/dummy-player-service.cpp index 11a50e0b8..09489b252 100644 --- a/src/steam/play/dummy-player-service.cpp +++ b/src/steam/play/dummy-player-service.cpp @@ -26,9 +26,9 @@ */ -#include "proc/play/dummy-player-service.hpp" -#include "proc/engine/worker/dummy-image-generator.hpp" -#include "proc/engine/worker/tick-service.hpp" +#include "steam/play/dummy-player-service.hpp" +#include "steam/engine/worker/dummy-image-generator.hpp" +#include "steam/engine/worker/tick-service.hpp" #include "lib/depend-inject.hpp" #include "lib/depend.hpp" diff --git a/src/steam/play/output-director.cpp b/src/steam/play/output-director.cpp index 31a32674c..fae48bde2 100644 --- a/src/steam/play/output-director.cpp +++ b/src/steam/play/output-director.cpp @@ -26,10 +26,10 @@ */ -#include "proc/play/play-service.hpp" -#include "proc/play/output-manager.hpp" -#include "proc/play/output-director.hpp" -#include "backend/thread-wrapper.hpp" +#include "steam/play/play-service.hpp" +#include "steam/play/output-manager.hpp" +#include "steam/play/output-director.hpp" +#include "vault/thread-wrapper.hpp" using backend::Thread; diff --git a/src/steam/play/output-director.hpp b/src/steam/play/output-director.hpp index 60bfe39b1..fb15243db 100644 --- a/src/steam/play/output-director.hpp +++ b/src/steam/play/output-director.hpp @@ -38,7 +38,7 @@ #include "lib/error.hpp" #include "lib/depend.hpp" #include "lib/depend-inject.hpp" -#include "proc/play/output-manager.hpp" +#include "steam/play/output-manager.hpp" #include "common/subsys.hpp" #include "lib/nocopy.hpp" #include "lib/sync.hpp" diff --git a/src/steam/play/output-manager.hpp b/src/steam/play/output-manager.hpp index 9bfc9175d..0f356ea07 100644 --- a/src/steam/play/output-manager.hpp +++ b/src/steam/play/output-manager.hpp @@ -33,8 +33,8 @@ #include "lib/error.hpp" #include "lib/nocopy.hpp" -#include "proc/play/output-slot.hpp" -#include "proc/mobject/model-port.hpp" +#include "steam/play/output-slot.hpp" +#include "steam/mobject/model-port.hpp" //#include //#include diff --git a/src/steam/play/output-slot-connection.hpp b/src/steam/play/output-slot-connection.hpp index ede82d9a2..8b6a8dd2e 100644 --- a/src/steam/play/output-slot-connection.hpp +++ b/src/steam/play/output-slot-connection.hpp @@ -41,14 +41,14 @@ #include "lib/error.hpp" #include "lib/nocopy.hpp" -#include "proc/play/output-slot.hpp" +#include "steam/play/output-slot.hpp" #include "lib/scoped-collection.hpp" #include "lib/iter-adapter-stl.hpp" #include "lib/iter-source.hpp" #include "lib/handle.hpp" //#include "lib/time/timevalue.hpp" -//#include "proc/engine/buffer-provider.hpp" -//#include "proc/play/timings.hpp" +//#include "steam/engine/buffer-provider.hpp" +//#include "steam/play/timings.hpp" //#include "lib/sync.hpp" //#include diff --git a/src/steam/play/output-slot.cpp b/src/steam/play/output-slot.cpp index 1ae9d3c4c..96c42f502 100644 --- a/src/steam/play/output-slot.cpp +++ b/src/steam/play/output-slot.cpp @@ -27,8 +27,8 @@ #include "lib/error.hpp" -#include "proc/play/output-slot.hpp" -#include "proc/play/output-slot-connection.hpp" +#include "steam/play/output-slot.hpp" +#include "steam/play/output-slot-connection.hpp" #include diff --git a/src/steam/play/output-slot.hpp b/src/steam/play/output-slot.hpp index 2c98d1599..1d3be1dd6 100644 --- a/src/steam/play/output-slot.hpp +++ b/src/steam/play/output-slot.hpp @@ -69,8 +69,8 @@ #include "lib/error.hpp" #include "lib/handle.hpp" #include "lib/time/timevalue.hpp" -#include "proc/engine/buffer-provider.hpp" -#include "proc/play/timings.hpp" +#include "steam/engine/buffer-provider.hpp" +#include "steam/play/timings.hpp" #include "lib/iter-source.hpp" #include "lib/nocopy.hpp" diff --git a/src/steam/play/play-controller.cpp b/src/steam/play/play-controller.cpp index ad4f1abb8..cdab60241 100644 --- a/src/steam/play/play-controller.cpp +++ b/src/steam/play/play-controller.cpp @@ -35,8 +35,8 @@ */ -#include "proc/play/play-controller.hpp" -#include "proc/play/play-process.hpp" +#include "steam/play/play-controller.hpp" +#include "steam/play/play-process.hpp" #include "lib/time/timevalue.hpp" //#include diff --git a/src/steam/play/play-controller.hpp b/src/steam/play/play-controller.hpp index 7960a830b..e34ba1410 100644 --- a/src/steam/play/play-controller.hpp +++ b/src/steam/play/play-controller.hpp @@ -32,7 +32,7 @@ #define PROC_PLAY_PLAY_CONTROLLER_H -#include "proc/play/play-service.hpp" +#include "steam/play/play-service.hpp" //#include "include/display-facade.h" //#include "common/instancehandle.hpp" //#include "lib/singleton-ref.hpp" diff --git a/src/steam/play/play-process.cpp b/src/steam/play/play-process.cpp index 2b3fe88e7..7ec84c25c 100644 --- a/src/steam/play/play-process.cpp +++ b/src/steam/play/play-process.cpp @@ -26,9 +26,9 @@ */ -#include "proc/play/play-process.hpp" -#include "proc/play/play-service.hpp" -#include "proc/play/render-configurator.hpp" +#include "steam/play/play-process.hpp" +#include "steam/play/play-service.hpp" +#include "steam/play/render-configurator.hpp" #include "lib/itertools.hpp" //#include diff --git a/src/steam/play/play-process.hpp b/src/steam/play/play-process.hpp index 8334eeb9d..3b76641ef 100644 --- a/src/steam/play/play-process.hpp +++ b/src/steam/play/play-process.hpp @@ -57,8 +57,8 @@ //#include "include/display-facade.h" //#include "common/instancehandle.hpp" //#include "lib/singleton-ref.hpp" -#include "proc/mobject/model-port.hpp" -#include "proc/engine/calc-stream.hpp" +#include "steam/mobject/model-port.hpp" +#include "steam/engine/calc-stream.hpp" #include "lib/iter-source.hpp" ////////////////////TICKET #493 : only using the IterSource base feature here #include "lib/util.hpp" diff --git a/src/steam/play/play-service.cpp b/src/steam/play/play-service.cpp index 4e40edd4a..ac9f16105 100644 --- a/src/steam/play/play-service.cpp +++ b/src/steam/play/play-service.cpp @@ -28,10 +28,10 @@ #include "lib/error.hpp" #include "include/play-facade.hpp" -#include "proc/play/play-service.hpp" -#include "proc/play/play-process.hpp" -#include "proc/play/render-configurator.hpp" -#include "proc/play/output-manager.hpp" +#include "steam/play/play-service.hpp" +#include "steam/play/play-process.hpp" +#include "steam/play/render-configurator.hpp" +#include "steam/play/output-manager.hpp" #include "lib/util-foreach.hpp" diff --git a/src/steam/play/render-configurator.cpp b/src/steam/play/render-configurator.cpp index ac26b7229..98052d050 100644 --- a/src/steam/play/render-configurator.cpp +++ b/src/steam/play/render-configurator.cpp @@ -29,9 +29,9 @@ #include "lib/error.hpp" -#include "proc/play/render-configurator.hpp" -#include "proc/play/output-manager.hpp" -#include "proc/engine/engine-service.hpp" +#include "steam/play/render-configurator.hpp" +#include "steam/play/output-manager.hpp" +#include "steam/engine/engine-service.hpp" //#include "lib/itertools.hpp" //#include diff --git a/src/steam/play/render-configurator.hpp b/src/steam/play/render-configurator.hpp index 47833cf1b..8ee975d56 100644 --- a/src/steam/play/render-configurator.hpp +++ b/src/steam/play/render-configurator.hpp @@ -40,11 +40,11 @@ //#include "include/display-facade.h" //#include "common/instancehandle.hpp" //#include "lib/singleton-ref.hpp" -#include "proc/mobject/model-port.hpp" -#include "proc/play/play-process.hpp" -#include "proc/engine/calc-stream.hpp" -#include "proc/play/output-slot.hpp" -#include "proc/play/output-manager.hpp" +#include "steam/mobject/model-port.hpp" +#include "steam/play/play-process.hpp" +#include "steam/engine/calc-stream.hpp" +#include "steam/play/output-slot.hpp" +#include "steam/play/output-manager.hpp" //#include "lib/iter-source.hpp" //#include "lib/util.hpp" diff --git a/src/steam/play/sound/jack-output.cpp b/src/steam/play/sound/jack-output.cpp index 85f857387..038ecfa25 100644 --- a/src/steam/play/sound/jack-output.cpp +++ b/src/steam/play/sound/jack-output.cpp @@ -28,7 +28,7 @@ */ -#include "proc/play/sound/jack-output.hpp" +#include "steam/play/sound/jack-output.hpp" namespace proc { namespace play { diff --git a/src/steam/play/timings.cpp b/src/steam/play/timings.cpp index b3b631502..663dc38f0 100644 --- a/src/steam/play/timings.cpp +++ b/src/steam/play/timings.cpp @@ -30,8 +30,8 @@ */ -#include "proc/play/timings.hpp" -#include "backend/engine/engine-config.h" +#include "steam/play/timings.hpp" +#include "vault/engine/engine-config.h" #include "lib/time/formats.hpp" #include "lib/time/timequant.hpp" diff --git a/src/steam/play/timings.hpp b/src/steam/play/timings.hpp index 5d61f614e..0bcc5536d 100644 --- a/src/steam/play/timings.hpp +++ b/src/steam/play/timings.hpp @@ -46,7 +46,7 @@ #include "lib/error.hpp" //#include "lib/handle.hpp" #include "lib/time/timevalue.hpp" -//#include "proc/engine/buffer-provider.hpp" +//#include "steam/engine/buffer-provider.hpp" //#include "lib/iter-source.hpp" //#include "lib/sync.hpp" diff --git a/src/steam/state.hpp b/src/steam/state.hpp index 593a30a48..3f7e62521 100644 --- a/src/steam/state.hpp +++ b/src/steam/state.hpp @@ -32,7 +32,7 @@ #include "lib/error.hpp" #include "lib/frameid.hpp" -#include "proc/engine/buffhandle.hpp" +#include "steam/engine/buffhandle.hpp" #include diff --git a/src/steam/streamtype.cpp b/src/steam/streamtype.cpp index 272390fb9..8e6313006 100644 --- a/src/steam/streamtype.cpp +++ b/src/steam/streamtype.cpp @@ -26,7 +26,7 @@ */ -#include "proc/streamtype.hpp" +#include "steam/streamtype.hpp" namespace proc { diff --git a/src/vault/backend.c b/src/vault/backend.c index 296887800..0c1b19181 100644 --- a/src/vault/backend.c +++ b/src/vault/backend.c @@ -31,14 +31,14 @@ #include "lib/tmpbuf.h" #include "lib/mpool.h" -#include "backend/backend.h" +#include "vault/backend.h" #include "common/config.h" -#include "backend/filehandlecache.h" -#include "backend/filedescriptor.h" -#include "backend/filedescriptorregistry.h" -#include "backend/mmapcache.h" -#include "backend/threadpool.h" -#include "backend/resourcecollector.h" +#include "vault/filehandlecache.h" +#include "vault/filedescriptor.h" +#include "vault/filedescriptorregistry.h" +#include "vault/mmapcache.h" +#include "vault/threadpool.h" +#include "vault/resourcecollector.h" #include #include diff --git a/src/vault/engine/engine-config.cpp b/src/vault/engine/engine-config.cpp index 0ac316e70..4e0ba27e2 100644 --- a/src/vault/engine/engine-config.cpp +++ b/src/vault/engine/engine-config.cpp @@ -26,7 +26,7 @@ */ -#include "backend/engine/engine-config.h" +#include "vault/engine/engine-config.h" #include "lib/time/timevalue.hpp" #include diff --git a/src/vault/engine/job.cpp b/src/vault/engine/job.cpp index 48a575a28..914a94d05 100644 --- a/src/vault/engine/job.cpp +++ b/src/vault/engine/job.cpp @@ -33,7 +33,7 @@ */ -#include "backend/engine/job.h" +#include "vault/engine/job.h" #include "lib/util.hpp" #include diff --git a/src/vault/engine/scheduler-diagnostics.hpp b/src/vault/engine/scheduler-diagnostics.hpp index 2e9b83708..92d4a6f14 100644 --- a/src/vault/engine/scheduler-diagnostics.hpp +++ b/src/vault/engine/scheduler-diagnostics.hpp @@ -41,7 +41,7 @@ #include "lib/nocopy.hpp" #include "lib/hash-value.h" #include "lib/time/timevalue.hpp" -#include "backend/engine/scheduler-frontend.hpp" +#include "vault/engine/scheduler-frontend.hpp" namespace backend{ diff --git a/src/vault/engine/scheduler-frontend.cpp b/src/vault/engine/scheduler-frontend.cpp index 7e4aff0c1..5692a28d9 100644 --- a/src/vault/engine/scheduler-frontend.cpp +++ b/src/vault/engine/scheduler-frontend.cpp @@ -27,7 +27,7 @@ #include "lib/error.h" -#include "backend/engine/scheduler-frontend.hpp" +#include "vault/engine/scheduler-frontend.hpp" namespace backend{ namespace engine { diff --git a/src/vault/engine/scheduler-frontend.hpp b/src/vault/engine/scheduler-frontend.hpp index f0826d39f..8501d900e 100644 --- a/src/vault/engine/scheduler-frontend.hpp +++ b/src/vault/engine/scheduler-frontend.hpp @@ -34,7 +34,7 @@ #include "lib/depend.hpp" #include "lib/time/timevalue.hpp" -#include "backend/engine/job.h" +#include "vault/engine/job.h" namespace backend{ diff --git a/src/vault/enginefacade.cpp b/src/vault/enginefacade.cpp index a6ac186f6..1de7b505b 100644 --- a/src/vault/enginefacade.cpp +++ b/src/vault/enginefacade.cpp @@ -32,7 +32,7 @@ */ -#include "backend/enginefacade.hpp" +#include "vault/enginefacade.hpp" #include "lib/depend.hpp" #include diff --git a/src/vault/file-handling.c b/src/vault/file-handling.c index 1fd1a3861..92cba38b4 100644 --- a/src/vault/file-handling.c +++ b/src/vault/file-handling.c @@ -30,8 +30,8 @@ #include "lib/mutex.h" #include "lib/safeclib.h" -#include "backend/file.h" -#include "backend/filehandlecache.h" +#include "vault/file.h" +#include "vault/filehandlecache.h" #include #include diff --git a/src/vault/file.h b/src/vault/file.h index 7a8aac5bf..79eaf8cb0 100644 --- a/src/vault/file.h +++ b/src/vault/file.h @@ -49,10 +49,10 @@ typedef struct lumiera_file_struct lumiera_file; typedef lumiera_file* LumieraFile; -#include "backend/filedescriptor.h" -#include "backend/filehandle.h" -#include "backend/mmapings.h" -#include "backend/mmap.h" +#include "vault/filedescriptor.h" +#include "vault/filehandle.h" +#include "vault/mmapings.h" +#include "vault/mmap.h" /** * File modes: diff --git a/src/vault/filedescriptor.c b/src/vault/filedescriptor.c index 180bd5d13..8210ba8e7 100644 --- a/src/vault/filedescriptor.c +++ b/src/vault/filedescriptor.c @@ -32,11 +32,11 @@ #include "lib/safeclib.h" #include "lib/tmpbuf.h" -#include "backend/file.h" -#include "backend/filedescriptor.h" -#include "backend/filedescriptorregistry.h" -#include "backend/filehandle.h" -#include "backend/filehandlecache.h" +#include "vault/file.h" +#include "vault/filedescriptor.h" +#include "vault/filedescriptorregistry.h" +#include "vault/filehandle.h" +#include "vault/filehandlecache.h" #include #include diff --git a/src/vault/filedescriptor.h b/src/vault/filedescriptor.h index 870cbb7d2..24dcd1a74 100644 --- a/src/vault/filedescriptor.h +++ b/src/vault/filedescriptor.h @@ -42,9 +42,9 @@ typedef struct lumiera_filedescriptor_struct lumiera_filedescriptor; typedef lumiera_filedescriptor* LumieraFiledescriptor; -#include "backend/filehandle.h" -#include "backend/file.h" -#include "backend/mmapings.h" +#include "vault/filehandle.h" +#include "vault/file.h" +#include "vault/mmapings.h" struct lumiera_filedescriptor_struct diff --git a/src/vault/filedescriptorregistry.c b/src/vault/filedescriptorregistry.c index 8717d25e4..469107d04 100644 --- a/src/vault/filedescriptorregistry.c +++ b/src/vault/filedescriptorregistry.c @@ -32,9 +32,9 @@ #include "lib/mutex.h" #include "lib/psplay.h" -#include "backend/file.h" -#include "backend/filedescriptor.h" -#include "backend/filedescriptorregistry.h" +#include "vault/file.h" +#include "vault/filedescriptor.h" +#include "vault/filedescriptorregistry.h" /** diff --git a/src/vault/filedescriptorregistry.h b/src/vault/filedescriptorregistry.h index b7c8d9ba7..75cb4bf64 100644 --- a/src/vault/filedescriptorregistry.h +++ b/src/vault/filedescriptorregistry.h @@ -30,7 +30,7 @@ #ifndef BACKEND_FILEDESCRIPTORREGISTRY_H #define BACKEND_FILEDESCRIPTORREGISTRY_H -#include "backend/filedescriptor.h" +#include "vault/filedescriptor.h" /** diff --git a/src/vault/filehandle.c b/src/vault/filehandle.c index 4557bc558..871dc7800 100644 --- a/src/vault/filehandle.c +++ b/src/vault/filehandle.c @@ -31,9 +31,9 @@ #include "lib/llist.h" #include "lib/safeclib.h" -#include "backend/file.h" -#include "backend/filehandle.h" -#include "backend/filedescriptor.h" +#include "vault/file.h" +#include "vault/filehandle.h" +#include "vault/filedescriptor.h" #include diff --git a/src/vault/filehandle.h b/src/vault/filehandle.h index 6b6180388..fb8af3b48 100644 --- a/src/vault/filehandle.h +++ b/src/vault/filehandle.h @@ -37,7 +37,7 @@ typedef struct lumiera_filehandle_struct lumiera_filehandle; typedef lumiera_filehandle* LumieraFilehandle; -#include "backend/filedescriptor.h" +#include "vault/filedescriptor.h" //NOBUG_DECLARE_FLAG (filehandle); diff --git a/src/vault/filehandlecache.c b/src/vault/filehandlecache.c index 2cd0046e5..f44ad0c8b 100644 --- a/src/vault/filehandlecache.c +++ b/src/vault/filehandlecache.c @@ -30,8 +30,8 @@ #include "include/logging.h" #include "lib/safeclib.h" -#include "backend/file.h" -#include "backend/filehandlecache.h" +#include "vault/file.h" +#include "vault/filehandlecache.h" diff --git a/src/vault/filehandlecache.h b/src/vault/filehandlecache.h index bfe51a016..d9e3d1a7e 100644 --- a/src/vault/filehandlecache.h +++ b/src/vault/filehandlecache.h @@ -39,7 +39,7 @@ typedef struct lumiera_filehandlecache_struct lumiera_filehandlecache; typedef lumiera_filehandlecache* LumieraFilehandlecache; -#include "backend/filehandle.h" +#include "vault/filehandle.h" diff --git a/src/vault/fileheader.c b/src/vault/fileheader.c index 1fe269d76..8fa9a26f4 100644 --- a/src/vault/fileheader.c +++ b/src/vault/fileheader.c @@ -30,8 +30,8 @@ #include "lib/tmpbuf.h" -#include "backend/fileheader.h" -#include "backend/file.h" +#include "vault/fileheader.h" +#include "vault/file.h" #include "include/logging.h" #include diff --git a/src/vault/fileheader.h b/src/vault/fileheader.h index c1ab9206f..93155642f 100644 --- a/src/vault/fileheader.h +++ b/src/vault/fileheader.h @@ -54,7 +54,7 @@ typedef struct lumiera_fileheader_raw_struct lumiera_fileheader_raw; typedef lumiera_fileheader_raw* LumieraFileheaderRaw; -#include "backend/file.h" +#include "vault/file.h" #include diff --git a/src/vault/media-access-facade.cpp b/src/vault/media-access-facade.cpp index de4e97d05..8a4ecf1a1 100644 --- a/src/vault/media-access-facade.cpp +++ b/src/vault/media-access-facade.cpp @@ -29,7 +29,7 @@ */ -#include "backend/media-access-facade.hpp" +#include "vault/media-access-facade.hpp" #include "lib/util.hpp" diff --git a/src/vault/mmap.c b/src/vault/mmap.c index fa9537ac0..da38c7e83 100644 --- a/src/vault/mmap.c +++ b/src/vault/mmap.c @@ -30,8 +30,8 @@ #include "include/logging.h" #include "lib/safeclib.h" -#include "backend/mmap.h" -#include "backend/mmapcache.h" +#include "vault/mmap.h" +#include "vault/mmapcache.h" #include "common/config.h" #include diff --git a/src/vault/mmap.h b/src/vault/mmap.h index 5b2ad2ba6..358fb321c 100644 --- a/src/vault/mmap.h +++ b/src/vault/mmap.h @@ -36,8 +36,8 @@ typedef struct lumiera_mmap_struct lumiera_mmap; typedef lumiera_mmap* LumieraMMap; -#include "backend/file.h" -#include "backend/filedescriptor.h" +#include "vault/file.h" +#include "vault/filedescriptor.h" #include diff --git a/src/vault/mmapcache.c b/src/vault/mmapcache.c index 9610579d6..a7668b4a9 100644 --- a/src/vault/mmapcache.c +++ b/src/vault/mmapcache.c @@ -30,7 +30,7 @@ #include "include/logging.h" #include "lib/safeclib.h" -#include "backend/mmapcache.h" +#include "vault/mmapcache.h" diff --git a/src/vault/mmapcache.h b/src/vault/mmapcache.h index cb8c9fe6c..d5c1488fa 100644 --- a/src/vault/mmapcache.h +++ b/src/vault/mmapcache.h @@ -37,7 +37,7 @@ typedef struct lumiera_mmapcache_struct lumiera_mmapcache; typedef lumiera_mmapcache* LumieraMMapcache; -#include "backend/mmap.h" +#include "vault/mmap.h" #include diff --git a/src/vault/mmapings.c b/src/vault/mmapings.c index 8107aa177..1f901bf7b 100644 --- a/src/vault/mmapings.c +++ b/src/vault/mmapings.c @@ -32,8 +32,8 @@ #include "lib/safeclib.h" -#include "backend/mmapings.h" -#include "backend/mmapcache.h" +#include "vault/mmapings.h" +#include "vault/mmapcache.h" diff --git a/src/vault/mmapings.h b/src/vault/mmapings.h index a6f05652f..abf2d6fe9 100644 --- a/src/vault/mmapings.h +++ b/src/vault/mmapings.h @@ -34,9 +34,9 @@ typedef struct lumiera_mmapings_struct lumiera_mmapings; typedef lumiera_mmapings* LumieraMMapings; -#include "backend/filedescriptor.h" -#include "backend/mmap.h" -#include "backend/file.h" +#include "vault/filedescriptor.h" +#include "vault/mmap.h" +#include "vault/file.h" #include diff --git a/src/vault/netnodefacade.cpp b/src/vault/netnodefacade.cpp index aad613e02..f0c5c5f5c 100644 --- a/src/vault/netnodefacade.cpp +++ b/src/vault/netnodefacade.cpp @@ -29,7 +29,7 @@ */ -#include "backend/netnodefacade.hpp" +#include "vault/netnodefacade.hpp" #include "lib/depend.hpp" #include diff --git a/src/vault/real-clock.cpp b/src/vault/real-clock.cpp index ea3cd6fc5..8b893f928 100644 --- a/src/vault/real-clock.cpp +++ b/src/vault/real-clock.cpp @@ -31,7 +31,7 @@ */ -#include "backend/real-clock.hpp" +#include "vault/real-clock.hpp" #include diff --git a/src/vault/real-clock.hpp b/src/vault/real-clock.hpp index 47ad1f7d2..e67be86d6 100644 --- a/src/vault/real-clock.hpp +++ b/src/vault/real-clock.hpp @@ -45,7 +45,7 @@ //#include "lib/handle.hpp" #include "lib/time/timevalue.hpp" //#include "lib/depend.hpp" -//#include "proc/engine/buffer-provider.hpp" +//#include "steam/engine/buffer-provider.hpp" //#include "lib/iter-source.hpp" //#include "lib/sync.hpp" diff --git a/src/vault/resourcecollector.c b/src/vault/resourcecollector.c index 86a8411c0..16d25ddea 100644 --- a/src/vault/resourcecollector.c +++ b/src/vault/resourcecollector.c @@ -32,7 +32,7 @@ #include "lib/mutex.h" #include "lib/safeclib.h" -#include "backend/resourcecollector.h" +#include "vault/resourcecollector.h" #include diff --git a/src/vault/scriptrunnerfacade.cpp b/src/vault/scriptrunnerfacade.cpp index 888abff86..c24330015 100644 --- a/src/vault/scriptrunnerfacade.cpp +++ b/src/vault/scriptrunnerfacade.cpp @@ -30,7 +30,7 @@ */ -#include "backend/scriptrunnerfacade.hpp" +#include "vault/scriptrunnerfacade.hpp" #include "lib/depend.hpp" #include diff --git a/src/vault/thread-wrapper.hpp b/src/vault/thread-wrapper.hpp index 775f27182..fc48bfab9 100644 --- a/src/vault/thread-wrapper.hpp +++ b/src/vault/thread-wrapper.hpp @@ -47,9 +47,9 @@ #include "lib/result.hpp" extern "C" { -#include "backend/threads.h" +#include "vault/threads.h" } -#include "backend/threadpool-init.hpp" +#include "vault/threadpool-init.hpp" #include #include diff --git a/src/vault/threadpool-init.cpp b/src/vault/threadpool-init.cpp index 2634d028c..b50e5d1d3 100644 --- a/src/vault/threadpool-init.cpp +++ b/src/vault/threadpool-init.cpp @@ -26,7 +26,7 @@ */ -#include "backend/threadpool-init.hpp" +#include "vault/threadpool-init.hpp" diff --git a/src/vault/threadpool-init.hpp b/src/vault/threadpool-init.hpp index 6186c0488..43688dcbb 100644 --- a/src/vault/threadpool-init.hpp +++ b/src/vault/threadpool-init.hpp @@ -41,7 +41,7 @@ #include "include/lifecycle.h" extern "C" { -#include "backend/threads.h" +#include "vault/threads.h" } diff --git a/src/vault/threadpool.c b/src/vault/threadpool.c index c00e94631..194ac5dad 100644 --- a/src/vault/threadpool.c +++ b/src/vault/threadpool.c @@ -30,7 +30,7 @@ #include "include/logging.h" #include "lib/safeclib.h" -#include "backend/threadpool.h" +#include "vault/threadpool.h" #include diff --git a/src/vault/threads.c b/src/vault/threads.c index 3c719eb13..0f80c47c5 100644 --- a/src/vault/threads.c +++ b/src/vault/threads.c @@ -29,7 +29,7 @@ #include "include/logging.h" #include "lib/safeclib.h" -#include "backend/threads.h" +#include "vault/threads.h" #include #include diff --git a/tests/basics/call-queue-test.cpp b/tests/basics/call-queue-test.cpp index 42c931fa4..f7a998415 100644 --- a/tests/basics/call-queue-test.cpp +++ b/tests/basics/call-queue-test.cpp @@ -27,7 +27,7 @@ #include "lib/test/run.hpp" #include "lib/scoped-collection.hpp" -#include "backend/thread-wrapper.hpp" +#include "vault/thread-wrapper.hpp" #include "lib/sync.hpp" #include "lib/util.hpp" diff --git a/tests/basics/diagnostic-context-test.cpp b/tests/basics/diagnostic-context-test.cpp index c674b10b0..395c9f058 100644 --- a/tests/basics/diagnostic-context-test.cpp +++ b/tests/basics/diagnostic-context-test.cpp @@ -28,7 +28,7 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "backend/thread-wrapper.hpp" +#include "vault/thread-wrapper.hpp" #include "lib/diagnostic-context.hpp" #include diff --git a/tests/basics/stream-type-basics-test.cpp b/tests/basics/stream-type-basics-test.cpp index 0e52cbeee..ff3d0bb2b 100644 --- a/tests/basics/stream-type-basics-test.cpp +++ b/tests/basics/stream-type-basics-test.cpp @@ -28,7 +28,7 @@ #include "lib/test/run.hpp" #include "lib/util.hpp" -#include "proc/control/stypemanager.hpp" +#include "steam/control/stypemanager.hpp" #include "teststreamtypes.hpp" using ::test::Test; diff --git a/tests/basics/stream-type-lifecycle-test.cpp b/tests/basics/stream-type-lifecycle-test.cpp index 1835807e4..2b5007d7b 100644 --- a/tests/basics/stream-type-lifecycle-test.cpp +++ b/tests/basics/stream-type-lifecycle-test.cpp @@ -28,8 +28,8 @@ #include "lib/test/run.hpp" #include "lib/util.hpp" -#include "proc/control/stypemanager.hpp" -#include "proc/mobject/session.hpp" +#include "steam/control/stypemanager.hpp" +#include "steam/mobject/session.hpp" //#include "teststreamtypes.hpp" #include "include/lifecycle.h" diff --git a/tests/basics/teststreamtypes.hpp b/tests/basics/teststreamtypes.hpp index bcb96df35..e7d17bfe0 100644 --- a/tests/basics/teststreamtypes.hpp +++ b/tests/basics/teststreamtypes.hpp @@ -31,8 +31,8 @@ //#include "lib/util.hpp" -#include "proc/streamtype.hpp" -#include "proc/control/stypemanager.hpp" +#include "steam/streamtype.hpp" +#include "steam/control/stypemanager.hpp" extern "C" { #include diff --git a/tests/basics/time/time-control-test.cpp b/tests/basics/time/time-control-test.cpp index 08f264785..9455d2cc6 100644 --- a/tests/basics/time/time-control-test.cpp +++ b/tests/basics/time/time-control-test.cpp @@ -32,7 +32,7 @@ #include "lib/time/control.hpp" #include "lib/meta/generator-combinations.hpp" -#include "proc/asset/meta/time-grid.hpp" +#include "steam/asset/meta/time-grid.hpp" #include "lib/scoped-holder.hpp" #include "lib/format-cout.hpp" #include "lib/util.hpp" diff --git a/tests/basics/time/time-formats-test.cpp b/tests/basics/time/time-formats-test.cpp index 041f8abfd..8fa23ae2e 100644 --- a/tests/basics/time/time-formats-test.cpp +++ b/tests/basics/time/time-formats-test.cpp @@ -27,7 +27,7 @@ #include "lib/test/run.hpp" //#include "lib/test/test-helper.hpp" -#include "proc/asset/meta/time-grid.hpp" +#include "steam/asset/meta/time-grid.hpp" #include "lib/time/timequant.hpp" #include "lib/time/timecode.hpp" #include "lib/time/mutation.hpp" diff --git a/tests/basics/time/time-mutation-test.cpp b/tests/basics/time/time-mutation-test.cpp index c0701c05f..bf20a68c6 100644 --- a/tests/basics/time/time-mutation-test.cpp +++ b/tests/basics/time/time-mutation-test.cpp @@ -30,7 +30,7 @@ #include "lib/time/timevalue.hpp" #include "lib/time/timequant.hpp" #include "lib/time/mutation.hpp" -#include "proc/asset/meta/time-grid.hpp" +#include "steam/asset/meta/time-grid.hpp" #include "lib/util.hpp" #include diff --git a/tests/basics/time/time-parsing-test.cpp b/tests/basics/time/time-parsing-test.cpp index 61a77978e..eaa574f63 100644 --- a/tests/basics/time/time-parsing-test.cpp +++ b/tests/basics/time/time-parsing-test.cpp @@ -27,7 +27,7 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/asset/meta/time-grid.hpp" +#include "steam/asset/meta/time-grid.hpp" #include "lib/time/quantiser.hpp" #include "lib/time/timecode.hpp" #include "lib/symbol.hpp" diff --git a/tests/basics/time/time-quantisation-test.cpp b/tests/basics/time/time-quantisation-test.cpp index 517b9bfc8..49ee145de 100644 --- a/tests/basics/time/time-quantisation-test.cpp +++ b/tests/basics/time/time-quantisation-test.cpp @@ -27,7 +27,7 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/asset/meta/time-grid.hpp" +#include "steam/asset/meta/time-grid.hpp" #include "lib/time/timequant.hpp" #include "lib/format-cout.hpp" #include "lib/util.hpp" diff --git a/tests/basics/typed-counter-test.cpp b/tests/basics/typed-counter-test.cpp index cf424eb92..cc233b8ad 100644 --- a/tests/basics/typed-counter-test.cpp +++ b/tests/basics/typed-counter-test.cpp @@ -45,7 +45,7 @@ #include "lib/test/test-helper.hpp" #include "lib/typed-counter.hpp" #include "lib/scoped-ptrvect.hpp" -#include "backend/thread-wrapper.hpp" +#include "vault/thread-wrapper.hpp" #include "lib/util-foreach.hpp" #include "lib/sync.hpp" diff --git a/tests/core/application/subsystem-runner-test.cpp b/tests/core/application/subsystem-runner-test.cpp index 90a487584..0441b2596 100644 --- a/tests/core/application/subsystem-runner-test.cpp +++ b/tests/core/application/subsystem-runner-test.cpp @@ -32,7 +32,7 @@ #include "common/option.hpp" #include "lib/symbol.hpp" -#include "backend/thread-wrapper.hpp" +#include "vault/thread-wrapper.hpp" #include "lib/query-util.hpp" #include "lib/format-cout.hpp" #include "lib/error.hpp" diff --git a/tests/core/steam/asset/asset-category-test.cpp b/tests/core/steam/asset/asset-category-test.cpp index b209eff6b..1e897105a 100644 --- a/tests/core/steam/asset/asset-category-test.cpp +++ b/tests/core/steam/asset/asset-category-test.cpp @@ -30,7 +30,7 @@ #include "lib/format-string.hpp" #include "lib/util.hpp" -#include "proc/asset/category.hpp" +#include "steam/asset/category.hpp" using util::_Fmt; diff --git a/tests/core/steam/asset/asset-diagnostics.hpp b/tests/core/steam/asset/asset-diagnostics.hpp index 2e91b5e71..8b12a6c81 100644 --- a/tests/core/steam/asset/asset-diagnostics.hpp +++ b/tests/core/steam/asset/asset-diagnostics.hpp @@ -33,7 +33,7 @@ #define ASSET_ASSET_DIAGNOSTICS_H -#include "proc/assetmanager.hpp" +#include "steam/assetmanager.hpp" #include "lib/format-string.hpp" #include "lib/format-cout.hpp" #include "lib/util-foreach.hpp" diff --git a/tests/core/steam/asset/basicpipetest.cpp b/tests/core/steam/asset/basicpipetest.cpp index f0bf2126b..a663bea82 100644 --- a/tests/core/steam/asset/basicpipetest.cpp +++ b/tests/core/steam/asset/basicpipetest.cpp @@ -29,11 +29,11 @@ #include "lib/test/run.hpp" #include "lib/util.hpp" -#include "proc/asset/category.hpp" -#include "proc/asset/pipe.hpp" -#include "proc/assetmanager.hpp" -#include "proc/mobject/session.hpp" -#include "proc/asset/asset-diagnostics.hpp" +#include "steam/asset/category.hpp" +#include "steam/asset/pipe.hpp" +#include "steam/assetmanager.hpp" +#include "steam/mobject/session.hpp" +#include "steam/asset/asset-diagnostics.hpp" #include "lib/query-util.hpp" #include "common/query.hpp" diff --git a/tests/core/steam/asset/compoundmediatest.cpp b/tests/core/steam/asset/compoundmediatest.cpp index b2f5a9cb7..9cb9fa28e 100644 --- a/tests/core/steam/asset/compoundmediatest.cpp +++ b/tests/core/steam/asset/compoundmediatest.cpp @@ -29,11 +29,11 @@ #include "lib/test/run.hpp" #include "lib/util.hpp" -#include "proc/assetmanager.hpp" -#include "proc/asset/media.hpp" -#include "proc/asset/proc.hpp" +#include "steam/assetmanager.hpp" +#include "steam/asset/media.hpp" +#include "steam/asset/proc.hpp" -#include "proc/asset/asset-diagnostics.hpp" +#include "steam/asset/asset-diagnostics.hpp" using util::isnil; using std::string; diff --git a/tests/core/steam/asset/create-asset-test.cpp b/tests/core/steam/asset/create-asset-test.cpp index ece46790f..6f5572aca 100644 --- a/tests/core/steam/asset/create-asset-test.cpp +++ b/tests/core/steam/asset/create-asset-test.cpp @@ -29,14 +29,14 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/assetmanager.hpp" -#include "proc/asset/media.hpp" -#include "proc/asset/proc.hpp" -#include "proc/asset/meta/time-grid.hpp" -#include "proc/asset/meta/error-log.hpp" +#include "steam/assetmanager.hpp" +#include "steam/asset/media.hpp" +#include "steam/asset/proc.hpp" +#include "steam/asset/meta/time-grid.hpp" +#include "steam/asset/meta/error-log.hpp" -#include "proc/asset/asset-diagnostics.hpp" -#include "backend/media-access-mock.hpp" +#include "steam/asset/asset-diagnostics.hpp" +#include "vault/media-access-mock.hpp" #include "lib/time/timevalue.hpp" #include "lib/depend-inject.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/asset/dependent-assets-test.cpp b/tests/core/steam/asset/dependent-assets-test.cpp index 5ef0e3beb..ed7ff2e20 100644 --- a/tests/core/steam/asset/dependent-assets-test.cpp +++ b/tests/core/steam/asset/dependent-assets-test.cpp @@ -26,12 +26,12 @@ #include "lib/test/run.hpp" -#include "proc/asset/testasset.hpp" -#include "proc/asset/asset-diagnostics.hpp" -#include "backend/media-access-mock.hpp" +#include "steam/asset/testasset.hpp" +#include "steam/asset/asset-diagnostics.hpp" +#include "vault/media-access-mock.hpp" #include "lib/depend-inject.hpp" -#include "proc/asset/media.hpp" -#include "proc/asset/clip.hpp" +#include "steam/asset/media.hpp" +#include "steam/asset/clip.hpp" #include "lib/util.hpp" using util::contains; diff --git a/tests/core/steam/asset/entry-id-test.cpp b/tests/core/steam/asset/entry-id-test.cpp index 458e3602c..19ab1ae57 100644 --- a/tests/core/steam/asset/entry-id-test.cpp +++ b/tests/core/steam/asset/entry-id-test.cpp @@ -29,9 +29,9 @@ #include "lib/test/test-helper.hpp" #include "lib/idi/entry-id.hpp" -#include "proc/asset/struct-scheme.hpp" -#include "proc/mobject/session/clip.hpp" -#include "proc/mobject/session/fork.hpp" +#include "steam/asset/struct-scheme.hpp" +#include "steam/mobject/session/clip.hpp" +#include "steam/mobject/session/fork.hpp" #include "lib/meta/trait-special.hpp" #include "lib/util-foreach.hpp" #include "lib/format-cout.hpp" diff --git a/tests/core/steam/asset/identity-of-assets-test.cpp b/tests/core/steam/asset/identity-of-assets-test.cpp index ff2e3c40d..be3438550 100644 --- a/tests/core/steam/asset/identity-of-assets-test.cpp +++ b/tests/core/steam/asset/identity-of-assets-test.cpp @@ -29,12 +29,12 @@ #include "lib/test/run.hpp" #include "lib/util.hpp" -#include "proc/assetmanager.hpp" -#include "proc/asset/media.hpp" -#include "proc/asset/proc.hpp" +#include "steam/assetmanager.hpp" +#include "steam/asset/media.hpp" +#include "steam/asset/proc.hpp" -#include "proc/asset/asset-diagnostics.hpp" -#include "backend/media-access-mock.hpp" +#include "steam/asset/asset-diagnostics.hpp" +#include "vault/media-access-mock.hpp" #include "lib/depend-inject.hpp" using util::isnil; diff --git a/tests/core/steam/asset/make-clip-test.cpp b/tests/core/steam/asset/make-clip-test.cpp index 16813e70a..b5387d1b6 100644 --- a/tests/core/steam/asset/make-clip-test.cpp +++ b/tests/core/steam/asset/make-clip-test.cpp @@ -30,11 +30,11 @@ #include "lib/util.hpp" #include "lib/time/timevalue.hpp" -#include "proc/assetmanager.hpp" -#include "proc/asset/media.hpp" -#include "proc/mobject/session/clip.hpp" -#include "proc/asset/asset-diagnostics.hpp" -#include "backend/media-access-mock.hpp" +#include "steam/assetmanager.hpp" +#include "steam/asset/media.hpp" +#include "steam/mobject/session/clip.hpp" +#include "steam/asset/asset-diagnostics.hpp" +#include "vault/media-access-mock.hpp" #include "lib/depend-inject.hpp" using util::contains; diff --git a/tests/core/steam/asset/media-structure-query-test.cpp b/tests/core/steam/asset/media-structure-query-test.cpp index e2e03ff56..7685ddc07 100644 --- a/tests/core/steam/asset/media-structure-query-test.cpp +++ b/tests/core/steam/asset/media-structure-query-test.cpp @@ -28,11 +28,11 @@ #include "lib/test/run.hpp" #include "lib/util.hpp" -#include "proc/assetmanager.hpp" -#include "proc/asset/media.hpp" -#include "proc/asset/proc.hpp" +#include "steam/assetmanager.hpp" +#include "steam/asset/media.hpp" +#include "steam/asset/proc.hpp" -#include "proc/asset/asset-diagnostics.hpp" +#include "steam/asset/asset-diagnostics.hpp" using util::isnil; using std::string; diff --git a/tests/core/steam/asset/meta/time-grid-basics-test.cpp b/tests/core/steam/asset/meta/time-grid-basics-test.cpp index 82d2d93c6..530a4f005 100644 --- a/tests/core/steam/asset/meta/time-grid-basics-test.cpp +++ b/tests/core/steam/asset/meta/time-grid-basics-test.cpp @@ -28,8 +28,8 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/asset/meta.hpp" -#include "proc/asset/meta/time-grid.hpp" +#include "steam/asset/meta.hpp" +#include "steam/asset/meta/time-grid.hpp" #include "lib/time/timevalue.hpp" #include "lib/format-cout.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/asset/ordering-of-assets-test.cpp b/tests/core/steam/asset/ordering-of-assets-test.cpp index a24fdf05c..a8d03d3ca 100644 --- a/tests/core/steam/asset/ordering-of-assets-test.cpp +++ b/tests/core/steam/asset/ordering-of-assets-test.cpp @@ -28,12 +28,12 @@ #include "lib/test/run.hpp" #include "lib/util.hpp" -#include "proc/assetmanager.hpp" -#include "proc/asset/media.hpp" -#include "proc/asset/proc.hpp" +#include "steam/assetmanager.hpp" +#include "steam/asset/media.hpp" +#include "steam/asset/proc.hpp" -#include "proc/asset/asset-diagnostics.hpp" -#include "backend/media-access-mock.hpp" +#include "steam/asset/asset-diagnostics.hpp" +#include "vault/media-access-mock.hpp" #include "lib/depend-inject.hpp" using util::isnil; diff --git a/tests/core/steam/asset/testasset.cpp b/tests/core/steam/asset/testasset.cpp index e0ea5ce5a..1786a1f5d 100644 --- a/tests/core/steam/asset/testasset.cpp +++ b/tests/core/steam/asset/testasset.cpp @@ -25,8 +25,8 @@ */ -#include "proc/asset/testasset.hpp" -#include "proc/assetmanager.hpp" +#include "steam/asset/testasset.hpp" +#include "steam/assetmanager.hpp" using std::static_pointer_cast; @@ -102,7 +102,7 @@ namespace test { /* explicit template instantiations for some Asset Kinds */ /*********************************************************/ -#include "proc/asset/unknown.hpp" +#include "steam/asset/unknown.hpp" namespace proc { diff --git a/tests/core/steam/asset/testasset.hpp b/tests/core/steam/asset/testasset.hpp index 50e958a74..90eb6cc64 100644 --- a/tests/core/steam/asset/testasset.hpp +++ b/tests/core/steam/asset/testasset.hpp @@ -29,7 +29,7 @@ #define ASSET_TESTASSET_H -#include "proc/asset.hpp" +#include "steam/asset.hpp" #include "lib/format-string.hpp" diff --git a/tests/core/steam/asset/typed-id-test.cpp b/tests/core/steam/asset/typed-id-test.cpp index 23ba5e948..5d9f4cf9f 100644 --- a/tests/core/steam/asset/typed-id-test.cpp +++ b/tests/core/steam/asset/typed-id-test.cpp @@ -28,13 +28,13 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/asset/typed-id.hpp" +#include "steam/asset/typed-id.hpp" #include "lib/idi/entry-id.hpp" #include "lib/p.hpp" -#include "proc/assetmanager.hpp" -#include "proc/asset/inventory.hpp" -//#include "proc/mobject/session/clip.hpp" -//#include "proc/mobject/session/fork.hpp" +#include "steam/assetmanager.hpp" +#include "steam/asset/inventory.hpp" +//#include "steam/mobject/session/clip.hpp" +//#include "steam/mobject/session/fork.hpp" //#include "lib/meta/trait-special.hpp" #include "lib/util-foreach.hpp" #include "lib/format-cout.hpp" diff --git a/tests/core/steam/control/argument-tuple-accept-test.cpp b/tests/core/steam/control/argument-tuple-accept-test.cpp index 317508ecb..a3bbe80fe 100644 --- a/tests/core/steam/control/argument-tuple-accept-test.cpp +++ b/tests/core/steam/control/argument-tuple-accept-test.cpp @@ -27,7 +27,7 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/control/argument-tuple-accept.hpp" +#include "steam/control/argument-tuple-accept.hpp" #include "lib/meta/tuple-helper.hpp" #include "lib/meta/function.hpp" #include "lib/format-cout.hpp" diff --git a/tests/core/steam/control/command-argument-test.cpp b/tests/core/steam/control/command-argument-test.cpp index e5b80c827..7339bd600 100644 --- a/tests/core/steam/control/command-argument-test.cpp +++ b/tests/core/steam/control/command-argument-test.cpp @@ -27,7 +27,7 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/control/command-storage-holder.hpp" +#include "steam/control/command-storage-holder.hpp" #include "lib/scoped-ptrvect.hpp" #include "lib/format-string.hpp" #include "lib/format-cout.hpp" diff --git a/tests/core/steam/control/command-basic-test.cpp b/tests/core/steam/control/command-basic-test.cpp index d6807625e..b86d2d855 100644 --- a/tests/core/steam/control/command-basic-test.cpp +++ b/tests/core/steam/control/command-basic-test.cpp @@ -26,7 +26,7 @@ #include "lib/test/run.hpp" -#include "proc/control/command-def.hpp" +#include "steam/control/command-def.hpp" #include "lib/time/timevalue.hpp" #include "lib/p.hpp" diff --git a/tests/core/steam/control/command-binding-test.cpp b/tests/core/steam/control/command-binding-test.cpp index e224f7803..0c492bc32 100644 --- a/tests/core/steam/control/command-binding-test.cpp +++ b/tests/core/steam/control/command-binding-test.cpp @@ -26,8 +26,8 @@ #include "lib/test/run.hpp" -#include "proc/control/command-def.hpp" -#include "proc/control/test-dummy-commands.hpp" +#include "steam/control/command-def.hpp" +#include "steam/control/test-dummy-commands.hpp" #include "lib/format-cout.hpp" diff --git a/tests/core/steam/control/command-clone-builder-test.cpp b/tests/core/steam/control/command-clone-builder-test.cpp index 86a881dea..236d210c8 100644 --- a/tests/core/steam/control/command-clone-builder-test.cpp +++ b/tests/core/steam/control/command-clone-builder-test.cpp @@ -26,16 +26,16 @@ #include "lib/test/run.hpp" -#include "proc/control/command-impl.hpp" -#include "proc/control/command-registry.hpp" -#include "proc/control/argument-erasure.hpp" -#include "proc/control/handling-pattern.hpp" +#include "steam/control/command-impl.hpp" +#include "steam/control/command-registry.hpp" +#include "steam/control/argument-erasure.hpp" +#include "steam/control/handling-pattern.hpp" #include "lib/meta/tuple-helper.hpp" #include "lib/symbol.hpp" #include "lib/util.hpp" #include "lib/p.hpp" -#include "proc/control/test-dummy-commands.hpp" +#include "steam/control/test-dummy-commands.hpp" namespace proc { diff --git a/tests/core/steam/control/command-equality-test.cpp b/tests/core/steam/control/command-equality-test.cpp index 1486806d3..c8e08c989 100644 --- a/tests/core/steam/control/command-equality-test.cpp +++ b/tests/core/steam/control/command-equality-test.cpp @@ -27,12 +27,12 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/control/command-def.hpp" -#include "proc/control/command-mutation.hpp" -#include "proc/control/argument-erasure.hpp" -#include "proc/control/command-storage-holder.hpp" -#include "proc/control/command-simple-closure.hpp" -#include "proc/control/memento-tie.hpp" +#include "steam/control/command-def.hpp" +#include "steam/control/command-mutation.hpp" +#include "steam/control/argument-erasure.hpp" +#include "steam/control/command-storage-holder.hpp" +#include "steam/control/command-simple-closure.hpp" +#include "steam/control/memento-tie.hpp" #include "lib/meta/tuple-helper.hpp" #include "lib/format-cout.hpp" #include "lib/symbol.hpp" diff --git a/tests/core/steam/control/command-instance-manager-test.cpp b/tests/core/steam/control/command-instance-manager-test.cpp index c166c71c6..a957e4b59 100644 --- a/tests/core/steam/control/command-instance-manager-test.cpp +++ b/tests/core/steam/control/command-instance-manager-test.cpp @@ -26,8 +26,8 @@ #include "lib/test/run.hpp" -#include "proc/control/test-dummy-commands.hpp" -#include "proc/control/command-instance-manager.hpp" +#include "steam/control/test-dummy-commands.hpp" +#include "steam/control/command-instance-manager.hpp" #include "lib/format-string.hpp" #include "lib/format-cout.hpp" #include "lib/iter-stack.hpp" diff --git a/tests/core/steam/control/command-message-binding-test.cpp b/tests/core/steam/control/command-message-binding-test.cpp index 77efb53cb..892d4d4f2 100644 --- a/tests/core/steam/control/command-message-binding-test.cpp +++ b/tests/core/steam/control/command-message-binding-test.cpp @@ -27,7 +27,7 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/control/command-def.hpp" +#include "steam/control/command-def.hpp" #include "lib/time/timevalue.hpp" #include "lib/diff/gen-node.hpp" diff --git a/tests/core/steam/control/command-mutation-test.cpp b/tests/core/steam/control/command-mutation-test.cpp index 7b4a29f0b..db5e32ccf 100644 --- a/tests/core/steam/control/command-mutation-test.cpp +++ b/tests/core/steam/control/command-mutation-test.cpp @@ -27,9 +27,9 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/control/command-mutation.hpp" -#include "proc/control/command-simple-closure.hpp" -#include "proc/control/memento-tie.hpp" +#include "steam/control/command-mutation.hpp" +#include "steam/control/command-simple-closure.hpp" +#include "steam/control/memento-tie.hpp" #include "lib/meta/tuple-helper.hpp" #include "lib/meta/typelist.hpp" #include "lib/format-cout.hpp" diff --git a/tests/core/steam/control/command-queue-test.cpp b/tests/core/steam/control/command-queue-test.cpp index ff1421ef2..5d5c565c1 100644 --- a/tests/core/steam/control/command-queue-test.cpp +++ b/tests/core/steam/control/command-queue-test.cpp @@ -22,14 +22,14 @@ #include "lib/test/run.hpp" -#include "proc/control/command-queue.hpp" -#include "proc/control/command-def.hpp" -//#include "proc/control/command-registry.hpp" +#include "steam/control/command-queue.hpp" +#include "steam/control/command-def.hpp" +//#include "steam/control/command-registry.hpp" //#include "lib/test/event-log.hpp" #include "lib/symbol.hpp" #include "lib/util.hpp" -#include "proc/control/test-dummy-commands.hpp" +#include "steam/control/test-dummy-commands.hpp" //#include diff --git a/tests/core/steam/control/command-registry-test.cpp b/tests/core/steam/control/command-registry-test.cpp index b137284e4..ad903cc1b 100644 --- a/tests/core/steam/control/command-registry-test.cpp +++ b/tests/core/steam/control/command-registry-test.cpp @@ -27,12 +27,12 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/control/command-def.hpp" -#include "proc/control/command-registry.hpp" +#include "steam/control/command-def.hpp" +#include "steam/control/command-registry.hpp" #include "lib/symbol.hpp" #include "lib/util.hpp" -#include "proc/control/test-dummy-commands.hpp" +#include "steam/control/test-dummy-commands.hpp" #include diff --git a/tests/core/steam/control/command-setup-test.cpp b/tests/core/steam/control/command-setup-test.cpp index 9bd692f3f..788217c88 100644 --- a/tests/core/steam/control/command-setup-test.cpp +++ b/tests/core/steam/control/command-setup-test.cpp @@ -26,8 +26,8 @@ #include "lib/test/run.hpp" -#include "proc/cmd.hpp" -#include "proc/control/command-def.hpp" +#include "steam/cmd.hpp" +#include "steam/control/command-def.hpp" #include "lib/format-string.hpp" #include "lib/format-cout.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/control/command-use1-test.cpp b/tests/core/steam/control/command-use1-test.cpp index cbc89a356..f8d33eba9 100644 --- a/tests/core/steam/control/command-use1-test.cpp +++ b/tests/core/steam/control/command-use1-test.cpp @@ -27,12 +27,12 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/control/command-invocation.hpp" -#include "proc/control/command-def.hpp" +#include "steam/control/command-invocation.hpp" +#include "steam/control/command-def.hpp" #include "lib/format-cout.hpp" #include "lib/util.hpp" -#include "proc/control/test-dummy-commands.hpp" +#include "steam/control/test-dummy-commands.hpp" namespace proc { diff --git a/tests/core/steam/control/command-use2-test.cpp b/tests/core/steam/control/command-use2-test.cpp index 8c6b490ad..d2fe121d6 100644 --- a/tests/core/steam/control/command-use2-test.cpp +++ b/tests/core/steam/control/command-use2-test.cpp @@ -27,19 +27,19 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/control/command.hpp" -#include "proc/control/command-def.hpp" -#include "proc/control/handling-pattern.hpp" +#include "steam/control/command.hpp" +#include "steam/control/command-def.hpp" +#include "steam/control/handling-pattern.hpp" #include "lib/format-string.hpp" #include "lib/format-obj.hpp" #include "lib/util.hpp" -#include "proc/control/test-dummy-commands.hpp" +#include "steam/control/test-dummy-commands.hpp" extern "C" { #include "common/interfaceregistry.h" } -#include "proc/control/proc-dispatcher.hpp" +#include "steam/control/proc-dispatcher.hpp" #include "include/session-command-facade.h" #include diff --git a/tests/core/steam/control/command-use3-test.cpp b/tests/core/steam/control/command-use3-test.cpp index eafb74e60..6b11e4848 100644 --- a/tests/core/steam/control/command-use3-test.cpp +++ b/tests/core/steam/control/command-use3-test.cpp @@ -27,11 +27,11 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/control/command-def.hpp" +#include "steam/control/command-def.hpp" //#include "lib/format-cout.hpp" //#include "lib/util.hpp" -#include "proc/control/test-dummy-commands.hpp" +#include "steam/control/test-dummy-commands.hpp" //#include //#include diff --git a/tests/core/steam/control/dispatcher-looper-test.cpp b/tests/core/steam/control/dispatcher-looper-test.cpp index 4b1cb52a0..6c5bb3268 100644 --- a/tests/core/steam/control/dispatcher-looper-test.cpp +++ b/tests/core/steam/control/dispatcher-looper-test.cpp @@ -22,7 +22,7 @@ #include "lib/test/run.hpp" -#include "proc/control/looper.hpp" +#include "steam/control/looper.hpp" #include #include diff --git a/tests/core/steam/control/handling-pattern-basics-test.cpp b/tests/core/steam/control/handling-pattern-basics-test.cpp index a3d24f658..67094376b 100644 --- a/tests/core/steam/control/handling-pattern-basics-test.cpp +++ b/tests/core/steam/control/handling-pattern-basics-test.cpp @@ -26,14 +26,14 @@ #include "lib/test/run.hpp" -#include "proc/control/command.hpp" -#include "proc/control/command-impl.hpp" -#include "proc/control/command-registry.hpp" -#include "proc/control/argument-erasure.hpp" -#include "proc/control/handling-pattern.hpp" +#include "steam/control/command.hpp" +#include "steam/control/command-impl.hpp" +#include "steam/control/command-registry.hpp" +#include "steam/control/argument-erasure.hpp" +#include "steam/control/handling-pattern.hpp" #include "lib/test/event-log.hpp" -#include "proc/control/test-dummy-commands.hpp" +#include "steam/control/test-dummy-commands.hpp" #include diff --git a/tests/core/steam/control/handling-pattern-standard-impl-test.cpp b/tests/core/steam/control/handling-pattern-standard-impl-test.cpp index 42a44241e..edfd5a782 100644 --- a/tests/core/steam/control/handling-pattern-standard-impl-test.cpp +++ b/tests/core/steam/control/handling-pattern-standard-impl-test.cpp @@ -27,24 +27,24 @@ #include "lib/test/run.hpp" //#include "lib/test/test-helper.hpp" -//#include "proc/asset/media.hpp" -//#include "proc/mobject/session.hpp" -//#include "proc/mobject/session/edl.hpp" -//#include "proc/mobject/session/testclip.hpp" -//#include "proc/mobject/test-dummy-mobject.hpp" +//#include "steam/asset/media.hpp" +//#include "steam/mobject/session.hpp" +//#include "steam/mobject/session/edl.hpp" +//#include "steam/mobject/session/testclip.hpp" +//#include "steam/mobject/test-dummy-mobject.hpp" //#include "lib/p.hpp" -//#include "proc/mobject/placement.hpp" -//#include "proc/mobject/session/placement-index.hpp" -//#include "proc/mobject/explicitplacement.hpp" -#include "proc/control/command.hpp" -#include "proc/control/command-impl.hpp" -#include "proc/control/command-registry.hpp" -//#include "proc/control/command-def.hpp" +//#include "steam/mobject/placement.hpp" +//#include "steam/mobject/session/placement-index.hpp" +//#include "steam/mobject/explicitplacement.hpp" +#include "steam/control/command.hpp" +#include "steam/control/command-impl.hpp" +#include "steam/control/command-registry.hpp" +//#include "steam/control/command-def.hpp" //#include "lib/format-cout.hpp" //#include "lib/symbol.hpp" //#include "lib/util.hpp" -#include "proc/control/test-dummy-commands.hpp" +#include "steam/control/test-dummy-commands.hpp" //#include //#include diff --git a/tests/core/steam/control/memento-tie-test.cpp b/tests/core/steam/control/memento-tie-test.cpp index f4b0da5e0..f73f73f98 100644 --- a/tests/core/steam/control/memento-tie-test.cpp +++ b/tests/core/steam/control/memento-tie-test.cpp @@ -27,7 +27,7 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/control/memento-tie.hpp" +#include "steam/control/memento-tie.hpp" #include #include diff --git a/tests/core/steam/control/session-command-function-test.cpp b/tests/core/steam/control/session-command-function-test.cpp index bf827c303..87ed07148 100644 --- a/tests/core/steam/control/session-command-function-test.cpp +++ b/tests/core/steam/control/session-command-function-test.cpp @@ -79,10 +79,10 @@ extern "C" { #include "common/interfaceregistry.h" } -#include "proc/control/proc-dispatcher.hpp" -#include "proc/control/command-def.hpp" +#include "steam/control/proc-dispatcher.hpp" +#include "steam/control/command-def.hpp" #include "include/session-command-facade.h" -#include "backend/thread-wrapper.hpp" +#include "vault/thread-wrapper.hpp" #include "lib/typed-counter.hpp" #include "lib/format-string.hpp" #include "lib/symbol.hpp" diff --git a/tests/core/steam/control/test-dummy-commands.cpp b/tests/core/steam/control/test-dummy-commands.cpp index 191e3864c..1072b35f1 100644 --- a/tests/core/steam/control/test-dummy-commands.cpp +++ b/tests/core/steam/control/test-dummy-commands.cpp @@ -25,8 +25,8 @@ */ -#include "proc/control/test-dummy-commands.hpp" -#include "proc/control/command-def.hpp" +#include "steam/control/test-dummy-commands.hpp" +#include "steam/control/command-def.hpp" diff --git a/tests/core/steam/control/test-dummy-commands.hpp b/tests/core/steam/control/test-dummy-commands.hpp index 566b71345..6d2dbaf16 100644 --- a/tests/core/steam/control/test-dummy-commands.hpp +++ b/tests/core/steam/control/test-dummy-commands.hpp @@ -40,7 +40,7 @@ #include "lib/error.hpp" #include "lib/test/test-helper.hpp" -#include "proc/control/command-setup.hpp" +#include "steam/control/command-setup.hpp" #include #include diff --git a/tests/core/steam/engine/buff-table-test.cpp b/tests/core/steam/engine/buff-table-test.cpp index f09a88055..b2d975220 100644 --- a/tests/core/steam/engine/buff-table-test.cpp +++ b/tests/core/steam/engine/buff-table-test.cpp @@ -28,8 +28,8 @@ #include "lib/test/run.hpp" #include "lib/error.hpp" -#include "proc/engine/procnode.hpp" -#include "proc/engine/bufftable-obsolete.hpp" +#include "steam/engine/procnode.hpp" +#include "steam/engine/bufftable-obsolete.hpp" #include "lib/ref-array.hpp" #include "lib/format-cout.hpp" diff --git a/tests/core/steam/engine/buffer-metadata-key-test.cpp b/tests/core/steam/engine/buffer-metadata-key-test.cpp index 6aaa06bb8..4f64c973a 100644 --- a/tests/core/steam/engine/buffer-metadata-key-test.cpp +++ b/tests/core/steam/engine/buffer-metadata-key-test.cpp @@ -28,7 +28,7 @@ #include "lib/error.hpp" #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/engine/buffer-metadata.hpp" +#include "steam/engine/buffer-metadata.hpp" #include #include diff --git a/tests/core/steam/engine/buffer-metadata-test.cpp b/tests/core/steam/engine/buffer-metadata-test.cpp index 3b72951dc..f496308f6 100644 --- a/tests/core/steam/engine/buffer-metadata-test.cpp +++ b/tests/core/steam/engine/buffer-metadata-test.cpp @@ -29,8 +29,8 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" #include "lib/util.hpp" -#include "proc/engine/buffer-metadata.hpp" -#include "proc/engine/testframe.hpp" +#include "steam/engine/buffer-metadata.hpp" +#include "steam/engine/testframe.hpp" #include #include diff --git a/tests/core/steam/engine/buffer-provider-protocol-test.cpp b/tests/core/steam/engine/buffer-provider-protocol-test.cpp index 66cb1313c..ab079bf67 100644 --- a/tests/core/steam/engine/buffer-provider-protocol-test.cpp +++ b/tests/core/steam/engine/buffer-provider-protocol-test.cpp @@ -30,10 +30,10 @@ #include "lib/test/test-helper.hpp" #include "lib/test/testdummy.hpp" #include "lib/util-foreach.hpp" -#include "proc/engine/testframe.hpp" -#include "proc/engine/diagnostic-buffer-provider.hpp" -#include "proc/engine/buffhandle-attach.hpp" -#include "proc/engine/bufftable.hpp" +#include "steam/engine/testframe.hpp" +#include "steam/engine/diagnostic-buffer-provider.hpp" +#include "steam/engine/buffhandle-attach.hpp" +#include "steam/engine/bufftable.hpp" using util::isSameObject; using util::for_each; diff --git a/tests/core/steam/engine/calc-stream-test.cpp b/tests/core/steam/engine/calc-stream-test.cpp index 641377aa1..d1390b7ed 100644 --- a/tests/core/steam/engine/calc-stream-test.cpp +++ b/tests/core/steam/engine/calc-stream-test.cpp @@ -28,7 +28,7 @@ #include "lib/test/run.hpp" #include "lib/error.hpp" -#include "proc/engine/engine-service.hpp" +#include "steam/engine/engine-service.hpp" //#include diff --git a/tests/core/steam/engine/dispatcher-interface-test.cpp b/tests/core/steam/engine/dispatcher-interface-test.cpp index 6abd9efce..409812029 100644 --- a/tests/core/steam/engine/dispatcher-interface-test.cpp +++ b/tests/core/steam/engine/dispatcher-interface-test.cpp @@ -28,11 +28,11 @@ #include "lib/test/run.hpp" #include "lib/error.hpp" -//#include "proc/engine/procnode.hpp" -#include "proc/play/dummy-play-connection.hpp" -#include "proc/mobject/model-port.hpp" -#include "proc/engine/dispatcher.hpp" -#include "proc/play/timings.hpp" +//#include "steam/engine/procnode.hpp" +#include "steam/play/dummy-play-connection.hpp" +#include "steam/mobject/model-port.hpp" +#include "steam/engine/dispatcher.hpp" +#include "steam/play/timings.hpp" #include "lib/time/timevalue.hpp" //#include "lib/time/timequant.hpp" //#include "lib/format-cout.hpp" diff --git a/tests/core/steam/engine/engine-interface-test.cpp b/tests/core/steam/engine/engine-interface-test.cpp index b3916afca..d21ad595c 100644 --- a/tests/core/steam/engine/engine-interface-test.cpp +++ b/tests/core/steam/engine/engine-interface-test.cpp @@ -28,13 +28,13 @@ #include "lib/test/run.hpp" #include "lib/error.hpp" -#include "proc/engine/calc-stream.hpp" -#include "proc/engine/engine-service.hpp" -#include "proc/engine/engine-diagnostics.hpp" -#include "proc/play/output-slot.hpp" -#include "proc/play/diagnostic-output-slot.hpp" -#include "proc/mobject/model-port.hpp" -#include "proc/asset/pipe.hpp" +#include "steam/engine/calc-stream.hpp" +#include "steam/engine/engine-service.hpp" +#include "steam/engine/engine-diagnostics.hpp" +#include "steam/play/output-slot.hpp" +#include "steam/play/diagnostic-output-slot.hpp" +#include "steam/mobject/model-port.hpp" +#include "steam/asset/pipe.hpp" #include "lib/time/timevalue.hpp" //#include diff --git a/tests/core/steam/engine/node-basic-test.cpp b/tests/core/steam/engine/node-basic-test.cpp index 36ef79b76..13dcfe601 100644 --- a/tests/core/steam/engine/node-basic-test.cpp +++ b/tests/core/steam/engine/node-basic-test.cpp @@ -26,11 +26,11 @@ #include "lib/test/run.hpp" -#include "proc/engine/nodefactory.hpp" -#include "proc/engine/nodewiring.hpp" -#include "proc/engine/stateproxy.hpp" -#include "proc/engine/channel-descriptor.hpp" -#include "proc/mobject/session/effect.hpp" +#include "steam/engine/nodefactory.hpp" +#include "steam/engine/nodewiring.hpp" +#include "steam/engine/stateproxy.hpp" +#include "steam/engine/channel-descriptor.hpp" +#include "steam/mobject/session/effect.hpp" #include "lib/allocation-cluster.hpp" //#include "lib/format-cout.hpp" //#include "lib/util.hpp" diff --git a/tests/core/steam/engine/testframe-test.cpp b/tests/core/steam/engine/testframe-test.cpp index aa87eac00..875c56f5b 100644 --- a/tests/core/steam/engine/testframe-test.cpp +++ b/tests/core/steam/engine/testframe-test.cpp @@ -26,7 +26,7 @@ #include "lib/test/run.hpp" -#include "proc/engine/testframe.hpp" +#include "steam/engine/testframe.hpp" #include "lib/util.hpp" #include diff --git a/tests/core/steam/engine/testframe.cpp b/tests/core/steam/engine/testframe.cpp index 9b4b5048a..a54eae7ae 100644 --- a/tests/core/steam/engine/testframe.cpp +++ b/tests/core/steam/engine/testframe.cpp @@ -25,7 +25,7 @@ */ -#include "proc/engine/testframe.hpp" +#include "steam/engine/testframe.hpp" #include "lib/error.hpp" #include diff --git a/tests/core/steam/engine/tracking-heap-block-provider-test.cpp b/tests/core/steam/engine/tracking-heap-block-provider-test.cpp index 50b2a83e7..5767133e0 100644 --- a/tests/core/steam/engine/tracking-heap-block-provider-test.cpp +++ b/tests/core/steam/engine/tracking-heap-block-provider-test.cpp @@ -27,9 +27,9 @@ #include "lib/error.hpp" #include "lib/test/run.hpp" -#include "proc/engine/tracking-heap-block-provider.hpp" -#include "proc/engine/buffhandle-attach.hpp" -#include "proc/engine/testframe.hpp" +#include "steam/engine/tracking-heap-block-provider.hpp" +#include "steam/engine/buffhandle-attach.hpp" +#include "steam/engine/testframe.hpp" #include #include diff --git a/tests/core/steam/mobject/builder/builder-tool-test.cpp b/tests/core/steam/mobject/builder/builder-tool-test.cpp index 1dc26415e..a172e132a 100644 --- a/tests/core/steam/mobject/builder/builder-tool-test.cpp +++ b/tests/core/steam/mobject/builder/builder-tool-test.cpp @@ -27,13 +27,13 @@ #include "lib/test/run.hpp" -#include "proc/mobject/builder/buildertool.hpp" -#include "proc/mobject/placement.hpp" -#include "proc/asset/category.hpp" -#include "proc/asset/media.hpp" -#include "proc/mobject/session/clip.hpp" -#include "proc/mobject/test-dummy-mobject.hpp" -#include "backend/media-access-mock.hpp" +#include "steam/mobject/builder/buildertool.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/asset/category.hpp" +#include "steam/asset/media.hpp" +#include "steam/mobject/session/clip.hpp" +#include "steam/mobject/test-dummy-mobject.hpp" +#include "vault/media-access-mock.hpp" #include "lib/depend-inject.hpp" #include "lib/format-cout.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/mobject/builder/fixture-change-detector-test.cpp b/tests/core/steam/mobject/builder/fixture-change-detector-test.cpp index 71b344efc..1379c88e3 100644 --- a/tests/core/steam/mobject/builder/fixture-change-detector-test.cpp +++ b/tests/core/steam/mobject/builder/fixture-change-detector-test.cpp @@ -27,9 +27,9 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/mobject/builder/fixture-change-detector.hpp" -#include "proc/asset/timeline.hpp" -#include "proc/asset/pipe.hpp" +#include "steam/mobject/builder/fixture-change-detector.hpp" +#include "steam/asset/timeline.hpp" +#include "steam/asset/pipe.hpp" #include "common/query.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/mobject/builder/model-port-registry-test.cpp b/tests/core/steam/mobject/builder/model-port-registry-test.cpp index 6fd756434..84dafdc28 100644 --- a/tests/core/steam/mobject/builder/model-port-registry-test.cpp +++ b/tests/core/steam/mobject/builder/model-port-registry-test.cpp @@ -27,9 +27,9 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/mobject/builder/model-port-registry.hpp" -#include "proc/asset/timeline.hpp" -#include "proc/asset/pipe.hpp" +#include "steam/mobject/builder/model-port-registry.hpp" +#include "steam/asset/timeline.hpp" +#include "steam/asset/pipe.hpp" #include "common/query.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/mobject/builder/segmentation-datastructure-test.cpp b/tests/core/steam/mobject/builder/segmentation-datastructure-test.cpp index b517e554b..ba0e07d74 100644 --- a/tests/core/steam/mobject/builder/segmentation-datastructure-test.cpp +++ b/tests/core/steam/mobject/builder/segmentation-datastructure-test.cpp @@ -27,9 +27,9 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/mobject/builder/fixture-change-detector.hpp" -#include "proc/asset/timeline.hpp" -#include "proc/asset/pipe.hpp" +#include "steam/mobject/builder/fixture-change-detector.hpp" +#include "steam/asset/timeline.hpp" +#include "steam/asset/pipe.hpp" #include "common/query.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/mobject/mobject-interface-test.cpp b/tests/core/steam/mobject/mobject-interface-test.cpp index 62165e3ab..b967681d6 100644 --- a/tests/core/steam/mobject/mobject-interface-test.cpp +++ b/tests/core/steam/mobject/mobject-interface-test.cpp @@ -28,18 +28,18 @@ #include "lib/test/run.hpp" #include "lib/symbol.hpp" -#include "proc/asset/media.hpp" -#include "proc/mobject/mobject.hpp" -#include "proc/mobject/session/mobjectfactory.hpp" -//#include "proc/mobject/mobject-ref.hpp" -#include "proc/mobject/placement.hpp" -//#include "proc/mobject/placement-ref.hpp" -//#include "proc/mobject/session/placement-index.hpp" -//#include "proc/mobject/session/session-service-mock-index.hpp" -//#include "proc/mobject/session/clip.hpp" -//#include "proc/mobject/explicitplacement.hpp" -#include "proc/mobject/test-dummy-mobject.hpp" -#include "backend/media-access-mock.hpp" +#include "steam/asset/media.hpp" +#include "steam/mobject/mobject.hpp" +#include "steam/mobject/session/mobjectfactory.hpp" +//#include "steam/mobject/mobject-ref.hpp" +#include "steam/mobject/placement.hpp" +//#include "steam/mobject/placement-ref.hpp" +//#include "steam/mobject/session/placement-index.hpp" +//#include "steam/mobject/session/session-service-mock-index.hpp" +//#include "steam/mobject/session/clip.hpp" +//#include "steam/mobject/explicitplacement.hpp" +#include "steam/mobject/test-dummy-mobject.hpp" +#include "vault/media-access-mock.hpp" #include "lib/depend-inject.hpp" #include "lib/time/timevalue.hpp" #include "lib/format-cout.hpp" diff --git a/tests/core/steam/mobject/mobject-ref-test.cpp b/tests/core/steam/mobject/mobject-ref-test.cpp index 5bd99dcb1..98af503e3 100644 --- a/tests/core/steam/mobject/mobject-ref-test.cpp +++ b/tests/core/steam/mobject/mobject-ref-test.cpp @@ -26,17 +26,17 @@ #include "lib/test/run.hpp" -#include "proc/asset/media.hpp" -#include "proc/mobject/mobject.hpp" -#include "proc/mobject/mobject-ref.hpp" -#include "proc/mobject/placement.hpp" -#include "proc/mobject/placement-ref.hpp" -#include "proc/mobject/session/placement-index.hpp" -#include "proc/mobject/session/session-service-mock-index.hpp" -#include "proc/mobject/session/clip.hpp" -#include "proc/mobject/explicitplacement.hpp" -#include "proc/mobject/test-dummy-mobject.hpp" -#include "backend/media-access-mock.hpp" +#include "steam/asset/media.hpp" +#include "steam/mobject/mobject.hpp" +#include "steam/mobject/mobject-ref.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/mobject/placement-ref.hpp" +#include "steam/mobject/session/placement-index.hpp" +#include "steam/mobject/session/session-service-mock-index.hpp" +#include "steam/mobject/session/clip.hpp" +#include "steam/mobject/explicitplacement.hpp" +#include "steam/mobject/test-dummy-mobject.hpp" +#include "vault/media-access-mock.hpp" #include "lib/depend-inject.hpp" #include "lib/test/test-helper.hpp" #include "lib/time/timevalue.hpp" diff --git a/tests/core/steam/mobject/output-mapping-test.cpp b/tests/core/steam/mobject/output-mapping-test.cpp index 8617e9a78..60ad18fa3 100644 --- a/tests/core/steam/mobject/output-mapping-test.cpp +++ b/tests/core/steam/mobject/output-mapping-test.cpp @@ -27,8 +27,8 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/mobject/output-mapping.hpp" -#include "proc/asset/pipe.hpp" +#include "steam/mobject/output-mapping.hpp" +#include "steam/asset/pipe.hpp" #include "lib/format-string.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/mobject/placement-basic-test.cpp b/tests/core/steam/mobject/placement-basic-test.cpp index 6bb2d89ac..92d0911be 100644 --- a/tests/core/steam/mobject/placement-basic-test.cpp +++ b/tests/core/steam/mobject/placement-basic-test.cpp @@ -26,12 +26,12 @@ #include "lib/test/run.hpp" -#include "proc/asset/media.hpp" -#include "proc/mobject/session.hpp" -#include "proc/mobject/session/testclip.hpp" -#include "proc/mobject/placement.hpp" -#include "proc/mobject/explicitplacement.hpp" -#include "proc/mobject/session/mobjectfactory.hpp" ////TODO: avoidable? +#include "steam/asset/media.hpp" +#include "steam/mobject/session.hpp" +#include "steam/mobject/session/testclip.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/mobject/explicitplacement.hpp" +#include "steam/mobject/session/mobjectfactory.hpp" ////TODO: avoidable? #include "lib/time/timevalue.hpp" //#include "lib/util.hpp" diff --git a/tests/core/steam/mobject/placement-hierarchy-test.cpp b/tests/core/steam/mobject/placement-hierarchy-test.cpp index 1c83f1cb3..948194e44 100644 --- a/tests/core/steam/mobject/placement-hierarchy-test.cpp +++ b/tests/core/steam/mobject/placement-hierarchy-test.cpp @@ -28,11 +28,11 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" #include "lib/depend-inject.hpp" -#include "backend/media-access-mock.hpp" -#include "proc/mobject/test-dummy-mobject.hpp" -#include "proc/mobject/session/clip.hpp" -#include "proc/mobject/placement.hpp" -#include "proc/asset/media.hpp" +#include "vault/media-access-mock.hpp" +#include "steam/mobject/test-dummy-mobject.hpp" +#include "steam/mobject/session/clip.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/asset/media.hpp" #include "lib/format-cout.hpp" #include "lib/error.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/mobject/placement-object-identity-test.cpp b/tests/core/steam/mobject/placement-object-identity-test.cpp index e2a83b948..56f8cfd91 100644 --- a/tests/core/steam/mobject/placement-object-identity-test.cpp +++ b/tests/core/steam/mobject/placement-object-identity-test.cpp @@ -26,17 +26,17 @@ #include "lib/test/run.hpp" -#include "proc/asset/media.hpp" -#include "proc/mobject/mobject.hpp" -#include "proc/mobject/mobject-ref.hpp" -#include "proc/mobject/placement.hpp" -#include "proc/mobject/placement-ref.hpp" -#include "proc/mobject/session/placement-index.hpp" -#include "proc/mobject/session/session-service-mock-index.hpp" -#include "proc/mobject/session/clip.hpp" -#include "proc/mobject/explicitplacement.hpp" +#include "steam/asset/media.hpp" +#include "steam/mobject/mobject.hpp" +#include "steam/mobject/mobject-ref.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/mobject/placement-ref.hpp" +#include "steam/mobject/session/placement-index.hpp" +#include "steam/mobject/session/session-service-mock-index.hpp" +#include "steam/mobject/session/clip.hpp" +#include "steam/mobject/explicitplacement.hpp" #include "lib/time/timevalue.hpp" -//#include "proc/mobject/test-dummy-mobject.hpp" +//#include "steam/mobject/test-dummy-mobject.hpp" //#include "lib/test/test-helper.hpp" diff --git a/tests/core/steam/mobject/placement-ref-test.cpp b/tests/core/steam/mobject/placement-ref-test.cpp index 38e642c3f..29a4dc243 100644 --- a/tests/core/steam/mobject/placement-ref-test.cpp +++ b/tests/core/steam/mobject/placement-ref-test.cpp @@ -27,12 +27,12 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/mobject/placement.hpp" -#include "proc/mobject/placement-ref.hpp" -#include "proc/mobject/session/placement-index.hpp" -#include "proc/mobject/session/session-service-mock-index.hpp" -#include "proc/mobject/explicitplacement.hpp" -#include "proc/mobject/test-dummy-mobject.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/mobject/placement-ref.hpp" +#include "steam/mobject/session/placement-index.hpp" +#include "steam/mobject/session/session-service-mock-index.hpp" +#include "steam/mobject/explicitplacement.hpp" +#include "steam/mobject/test-dummy-mobject.hpp" #include "lib/time/timevalue.hpp" #include "lib/format-cout.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/mobject/session/add-clip-test.cpp b/tests/core/steam/mobject/session/add-clip-test.cpp index 730b129c2..60166aa25 100644 --- a/tests/core/steam/mobject/session/add-clip-test.cpp +++ b/tests/core/steam/mobject/session/add-clip-test.cpp @@ -26,9 +26,9 @@ #include "lib/test/run.hpp" -#include "proc/mobject/session.hpp" -#include "proc/mobject/session/testclip.hpp" -#include "proc/mobject/placement.hpp" +#include "steam/mobject/session.hpp" +#include "steam/mobject/session/testclip.hpp" +#include "steam/mobject/placement.hpp" //#include "lib/format-cout.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/mobject/session/defs-manager-impl-test.cpp b/tests/core/steam/mobject/session/defs-manager-impl-test.cpp index 6289cd192..8aa9b6f49 100644 --- a/tests/core/steam/mobject/session/defs-manager-impl-test.cpp +++ b/tests/core/steam/mobject/session/defs-manager-impl-test.cpp @@ -28,13 +28,13 @@ #include "lib/test/run.hpp" #include "lib/util.hpp" -#include "proc/asset.hpp" -#include "proc/asset/pipe.hpp" -#include "proc/asset/struct.hpp" -#include "proc/config-resolver.hpp" -#include "proc/assetmanager.hpp" -#include "proc/mobject/session.hpp" -#include "proc/streamtype.hpp" +#include "steam/asset.hpp" +#include "steam/asset/pipe.hpp" +#include "steam/asset/struct.hpp" +#include "steam/config-resolver.hpp" +#include "steam/assetmanager.hpp" +#include "steam/mobject/session.hpp" +#include "steam/streamtype.hpp" #include "lib/format-string.hpp" #include "lib/query-util.hpp" #include "common/query.hpp" diff --git a/tests/core/steam/mobject/session/defs-manager-test.cpp b/tests/core/steam/mobject/session/defs-manager-test.cpp index 8225dcae8..35230f5ba 100644 --- a/tests/core/steam/mobject/session/defs-manager-test.cpp +++ b/tests/core/steam/mobject/session/defs-manager-test.cpp @@ -32,12 +32,12 @@ #include "lib/query-util.hpp" #include "common/query.hpp" -#include "proc/asset.hpp" -#include "proc/asset/pipe.hpp" -#include "proc/asset/struct.hpp" -#include "proc/assetmanager.hpp" -#include "proc/mobject/session.hpp" -#include "proc/streamtype.hpp" +#include "steam/asset.hpp" +#include "steam/asset/pipe.hpp" +#include "steam/asset/struct.hpp" +#include "steam/assetmanager.hpp" +#include "steam/mobject/session.hpp" +#include "steam/streamtype.hpp" using util::_Fmt; using util::isnil; diff --git a/tests/core/steam/mobject/session/deletecliptest.cpp b/tests/core/steam/mobject/session/deletecliptest.cpp index a744c2336..edbf92d77 100644 --- a/tests/core/steam/mobject/session/deletecliptest.cpp +++ b/tests/core/steam/mobject/session/deletecliptest.cpp @@ -26,10 +26,10 @@ #include "lib/test/run.hpp" -#include "proc/assetmanager.hpp" -#include "proc/mobject/session.hpp" -#include "proc/mobject/session/testsession1.hpp" -#include "proc/mobject/session/clip.hpp" // TODO: really neded? +#include "steam/assetmanager.hpp" +#include "steam/mobject/session.hpp" +#include "steam/mobject/session/testsession1.hpp" +#include "steam/mobject/session/clip.hpp" // TODO: really neded? #include "lib/format-cout.hpp" //#include "lib/util.hpp" diff --git a/tests/core/steam/mobject/session/dummy-session-connection-test.cpp b/tests/core/steam/mobject/session/dummy-session-connection-test.cpp index a4c6ce45c..95be893ce 100644 --- a/tests/core/steam/mobject/session/dummy-session-connection-test.cpp +++ b/tests/core/steam/mobject/session/dummy-session-connection-test.cpp @@ -27,7 +27,7 @@ #include "lib/test/run.hpp" #include "lib/util.hpp" -#include "proc/mobject/session/dummy-session-connection.hpp" +#include "steam/mobject/session/dummy-session-connection.hpp" //#include //#include diff --git a/tests/core/steam/mobject/session/placement-index-query-test.cpp b/tests/core/steam/mobject/session/placement-index-query-test.cpp index b6409908f..817185f50 100644 --- a/tests/core/steam/mobject/session/placement-index-query-test.cpp +++ b/tests/core/steam/mobject/session/placement-index-query-test.cpp @@ -26,10 +26,10 @@ #include "lib/test/run.hpp" -#include "proc/mobject/session/scope-query.hpp" -#include "proc/mobject/session/session-service-explore-scope.hpp" -#include "proc/mobject/session/placement-index-query-resolver.hpp" -#include "proc/mobject/session/test-scopes.hpp" +#include "steam/mobject/session/scope-query.hpp" +#include "steam/mobject/session/session-service-explore-scope.hpp" +#include "steam/mobject/session/placement-index-query-resolver.hpp" +#include "steam/mobject/session/test-scopes.hpp" #include "common/query/query-resolver.hpp" #include "lib/format-cout.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/mobject/session/placement-index-test.cpp b/tests/core/steam/mobject/session/placement-index-test.cpp index 85cddf015..de1b25e87 100644 --- a/tests/core/steam/mobject/session/placement-index-test.cpp +++ b/tests/core/steam/mobject/session/placement-index-test.cpp @@ -27,16 +27,16 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/mobject/session/placement-index.hpp" -#include "proc/mobject/session/scope.hpp" -#include "proc/mobject/placement.hpp" -#include "proc/asset/media.hpp" +#include "steam/mobject/session/placement-index.hpp" +#include "steam/mobject/session/scope.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/asset/media.hpp" #include "lib/format-string.hpp" #include "lib/format-cout.hpp" #include "lib/util.hpp" -#include "proc/mobject/session/testclip.hpp" -#include "proc/mobject/session/testroot.hpp" +#include "steam/mobject/session/testclip.hpp" +#include "steam/mobject/session/testroot.hpp" using util::_Fmt; diff --git a/tests/core/steam/mobject/session/placement-scope-test.cpp b/tests/core/steam/mobject/session/placement-scope-test.cpp index 01ae4e1c9..0eb4f55c4 100644 --- a/tests/core/steam/mobject/session/placement-scope-test.cpp +++ b/tests/core/steam/mobject/session/placement-scope-test.cpp @@ -27,10 +27,10 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/mobject/mobject.hpp" -#include "proc/mobject/session/scope.hpp" -#include "proc/mobject/session/test-scopes.hpp" -#include "proc/mobject/session/scope-locator.hpp" +#include "steam/mobject/mobject.hpp" +#include "steam/mobject/session/scope.hpp" +#include "steam/mobject/session/test-scopes.hpp" +#include "steam/mobject/session/scope-locator.hpp" #include "lib/format-cout.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/mobject/session/query-focus-stack-test.cpp b/tests/core/steam/mobject/session/query-focus-stack-test.cpp index a45b855a1..a4814d80b 100644 --- a/tests/core/steam/mobject/session/query-focus-stack-test.cpp +++ b/tests/core/steam/mobject/session/query-focus-stack-test.cpp @@ -27,9 +27,9 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/mobject/session/test-scopes.hpp" -#include "proc/mobject/session/query-focus-stack.hpp" -#include "proc/mobject/session/test-scope-invalid.hpp" +#include "steam/mobject/session/test-scopes.hpp" +#include "steam/mobject/session/query-focus-stack.hpp" +#include "steam/mobject/session/test-scope-invalid.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/mobject/session/query-focus-test.cpp b/tests/core/steam/mobject/session/query-focus-test.cpp index 36b86372f..4756af201 100644 --- a/tests/core/steam/mobject/session/query-focus-test.cpp +++ b/tests/core/steam/mobject/session/query-focus-test.cpp @@ -26,10 +26,10 @@ #include "lib/test/run.hpp" -#include "proc/mobject/session/test-scopes.hpp" -#include "proc/mobject/session/placement-index.hpp" -#include "proc/mobject/session/query-focus.hpp" -#include "proc/mobject/session/scope.hpp" +#include "steam/mobject/session/test-scopes.hpp" +#include "steam/mobject/session/placement-index.hpp" +#include "steam/mobject/session/query-focus.hpp" +#include "steam/mobject/session/scope.hpp" #include "lib/format-cout.hpp" diff --git a/tests/core/steam/mobject/session/rebuildfixturetest.cpp b/tests/core/steam/mobject/session/rebuildfixturetest.cpp index 08ef95834..c2069a989 100644 --- a/tests/core/steam/mobject/session/rebuildfixturetest.cpp +++ b/tests/core/steam/mobject/session/rebuildfixturetest.cpp @@ -26,8 +26,8 @@ #include "lib/test/run.hpp" -#include "proc/mobject/session.hpp" -#include "proc/mobject/session/testsession1.hpp" +#include "steam/mobject/session.hpp" +#include "steam/mobject/session/testsession1.hpp" //#include "lib/format-cout.hpp" //#include "lib/util.hpp" diff --git a/tests/core/steam/mobject/session/scope-path-test.cpp b/tests/core/steam/mobject/session/scope-path-test.cpp index 4487aa679..4b17c7292 100644 --- a/tests/core/steam/mobject/session/scope-path-test.cpp +++ b/tests/core/steam/mobject/session/scope-path-test.cpp @@ -27,10 +27,10 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "proc/mobject/session/test-scopes.hpp" -#include "proc/mobject/session/placement-index.hpp" -#include "proc/mobject/session/scope-path.hpp" -#include "proc/mobject/session/test-scope-invalid.hpp" +#include "steam/mobject/session/test-scopes.hpp" +#include "steam/mobject/session/placement-index.hpp" +#include "steam/mobject/session/scope-path.hpp" +#include "steam/mobject/session/test-scope-invalid.hpp" #include "lib/format-cout.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/mobject/session/scope-query-test.cpp b/tests/core/steam/mobject/session/scope-query-test.cpp index c2206eae1..f94ea5ed8 100644 --- a/tests/core/steam/mobject/session/scope-query-test.cpp +++ b/tests/core/steam/mobject/session/scope-query-test.cpp @@ -26,11 +26,11 @@ #include "lib/test/run.hpp" -#include "proc/mobject/session/scope-query.hpp" -#include "proc/mobject/session/specific-contents-query.hpp" -#include "proc/mobject/session/session-service-explore-scope.hpp" -#include "proc/mobject/session/test-scopes.hpp" -#include "proc/mobject/session/clip.hpp" +#include "steam/mobject/session/scope-query.hpp" +#include "steam/mobject/session/specific-contents-query.hpp" +#include "steam/mobject/session/session-service-explore-scope.hpp" +#include "steam/mobject/session/test-scopes.hpp" +#include "steam/mobject/session/clip.hpp" #include "lib/format-cout.hpp" #include "lib/symbol.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/mobject/session/session-element-query-test.cpp b/tests/core/steam/mobject/session/session-element-query-test.cpp index b75c54394..81ae8f8ad 100644 --- a/tests/core/steam/mobject/session/session-element-query-test.cpp +++ b/tests/core/steam/mobject/session/session-element-query-test.cpp @@ -26,11 +26,11 @@ #include "lib/test/run.hpp" -#include "proc/mobject/session/test-scopes.hpp" -#include "proc/mobject/session/element-query.hpp" -#include "proc/mobject/session/scope-path.hpp" -#include "proc/mobject/session/scope.hpp" -#include "proc/mobject/mobject-ref.hpp" +#include "steam/mobject/session/test-scopes.hpp" +#include "steam/mobject/session/element-query.hpp" +#include "steam/mobject/session/scope-path.hpp" +#include "steam/mobject/session/scope.hpp" +#include "steam/mobject/mobject-ref.hpp" #include "lib/util.hpp" #include diff --git a/tests/core/steam/mobject/session/session-element-tracker-test.cpp b/tests/core/steam/mobject/session/session-element-tracker-test.cpp index 503141f49..06d22d967 100644 --- a/tests/core/steam/mobject/session/session-element-tracker-test.cpp +++ b/tests/core/steam/mobject/session/session-element-tracker-test.cpp @@ -29,10 +29,10 @@ #include "lib/element-tracker.hpp" -#include "proc/assetmanager.hpp" -#include "proc/mobject/session.hpp" -#include "proc/asset/timeline.hpp" -#include "proc/asset/sequence.hpp" +#include "steam/assetmanager.hpp" +#include "steam/mobject/session.hpp" +#include "steam/asset/timeline.hpp" +#include "steam/asset/sequence.hpp" #include "common/query.hpp" #include "lib/p.hpp" diff --git a/tests/core/steam/mobject/session/session-manager-test.cpp b/tests/core/steam/mobject/session/session-manager-test.cpp index 3aee985a0..195452bd3 100644 --- a/tests/core/steam/mobject/session/session-manager-test.cpp +++ b/tests/core/steam/mobject/session/session-manager-test.cpp @@ -26,8 +26,8 @@ #include "lib/test/run.hpp" -#include "proc/mobject/session.hpp" -#include "proc/mobject/session/testsession1.hpp" +#include "steam/mobject/session.hpp" +#include "steam/mobject/session/testsession1.hpp" //#include "lib/util.hpp" //using std::string; diff --git a/tests/core/steam/mobject/session/session-modify-parts-test.cpp b/tests/core/steam/mobject/session/session-modify-parts-test.cpp index dabf20f79..9a1d22292 100644 --- a/tests/core/steam/mobject/session/session-modify-parts-test.cpp +++ b/tests/core/steam/mobject/session/session-modify-parts-test.cpp @@ -26,16 +26,16 @@ #include "lib/test/run.hpp" -#include "proc/mobject/session.hpp" -#include "proc/mobject/session/fixture.hpp" // TODO only temporarily needed -//#include "proc/assetmanager.hpp" //////?? -//#include "proc/asset/timeline.hpp" -#include "proc/asset/sequence.hpp" +#include "steam/mobject/session.hpp" +#include "steam/mobject/session/fixture.hpp" // TODO only temporarily needed +//#include "steam/assetmanager.hpp" //////?? +//#include "steam/asset/timeline.hpp" +#include "steam/asset/sequence.hpp" #include "lib/format-cout.hpp" #include "lib/util-foreach.hpp" -#include "proc/mobject/session/testclip.hpp" -#include "proc/mobject/mobject-ref.hpp" -#include "proc/mobject/placement.hpp" +#include "steam/mobject/session/testclip.hpp" +#include "steam/mobject/mobject-ref.hpp" +#include "steam/mobject/placement.hpp" #include "common/query.hpp" #include diff --git a/tests/core/steam/mobject/session/session-service-access-test.cpp b/tests/core/steam/mobject/session/session-service-access-test.cpp index 0c0b849d1..61d40ac61 100644 --- a/tests/core/steam/mobject/session/session-service-access-test.cpp +++ b/tests/core/steam/mobject/session/session-service-access-test.cpp @@ -26,7 +26,7 @@ #include "lib/test/run.hpp" -#include "proc/mobject/session.hpp" +#include "steam/mobject/session.hpp" #include "lib/meta/generator.hpp" #include "lib/format-cout.hpp" #include "lib/depend.hpp" diff --git a/tests/core/steam/mobject/session/session-structure-test.cpp b/tests/core/steam/mobject/session/session-structure-test.cpp index e3d2ee0bf..5eb950a2f 100644 --- a/tests/core/steam/mobject/session/session-structure-test.cpp +++ b/tests/core/steam/mobject/session/session-structure-test.cpp @@ -26,11 +26,11 @@ #include "lib/test/run.hpp" -#include "proc/mobject/session.hpp" -#include "proc/mobject/session/fixture.hpp" // TODO only temporarily needed -#include "proc/assetmanager.hpp" //////?? -#include "proc/asset/timeline.hpp" -#include "proc/asset/sequence.hpp" +#include "steam/mobject/session.hpp" +#include "steam/mobject/session/fixture.hpp" // TODO only temporarily needed +#include "steam/assetmanager.hpp" //////?? +#include "steam/asset/timeline.hpp" +#include "steam/asset/sequence.hpp" //#include "lib/format-cout.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/mobject/session/test-scope-invalid.hpp b/tests/core/steam/mobject/session/test-scope-invalid.hpp index b0a1849f6..eae2230cd 100644 --- a/tests/core/steam/mobject/session/test-scope-invalid.hpp +++ b/tests/core/steam/mobject/session/test-scope-invalid.hpp @@ -30,8 +30,8 @@ #define MOBJECT_SESSION_TEST_SCOPE_INVALID_H -#include "proc/mobject/placement.hpp" -#include "proc/mobject/session/scope.hpp" +#include "steam/mobject/placement.hpp" +#include "steam/mobject/session/scope.hpp" diff --git a/tests/core/steam/mobject/session/test-scopes.cpp b/tests/core/steam/mobject/session/test-scopes.cpp index b7374d926..8f96e8ec5 100644 --- a/tests/core/steam/mobject/session/test-scopes.cpp +++ b/tests/core/steam/mobject/session/test-scopes.cpp @@ -27,10 +27,10 @@ */ -#include "proc/mobject/session/test-scopes.hpp" -#include "proc/mobject/session/session-service-mock-index.hpp" -#include "proc/mobject/session/session-service-explore-scope.hpp" -#include "proc/mobject/session/scope-query.hpp" +#include "steam/mobject/session/test-scopes.hpp" +#include "steam/mobject/session/session-service-mock-index.hpp" +#include "steam/mobject/session/session-service-explore-scope.hpp" +#include "steam/mobject/session/scope-query.hpp" namespace proc { diff --git a/tests/core/steam/mobject/session/test-scopes.hpp b/tests/core/steam/mobject/session/test-scopes.hpp index eb9d49d77..50b7fe719 100644 --- a/tests/core/steam/mobject/session/test-scopes.hpp +++ b/tests/core/steam/mobject/session/test-scopes.hpp @@ -32,10 +32,10 @@ #define MOBJECT_SESSION_TEST_TEST_SCOPES_H -#include "proc/mobject/test-dummy-mobject.hpp" -#include "proc/mobject/session/placement-index.hpp" -#include "proc/mobject/session/scope-query.hpp" -#include "proc/mobject/placement.hpp" +#include "steam/mobject/test-dummy-mobject.hpp" +#include "steam/mobject/session/placement-index.hpp" +#include "steam/mobject/session/scope-query.hpp" +#include "steam/mobject/placement.hpp" #include diff --git a/tests/core/steam/mobject/session/testclip.cpp b/tests/core/steam/mobject/session/testclip.cpp index 957adb992..2c4821535 100644 --- a/tests/core/steam/mobject/session/testclip.cpp +++ b/tests/core/steam/mobject/session/testclip.cpp @@ -25,12 +25,12 @@ */ -#include "proc/mobject/session/testclip.hpp" -#include "backend/media-access-facade.hpp" -#include "backend/media-access-mock.hpp" +#include "steam/mobject/session/testclip.hpp" +#include "vault/media-access-facade.hpp" +#include "vault/media-access-mock.hpp" #include "lib/depend-inject.hpp" -#include "proc/asset/media.hpp" -#include "proc/asset/clip.hpp" +#include "steam/asset/media.hpp" +#include "steam/asset/clip.hpp" #include "lib/depend.hpp" #include "lib/time/timevalue.hpp" diff --git a/tests/core/steam/mobject/session/testclip.hpp b/tests/core/steam/mobject/session/testclip.hpp index dcd3adef1..9f838889b 100644 --- a/tests/core/steam/mobject/session/testclip.hpp +++ b/tests/core/steam/mobject/session/testclip.hpp @@ -29,7 +29,7 @@ #define MOBJECT_SESSION_TESTCLIP_H -#include "proc/mobject/session/clip.hpp" +#include "steam/mobject/session/clip.hpp" #include "lib/time/timevalue.hpp" diff --git a/tests/core/steam/mobject/session/testroot.hpp b/tests/core/steam/mobject/session/testroot.hpp index 93d539d3b..01a195c4a 100644 --- a/tests/core/steam/mobject/session/testroot.hpp +++ b/tests/core/steam/mobject/session/testroot.hpp @@ -31,8 +31,8 @@ #define MOBJECT_SESSION_TESTROOT_H -#include "proc/mobject/session/label.hpp" -#include "proc/mobject/session/mobjectfactory.hpp" +#include "steam/mobject/session/label.hpp" +#include "steam/mobject/session/mobjectfactory.hpp" #include "lib/symbol.hpp" using lib::Symbol; diff --git a/tests/core/steam/mobject/session/testsession1.hpp b/tests/core/steam/mobject/session/testsession1.hpp index 1d47c7ea7..067fb3191 100644 --- a/tests/core/steam/mobject/session/testsession1.hpp +++ b/tests/core/steam/mobject/session/testsession1.hpp @@ -32,7 +32,7 @@ #define MOBJECT_SESSION_TESTSESSION1_H -#include "proc/mobject/session.hpp" +#include "steam/mobject/session.hpp" #include "lib/error.hpp" //#include "lib/util.hpp" diff --git a/tests/core/steam/mobject/session/timeline-sequence-handling-test.cpp b/tests/core/steam/mobject/session/timeline-sequence-handling-test.cpp index 6249055fe..327f75ff3 100644 --- a/tests/core/steam/mobject/session/timeline-sequence-handling-test.cpp +++ b/tests/core/steam/mobject/session/timeline-sequence-handling-test.cpp @@ -26,14 +26,14 @@ #include "lib/test/run.hpp" -#include "proc/mobject/session.hpp" -#include "proc/mobject/mobject-ref.hpp" -#include "proc/mobject/session/binding.hpp" -//#include "proc/mobject/session/fixture.hpp" // TODO only temporarily needed -#include "proc/assetmanager.hpp" -#include "proc/asset/timeline.hpp" -#include "proc/asset/sequence.hpp" -#include "proc/asset/pipe.hpp" +#include "steam/mobject/session.hpp" +#include "steam/mobject/mobject-ref.hpp" +#include "steam/mobject/session/binding.hpp" +//#include "steam/mobject/session/fixture.hpp" // TODO only temporarily needed +#include "steam/assetmanager.hpp" +#include "steam/asset/timeline.hpp" +#include "steam/asset/sequence.hpp" +#include "steam/asset/pipe.hpp" #include "common/query.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/play/diagnostic-output-slot.hpp b/tests/core/steam/play/diagnostic-output-slot.hpp index ba1cdfd1f..8cedeb8da 100644 --- a/tests/core/steam/play/diagnostic-output-slot.hpp +++ b/tests/core/steam/play/diagnostic-output-slot.hpp @@ -34,18 +34,18 @@ #include "lib/error.hpp" #include "lib/nocopy.hpp" #include "include/logging.h" -#include "proc/play/output-slot.hpp" -#include "proc/play/output-slot-connection.hpp" -#include "proc/asset/meta/time-grid.hpp" -#include "proc/engine/buffhandle.hpp" -#include "proc/engine/tracking-heap-block-provider.hpp" +#include "steam/play/output-slot.hpp" +#include "steam/play/output-slot-connection.hpp" +#include "steam/asset/meta/time-grid.hpp" +#include "steam/engine/buffhandle.hpp" +#include "steam/engine/tracking-heap-block-provider.hpp" #include "lib/time/timevalue.hpp" #include "lib/scoped-ptrvect.hpp" #include "lib/iter-source.hpp" #include "lib/symbol.hpp" #include "lib/util.hpp" #include "common/advice.hpp" -#include "proc/engine/testframe.hpp" +#include "steam/engine/testframe.hpp" //#include "lib/sync.hpp" //#include diff --git a/tests/core/steam/play/dummy-play-connection-test.cpp b/tests/core/steam/play/dummy-play-connection-test.cpp index e6a2ae46f..5006f8925 100644 --- a/tests/core/steam/play/dummy-play-connection-test.cpp +++ b/tests/core/steam/play/dummy-play-connection-test.cpp @@ -27,9 +27,9 @@ #include "lib/test/run.hpp" -#include "proc/play/dummy-play-connection.hpp" -//#include "proc/engine/buffhandle.hpp" -//#include "proc/engine/testframe.hpp" +#include "steam/play/dummy-play-connection.hpp" +//#include "steam/engine/buffhandle.hpp" +//#include "steam/engine/testframe.hpp" #include "include/play-facade.hpp" #include "lib/time/control.hpp" diff --git a/tests/core/steam/play/output-slot-protocol-test.cpp b/tests/core/steam/play/output-slot-protocol-test.cpp index 46fa21097..6e80e3d8a 100644 --- a/tests/core/steam/play/output-slot-protocol-test.cpp +++ b/tests/core/steam/play/output-slot-protocol-test.cpp @@ -27,9 +27,9 @@ #include "lib/test/run.hpp" -#include "proc/play/diagnostic-output-slot.hpp" -#include "proc/engine/buffhandle.hpp" -#include "proc/engine/testframe.hpp" +#include "steam/play/diagnostic-output-slot.hpp" +#include "steam/engine/buffhandle.hpp" +#include "steam/engine/testframe.hpp" diff --git a/tests/core/steam/play/timing-constraints-test.cpp b/tests/core/steam/play/timing-constraints-test.cpp index 14bca2d2f..f0c60b981 100644 --- a/tests/core/steam/play/timing-constraints-test.cpp +++ b/tests/core/steam/play/timing-constraints-test.cpp @@ -27,10 +27,10 @@ #include "lib/test/run.hpp" -#include "proc/play/timings.hpp" +#include "steam/play/timings.hpp" #include "lib/time/timevalue.hpp" -//#include "proc/engine/buffhandle.hpp" -//#include "proc/engine/testframe.hpp" +//#include "steam/engine/buffhandle.hpp" +//#include "steam/engine/testframe.hpp" //#include "lib/time/control.hpp" diff --git a/tests/core/vault/engine/dummy-job.cpp b/tests/core/vault/engine/dummy-job.cpp index 1b69ad09e..b54827721 100644 --- a/tests/core/vault/engine/dummy-job.cpp +++ b/tests/core/vault/engine/dummy-job.cpp @@ -25,11 +25,11 @@ */ -#include "backend/engine/dummy-job.hpp" +#include "vault/engine/dummy-job.hpp" #include "lib/test/test-helper.hpp" #include "lib/time/timevalue.hpp" -#include "backend/real-clock.hpp" +#include "vault/real-clock.hpp" #include "lib/null-value.hpp" #include "lib/hash-value.h" #include "lib/util.hpp" diff --git a/tests/core/vault/engine/dummy-job.hpp b/tests/core/vault/engine/dummy-job.hpp index b18571e10..e2b45fcd8 100644 --- a/tests/core/vault/engine/dummy-job.hpp +++ b/tests/core/vault/engine/dummy-job.hpp @@ -30,7 +30,7 @@ -#include "backend/engine/job.h" +#include "vault/engine/job.h" #include "lib/time/timevalue.hpp" diff --git a/tests/core/vault/engine/job-hash-test.cpp b/tests/core/vault/engine/job-hash-test.cpp index 41f2fe21b..aed243f81 100644 --- a/tests/core/vault/engine/job-hash-test.cpp +++ b/tests/core/vault/engine/job-hash-test.cpp @@ -28,8 +28,8 @@ #include "lib/test/run.hpp" #include "lib/util.hpp" -#include "backend/real-clock.hpp" -#include "backend/engine/dummy-job.hpp" +#include "vault/real-clock.hpp" +#include "vault/engine/dummy-job.hpp" #include diff --git a/tests/core/vault/engine/scheduler-interface-test.cpp b/tests/core/vault/engine/scheduler-interface-test.cpp index adc03ea0f..ca1432a72 100644 --- a/tests/core/vault/engine/scheduler-interface-test.cpp +++ b/tests/core/vault/engine/scheduler-interface-test.cpp @@ -28,10 +28,10 @@ #include "lib/test/run.hpp" #include "lib/util.hpp" -#include "backend/real-clock.hpp" -#include "backend/engine/scheduler-frontend.hpp" -#include "backend/engine/scheduler-diagnostics.hpp" -#include "backend/engine/dummy-job.hpp" +#include "vault/real-clock.hpp" +#include "vault/engine/scheduler-frontend.hpp" +#include "vault/engine/scheduler-diagnostics.hpp" +#include "vault/engine/dummy-job.hpp" namespace backend { diff --git a/tests/core/vault/media-access-mock-test.cpp b/tests/core/vault/media-access-mock-test.cpp index 954d8612a..e6c45042f 100644 --- a/tests/core/vault/media-access-mock-test.cpp +++ b/tests/core/vault/media-access-mock-test.cpp @@ -25,8 +25,8 @@ */ -#include "backend/media-access-facade.hpp" -#include "backend/media-access-mock.hpp" +#include "vault/media-access-facade.hpp" +#include "vault/media-access-mock.hpp" #include "lib/depend-inject.hpp" #include "lib/format-cout.hpp" diff --git a/tests/core/vault/media-access-mock.cpp b/tests/core/vault/media-access-mock.cpp index fac990051..84f1e8b91 100644 --- a/tests/core/vault/media-access-mock.cpp +++ b/tests/core/vault/media-access-mock.cpp @@ -34,8 +34,8 @@ */ -#include "backend/media-access-mock.hpp" -#include "proc/mobject/session/testclip.hpp" +#include "vault/media-access-mock.hpp" +#include "steam/mobject/session/testclip.hpp" #include "lib/util.hpp" #include "lib/depend.hpp" diff --git a/tests/core/vault/media-access-mock.hpp b/tests/core/vault/media-access-mock.hpp index 4c69d8fb0..ce7a976f5 100644 --- a/tests/core/vault/media-access-mock.hpp +++ b/tests/core/vault/media-access-mock.hpp @@ -33,7 +33,7 @@ #define BACKEND_TEST_MEDIA_ACCESS_MOCK_H -#include "backend/media-access-facade.hpp" +#include "vault/media-access-facade.hpp" diff --git a/tests/library/advice/advice-configuration-test.cpp b/tests/library/advice/advice-configuration-test.cpp index 496de1df7..e7129d19b 100644 --- a/tests/library/advice/advice-configuration-test.cpp +++ b/tests/library/advice/advice-configuration-test.cpp @@ -30,10 +30,10 @@ #include "common/advice.hpp" //#include "lib/p.hpp" -//#include "proc/assetmanager.hpp" -//#include "proc/asset/inventory.hpp" -//#include "proc/mobject/session/clip.hpp" -//#include "proc/mobject/session/fork.hpp" +//#include "steam/assetmanager.hpp" +//#include "steam/asset/inventory.hpp" +//#include "steam/mobject/session/clip.hpp" +//#include "steam/mobject/session/fork.hpp" //#include "lib/meta/trait-special.hpp" //#include "lib/util-foreach.hpp" //#include "lib/symbol.hpp" diff --git a/tests/library/advice/advice-multiplicity-test.cpp b/tests/library/advice/advice-multiplicity-test.cpp index a6fd7f8b3..c92494486 100644 --- a/tests/library/advice/advice-multiplicity-test.cpp +++ b/tests/library/advice/advice-multiplicity-test.cpp @@ -29,10 +29,10 @@ //#include "lib/test/test-helper.hpp" //#include "lib/p.hpp" -//#include "proc/assetmanager.hpp" -//#include "proc/asset/inventory.hpp" -//#include "proc/mobject/session/clip.hpp" -//#include "proc/mobject/session/fork.hpp" +//#include "steam/assetmanager.hpp" +//#include "steam/asset/inventory.hpp" +//#include "steam/mobject/session/clip.hpp" +//#include "steam/mobject/session/fork.hpp" //#include "lib/meta/trait-special.hpp" //#include "lib/util-foreach.hpp" //#include "lib/symbol.hpp" diff --git a/tests/library/advice/advice-situations-test.cpp b/tests/library/advice/advice-situations-test.cpp index 7b5c3236e..c053fd71b 100644 --- a/tests/library/advice/advice-situations-test.cpp +++ b/tests/library/advice/advice-situations-test.cpp @@ -31,10 +31,10 @@ #include "common/advice.hpp" //#include "lib/p.hpp" -//#include "proc/assetmanager.hpp" -//#include "proc/asset/inventory.hpp" -//#include "proc/mobject/session/clip.hpp" -//#include "proc/mobject/session/fork.hpp" +//#include "steam/assetmanager.hpp" +//#include "steam/asset/inventory.hpp" +//#include "steam/mobject/session/clip.hpp" +//#include "steam/mobject/session/fork.hpp" //#include "lib/meta/trait-special.hpp" //#include "lib/util-foreach.hpp" //#include "lib/symbol.hpp" diff --git a/tests/library/meta/config-flags-test.cpp b/tests/library/meta/config-flags-test.cpp index 9ed9b2bd1..70efd90c7 100644 --- a/tests/library/meta/config-flags-test.cpp +++ b/tests/library/meta/config-flags-test.cpp @@ -43,7 +43,7 @@ #include "lib/meta/typelist-manip.hpp" #include "lib/meta/configflags.hpp" #include "meta/typelist-diagnostics.hpp" -#include "proc/engine/nodewiring-config.hpp" +#include "steam/engine/nodewiring-config.hpp" #include "lib/format-cout.hpp" #include "lib/util.hpp" diff --git a/tests/library/meta/iterable-classification-test.cpp b/tests/library/meta/iterable-classification-test.cpp index 3c5e0b3c0..f210715c9 100644 --- a/tests/library/meta/iterable-classification-test.cpp +++ b/tests/library/meta/iterable-classification-test.cpp @@ -27,8 +27,8 @@ #include "lib/test/run.hpp" -#include "proc/mobject/session/scope-query.hpp" -#include "proc/mobject/session/effect.hpp" +#include "steam/mobject/session/scope-query.hpp" +#include "steam/mobject/session/effect.hpp" #include "lib/meta/duck-detector.hpp" #include "lib/time/timevalue.hpp" #include "lib/util-foreach.hpp" diff --git a/tests/stage/abstract-tangible-test.cpp b/tests/stage/abstract-tangible-test.cpp index 87008526c..dbd1cb4b6 100644 --- a/tests/stage/abstract-tangible-test.cpp +++ b/tests/stage/abstract-tangible-test.cpp @@ -51,7 +51,7 @@ #include "test/test-nexus.hpp" #include "lib/idi/genfunc.hpp" #include "lib/idi/entry-id.hpp" -#include "proc/control/command-def.hpp" +#include "steam/control/command-def.hpp" #include "lib/diff/mutation-message.hpp" #include "lib/diff/tree-diff.hpp" #include "lib/time/timevalue.hpp" diff --git a/tests/stage/bus-term-test.cpp b/tests/stage/bus-term-test.cpp index 931f20711..59b54f2c4 100644 --- a/tests/stage/bus-term-test.cpp +++ b/tests/stage/bus-term-test.cpp @@ -29,11 +29,11 @@ #include "lib/test/test-helper.hpp" #include "lib/sync.hpp" #include "lib/sync-classlock.hpp" -#include "backend/thread-wrapper.hpp" +#include "vault/thread-wrapper.hpp" #include "include/ui-protocol.hpp" -#include "gui/ctrl/bus-term.hpp" -#include "gui/ctrl/state-manager.hpp" -#include "proc/control/command.hpp" +#include "stage/ctrl/bus-term.hpp" +#include "stage/ctrl/state-manager.hpp" +#include "steam/control/command.hpp" #include "test/test-nexus.hpp" #include "test/mock-elm.hpp" #include "lib/diff/gen-node.hpp" diff --git a/tests/stage/ctrl/state-map-grouping-storage-test.cpp b/tests/stage/ctrl/state-map-grouping-storage-test.cpp index 904fcf815..a7ac7006b 100644 --- a/tests/stage/ctrl/state-map-grouping-storage-test.cpp +++ b/tests/stage/ctrl/state-map-grouping-storage-test.cpp @@ -27,7 +27,7 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "gui/ctrl/state-map-grouping-storage.hpp" +#include "stage/ctrl/state-map-grouping-storage.hpp" #include "lib/idi/entry-id.hpp" #include "lib/diff/gen-node.hpp" #include "lib/util.hpp" diff --git a/tests/stage/gen-node-location-query.hpp b/tests/stage/gen-node-location-query.hpp index 0c2c5c2fd..f6048d6af 100644 --- a/tests/stage/gen-node-location-query.hpp +++ b/tests/stage/gen-node-location-query.hpp @@ -63,7 +63,7 @@ #include "lib/error.hpp" #include "lib/symbol.hpp" -#include "gui/interact/ui-coord-resolver.hpp" +#include "stage/interact/ui-coord-resolver.hpp" #include "lib/diff/gen-node.hpp" #include "lib/format-string.hpp" #include "lib/iter-tree-explorer.hpp" diff --git a/tests/stage/interact/cmd-context-test.cpp b/tests/stage/interact/cmd-context-test.cpp index 98f31924a..43fdc443d 100644 --- a/tests/stage/interact/cmd-context-test.cpp +++ b/tests/stage/interact/cmd-context-test.cpp @@ -29,7 +29,7 @@ #include "lib/test/run.hpp" //#include "lib/test/test-helper.hpp" -#include "gui/interact/cmd-context.hpp" +#include "stage/interact/cmd-context.hpp" //#include "lib/idi/entry-id.hpp" //#include "lib/diff/gen-node.hpp" //#include "lib/util.hpp" diff --git a/tests/stage/interact/ui-coord-resolver-test.cpp b/tests/stage/interact/ui-coord-resolver-test.cpp index 3f3bc6d66..2a61e58cb 100644 --- a/tests/stage/interact/ui-coord-resolver-test.cpp +++ b/tests/stage/interact/ui-coord-resolver-test.cpp @@ -27,8 +27,8 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "gui/interact/ui-coord.hpp" -#include "gui/interact/ui-coord-resolver.hpp" +#include "stage/interact/ui-coord.hpp" +#include "stage/interact/ui-coord-resolver.hpp" #include "gen-node-location-query.hpp" #include "lib/diff/gen-node.hpp" #include "lib/format-util.hpp" diff --git a/tests/stage/interact/ui-coord-test.cpp b/tests/stage/interact/ui-coord-test.cpp index 3f8908403..9cda88f8a 100644 --- a/tests/stage/interact/ui-coord-test.cpp +++ b/tests/stage/interact/ui-coord-test.cpp @@ -27,7 +27,7 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "gui/interact/ui-coord.hpp" +#include "stage/interact/ui-coord.hpp" #include "lib/format-util.hpp" #include "lib/util.hpp" diff --git a/tests/stage/interact/ui-location-solver-test.cpp b/tests/stage/interact/ui-location-solver-test.cpp index 6faaaf6e4..00b070911 100644 --- a/tests/stage/interact/ui-location-solver-test.cpp +++ b/tests/stage/interact/ui-location-solver-test.cpp @@ -27,8 +27,8 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "gui/interact/ui-coord.hpp" -#include "gui/interact/ui-location-solver.hpp" +#include "stage/interact/ui-coord.hpp" +#include "stage/interact/ui-location-solver.hpp" #include "gen-node-location-query.hpp" #include "lib/format-cout.hpp" diff --git a/tests/stage/interact/view-spec-dsl-test.cpp b/tests/stage/interact/view-spec-dsl-test.cpp index 832934ad7..e980af63a 100644 --- a/tests/stage/interact/view-spec-dsl-test.cpp +++ b/tests/stage/interact/view-spec-dsl-test.cpp @@ -27,9 +27,9 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "gui/interact/ui-coord.hpp" -#include "gui/interact/view-locator.hpp" -#include "gui/interact/view-spec-dsl.hpp" +#include "stage/interact/ui-coord.hpp" +#include "stage/interact/view-locator.hpp" +#include "stage/interact/view-spec-dsl.hpp" #include "gen-node-location-query.hpp" #include "test/test-element-access.hpp" #include "lib/depend-inject.hpp" diff --git a/tests/stage/model/element-access-test.cpp b/tests/stage/model/element-access-test.cpp index 281aa98c5..b7a091f9e 100644 --- a/tests/stage/model/element-access-test.cpp +++ b/tests/stage/model/element-access-test.cpp @@ -27,9 +27,9 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -//#include "gui/interact/view-spec-dsl.hpp" +//#include "stage/interact/view-spec-dsl.hpp" #include "test/test-element-access.hpp" -#include "gui/interact/ui-coord.hpp" +#include "stage/interact/ui-coord.hpp" //#include "gen-node-location-query.hpp" #include "lib/depend-inject.hpp" #include "lib/format-cout.hpp" diff --git a/tests/stage/model/w-link-test.cpp b/tests/stage/model/w-link-test.cpp index 41074c6c0..f34513ea6 100644 --- a/tests/stage/model/w-link-test.cpp +++ b/tests/stage/model/w-link-test.cpp @@ -27,7 +27,7 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "gui/model/w-link.hpp" +#include "stage/model/w-link.hpp" #include "lib/util.hpp" #include diff --git a/tests/stage/session-structure-mapping-test.cpp b/tests/stage/session-structure-mapping-test.cpp index c4a615555..476519edb 100644 --- a/tests/stage/session-structure-mapping-test.cpp +++ b/tests/stage/session-structure-mapping-test.cpp @@ -47,8 +47,8 @@ #include "lib/test/run.hpp" -#include "gui/model/session-facade.hpp" -#include "gui/model/diagnostics.hpp" +#include "stage/model/session-facade.hpp" +#include "stage/model/diagnostics.hpp" //#include "lib/util.hpp" diff --git a/tests/stage/test-gui-test.cpp b/tests/stage/test-gui-test.cpp index 1947b2f70..cb5e9d2c4 100644 --- a/tests/stage/test-gui-test.cpp +++ b/tests/stage/test-gui-test.cpp @@ -27,7 +27,7 @@ #include "lib/test/run.hpp" #include "lib/util.hpp" -#include "gui/model/session-facade.hpp" +#include "stage/model/session-facade.hpp" #include "lib/format-cout.hpp" diff --git a/tests/stage/test/mock-elm.hpp b/tests/stage/test/mock-elm.hpp index 09cf2e996..eb272c3ec 100644 --- a/tests/stage/test/mock-elm.hpp +++ b/tests/stage/test/mock-elm.hpp @@ -63,7 +63,7 @@ #include "lib/error.hpp" #include "include/ui-protocol.hpp" #include "lib/test/event-log.hpp" -#include "gui/model/tangible.hpp" +#include "stage/model/tangible.hpp" #include "lib/diff/record.hpp" #include "lib/idi/genfunc.hpp" #include "test/test-nexus.hpp" diff --git a/tests/stage/test/placeholder-command.hpp b/tests/stage/test/placeholder-command.hpp index 898ade4cd..c63c212e9 100644 --- a/tests/stage/test/placeholder-command.hpp +++ b/tests/stage/test/placeholder-command.hpp @@ -45,7 +45,7 @@ #include "lib/symbol.hpp" #include "lib/idi/genfunc.hpp" #include "lib/test/event-log.hpp" -#include "proc/control/command-def.hpp" +#include "steam/control/command-def.hpp" #include "lib/format-util.hpp" #include diff --git a/tests/stage/test/test-element-access.hpp b/tests/stage/test/test-element-access.hpp index a2c457fd8..dfb387a1e 100644 --- a/tests/stage/test/test-element-access.hpp +++ b/tests/stage/test/test-element-access.hpp @@ -44,8 +44,8 @@ #include "lib/error.hpp" -#include "gui/model/element-access.hpp" -#include "gui/interact/ui-coord.hpp" +#include "stage/model/element-access.hpp" +#include "stage/interact/ui-coord.hpp" #include "test/mock-elm.hpp" #include "lib/symbol.hpp" //#include "lib/util.hpp" diff --git a/tests/stage/test/test-nexus.cpp b/tests/stage/test/test-nexus.cpp index 33a29f62f..012053f93 100644 --- a/tests/stage/test/test-nexus.cpp +++ b/tests/stage/test/test-nexus.cpp @@ -48,9 +48,9 @@ #include "lib/itertools.hpp" #include "test/test-nexus.hpp" #include "lib/test/event-log.hpp" -#include "proc/control/command.hpp" -#include "gui/ctrl/nexus.hpp" -#include "gui/ctrl/state-recorder.hpp" +#include "steam/control/command.hpp" +#include "stage/ctrl/nexus.hpp" +#include "stage/ctrl/state-recorder.hpp" #include "lib/diff/mutation-message.hpp" #include "lib/diff/gen-node.hpp" #include "lib/idi/entry-id.hpp" diff --git a/tests/stage/test/test-nexus.hpp b/tests/stage/test/test-nexus.hpp index 118841057..0b881dccd 100644 --- a/tests/stage/test/test-nexus.hpp +++ b/tests/stage/test/test-nexus.hpp @@ -47,9 +47,9 @@ #include "lib/error.hpp" #include "lib/nocopy.hpp" -#include "gui/ctrl/bus-term.hpp" -#include "gui/model/tangible.hpp" -#include "gui/ctrl/state-manager.hpp" +#include "stage/ctrl/bus-term.hpp" +#include "stage/model/tangible.hpp" +#include "stage/ctrl/state-manager.hpp" #include "test/placeholder-command.hpp" #include "lib/test/event-log.hpp" #include "lib/diff/gen-node.hpp" diff --git a/tests/vault/sync-classlock-test.cpp b/tests/vault/sync-classlock-test.cpp index cff0649e6..0da4ea44d 100644 --- a/tests/vault/sync-classlock-test.cpp +++ b/tests/vault/sync-classlock-test.cpp @@ -28,7 +28,7 @@ #include "lib/test/run.hpp" #include "lib/sync-classlock.hpp" #include "lib/scoped-collection.hpp" -#include "backend/thread-wrapper.hpp" +#include "vault/thread-wrapper.hpp" using test::Test; using backend::ThreadJoinable; diff --git a/tests/vault/sync-locking-test.cpp b/tests/vault/sync-locking-test.cpp index b73bdb147..10e2157db 100644 --- a/tests/vault/sync-locking-test.cpp +++ b/tests/vault/sync-locking-test.cpp @@ -29,7 +29,7 @@ #include "lib/error.hpp" #include "lib/sync.hpp" -#include "backend/thread-wrapper.hpp" +#include "vault/thread-wrapper.hpp" #include #include diff --git a/tests/vault/sync-waiting-test.cpp b/tests/vault/sync-waiting-test.cpp index 06191de09..4e9d7a40b 100644 --- a/tests/vault/sync-waiting-test.cpp +++ b/tests/vault/sync-waiting-test.cpp @@ -28,7 +28,7 @@ #include "lib/test/run.hpp" #include "lib/error.hpp" -#include "backend/thread-wrapper.hpp" +#include "vault/thread-wrapper.hpp" #include "lib/sync.hpp" #include diff --git a/tests/vault/test-filedescriptors.c b/tests/vault/test-filedescriptors.c index 904228dac..c20a16db7 100644 --- a/tests/vault/test-filedescriptors.c +++ b/tests/vault/test-filedescriptors.c @@ -29,8 +29,8 @@ #include "lib/safeclib.h" #include "common/config.h" -#include "backend/backend.h" -#include "backend/filedescriptor.h" +#include "vault/backend.h" +#include "vault/filedescriptor.h" #include "lib/test/test.h" diff --git a/tests/vault/test-filehandles.c b/tests/vault/test-filehandles.c index 83da58793..1b5ae33af 100644 --- a/tests/vault/test-filehandles.c +++ b/tests/vault/test-filehandles.c @@ -30,8 +30,8 @@ #include "lib/tmpbuf.h" #include "common/config.h" -#include "backend/backend.h" -#include "backend/filehandlecache.h" +#include "vault/backend.h" +#include "vault/filehandlecache.h" #include "lib/test/test.h" diff --git a/tests/vault/test-fileheader.c b/tests/vault/test-fileheader.c index 6787e4c56..243a34141 100644 --- a/tests/vault/test-fileheader.c +++ b/tests/vault/test-fileheader.c @@ -26,12 +26,12 @@ */ -#include "backend/backend.h" -#include "backend/fileheader.h" +#include "vault/backend.h" +#include "vault/fileheader.h" #include "lib/test/test.h" -#include "backend/filehandlecache.h" +#include "vault/filehandlecache.h" extern LumieraFilehandlecache lumiera_fhcache; TESTS_BEGIN diff --git a/tests/vault/test-filemmap.c b/tests/vault/test-filemmap.c index 4a2159ec1..df904a7f5 100644 --- a/tests/vault/test-filemmap.c +++ b/tests/vault/test-filemmap.c @@ -32,11 +32,11 @@ #include "lib/llist.h" #include "common/config.h" -#include "backend/backend.h" -#include "backend/file.h" -#include "backend/filedescriptor.h" -#include "backend/mmapings.h" -#include "backend/mmap.h" +#include "vault/backend.h" +#include "vault/file.h" +#include "vault/filedescriptor.h" +#include "vault/mmapings.h" +#include "vault/mmap.h" #include "lib/test/test.h" diff --git a/tests/vault/test-resourcecollector.c b/tests/vault/test-resourcecollector.c index b55ec115f..992ab09fa 100644 --- a/tests/vault/test-resourcecollector.c +++ b/tests/vault/test-resourcecollector.c @@ -26,7 +26,7 @@ */ -#include "backend/resourcecollector.h" +#include "vault/resourcecollector.h" #include "lib/test/test.h" diff --git a/tests/vault/test-threadpool.c b/tests/vault/test-threadpool.c index 9320b94c5..f4ed3a4db 100644 --- a/tests/vault/test-threadpool.c +++ b/tests/vault/test-threadpool.c @@ -27,7 +27,7 @@ #include "lib/test/test.h" -#include "backend/threadpool.h" +#include "vault/threadpool.h" #include "include/logging.h" #include diff --git a/tests/vault/test-threads.c b/tests/vault/test-threads.c index 395680d0e..75c17c9c6 100644 --- a/tests/vault/test-threads.c +++ b/tests/vault/test-threads.c @@ -36,7 +36,7 @@ #include "include/logging.h" #include "lib/mutex.h" -#include "backend/threads.h" +#include "vault/threads.h" #include "lib/test/test.h" #include diff --git a/tests/vault/thread-local-test.cpp b/tests/vault/thread-local-test.cpp index 78ff14bc6..5952e0452 100644 --- a/tests/vault/thread-local-test.cpp +++ b/tests/vault/thread-local-test.cpp @@ -27,7 +27,7 @@ #include "lib/test/run.hpp" -#include "backend/thread-wrapper.hpp" +#include "vault/thread-wrapper.hpp" #include "lib/thread-local.hpp" #include diff --git a/tests/vault/thread-wrapper-join-test.cpp b/tests/vault/thread-wrapper-join-test.cpp index f96935c6e..b70456f39 100644 --- a/tests/vault/thread-wrapper-join-test.cpp +++ b/tests/vault/thread-wrapper-join-test.cpp @@ -28,7 +28,7 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "backend/thread-wrapper.hpp" +#include "vault/thread-wrapper.hpp" #include "lib/error.hpp" #include diff --git a/tests/vault/thread-wrapper-self-recognition-test.cpp b/tests/vault/thread-wrapper-self-recognition-test.cpp index 5816440aa..e88b3065b 100644 --- a/tests/vault/thread-wrapper-self-recognition-test.cpp +++ b/tests/vault/thread-wrapper-self-recognition-test.cpp @@ -24,7 +24,7 @@ #include "lib/test/run.hpp" #include "lib/test/test-helper.hpp" -#include "backend/thread-wrapper.hpp" +#include "vault/thread-wrapper.hpp" #include "lib/error.hpp" using test::Test; diff --git a/tests/vault/thread-wrapper-test.cpp b/tests/vault/thread-wrapper-test.cpp index 55b165d47..d7193bfb3 100644 --- a/tests/vault/thread-wrapper-test.cpp +++ b/tests/vault/thread-wrapper-test.cpp @@ -27,7 +27,7 @@ #include "lib/test/run.hpp" -#include "backend/thread-wrapper.hpp" +#include "vault/thread-wrapper.hpp" #include "lib/sync.hpp" #include "lib/symbol.hpp"