diff --git a/src/proc/asset/entry-id.hpp b/src/proc/asset/entry-id.hpp index 6a6bbcd9f..632561e77 100644 --- a/src/proc/asset/entry-id.hpp +++ b/src/proc/asset/entry-id.hpp @@ -87,7 +87,7 @@ namespace asset { boost::hash_combine(seed, sym); lumiera_uid tmpLUID; lumiera_uid_set_ptr (&tmpLUID, reinterpret_cast (&seed)); - return reinterpret_cast (tmpLUID); + return reinterpret_cast (tmpLUID); } } @@ -110,9 +110,9 @@ namespace asset { public: explicit - BareEntryID (string const& symbolID, HashVal seed =0) /////////////TODO couldn't this be protected? + BareEntryID (string const& symbolID, idi::HashVal seed =0) /////////////TODO couldn't this be protected? : symbol_(util::sanitise(symbolID)) - , hash_(buildHash (symbol_, seed)) + , hash_(idi::buildHash (symbol_, seed)) { } /* default copy- and assignable */ @@ -138,7 +138,7 @@ namespace asset { /** using BareEntryID derived objects as keys within tr1::unordered_map */ struct UseEmbeddedHash - : public std::unary_function + : public std::unary_function { size_t operator() (BareEntryID const& obj) const { return obj.getHash(); } }; @@ -190,7 +190,7 @@ namespace asset { getIdent() const { Category cat (STRUCT, idi::StructTraits::catFolder); - return Asset::Ident (name, cat); + return Asset::Ident (this->getSym(), cat); } static idi::HashVal @@ -225,7 +225,7 @@ namespace asset { operator string () const { - return "ID<"+idi::StructTraits::idSymbol+">-"+getSym(); + return "ID<"+idi::StructTraits::idSymbol+">-"+EntryID::getSym(); } friend ostream& operator<< (ostream& os, EntryID const& id) { return os << string(id); } diff --git a/src/proc/asset/struct-factory-impl.hpp b/src/proc/asset/struct-factory-impl.hpp index 6cf87e215..0fe969261 100644 --- a/src/proc/asset/struct-factory-impl.hpp +++ b/src/proc/asset/struct-factory-impl.hpp @@ -37,7 +37,8 @@ #include "proc/mobject/session.hpp" -#include "proc/mobject/mobject.hpp" +#include "proc/mobject/session/binding.hpp" +#include "proc/mobject/session/mobjectfactory.hpp" #include "common/configrules.hpp" #include "proc/asset/timeline.hpp" #include "proc/asset/sequence.hpp" diff --git a/src/proc/mobject/session/binding.cpp b/src/proc/mobject/session/binding.cpp index 8aa2a9bc7..955d94149 100644 --- a/src/proc/mobject/session/binding.cpp +++ b/src/proc/mobject/session/binding.cpp @@ -28,7 +28,7 @@ namespace mobject { namespace session { /** */ - Binding::Binding (PSequence& sequence_to_bind) + Binding::Binding (PSequence const& sequence_to_bind) : boundSequence_(sequence_to_bind) { throwIfInvalid(); diff --git a/src/proc/mobject/session/binding.hpp b/src/proc/mobject/session/binding.hpp index 0f588eb91..135482e57 100644 --- a/src/proc/mobject/session/binding.hpp +++ b/src/proc/mobject/session/binding.hpp @@ -28,12 +28,17 @@ #include "proc/mobject/builder/buildertool.hpp" -namespace asset { class Sequence; } +namespace asset { + class Sequence; + + typedef lumiera::P PSequence; + +} namespace mobject { namespace session { - typedef lumiera::P PSequence; + using asset::PSequence; /** * Explicit link to bind a Sequence (container) to be used within the Session, @@ -48,7 +53,7 @@ namespace session { bool isValid() const; public: - Binding (PSequence& sequence_to_bind); + Binding (PSequence const& sequence_to_bind); DEFINE_PROCESSABLE_BY (builder::BuilderTool); diff --git a/src/proc/mobject/session/mobjectfactory.cpp b/src/proc/mobject/session/mobjectfactory.cpp index fc1a2ccbf..d08bc7e3a 100644 --- a/src/proc/mobject/session/mobjectfactory.cpp +++ b/src/proc/mobject/session/mobjectfactory.cpp @@ -99,7 +99,7 @@ namespace session { /** */ Placement - MObjectFactory::operator() (PSequence& sequence_to_bind) + MObjectFactory::operator() (PSequence const& sequence_to_bind) { TODO ("any additional liabilities when creating a binding?"); return Placement (*new Binding(sequence_to_bind), &deleterFunc); diff --git a/src/proc/mobject/session/mobjectfactory.hpp b/src/proc/mobject/session/mobjectfactory.hpp index 6b9ccfca5..972bc6628 100644 --- a/src/proc/mobject/session/mobjectfactory.hpp +++ b/src/proc/mobject/session/mobjectfactory.hpp @@ -53,8 +53,6 @@ namespace session { typedef P PTrackAsset; - using asset::PSequence; - class DefsManager; @@ -73,7 +71,7 @@ namespace session { Placement operator() (PTrackAsset&); Placement operator() (asset::Effect const&); Placement