Menu
▾
▴
[Lmuse-cvs-traffic] muse/muse app.cpp,1.236,1.237 icons.cpp,1.20,1.21 icons.h,1.20,1.21 song.cpp,1.160,1.161 song.h,1.85,1.86 songfile.cpp,1.77,1.78 transport.cpp,1.26,1.27 transport.h,1.19,1.20 transportbase.ui,1.7,1.8
Update of /cvsroot/lmuse/muse/muse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29855/muse Modified Files: app.cpp icons.cpp icons.h song.cpp song.h songfile.cpp transport.cpp transport.h transportbase.ui Log Message: updates Index: transport.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/transport.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** transport.h 1 Feb 2006 18:40:46 -0000 1.19 --- transport.h 7 Feb 2006 16:59:35 -0000 1.20 *************** *** 40,43 **** --- 40,44 ---- void stopToggled(bool); void playToggled(bool); + void setLen(const AL::Pos& len); public slots: Index: app.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/app.cpp,v retrieving revision 1.236 retrieving revision 1.237 diff -C2 -d -r1.236 -r1.237 *** app.cpp 6 Feb 2006 17:57:21 -0000 1.236 --- app.cpp 7 Feb 2006 16:59:35 -0000 1.237 *************** *** 857,866 **** Awl::PosLabel* cursorPos = new Awl::PosLabel; aToolBar->addWidget(cursorPos); ! cursorPos->setFixedHeight(34); label = new QLabel(tr("Snap")); aToolBar->addWidget(label); - label->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - label->setIndent(3); QComboBox* raster = new QComboBox; --- 857,865 ---- Awl::PosLabel* cursorPos = new Awl::PosLabel; aToolBar->addWidget(cursorPos); ! cursorPos->setFixedHeight(25); label = new QLabel(tr("Snap")); + label->setIndent(5); aToolBar->addWidget(label); QComboBox* raster = new QComboBox; *************** *** 874,880 **** // Song len label = new QLabel(tr("Len")); aToolBar->addWidget(label); - label->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - label->setIndent(3); // song length is limited to 10000 bars; the real song len is limited --- 873,878 ---- // Song len label = new QLabel(tr("Len")); + label->setIndent(5); aToolBar->addWidget(label); // song length is limited to 10000 bars; the real song len is limited *************** *** 890,896 **** label = new QLabel(tr("Pitch")); aToolBar->addWidget(label); - label->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - label->setIndent(3); QSpinBox* globalPitchSpinBox = new QSpinBox; --- 888,893 ---- label = new QLabel(tr("Pitch")); + label->setIndent(5); aToolBar->addWidget(label); QSpinBox* globalPitchSpinBox = new QSpinBox; *************** *** 904,911 **** label = new QLabel(tr("Tempo")); ! label->setFixedHeight(24); aToolBar->addWidget(label); - label->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - label->setIndent(3); globalTempoSpinBox = new QSpinBox; --- 901,906 ---- label = new QLabel(tr("Tempo")); ! label->setIndent(5); aToolBar->addWidget(label); globalTempoSpinBox = new QSpinBox; *************** *** 1573,1577 **** void MusE::startPianoroll(PartList* pl) { ! PianoRoll* pianoroll = new PianoRoll(pl, true); pianoroll->show(); connect(muse, SIGNAL(configChanged()), pianoroll, SLOT(configChanged())); --- 1568,1572 ---- void MusE::startPianoroll(PartList* pl) { ! PianoRoll* pianoroll = new PianoRoll(pl, false); pianoroll->show(); connect(muse, SIGNAL(configChanged()), pianoroll, SLOT(configChanged())); *************** *** 1621,1625 **** void MusE::startDrumEditor(PartList* pl) { ! DrumEdit* drumEditor = new DrumEdit(pl, true); drumEditor->show(); connect(muse, SIGNAL(configChanged()), drumEditor, SLOT(configChanged())); --- 1616,1620 ---- void MusE::startDrumEditor(PartList* pl) { ! DrumEdit* drumEditor = new DrumEdit(pl, false); drumEditor->show(); connect(muse, SIGNAL(configChanged()), drumEditor, SLOT(configChanged())); *************** *** 2833,2838 **** 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&))); connect(markerView, SIGNAL(closed()), SLOT(markerClosed())); } --- 2828,2831 ---- Index: songfile.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/songfile.cpp,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** songfile.cpp 6 Feb 2006 17:57:21 -0000 1.77 --- songfile.cpp 7 Feb 2006 16:59:35 -0000 1.78 *************** *** 65,69 **** } else if (tag == "PianoRoll") { ! PianoRoll* pianoroll = new PianoRoll(pl, false); connect(muse, SIGNAL(configChanged()), pianoroll, SLOT(configChanged())); pianoroll->read(node); --- 65,69 ---- } else if (tag == "PianoRoll") { ! PianoRoll* pianoroll = new PianoRoll(pl, true); connect(muse, SIGNAL(configChanged()), pianoroll, SLOT(configChanged())); pianoroll->read(node); *************** *** 72,76 **** } else if (tag == "DrumEdit") { ! DrumEdit* drumEditor = new DrumEdit(pl, false); connect(muse, SIGNAL(configChanged()), drumEditor, SLOT(configChanged())); drumEditor->read(node); --- 72,76 ---- } else if (tag == "DrumEdit") { ! DrumEdit* drumEditor = new DrumEdit(pl, true); connect(muse, SIGNAL(configChanged()), drumEditor, SLOT(configChanged())); drumEditor->read(node); Index: song.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/song.cpp,v retrieving revision 1.160 retrieving revision 1.161 diff -C2 -d -r1.160 -r1.161 *** song.cpp 6 Feb 2006 21:59:56 -0000 1.160 --- song.cpp 7 Feb 2006 16:59:35 -0000 1.161 *************** *** 501,505 **** void Song::setPos(int idx, const Pos& val, bool sig, bool isSeek, bool follow) { ! // printf("setPos %d sig=%d,seek=%d,scroll=%d ", // idx, sig, isSeek, follow); // val.dump(0); --- 501,505 ---- void Song::setPos(int idx, const Pos& val, bool sig, bool isSeek, bool follow) { ! // printf("setPos %d sig=%d,seek=%d,scroll=%d\n", // idx, sig, isSeek, follow); // val.dump(0); *************** *** 511,514 **** --- 511,515 ---- _vcpos = val; if (isSeek) { + seekInProgress = true; audio->msgSeek(val); return; *************** *** 1128,1131 **** --- 1129,1133 ---- void Song::clear(bool signal) { + seekInProgress = false; bounceTrack = 0; *************** *** 1203,1207 **** break; case MSG_SEEK: ! setPos(0, audio->tickPos(), true, false, true); beat(); // update controller guis break; --- 1205,1210 ---- break; case MSG_SEEK: ! setPos(0, audio->tickPos(), true, false, !seekInProgress); ! seekInProgress = false; beat(); // update controller guis break; Index: icons.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/icons.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** icons.h 2 Feb 2006 18:00:22 -0000 1.20 --- icons.h 7 Feb 2006 16:59:35 -0000 1.21 *************** *** 13,18 **** extern QPixmap* pencilIcon; extern QPixmap* deleteIcon; - extern QPixmap* punchinIcon; - extern QPixmap* punchoutIcon; extern QPixmap* punchin1Icon; extern QPixmap* punchout1Icon; --- 13,16 ---- Index: icons.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/icons.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** icons.cpp 2 Feb 2006 18:00:22 -0000 1.20 --- icons.cpp 7 Feb 2006 16:59:35 -0000 1.21 *************** *** 51,56 **** #include "xpm/fforward.xpm" #include "xpm/frewind.xpm" - #include "xpm/punchin.xpm" - #include "xpm/punchout.xpm" #include "xpm/punchin1.xpm" #include "xpm/punchout1.xpm" --- 51,54 ---- *************** *** 216,221 **** QPixmap* pencilIcon; QPixmap* deleteIcon; - QPixmap* punchinIcon; - QPixmap* punchoutIcon; QPixmap* punchin1Icon; QPixmap* punchout1Icon; --- 214,217 ---- *************** *** 381,386 **** pencilIcon = new QPixmap(pencil_xpm); deleteIcon = new QPixmap(delete_xpm); - punchinIcon = new QPixmap(punchin_xpm); - punchoutIcon = new QPixmap(punchout_xpm); punchin1Icon = new QPixmap(punchin1_xpm); punchout1Icon = new QPixmap(punchout1_xpm); --- 377,380 ---- Index: song.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/song.h,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** song.h 3 Feb 2006 16:46:38 -0000 1.85 --- song.h 7 Feb 2006 16:59:35 -0000 1.86 *************** *** 99,103 **** Pos _vcpos; // virtual CPOS (locate in progress) AL::MarkerList* _markerList; ! // SettingsList* esettingsList; // settings for the midieditors (related to parts) bool _masterFlag; --- 99,103 ---- Pos _vcpos; // virtual CPOS (locate in progress) AL::MarkerList* _markerList; ! bool seekInProgress; // user initiated a seek bool _masterFlag; Index: transportbase.ui =================================================================== RCS file: /cvsroot/lmuse/muse/muse/transportbase.ui,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** transportbase.ui 1 Feb 2006 18:40:46 -0000 1.7 --- transportbase.ui 7 Feb 2006 16:59:35 -0000 1.8 *************** *** 134,139 **** </sizepolicy> </property> ! <property name="text" > ! <string>MOP</string> </property> <property name="checkable" > --- 134,139 ---- </sizepolicy> </property> ! <property name="icon" > ! <iconset resource="../muse.qrc" >:/xpm/punchin.xpm</iconset> </property> <property name="checkable" > *************** *** 170,175 **** </sizepolicy> </property> ! <property name="text" > ! <string>...</string> </property> <property name="checkable" > --- 170,175 ---- </sizepolicy> </property> ! <property name="icon" > ! <iconset resource="../muse.qrc" >:/xpm/punchout.xpm</iconset> </property> <property name="checkable" > *************** *** 793,799 **** <customwidgets> <customwidget> ! <class>Awl::PosEdit</class> ! <extends></extends> ! <header>awl/posedit.h</header> <container>0</container> <pixmap></pixmap> --- 793,799 ---- <customwidgets> <customwidget> ! <class>SigLabel</class> ! <extends>QLabel</extends> ! <header>widgets/siglabel.h</header> <container>0</container> <pixmap></pixmap> *************** *** 807,818 **** </customwidget> <customwidget> ! <class>SigLabel</class> ! <extends>QLabel</extends> ! <header>widgets/siglabel.h</header> <container>0</container> <pixmap></pixmap> </customwidget> </customwidgets> ! <resources/> <connections/> </ui> --- 807,820 ---- </customwidget> <customwidget> ! <class>Awl::PosEdit</class> ! <extends></extends> ! <header>awl/posedit.h</header> <container>0</container> <pixmap></pixmap> </customwidget> </customwidgets> ! <resources> ! <include location="../muse.qrc" /> ! </resources> <connections/> </ui> Index: transport.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/transport.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** transport.cpp 1 Feb 2006 18:40:46 -0000 1.26 --- transport.cpp 7 Feb 2006 16:59:35 -0000 1.27 *************** *** 35,40 **** { setupUi(this); - punchinButton->setIcon(QIcon(*punchinIcon)); - punchoutButton->setIcon(QIcon(*punchoutIcon)); loopButton->setIcon(QIcon(*loopIcon)); --- 35,38 ---- *************** *** 129,136 **** connect(time2, SIGNAL(valueChanged(const Pos&)), SLOT(cposChanged(const Pos&))); connect(slider,SIGNAL(sliderMoved(int)), SLOT(cposChanged(int))); connect(song, SIGNAL(posChanged(int,const AL::Pos&, bool)), SLOT(setPos(int,const AL::Pos&))); connect(tempo, SIGNAL(tempoChanged(int)), song, SLOT(setTempo(int))); - // connect(tempo, SIGNAL(sigChanged(int, int)), song, SLOT(setSig(int, int))); connect(song, SIGNAL(playChanged(bool)), SLOT(setPlay(bool))); connect(song, SIGNAL(songChanged(int)), this, SLOT(songChanged(int))); --- 127,135 ---- connect(time2, SIGNAL(valueChanged(const Pos&)), SLOT(cposChanged(const Pos&))); + slider->setRange(0, song->len()); + connect(song, SIGNAL(lenChanged(const AL::Pos&)), SLOT(setLen(const AL::Pos&))); connect(slider,SIGNAL(sliderMoved(int)), SLOT(cposChanged(int))); connect(song, SIGNAL(posChanged(int,const AL::Pos&, bool)), SLOT(setPos(int,const AL::Pos&))); connect(tempo, SIGNAL(tempoChanged(int)), song, SLOT(setTempo(int))); connect(song, SIGNAL(playChanged(bool)), SLOT(setPlay(bool))); connect(song, SIGNAL(songChanged(int)), this, SLOT(songChanged(int))); *************** *** 156,159 **** --- 155,168 ---- //--------------------------------------------------------- + // setLen + // song len changed + //--------------------------------------------------------- + + void Transport::setLen(const AL::Pos& len) + { + slider->setRange(0, len.tick()); + } + + //--------------------------------------------------------- // setTimesig //--------------------------------------------------------- *************** *** 290,294 **** void Transport::songChanged(int flags) { - slider->setRange(0, song->len()); int cpos = song->cpos(); if (flags & (SC_MASTER | SC_TEMPO)) { --- 299,302 ---- |