From: Robert J. <spa...@us...> - 2007-02-13 08:24:04
|
Update of /cvsroot/lmuse/muse/muse In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25441/muse Modified Files: Tag: REL07 app.cpp conf.cpp gconfig.cpp gconfig.h Log Message: added possiblity to start/stop playback with one shortcut (default space) Index: gconfig.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/gconfig.h,v retrieving revision 1.12.2.2 retrieving revision 1.12.2.3 diff -C2 -d -r1.12.2.2 -r1.12.2.3 *** gconfig.h 14 Aug 2005 21:47:31 -0000 1.12.2.2 --- gconfig.h 13 Feb 2007 08:23:53 -0000 1.12.2.3 *************** *** 80,83 **** --- 80,84 ---- QString externalWavEditor; + bool useOldStyleStopShortCut; }; Index: gconfig.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/gconfig.cpp,v retrieving revision 1.15.2.3 retrieving revision 1.15.2.4 diff -C2 -d -r1.15.2.3 -r1.15.2.4 *** gconfig.cpp 14 Aug 2005 21:47:31 -0000 1.15.2.3 --- gconfig.cpp 13 Feb 2007 08:23:53 -0000 1.15.2.4 *************** *** 103,106 **** --- 103,107 ---- QString(""), // style QString("sweep"), // externalWavEditor + false, // useOldStyleStopShortCut }; Index: conf.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/conf.cpp,v retrieving revision 1.33.2.7 retrieving revision 1.33.2.8 diff -C2 -d -r1.33.2.7 -r1.33.2.8 *** conf.cpp 28 Sep 2006 19:40:12 -0000 1.33.2.7 --- conf.cpp 13 Feb 2007 08:23:53 -0000 1.33.2.8 *************** *** 399,402 **** --- 399,404 ---- if (tag == "theme") config.style = xml.parse1(); + else if (tag == "useOldStyleStopShortCut") + config.useOldStyleStopShortCut = xml.parseInt(); else if (tag == "externalWavEditor") config.externalWavEditor = xml.parse1(); *************** *** 859,862 **** --- 861,865 ---- xml.strTag(level, "theme", config.style); xml.strTag(level, "externalWavEditor", config.externalWavEditor); + xml.intTag(level, "useOldStyleStopShortCut", config.useOldStyleStopShortCut); for (int i = 0; i < 6; ++i) { Index: app.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/app.cpp,v retrieving revision 1.113.2.34 retrieving revision 1.113.2.35 diff -C2 -d -r1.113.2.34 -r1.113.2.35 *** app.cpp 27 Jan 2007 14:30:21 -0000 1.113.2.34 --- app.cpp 13 Feb 2007 08:23:53 -0000 1.113.2.35 *************** *** 1669,1672 **** --- 1669,1674 ---- //song->setStopPlay(false); song->setStop(true); + else if (!config.useOldStyleStopShortCut) + song->setPlay(true); else if (song->cpos() != song->lpos()) song->setPos(0, song->lPos()); |