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

remove deferred loading of chords.xml

Browse source
This commit is contained in:
ws 2013-06-24 10:26:58 +02:00
parent b4772a6d54
commit 714bc5358e
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/Doxyfile-LibMscore.in
View file

@ -245,7 +245,7 @@ SIP_SUPPORT = NO
# setting a simple type. If this is not the case, or you want to show the
# methods anyway, you should set this option to NO.
IDL_PROPERTY_SUPPORT = YES
IDL_PROPERTY_SUPPORT = NO
# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
# tag is set to YES, then doxygen will reuse the documentation of the first
@ -609,6 +609,8 @@ EXCLUDE = @CMAKE_CURRENT_SOURCE_DIR@/portmidi \
@CMAKE_CURRENT_SOURCE_DIR@/build \
@CMAKE_CURRENT_SOURCE_DIR@/build.release \
@CMAKE_CURRENT_SOURCE_DIR@/build.debug \
@CMAKE_CURRENT_SOURCE_DIR@/Doc \
@CMAKE_CURRENT_SOURCE_DIR@/DocLib \
@CMAKE_CURRENT_SOURCE_DIR@/qtcreator-build
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or

11
libmscore/doc.dox Normal file
View file

@ -0,0 +1,11 @@
/*! \mainpage MuseScore Library
\subsection Grace Notes
Grace notes are chords in MuseScore terms. They are handled as extensions to normal
chords like accidentals for notes.
The normal chord is called the main chord of the grace note.
Parent for a grace notes is not a Segment like for normal chords but the main chord.
*/

12
libmscore/style.cpp
View file

@ -1068,16 +1068,10 @@ void StyleData::load(XmlReader& e)
else
_customChordList = false;
delete _chordList;
#if 1
// use this code to set chord list to be loaded on demand
_chordList = 0;
#else
// use this code to load chord list now
_chordList = new ChordList;
if (value(ST_chordsXmlFile).toBool())
_chordList->read("chords.xml");
_chordList->read(newChordDescriptionFile);
#endif
}
//
@ -1177,12 +1171,6 @@ const ChordDescription* StyleData::chordDescription(int id) const
ChordList* StyleData::chordList() const
{
if (_chordList == 0) {
_chordList = new ChordList();
if (value(ST_chordsXmlFile).toBool())
_chordList->read("chords.xml");
_chordList->read(value(ST_chordDescriptionFile).toString());
}
return _chordList;
}

2
libmscore/style_p.h
View file

@ -88,7 +88,7 @@ class TextStyleData : public QSharedData, public ElementLayout {
class StyleData : public QSharedData {
protected:
QVector<StyleVal> _values;
mutable ChordList* _chordList;
ChordList* _chordList;
QList<TextStyle> _textStyles;
PageFormat _pageFormat;
qreal _spatium;