From 7c7a07b54f805bb44e6b378b6198ea1a86af2a44 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sat, 30 May 2015 22:09:26 +0200 Subject: [PATCH] Ticket #155: rename the Track-MObject to "Fork" In Lumiera, "Tracks" are not what you'd expect from conventional video editing software. They are a mere grouping devide, and are also used to implement the "media bins" and tool palettes. But having "folders" on the timeline would be likewise confusing, as would be to have a "branch" or "tree". To get out of that dilemma, we chose an understandable but deliberately somewhat strange name: "Fork" It was common understanding on the Mailinglist that we should handle this renaming in a tuned-down and discrete way: The UI will continue to show "Tracks" for a familiar sight and "Bins" in the Asset section. But Lumiera developers will be nudged to accomodate by renaming the entity in source code accordingly --- src/include/play-facade.h | 2 +- src/proc/asset/sequence.cpp | 2 +- src/proc/asset/timeline.cpp | 2 +- src/proc/asset/viewer.cpp | 2 +- src/proc/config-resolver.cpp | 2 +- src/proc/config-resolver.hpp | 2 +- src/proc/mobject/session/fixture.hpp | 2 +- src/proc/mobject/session/{track.cpp => fork.cpp} | 4 ++-- src/proc/mobject/session/{track.hpp => fork.hpp} | 8 ++++---- src/proc/mobject/session/mobjectfactory.cpp | 2 +- src/proc/mobject/session/query/fake-configrules.cpp | 2 +- src/proc/mobject/session/session-query.hpp | 2 +- tests/core/proc/asset/entry-id-test.cpp | 2 +- tests/core/proc/asset/typed-id-test.cpp | 2 +- tests/library/advice/advice-configuration-test.cpp | 2 +- tests/library/advice/advice-multiplicity-test.cpp | 2 +- tests/library/advice/advice-situations-test.cpp | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) rename src/proc/mobject/session/{track.cpp => fork.cpp} (94%) rename src/proc/mobject/session/{track.hpp => fork.hpp} (96%) diff --git a/src/include/play-facade.h b/src/include/play-facade.h index 23e0ba3dd..afd239abb 100644 --- a/src/include/play-facade.h +++ b/src/include/play-facade.h @@ -38,7 +38,7 @@ #include "proc/mobject/model-port.hpp" #include "proc/mobject/output-designation.hpp" #include "proc/mobject/session/clip.hpp" -#include "proc/mobject/session/track.hpp" +#include "proc/mobject/session/fork.hpp" #include "proc/play/output-manager.hpp" #include "proc/asset/timeline.hpp" #include "proc/asset/viewer.hpp" diff --git a/src/proc/asset/sequence.cpp b/src/proc/asset/sequence.cpp index 8991fb864..acf3e2462 100644 --- a/src/proc/asset/sequence.cpp +++ b/src/proc/asset/sequence.cpp @@ -22,7 +22,7 @@ #include "proc/asset/sequence.hpp" -//#include "proc/mobject/session/track.hpp" +//#include "proc/mobject/session/fork.hpp" #include "proc/assetmanager.hpp" //#include "proc/mobject/placement.hpp" //#include "proc/mobject/session/mobjectfactory.hpp" diff --git a/src/proc/asset/timeline.cpp b/src/proc/asset/timeline.cpp index 2b4bfdc3f..bf34d4f44 100644 --- a/src/proc/asset/timeline.cpp +++ b/src/proc/asset/timeline.cpp @@ -22,7 +22,7 @@ #include "proc/asset/timeline.hpp" -//#include "proc/mobject/session/track.hpp" +//#include "proc/mobject/session/fork.hpp" //#include "proc/mobject/placement.hpp" //#include "proc/mobject/session/mobjectfactory.hpp" #include "proc/mobject/session/binding.hpp" diff --git a/src/proc/asset/viewer.cpp b/src/proc/asset/viewer.cpp index 12e660e67..7c78f0754 100644 --- a/src/proc/asset/viewer.cpp +++ b/src/proc/asset/viewer.cpp @@ -22,7 +22,7 @@ #include "proc/asset/viewer.hpp" -//#include "proc/mobject/session/track.hpp" +//#include "proc/mobject/session/fork.hpp" //#include "proc/mobject/placement.hpp" //#include "proc/mobject/session/mobjectfactory.hpp" //#include "proc/mobject/session/binding.hpp" diff --git a/src/proc/config-resolver.cpp b/src/proc/config-resolver.cpp index 0c71a1069..10e26d8cd 100644 --- a/src/proc/config-resolver.cpp +++ b/src/proc/config-resolver.cpp @@ -56,7 +56,7 @@ namespace proc { #include "proc/asset/pipe.hpp" #include "proc/asset/timeline.hpp" #include "proc/asset/sequence.hpp" -#include "proc/mobject/session/track.hpp" +#include "proc/mobject/session/fork.hpp" namespace lumiera{ namespace query { diff --git a/src/proc/config-resolver.hpp b/src/proc/config-resolver.hpp index 34e29da2b..e9e19af67 100644 --- a/src/proc/config-resolver.hpp +++ b/src/proc/config-resolver.hpp @@ -51,7 +51,7 @@ #include "lib/depend.hpp" // types for explicit specialisations.... -#include "proc/mobject/session/track.hpp" +#include "proc/mobject/session/fork.hpp" #include "proc/asset/procpatt.hpp" #include "proc/asset/pipe.hpp" #include "proc/asset/timeline.hpp" diff --git a/src/proc/mobject/session/fixture.hpp b/src/proc/mobject/session/fixture.hpp index cf5f2e46c..4b40b3b93 100644 --- a/src/proc/mobject/session/fixture.hpp +++ b/src/proc/mobject/session/fixture.hpp @@ -25,7 +25,7 @@ #define MOBJECT_SESSION_FIXTURE_H #include "proc/mobject/session/segmentation.hpp" -#include "proc/mobject/session/track.hpp" +#include "proc/mobject/session/fork.hpp" #include "proc/mobject/explicitplacement.hpp" #include "proc/mobject/session/auto.hpp" diff --git a/src/proc/mobject/session/track.cpp b/src/proc/mobject/session/fork.cpp similarity index 94% rename from src/proc/mobject/session/track.cpp rename to src/proc/mobject/session/fork.cpp index 27ab2f300..6f20581e1 100644 --- a/src/proc/mobject/session/track.cpp +++ b/src/proc/mobject/session/fork.cpp @@ -1,5 +1,5 @@ /* - Track - A grouping device within the Session. + Fork - A grouping device within the Session. Copyright (C) Lumiera.org 2008, Hermann Vosseler @@ -21,7 +21,7 @@ * *****************************************************/ -#include "proc/mobject/session/track.hpp" +#include "proc/mobject/session/fork.hpp" namespace proc { diff --git a/src/proc/mobject/session/track.hpp b/src/proc/mobject/session/fork.hpp similarity index 96% rename from src/proc/mobject/session/track.hpp rename to src/proc/mobject/session/fork.hpp index f11bf99a6..6a1124f55 100644 --- a/src/proc/mobject/session/track.hpp +++ b/src/proc/mobject/session/fork.hpp @@ -1,5 +1,5 @@ /* - TRACK.hpp - A grouping device within the Session. + FORK.hpp - A grouping device within the Session. Copyright (C) Lumiera.org 2008, Hermann Vosseler @@ -21,8 +21,8 @@ */ -#ifndef MOBJECT_SESSION_TRACK_H -#define MOBJECT_SESSION_TRACK_H +#ifndef MOBJECT_SESSION_FORK_H +#define MOBJECT_SESSION_FORK_H #include "proc/mobject/session/meta.hpp" #include "proc/asset/entry-id.hpp" @@ -119,4 +119,4 @@ namespace session { typedef Placement PTrack; }} // namespace proc::mobject -#endif +#endif /*MOBJECT_SESSION_FORK_H*/ diff --git a/src/proc/mobject/session/mobjectfactory.cpp b/src/proc/mobject/session/mobjectfactory.cpp index 62c9ce9d6..e24472cb2 100644 --- a/src/proc/mobject/session/mobjectfactory.cpp +++ b/src/proc/mobject/session/mobjectfactory.cpp @@ -24,7 +24,7 @@ #include "proc/mobject/session/mobjectfactory.hpp" #include "proc/mobject/session/root.hpp" #include "proc/mobject/session/clip.hpp" -#include "proc/mobject/session/track.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" diff --git a/src/proc/mobject/session/query/fake-configrules.cpp b/src/proc/mobject/session/query/fake-configrules.cpp index fd6b64c2f..79747f2a3 100644 --- a/src/proc/mobject/session/query/fake-configrules.cpp +++ b/src/proc/mobject/session/query/fake-configrules.cpp @@ -24,7 +24,7 @@ #include "proc/mobject/session/query/fake-configrules.hpp" #include "proc/mobject/session.hpp" -#include "proc/mobject/session/track.hpp" +#include "proc/mobject/session/fork.hpp" #include "proc/asset/procpatt.hpp" #include "proc/asset/pipe.hpp" #include "lib/query-util.hpp" diff --git a/src/proc/mobject/session/session-query.hpp b/src/proc/mobject/session/session-query.hpp index 42923db4f..cde9b68ac 100644 --- a/src/proc/mobject/session/session-query.hpp +++ b/src/proc/mobject/session/session-query.hpp @@ -42,7 +42,7 @@ #include "proc/mobject/session.hpp" #include "proc/mobject/placement.hpp" -#include "proc/mobject/session/track.hpp" +#include "proc/mobject/session/fork.hpp" #include diff --git a/tests/core/proc/asset/entry-id-test.cpp b/tests/core/proc/asset/entry-id-test.cpp index 543ba45e3..2c42f0881 100644 --- a/tests/core/proc/asset/entry-id-test.cpp +++ b/tests/core/proc/asset/entry-id-test.cpp @@ -26,7 +26,7 @@ #include "proc/asset/entry-id.hpp" #include "proc/mobject/session/clip.hpp" -#include "proc/mobject/session/track.hpp" +#include "proc/mobject/session/fork.hpp" #include "lib/meta/trait-special.hpp" #include "lib/util-foreach.hpp" #include "lib/symbol.hpp" diff --git a/tests/core/proc/asset/typed-id-test.cpp b/tests/core/proc/asset/typed-id-test.cpp index d08d30988..9a1967f74 100644 --- a/tests/core/proc/asset/typed-id-test.cpp +++ b/tests/core/proc/asset/typed-id-test.cpp @@ -30,7 +30,7 @@ #include "proc/assetmanager.hpp" #include "proc/asset/inventory.hpp" //#include "proc/mobject/session/clip.hpp" -//#include "proc/mobject/session/track.hpp" +//#include "proc/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-configuration-test.cpp b/tests/library/advice/advice-configuration-test.cpp index 2b011c96b..e682334b9 100644 --- a/tests/library/advice/advice-configuration-test.cpp +++ b/tests/library/advice/advice-configuration-test.cpp @@ -29,7 +29,7 @@ //#include "proc/assetmanager.hpp" //#include "proc/asset/inventory.hpp" //#include "proc/mobject/session/clip.hpp" -//#include "proc/mobject/session/track.hpp" +//#include "proc/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 c0dda990b..00aa5e03b 100644 --- a/tests/library/advice/advice-multiplicity-test.cpp +++ b/tests/library/advice/advice-multiplicity-test.cpp @@ -28,7 +28,7 @@ //#include "proc/assetmanager.hpp" //#include "proc/asset/inventory.hpp" //#include "proc/mobject/session/clip.hpp" -//#include "proc/mobject/session/track.hpp" +//#include "proc/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 6729d6c0c..a966f2ca0 100644 --- a/tests/library/advice/advice-situations-test.cpp +++ b/tests/library/advice/advice-situations-test.cpp @@ -30,7 +30,7 @@ //#include "proc/assetmanager.hpp" //#include "proc/asset/inventory.hpp" //#include "proc/mobject/session/clip.hpp" -//#include "proc/mobject/session/track.hpp" +//#include "proc/mobject/session/fork.hpp" //#include "lib/meta/trait-special.hpp" //#include "lib/util-foreach.hpp" //#include "lib/symbol.hpp"