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
This commit is contained in:
Fischlurch 2015-05-30 22:09:26 +02:00
parent 97fec4179b
commit 7c7a07b54f
17 changed files with 21 additions and 21 deletions

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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 {

View file

@ -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"

View file

@ -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"

View file

@ -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 <Ichthyostega@web.de>
@ -21,7 +21,7 @@
* *****************************************************/
#include "proc/mobject/session/track.hpp"
#include "proc/mobject/session/fork.hpp"
namespace proc {

View file

@ -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 <Ichthyostega@web.de>
@ -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<session::Track, session::Meta> PTrack;
}} // namespace proc::mobject
#endif
#endif /*MOBJECT_SESSION_FORK_H*/

View file

@ -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"

View file

@ -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"

View file

@ -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 <functional>

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"