diff --git a/src/common/configrules.hpp b/src/common/configrules.hpp index a1146283e..8363bf182 100644 --- a/src/common/configrules.hpp +++ b/src/common/configrules.hpp @@ -57,7 +57,6 @@ #include "proc/mobject/session/track.hpp" #include "proc/asset/procpatt.hpp" #include "proc/asset/pipe.hpp" -#include "proc/asset/track.hpp" #include "proc/asset/timeline.hpp" #include "proc/asset/sequence.hpp" @@ -213,7 +212,6 @@ namespace lumiera { ///////TODO: shouldn't that be namespace lib? or proc? * rule based config query system */ typedef lumiera::typelist::Types < mobject::session::Track - , asset::Track , asset::Pipe , const asset::ProcPatt , asset::Timeline diff --git a/src/proc/asset/sequence.cpp b/src/proc/asset/sequence.cpp index 77fc8e793..0090a62ef 100644 --- a/src/proc/asset/sequence.cpp +++ b/src/proc/asset/sequence.cpp @@ -25,7 +25,6 @@ //#include "proc/mobject/session/track.hpp" //#include "proc/mobject/placement.hpp" //#include "proc/mobject/session/mobjectfactory.hpp" -//#include "proc/asset/track.hpp" namespace asset { diff --git a/src/proc/asset/struct-factory-impl.hpp b/src/proc/asset/struct-factory-impl.hpp index 496600fc4..304432144 100644 --- a/src/proc/asset/struct-factory-impl.hpp +++ b/src/proc/asset/struct-factory-impl.hpp @@ -46,7 +46,6 @@ #include "proc/asset/timeline.hpp" #include "proc/asset/sequence.hpp" #include "proc/asset/procpatt.hpp" -#include "proc/asset/track.hpp" #include "proc/asset/pipe.hpp" #include "proc/asset/struct-scheme.hpp" @@ -175,15 +174,6 @@ namespace asset { /* ============= specialisations =========================== */ - template<> - inline Track* - StructFactoryImpl::fabricate (const Query& caps) - { - TODO ("actually extract properties/capabilities from the query..."); - TODO ("make sure AssetManager detects duplicates (currently 4/08 it doesn't)"); /////////////TICKET #102 - return new Track (createIdent (caps)); - } - template<> inline const ProcPatt* StructFactoryImpl::fabricate (const Query& caps) diff --git a/src/proc/asset/struct.cpp b/src/proc/asset/struct.cpp index 128745279..6bc9a9ff1 100644 --- a/src/proc/asset/struct.cpp +++ b/src/proc/asset/struct.cpp @@ -140,7 +140,6 @@ 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" #include "proc/asset/timeline.hpp" #include "proc/asset/sequence.hpp" @@ -149,7 +148,6 @@ namespace asset { namespace asset { template P StructFactory::operator() (const Query& query); - template P StructFactory::operator() (const Query& query); template PProcPatt StructFactory::operator() (const Query& query); template PTimeline StructFactory::operator() (const Query& query); template PSequence StructFactory::operator() (const Query& query); diff --git a/src/proc/asset/timeline.cpp b/src/proc/asset/timeline.cpp index bf692c7c0..65ad28d17 100644 --- a/src/proc/asset/timeline.cpp +++ b/src/proc/asset/timeline.cpp @@ -26,7 +26,6 @@ //#include "proc/mobject/placement.hpp" //#include "proc/mobject/session/mobjectfactory.hpp" #include "proc/mobject/session/binding.hpp" -//#include "proc/asset/track.hpp" namespace asset { diff --git a/src/proc/asset/track.cpp b/src/proc/asset/track.cpp deleted file mode 100644 index 0ef3e0b86..000000000 --- a/src/proc/asset/track.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/* - Track - structural asset holding the configuration of a track in the Session - - Copyright (C) Lumiera.org - 2008, Hermann Vosseler - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -* *****************************************************/ - - -#include "proc/asset/track.hpp" - -namespace asset - { - - /** @todo work out the details of track assets */ - Track::Track (const Asset::Ident& idi) - : Struct (idi) - { - - } - - -} // namespace asset diff --git a/src/proc/asset/track.hpp b/src/proc/asset/track.hpp deleted file mode 100644 index 6ba48e26e..000000000 --- a/src/proc/asset/track.hpp +++ /dev/null @@ -1,56 +0,0 @@ -/* - TRACK.hpp - structural asset used as global track identifier - - Copyright (C) Lumiera.org - 2008, Hermann Vosseler - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - - -#ifndef ASSET_TRACK_H -#define ASSET_TRACK_H - -#include "proc/asset/struct.hpp" - - - -namespace asset { - - - /** - * Structural Asset used as a global identifier for placing - * media objects onto a given track. Not to be confused with the "track-MO", - * the MObject which becomes part of the high-level-model: - * In order actually to use a track within an Sequence, we need to attach a - * Placement to the tree-of-tracks of this Sequence. - * Thus, we have one global track-identifier (this class here), but maybe - * several instances (placement of a track-MO) within various Sequences - */ - class Track : public Struct - { - protected: - Track (const Asset::Ident& idi); - friend class StructFactoryImpl; - }; - - - typedef P PTrack; - - - -} // namespace asset -#endif diff --git a/src/proc/assetmanager.cpp b/src/proc/assetmanager.cpp index 90489674d..dcd18b7b7 100644 --- a/src/proc/assetmanager.cpp +++ b/src/proc/assetmanager.cpp @@ -234,7 +234,6 @@ namespace asset { #include "proc/asset/clip.hpp" #include "proc/asset/proc.hpp" #include "proc/asset/struct.hpp" -#include "proc/asset/track.hpp" #include "proc/asset/pipe.hpp" #include "proc/asset/meta.hpp" #include "proc/asset/procpatt.hpp" @@ -256,7 +255,6 @@ namespace asset { template P AssetManager::wrap (const Asset& asset); template P AssetManager::wrap (const Media& asset); template P AssetManager::wrap (const Clip& asset); - template P AssetManager::wrap (const Track& asset); template P AssetManager::wrap (const Pipe& asset); template P AssetManager::wrap (const ProcPatt& asset); template P AssetManager::wrap (const Timeline& asset); diff --git a/src/proc/mobject/session/defsmanager.cpp b/src/proc/mobject/session/defsmanager.cpp index a5bfe1dfc..c31044392 100644 --- a/src/proc/mobject/session/defsmanager.cpp +++ b/src/proc/mobject/session/defsmanager.cpp @@ -140,7 +140,6 @@ namespace session { #include "proc/asset/procpatt.hpp" #include "proc/asset/pipe.hpp" -#include "proc/asset/track.hpp" #include "proc/asset/timeline.hpp" #include "proc/asset/sequence.hpp" #include "proc/mobject/session/track.hpp" @@ -159,14 +158,11 @@ namespace session { using asset::PSequence; using mobject::session::Track; - using mobject::session::TrackAsset; using mobject::session::PTrack; - using mobject::session::PTrackAsset; template PPipe DefsManager::operator() (const Query&); template PProcPatt DefsManager::operator() (const Query&); template PTrack DefsManager::operator() (const Query&); - template PTrackAsset DefsManager::operator() (const Query&); template PTimeline DefsManager::operator() (const Query&); template PSequence DefsManager::operator() (const Query&); diff --git a/src/proc/mobject/session/mobjectfactory.cpp b/src/proc/mobject/session/mobjectfactory.cpp index 0b1373710..b7f639d9e 100644 --- a/src/proc/mobject/session/mobjectfactory.cpp +++ b/src/proc/mobject/session/mobjectfactory.cpp @@ -29,7 +29,6 @@ #include "proc/mobject/session/label.hpp" #include "proc/mobject/session/binding.hpp" #include "proc/asset/clip.hpp" -#include "proc/asset/track.hpp" #include "proc/asset/effect.hpp" namespace mobject { @@ -82,14 +81,6 @@ namespace session { UNIMPLEMENTED ("build multichannel compound clip-MO"); } - /** */ - Placement - MObjectFactory::operator() (PTrackAsset& trackDef) /////////////////////TICKET #581 kill kill kill the track-asset - { - TODO ("what needs to be registered when creating an Track-MO?"); - return Placement (*new Track (trackDef), &deleterFunc); - } - /** fabricate a new track-MObject, using the given unique ID */ Placement MObjectFactory::operator() (TrackID const& id) diff --git a/src/proc/mobject/session/mobjectfactory.hpp b/src/proc/mobject/session/mobjectfactory.hpp index 509975676..0d7aa6010 100644 --- a/src/proc/mobject/session/mobjectfactory.hpp +++ b/src/proc/mobject/session/mobjectfactory.hpp @@ -34,7 +34,6 @@ namespace asset { class Clip; class Media; - class Track; class Effect; class Sequence; @@ -52,8 +51,6 @@ namespace session { class Label; class Binding; - typedef P PTrackAsset; - class DefsManager; @@ -69,8 +66,7 @@ namespace session { Placement operator() (DefsManager&); Placement operator() (asset::Clip const&, asset::Media const&); Placement operator() (asset::Clip const&, vector); - Placement operator() (PTrackAsset&); ////////////////////////////////////////////////////TICKET #581 kill kill kill the track-asset - Placement operator() (asset::EntryID const&); ////////////TICKET #581 use this one instead + Placement operator() (asset::EntryID const&); Placement operator() (asset::Effect const&); Placement