Emit various signals from Train when it's loaded

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

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index bacb246f4dfd5f68a4dee346aa92abf5a85bebcf..530d0209015a6217165d5fe4217637a239aae024 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -26,10 +26,17 @@ 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 name(const std::string &);
                void real_speed(unsigned, float, float);
+               void route(const std::string &);
        };
 
        sigc::signal<void, const std::string &> signal_name_changed;
@@ -63,7 +70,6 @@ private:
        Block *pending_block;
        unsigned target_speed;
        const Route *route;
-       Msp::Time::TimeStamp try_reserve;
        std::string status;
 
        Msp::Time::TimeStamp last_entry_time;
@@ -90,8 +96,10 @@ public:
        const Route *get_route() const { return route; }
        const std::string &get_status() const { return status; }
        const Point &get_position() const { return pos; }
-       void place(Block *, unsigned);
-       bool free_block(Block *);
+       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 &);
        void save(std::list<Msp::DataFile::Statement> &) const;
 private:
@@ -99,13 +107,16 @@ private:
        void sensor_event(bool, Sensor *);
        void turnout_path_changing(unsigned, Turnout *);
        void turnout_path_changed(unsigned, Turnout *);
+       void block_reserved(const Block &, const Train *);
        unsigned reserve_more();
        void update_speed();
        float get_real_speed(unsigned) const;
        unsigned find_speed(float) const;
        void set_status(const std::string &);
        void set_position(const Block::Endpoint &);
-       void release_reserved_blocks();
+       void release_blocks(std::list<BlockRef> &);
+       void release_blocks(std::list<BlockRef> &, std::list<BlockRef>::iterator, std::list<BlockRef>::iterator);
+       void reverse_blocks(std::list<BlockRef> &) const;
 };
 
 } // namespace Marklin