Menu
▾
▴
[Lmuse-cvs-traffic] muse/muse app.cpp,1.235,1.236 cobject.cpp,1.11,1.12 cobject.h,1.14,1.15 editor.cpp,1.2,1.3 editor.h,1.2,1.3 songfile.cpp,1.76,1.77
|
From: werner s. <wsc...@us...> - 2006-02-06 17:57:34
|
Update of /cvsroot/lmuse/muse/muse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28233/muse Modified Files: app.cpp cobject.cpp cobject.h editor.cpp editor.h songfile.cpp Log Message: marker fixes Index: editor.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/editor.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** editor.h 24 Jan 2006 16:18:09 -0000 1.2 --- editor.h 6 Feb 2006 17:57:21 -0000 1.3 *************** *** 9,20 **** #define __EDITOR_H__ - #include "al/sig.h" #include "cobject.h" - namespace AL { - class Xml; - }; - using AL::Xml; - class TimeCanvas; --- 9,14 ---- Index: cobject.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/cobject.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** cobject.cpp 24 Jan 2006 16:18:09 -0000 1.11 --- cobject.cpp 6 Feb 2006 17:57:21 -0000 1.12 *************** *** 4,8 **** // $Id$ // ! // (C) Copyright 1999/2000 Werner Schweer (ws...@se...) //========================================================= --- 4,8 ---- // $Id$ // ! // (C) Copyright 1999/2006 Werner Schweer (ws...@se...) //========================================================= *************** *** 27,53 **** void TopWin::read(QDomNode node) { ! while (!node.isNull()) { ! QDomElement e = node.toElement(); ! if (e.tagName() == "geometry") { ! QRect r(AL::readGeometry(node)); ! resize(r.size()); ! move(r.topLeft()); ! } ! else ! printf("MusE:read20(): unknown tag %s\n", e.tagName().toLatin1().data()); ! node = node.nextSibling(); ! } } //--------------------------------------------------------- ! // writeStatus //--------------------------------------------------------- void TopWin::write(Xml& xml) const { ! printf("TopWin::write\n"); ! xml.tag("topwin"); ! xml.qrectTag("geometry", geometry()); ! xml.etag("topwin"); } --- 27,43 ---- void TopWin::read(QDomNode node) { ! for (node = node.firstChild(); !node.isNull(); node = node.nextSibling()) ! AL::readProperties(this, node); } //--------------------------------------------------------- ! // write //--------------------------------------------------------- void TopWin::write(Xml& xml) const { ! xml.tag(metaObject()->className()); ! xml.writeProperties(this); ! xml.etag(metaObject()->className()); } Index: cobject.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/cobject.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** cobject.h 24 Jan 2006 16:18:09 -0000 1.14 --- cobject.h 6 Feb 2006 17:57:21 -0000 1.15 *************** *** 29,33 **** public: virtual void read(QDomNode); ! virtual void write(Xml&) const; TopWin(); }; --- 29,33 ---- public: virtual void read(QDomNode); ! virtual void write(Xml& xml) const; TopWin(); }; Index: songfile.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/songfile.cpp,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** songfile.cpp 3 Feb 2006 16:46:38 -0000 1.76 --- songfile.cpp 6 Feb 2006 17:57:21 -0000 1.77 *************** *** 25,28 **** --- 25,29 ---- #include "midiedit/pianoroll.h" #include "part.h" + #include "marker/markerview.h" //--------------------------------------------------------- *************** *** 64,68 **** } else if (tag == "PianoRoll") { ! PianoRoll* pianoroll = new PianoRoll(pl); connect(muse, SIGNAL(configChanged()), pianoroll, SLOT(configChanged())); pianoroll->read(node); --- 65,69 ---- } else if (tag == "PianoRoll") { ! PianoRoll* pianoroll = new PianoRoll(pl, false); connect(muse, SIGNAL(configChanged()), pianoroll, SLOT(configChanged())); pianoroll->read(node); *************** *** 71,75 **** } else if (tag == "DrumEdit") { ! DrumEdit* drumEditor = new DrumEdit(pl); connect(muse, SIGNAL(configChanged()), drumEditor, SLOT(configChanged())); drumEditor->read(node); --- 72,76 ---- } else if (tag == "DrumEdit") { ! DrumEdit* drumEditor = new DrumEdit(pl, false); connect(muse, SIGNAL(configChanged()), drumEditor, SLOT(configChanged())); drumEditor->read(node); *************** *** 77,81 **** pl = new PartList; } ! else if (tag == "listeditor") { // ListEdit* listEditor = new ListEdit(0, pl); // listEditor->show(); --- 78,82 ---- pl = new PartList; } ! else if (tag == "ListEditor") { // ListEdit* listEditor = new ListEdit(0, pl); // listEditor->show(); *************** *** 88,95 **** masterEditor->read(node); } ! else if (tag == "marker") { showMarker(true); } ! else if (tag == "waveedit") { WaveEdit* waveEditor = new WaveEdit(pl); waveEditor->show(); --- 89,97 ---- masterEditor->read(node); } ! else if (tag == "MarkerView") { showMarker(true); + markerView->read(node); } ! else if (tag == "WaveEdit") { WaveEdit* waveEditor = new WaveEdit(pl); waveEditor->show(); *************** *** 215,219 **** readRoute(node); else if (tag == "marker") ! readMarker(node.firstChild()); else if (tag == "globalPitchShift") _globalPitchShift = i; --- 217,221 ---- readRoute(node); else if (tag == "marker") ! readMarker(node); else if (tag == "globalPitchShift") _globalPitchShift = i; *************** *** 324,327 **** --- 326,331 ---- else if (strcmp("ListEdit", w->metaObject()->className()) == 0) ((TopWin*)w)->write(xml); + else if (strcmp("MarkerView", w->metaObject()->className()) == 0) + ((TopWin*)w)->write(xml); else if (strcmp("Mixer", w->metaObject()->className()) == 0) ; Index: app.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/app.cpp,v retrieving revision 1.235 retrieving revision 1.236 diff -C2 -d -r1.235 -r1.236 *** app.cpp 3 Feb 2006 16:46:37 -0000 1.235 --- app.cpp 6 Feb 2006 17:57:21 -0000 1.236 *************** *** 1573,1577 **** void MusE::startPianoroll(PartList* pl) { ! PianoRoll* pianoroll = new PianoRoll(pl); pianoroll->show(); connect(muse, SIGNAL(configChanged()), pianoroll, SLOT(configChanged())); --- 1573,1577 ---- void MusE::startPianoroll(PartList* pl) { ! PianoRoll* pianoroll = new PianoRoll(pl, true); pianoroll->show(); connect(muse, SIGNAL(configChanged()), pianoroll, SLOT(configChanged())); *************** *** 1621,1625 **** void MusE::startDrumEditor(PartList* pl) { ! DrumEdit* drumEditor = new DrumEdit(pl); drumEditor->show(); connect(muse, SIGNAL(configChanged()), drumEditor, SLOT(configChanged())); --- 1621,1625 ---- void MusE::startDrumEditor(PartList* pl) { ! DrumEdit* drumEditor = new DrumEdit(pl, true); drumEditor->show(); connect(muse, SIGNAL(configChanged()), drumEditor, SLOT(configChanged())); *************** *** 2832,2836 **** { if (on && markerView == 0) { ! markerView = new MarkerView(this); connect(arranger, SIGNAL(addMarker(const AL::Pos&)), markerView, SLOT(addMarker(const AL::Pos&))); connect(arranger, SIGNAL(removeMarker(const AL::Pos&)), markerView, SLOT(removeMarker(const AL::Pos&))); --- 2832,2836 ---- { if (on && markerView == 0) { ! markerView = new MarkerView; connect(arranger, SIGNAL(addMarker(const AL::Pos&)), markerView, SLOT(addMarker(const AL::Pos&))); connect(arranger, SIGNAL(removeMarker(const AL::Pos&)), markerView, SLOT(removeMarker(const AL::Pos&))); Index: editor.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/editor.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** editor.cpp 24 Jan 2006 16:18:09 -0000 1.2 --- editor.cpp 6 Feb 2006 17:57:21 -0000 1.3 *************** *** 7,15 **** #include "editor.h" - #include "al/xml.h" - #include "part.h" - #include "track.h" - #include "song.h" - #include "awl/tcanvas.h" //--------------------------------------------------------- --- 7,10 ---- |