Compute deterministic IDs for blocks

[r2c2.git] / source / libmarklin / train.h

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 5f75a2a82bf837004352a7b537f841512a1f974d..5ef23537a4710b9f3e4e8832f9056d73c10e2813 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -26,10 +26,16 @@ class Train: public sigc::trackable
 public:
        class Loader: public Msp::DataFile::BasicLoader<Train>
        {
+       private:
+               Block *prev_block;
+
        public:
                Loader(Train &);
        private:
+               void block(unsigned);
+               void block_hint(unsigned);
                void real_speed(unsigned, float, float);
+               void route(const std::string &);
        };
 
        sigc::signal<void, const std::string &> signal_name_changed;
@@ -91,6 +97,7 @@ public:
        const std::string &get_status() const { return status; }
        const Point &get_position() const { return pos; }
        void place(Block &, unsigned);
+       bool is_placed() const { return !cur_blocks.empty(); }
        bool free_block(Block &);
        int get_entry_to_block(Block &) const;
        void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
@@ -107,6 +114,7 @@ private:
        void set_status(const std::string &);
        void set_position(const Block::Endpoint &);
        void release_blocks(std::list<BlockRef> &);
+       void reverse_blocks(std::list<BlockRef> &) const;
 };
 
 } // namespace Marklin