[Lmuse-cvs-traffic] muse/al marker.cpp,1.2,1.3 marker.h,1.1,1.2

[werner s. <wsc...@us...>]

Update of /cvsroot/lmuse/muse/al
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15150/al

Modified Files:
	marker.cpp marker.h 
Log Message:
misc updates


Index: marker.h
===================================================================
RCS file: /cvsroot/lmuse/muse/al/marker.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** marker.h	1 Oct 2005 11:43:24 -0000	1.1
--- marker.h	3 Feb 2006 16:46:37 -0000	1.2
***************
*** 24,27 ****
--- 24,28 ----
     public:
        Marker() : _current(false) {}
+   	Marker(const Pos& m) : Pos(m), _current(false) {}
        Marker(const QString& s, bool cur = false)
           : _name(s), _current(cur) {}
***************
*** 40,44 ****
     public:
        Marker* add(const Marker& m);
!       Marker* add(const QString& s, int t, bool lck);
        void write(Xml&) const;
        void remove(Marker*);
--- 41,45 ----
     public:
        Marker* add(const Marker& m);
!       Marker* add(const QString& s, const Pos&);
        void write(Xml&) const;
        void remove(Marker*);

Index: marker.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/al/marker.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** marker.cpp	4 Nov 2005 12:03:34 -0000	1.2
--- marker.cpp	3 Feb 2006 16:46:37 -0000	1.3
***************
*** 21,30 ****
        }
  
! Marker* MarkerList::add(const QString& s, int t, bool lck)
        {
!       Marker marker(s);
!       marker.setType(lck ? AL::FRAMES : AL::TICKS);
!       marker.setTick(t);
!       iMarker i = insert(std::pair<const int, Marker> (t, marker));
        return &i->second;
        }
--- 21,29 ----
        }
  
! Marker* MarkerList::add(const QString& s, const Pos& pos)
        {
!       Marker marker(pos);
!   	marker.setName(s);
!       iMarker i = insert(std::pair<const int, Marker> (pos.tick(), marker));
        return &i->second;
        }