X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrackattachment.h;h=bd8712b83981ecb7a3634e78ee334865d0a65835;hb=0443ca05cbd306487131f5f5bd3b91181ae4a733;hp=1572f619db1ede100ea9cfa8e22d4298ba9a2edc;hpb=5fa009f4af8d0a2e4f52929e1ee29f5c93986ab6;p=r2c2.git diff --git a/source/libr2c2/trackattachment.h b/source/libr2c2/trackattachment.h index 1572f61..bd8712b 100644 --- a/source/libr2c2/trackattachment.h +++ b/source/libr2c2/trackattachment.h @@ -3,27 +3,26 @@ #include "object.h" #include "track.h" -#include "trackiter.h" +#include "trackoffsetiter.h" namespace R2C2 { class TrackAttachment: public Object, public sigc::trackable { protected: - TrackIter track; - float offset; + TrackOffsetIter track; TrackAttachment(Layout &); public: virtual ~TrackAttachment(); - const TrackIter &get_track_iter() const { return track; } + const TrackOffsetIter &get_track_iter() const { return track; } Track *get_track() const { return track.track(); } unsigned get_entry() const { return track.entry(); } - float get_offset() const { return offset; } + float get_offset() const { return track.offset(); } float get_offset_from_endpoint(unsigned) const; protected: - void attach_to(const TrackIter &, float); + void attach_to(const TrackOffsetIter &); void attach_to_closest(float); float find_offset(const TrackIter &, const Vector &);