LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

initialize ChordRest->crossMeasure

Browse source
This commit is contained in:
ws 2013-05-16 10:36:56 +02:00
parent 55412d87ae
commit 32b6453b08
3 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -28,7 +28,8 @@ VERSION = "2.0b-${REVISION}"
#
# change path to include your Qt5 installation
#
BINPATH = ${HOME}/Qt5.1.0/5.1.0-beta1/gcc_64/bin:${PATH}
# BINPATH = ${HOME}/Qt5.1.0/5.1.0-beta1/gcc_64/bin:${PATH}
BINPATH = ${HOME}/Qt5.0.2/5.0.2/gcc_64/bin:${PATH}
release:
if test ! -d build.release; then mkdir build.release; fi; \

18
libmscore/chordrest.cpp
View file

@ -65,14 +65,15 @@ Articulation* ChordRest::hasArticulation(const Articulation* aa)
ChordRest::ChordRest(Score* s)
: DurationElement(s)
{
_beam = 0;
_small = false;
_beamMode = BeamMode::AUTO;
_up = true;
_staffMove = 0;
_tabDur = 0;
_spannerFor = 0;
_spannerBack = 0;
_beam = 0;
_small = false;
_beamMode = BeamMode::AUTO;
_up = true;
_staffMove = 0;
_tabDur = 0;
_spannerFor = 0;
_spannerBack = 0;
_crossMeasure = 0;
}
ChordRest::ChordRest(const ChordRest& cr)
@ -106,6 +107,7 @@ ChordRest::ChordRest(const ChordRest& cr)
}
_spannerFor = 0;
_spannerBack = 0;
_crossMeasure = cr._crossMeasure;
}
//---------------------------------------------------------

10
libmscore/chordrest.h
View file

@ -18,10 +18,12 @@
namespace Ms {
#define CROSSMEASURE_UNKNOWN -1
#define CROSSMEASURE_NONE 0
#define CROSSMEASURE_FIRST 1
#define CROSSMEASURE_SECOND 2
enum {
CROSSMEASURE_UNKNOWN = -1,
CROSSMEASURE_NONE = 0,
CROSSMEASURE_FIRST,
CROSSMEASURE_SECOND
};
class Score;
class Measure;