[Lmuse-cvs-traffic] muse/muse/arranger pcanvas.cpp, 1.48.2.10, 1.48.2.11

[Robert J. <spa...@us...>]

Update of /cvsroot/lmuse/muse/muse/arranger
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5312/muse/arranger

Modified Files:
      Tag: REL07
	pcanvas.cpp 
Log Message:
new paste methodology

Index: pcanvas.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/Attic/pcanvas.cpp,v
retrieving revision 1.48.2.10
retrieving revision 1.48.2.11
diff -C2 -d -r1.48.2.10 -r1.48.2.11
*** pcanvas.cpp	19 Sep 2006 20:33:54 -0000	1.48.2.10
--- pcanvas.cpp	3 Oct 2006 19:50:08 -0000	1.48.2.11
***************
*** 1411,1414 ****
--- 1411,1417 ----
        const char* p = pt.latin1();
        Xml xml(p);
+       bool firstPart=true;
+       int  posOffset=0;
+       int  finalPos=0;
  
        song->startUndo();
***************
*** 1420,1424 ****
                    case Xml::End:
                          song->endUndo(SC_PART_INSERTED);
!                         return pos;
                    case Xml::TagStart:
                          if (tag == "part") {
--- 1423,1427 ----
                    case Xml::End:
                          song->endUndo(SC_PART_INSERTED);
!                         return finalPos;
                    case Xml::TagStart:
                          if (tag == "part") {
***************
*** 1431,1436 ****
                                      break;
                                p->read(xml);
!                               p->setTick(pos);
!                               pos += p->lenTick();
                                audio->msgAddPart(p,false);
                                }
--- 1434,1444 ----
                                      break;
                                p->read(xml);
!                               if (firstPart) {
!                                     firstPart=false;
!                                     posOffset=pos-p->tick();
!                                     }
!                               p->setTick(p->tick()+posOffset);
!                               finalPos=p->tick()+p->lenTick();
!                               //pos += p->lenTick();
                                audio->msgAddPart(p,false);
                                }