Support multiple TrackAppearances in Catalogue

[r2c2.git] / source / libr2c2 / tracktype.h

diff --git a/source/libr2c2/tracktype.h b/source/libr2c2/tracktype.h
index 2a116134d850b0353a0ba1f2586bea15caa52a2d..bccd10baadc0a4c551570ece52383b2b8998b915 100644 (file)
--- a/source/libr2c2/tracktype.h
+++ b/source/libr2c2/tracktype.h
@@ -28,13 +28,20 @@ public:
 
        class Loader: public Msp::DataFile::DerivedObjectLoader<TrackType, ObjectType::Loader>
        {
+       public:
+               typedef Msp::DataFile::Collection Collection;
+
        private:
+               Collection &coll;
                bool state_bits_set;
 
        public:
-               Loader(TrackType &);
+               Loader(TrackType &, Collection &);
+
+               virtual Collection &get_collection() const { return coll; }
        private:
                virtual void finish();
+               void appearance(const std::string &);
                void part();
                void position(float, float, float);
                void state_bits(unsigned);
@@ -49,7 +56,7 @@ private:
        std::string object;
 
 public:
-       TrackType(const ArticleNumber & = ArticleNumber(), const TrackAppearance * = 0);
+       TrackType(const ArticleNumber & = ArticleNumber());
 
        const TrackAppearance &get_appearance() const;
        float get_gauge() const;