From b998935d6ff67e17397625ded19e871d3adbf7dc Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Fri, 9 Apr 2010 03:45:20 +0200
Subject: [PATCH] fix linking problem with the asset::Struct naming scheme

---
 src/proc/asset/struct-scheme.hpp | 28 +------------------------
 src/proc/asset/struct.cpp        | 36 ++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/proc/asset/struct-scheme.hpp b/src/proc/asset/struct-scheme.hpp
index 2f74c1eb3..588b01551 100644
--- a/src/proc/asset/struct-scheme.hpp
+++ b/src/proc/asset/struct-scheme.hpp
@@ -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>
diff --git a/src/proc/asset/struct.cpp b/src/proc/asset/struct.cpp
index b9e768007..387d8b3bf 100644
--- a/src/proc/asset/struct.cpp
+++ b/src/proc/asset/struct.cpp
@@ -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