ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix linking problem with the asset::Struct naming scheme

Browse source
This commit is contained in:
Fischlurch 2010-04-09 03:45:20 +02:00
parent 1f988e17cd
commit b998935d6f
2 changed files with 37 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/proc/asset/struct-scheme.hpp
View file

@ -89,34 +89,8 @@ namespace asset{
static Symbol idSymbol;
};
///////////////////////////////////////////////////////////////////////////////////////////TICKET #581 intending to abandon asset::Track in favour of a plain EntryID
template<> Symbol StructTraits<asset::Track>::namePrefix = "track";
template<> Symbol StructTraits<asset::Track>::catFolder = "tracks";
template<> Symbol StructTraits<asset::Track>::idSymbol = "track";
// Note: individual defaults are defined in stuct.cpp
template<> Symbol StructTraits<mobject::session::Track>::namePrefix = "track";
template<> Symbol StructTraits<mobject::session::Track>::catFolder = "tracks";
template<> Symbol StructTraits<mobject::session::Track>::idSymbol = "track";
template<> Symbol StructTraits<mobject::session::Clip>::namePrefix = "clip";
template<> Symbol StructTraits<mobject::session::Clip>::catFolder = "clips";
template<> Symbol StructTraits<mobject::session::Clip>::idSymbol = "clip";
template<> Symbol StructTraits<Pipe>::namePrefix = "pipe";
template<> Symbol StructTraits<Pipe>::catFolder = "pipes";
template<> Symbol StructTraits<Pipe>::idSymbol = "pipe";
template<> Symbol StructTraits<const ProcPatt>::namePrefix = "patt";
template<> Symbol StructTraits<const ProcPatt>::catFolder = "build-templates";
template<> Symbol StructTraits<const ProcPatt>::idSymbol = "procPatt";
template<> Symbol StructTraits<Timeline>::namePrefix = "tL";
template<> Symbol StructTraits<Timeline>::catFolder = "timelines";
template<> Symbol StructTraits<Timeline>::idSymbol = "timeline";
template<> Symbol StructTraits<Sequence>::namePrefix = "seq";
template<> Symbol StructTraits<Sequence>::catFolder = "sequences";
template<> Symbol StructTraits<Sequence>::idSymbol = "sequence";
/* catch-all defaults */
template<class X>

36
src/proc/asset/struct.cpp
View file

@ -138,6 +138,7 @@ namespace asset {
/**************************************************/
#include "proc/asset/struct.hpp"
#include "proc/asset/struct-scheme.hpp"
#include "proc/asset/procpatt.hpp"
#include "proc/asset/track.hpp"
#include "proc/asset/pipe.hpp"
@ -154,4 +155,39 @@ namespace asset {
template PSequence StructFactory::operator() (const Query<Sequence>& query);
/* ======= struct asset naming scheme ======== */
///////////////////////////////////////////////////////////////////////////////////////////TICKET #565 better organisation for the asset::Struct naming scheme
///////////////////////////////////////////////////////////////////////////////////////////TICKET #581 intending to abandon asset::Track in favour of a plain EntryID
template<> Symbol StructTraits<asset::Track>::namePrefix = "track";
template<> Symbol StructTraits<asset::Track>::catFolder = "tracks";
template<> Symbol StructTraits<asset::Track>::idSymbol = "track";
template<> Symbol StructTraits<mobject::session::Track>::namePrefix = "track";
template<> Symbol StructTraits<mobject::session::Track>::catFolder = "tracks";
template<> Symbol StructTraits<mobject::session::Track>::idSymbol = "track";
template<> Symbol StructTraits<mobject::session::Clip>::namePrefix = "clip";
template<> Symbol StructTraits<mobject::session::Clip>::catFolder = "clips";
template<> Symbol StructTraits<mobject::session::Clip>::idSymbol = "clip";
template<> Symbol StructTraits<Pipe>::namePrefix = "pipe";
template<> Symbol StructTraits<Pipe>::catFolder = "pipes";
template<> Symbol StructTraits<Pipe>::idSymbol = "pipe";
template<> Symbol StructTraits<const ProcPatt>::namePrefix = "patt";
template<> Symbol StructTraits<const ProcPatt>::catFolder = "build-templates";
template<> Symbol StructTraits<const ProcPatt>::idSymbol = "procPatt";
template<> Symbol StructTraits<Timeline>::namePrefix = "tL";
template<> Symbol StructTraits<Timeline>::catFolder = "timelines";
template<> Symbol StructTraits<Timeline>::idSymbol = "timeline";
template<> Symbol StructTraits<Sequence>::namePrefix = "seq";
template<> Symbol StructTraits<Sequence>::catFolder = "sequences";
template<> Symbol StructTraits<Sequence>::idSymbol = "sequence";
} // namespace asset