Menu
▾
▴
[Lmuse-cvs-traffic] muse/muse/arranger arranger.cpp,1.51,1.52 canvaswidget.cpp,1.11,1.12 cswidget.cpp,1.7,1.8 cswidget.h,1.3,1.4
|
From: werner s. <wsc...@us...> - 2004-09-28 18:32:33
|
Update of /cvsroot/lmuse/muse/muse/arranger In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11710/muse/arranger Modified Files: arranger.cpp canvaswidget.cpp cswidget.cpp cswidget.h Log Message: more controller editing Index: canvaswidget.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/arranger/canvaswidget.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** canvaswidget.cpp 27 Sep 2004 18:16:17 -0000 1.11 --- canvaswidget.cpp 28 Sep 2004 18:32:23 -0000 1.12 *************** *** 250,253 **** --- 250,254 ---- case 1: audio->msgRemovePart(part, true); + _track->partListChanged(); break; case 2: Index: cswidget.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/arranger/cswidget.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** cswidget.cpp 27 Sep 2004 16:43:45 -0000 1.7 --- cswidget.cpp 28 Sep 2004 18:32:23 -0000 1.8 *************** *** 99,109 **** if (i != controller->end()) { x1 = MAPX(i->first); ! y1 = controller->val2pixel(i->second, th); ! p.fillRect( x1 - HANDLE2, y1 - HANDLE2, HANDLE1, HANDLE1, (x1 == xs) ? red : yellow); } for (; i != controller->end(); ++i) { x2 = MAPX(i->first); ! y2 = controller->val2pixel(i->second, th); p.drawLine(x1, y1, x2, y1); p.drawLine(x2, y1, x2, y2); --- 99,109 ---- if (i != controller->end()) { x1 = MAPX(i->first); ! y1 = controller->val2pixelR(i->second, th); ! p.fillRect(x1 - HANDLE2, y1 - HANDLE2, HANDLE1, HANDLE1, (x1 == xs) ? red : yellow); } for (; i != controller->end(); ++i) { x2 = MAPX(i->first); ! y2 = controller->val2pixelR(i->second, th); p.drawLine(x1, y1, x2, y1); p.drawLine(x2, y1, x2, y2); *************** *** 118,122 **** for (ciCtrlVal i = controller->begin(); i != controller->end(); ++i) { int x2 = MAPX(i->first); ! int y2 = controller->val2pixel(i->second, th); if (x1 == -1) { x1 = MAP_OFFSET - offset; --- 118,122 ---- for (ciCtrlVal i = controller->begin(); i != controller->end(); ++i) { int x2 = MAPX(i->first); ! int y2 = controller->val2pixelR(i->second, th); if (x1 == -1) { x1 = MAP_OFFSET - offset; *************** *** 136,144 **** if (x1 != -1 && x1 < (x+w+5)) { p.drawLine(x1, y1, x+w, y1); ! p.fillRect(x1-5, y1-5, 10, 10, x1 == xs ? red : yellow); } } } - canvas->paintForeground(p, r); bitBlt(this, r.topLeft(), pm, r, CopyROP, true); --- 136,143 ---- if (x1 != -1 && x1 < (x+w+5)) { p.drawLine(x1, y1, x+w, y1); ! p.fillRect(x1-HANDLE2, y1-HANDLE2, HANDLE1, HANDLE1, x1 == xs ? red : yellow); } } } canvas->paintForeground(p, r); bitBlt(this, r.topLeft(), pm, r, CopyROP, true); *************** *** 171,182 **** ciCtrlVal e = controller->upper_bound(MAPXDEV(x + HANDLE2)); for (ciCtrlVal i = s; i != e; ++i) { ! int yy = controller->val2pixel(i->second, h); if ((yy >= (y-HANDLE2)) && (yy < (y + HANDLE2))) { selected = i->first; int xs = MAPX(selected); // QRect r(xs - HANDLE2, yy - HANDLE2, HANDLE1, HANDLE1); ! if (button == QMouseEvent::RightButton) { ! emit controllerValRemoved(_track, controller->id(), selected); ! } else update(); --- 170,180 ---- ciCtrlVal e = controller->upper_bound(MAPXDEV(x + HANDLE2)); for (ciCtrlVal i = s; i != e; ++i) { ! int yy = controller->val2pixelR(i->second, h); if ((yy >= (y-HANDLE2)) && (yy < (y + HANDLE2))) { selected = i->first; int xs = MAPX(selected); // QRect r(xs - HANDLE2, yy - HANDLE2, HANDLE1, HANDLE1); ! if (button == QMouseEvent::RightButton) ! song->removeControllerVal(_track, controller->id(), selected); else update(); *************** *** 192,196 **** x = 0; unsigned time = MAPXDEV(x); ! emit controllerValAdded(_track, controller->id(), time, val); } } --- 190,194 ---- x = 0; unsigned time = MAPXDEV(x); ! song->addControllerVal(_track, controller->id(), time, val); } } *************** *** 212,216 **** int h = height(); float val = controller->pixel2val(starty-delta, h); ! emit controllerValChanged(_track, controller->id(), s->first, val); } } --- 210,214 ---- int h = height(); float val = controller->pixel2val(starty-delta, h); ! song->changeControllerVal(_track, controller->id(), s->first, val); } } *************** *** 358,363 **** pos += xScale; for (unsigned k = 0; k < channels; ++k) { ! int peak = (sa[k].peak * h) >> 8; ! // int rms = (sa[k].rms * h) >> 8; p.setPen(QColor(lightGray)); p.drawLine(i, y - peak - cc, i, y + peak); --- 356,361 ---- pos += xScale; for (unsigned k = 0; k < channels; ++k) { ! int peak = (sa[k].peak * h) >> 7; ! // int rms = (sa[k].rms * h) >> 7; p.setPen(QColor(lightGray)); p.drawLine(i, y - peak - cc, i, y + peak); Index: cswidget.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/arranger/cswidget.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cswidget.h 24 Sep 2004 16:25:50 -0000 1.3 --- cswidget.h 28 Sep 2004 18:32:23 -0000 1.4 *************** *** 57,63 **** signals: - void controllerValChanged(Track*, int, unsigned, float); - void controllerValAdded(Track*, int, unsigned, float); - void controllerValRemoved(Track*, int, unsigned); void cursorPos(unsigned); --- 57,60 ---- Index: arranger.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/arranger/arranger.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** arranger.cpp 27 Sep 2004 16:43:44 -0000 1.51 --- arranger.cpp 28 Sep 2004 18:32:22 -0000 1.52 *************** *** 56,60 **** const TrElement trElements[] = { ! TrElement(TR_RECORD, 0, "record", -1), TrElement(TR_NAME, 1, "trackname", -1), TrElement(TR_MUTE, 2, "mute", -1), --- 56,61 ---- const TrElement trElements[] = { ! TrElement(TR_RECORD, 0, "record", ! Track::M_MIDI | Track::M_DRUM | Track::M_AUDIO_OUTPUT | Track::M_WAVE), TrElement(TR_NAME, 1, "trackname", -1), TrElement(TR_MUTE, 2, "mute", -1), *************** *** 517,526 **** connect(tw, SIGNAL(controllerChanged(int)), cw, SLOT(setController(int))); connect(t, SIGNAL(controllerChanged(int)), cw, SLOT(controllerChanged(int))); - connect(cw, SIGNAL(controllerValChanged(Track*,int,unsigned,float)), - song, SLOT(changeControllerVal(Track*,int,unsigned,float))); - connect(cw, SIGNAL(controllerValAdded(Track*,int,unsigned,float)), - song, SLOT(addControllerVal(Track*,int,unsigned,float))); - connect(cw, SIGNAL(controllerValRemoved(Track*,int,unsigned)), - song, SLOT(removeControllerVal(Track*,int,unsigned))); connect(this, SIGNAL(toolChanged(int)), cw, SLOT(setTool(int))); cw->setTool(tool); --- 518,521 ---- |