Skip to content

Commit

Permalink
Merge pull request #2079 from MarcSabatella/65831-bend-properties
Browse files Browse the repository at this point in the history 
fix #65831: basic bend properties not written / read
  • Loading branch information
@lasconic
lasconic committed Jun 22, 2015
2 parents b695ae4 + 8cf36ec commit 7678bb9
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 1 deletion.
3 changes: 2 additions & 1 deletion libmscore/bend.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ void Bend::write(Xml& xml) const
xml.tagE(QString("point time=\"%1\" pitch=\"%2\" vibrato=\"%3\"")
.arg(v.time).arg(v.pitch).arg(v.vibrato));
}
Element::writeProperties(xml);
xml.etag();
}

Expand All @@ -277,7 +278,7 @@ void Bend::read(XmlReader& e)
_points.append(pv);
e.readNext();
}
else
else if (!Element::readProperties(e))
e.unknown();
}
}
Expand Down
3 changes: 3 additions & 0 deletions mtest/guitarpro/basic-bend.gp5-ref.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
<point time="0" pitch="0" vibrato="0"/>
<point time="30" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>7</lid>
</Bend>
<pitch>66</pitch>
<tpc>20</tpc>
Expand Down Expand Up @@ -264,6 +265,7 @@
<point time="0" pitch="0" vibrato="0"/>
<point time="30" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>7</lid>
</Bend>
<pitch>66</pitch>
<tpc>20</tpc>
Expand Down Expand Up @@ -304,6 +306,7 @@
<point time="0" pitch="0" vibrato="0"/>
<point time="30" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>7</lid>
</Bend>
<pitch>66</pitch>
<tpc>20</tpc>
Expand Down
15 changes: 15 additions & 0 deletions mtest/guitarpro/bend.gp3-ref.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
<point time="40" pitch="0" vibrato="0"/>
<point time="50" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>8</lid>
</Bend>
<Tie id="2">
<lid>9</lid>
Expand Down Expand Up @@ -175,6 +176,7 @@
<point time="30" pitch="100" vibrato="0"/>
<point time="45" pitch="0" vibrato="0"/>
<point time="60" pitch="0" vibrato="0"/>
<lid>18</lid>
</Bend>
<pitch>57</pitch>
<tpc>17</tpc>
Expand All @@ -191,6 +193,7 @@
<point time="0" pitch="0" vibrato="0"/>
<point time="30" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>21</lid>
</Bend>
<pitch>60</pitch>
<tpc>14</tpc>
Expand All @@ -208,6 +211,7 @@
<Bend>
<point time="0" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>25</lid>
</Bend>
<pitch>57</pitch>
<tpc>17</tpc>
Expand All @@ -225,6 +229,7 @@
<point time="20" pitch="100" vibrato="0"/>
<point time="40" pitch="0" vibrato="0"/>
<point time="60" pitch="0" vibrato="0"/>
<lid>28</lid>
</Bend>
<pitch>53</pitch>
<tpc>13</tpc>
Expand Down Expand Up @@ -383,6 +388,7 @@
<point time="40" pitch="0" vibrato="0"/>
<point time="50" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>8</lid>
</Bend>
<Tie id="4">
<lid>9</lid>
Expand Down Expand Up @@ -434,6 +440,7 @@
<point time="30" pitch="100" vibrato="0"/>
<point time="45" pitch="0" vibrato="0"/>
<point time="60" pitch="0" vibrato="0"/>
<lid>18</lid>
</Bend>
<pitch>57</pitch>
<tpc>17</tpc>
Expand All @@ -450,6 +457,7 @@
<point time="0" pitch="0" vibrato="0"/>
<point time="30" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>21</lid>
</Bend>
<pitch>60</pitch>
<tpc>14</tpc>
Expand All @@ -467,6 +475,7 @@
<Bend>
<point time="0" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>25</lid>
</Bend>
<pitch>57</pitch>
<tpc>17</tpc>
Expand All @@ -484,6 +493,7 @@
<point time="20" pitch="100" vibrato="0"/>
<point time="40" pitch="0" vibrato="0"/>
<point time="60" pitch="0" vibrato="0"/>
<lid>28</lid>
</Bend>
<pitch>53</pitch>
<tpc>13</tpc>
Expand Down Expand Up @@ -528,6 +538,7 @@
<point time="40" pitch="0" vibrato="0"/>
<point time="50" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>8</lid>
</Bend>
<Tie id="6">
<lid>9</lid>
Expand Down Expand Up @@ -579,6 +590,7 @@
<point time="30" pitch="100" vibrato="0"/>
<point time="45" pitch="0" vibrato="0"/>
<point time="60" pitch="0" vibrato="0"/>
<lid>18</lid>
</Bend>
<pitch>57</pitch>
<tpc>17</tpc>
Expand All @@ -595,6 +607,7 @@
<point time="0" pitch="0" vibrato="0"/>
<point time="30" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>21</lid>
</Bend>
<pitch>60</pitch>
<tpc>14</tpc>
Expand All @@ -612,6 +625,7 @@
<Bend>
<point time="0" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>25</lid>
</Bend>
<pitch>57</pitch>
<tpc>17</tpc>
Expand All @@ -629,6 +643,7 @@
<point time="20" pitch="100" vibrato="0"/>
<point time="40" pitch="0" vibrato="0"/>
<point time="60" pitch="0" vibrato="0"/>
<lid>28</lid>
</Bend>
<pitch>53</pitch>
<tpc>13</tpc>
Expand Down
15 changes: 15 additions & 0 deletions mtest/guitarpro/bend.gp4-ref.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
<point time="40" pitch="0" vibrato="0"/>
<point time="50" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>13</lid>
</Bend>
<Tie id="2">
<lid>14</lid>
Expand Down Expand Up @@ -197,6 +198,7 @@
<point time="30" pitch="100" vibrato="0"/>
<point time="45" pitch="0" vibrato="0"/>
<point time="60" pitch="0" vibrato="0"/>
<lid>23</lid>
</Bend>
<pitch>57</pitch>
<tpc>17</tpc>
Expand All @@ -213,6 +215,7 @@
<point time="0" pitch="0" vibrato="0"/>
<point time="30" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>26</lid>
</Bend>
<pitch>60</pitch>
<tpc>14</tpc>
Expand All @@ -230,6 +233,7 @@
<Bend>
<point time="0" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>30</lid>
</Bend>
<pitch>57</pitch>
<tpc>17</tpc>
Expand All @@ -247,6 +251,7 @@
<point time="20" pitch="100" vibrato="0"/>
<point time="40" pitch="0" vibrato="0"/>
<point time="60" pitch="0" vibrato="0"/>
<lid>33</lid>
</Bend>
<pitch>53</pitch>
<tpc>13</tpc>
Expand Down Expand Up @@ -427,6 +432,7 @@
<point time="40" pitch="0" vibrato="0"/>
<point time="50" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>13</lid>
</Bend>
<Tie id="4">
<lid>14</lid>
Expand Down Expand Up @@ -478,6 +484,7 @@
<point time="30" pitch="100" vibrato="0"/>
<point time="45" pitch="0" vibrato="0"/>
<point time="60" pitch="0" vibrato="0"/>
<lid>23</lid>
</Bend>
<pitch>57</pitch>
<tpc>17</tpc>
Expand All @@ -494,6 +501,7 @@
<point time="0" pitch="0" vibrato="0"/>
<point time="30" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>26</lid>
</Bend>
<pitch>60</pitch>
<tpc>14</tpc>
Expand All @@ -511,6 +519,7 @@
<Bend>
<point time="0" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>30</lid>
</Bend>
<pitch>57</pitch>
<tpc>17</tpc>
Expand All @@ -528,6 +537,7 @@
<point time="20" pitch="100" vibrato="0"/>
<point time="40" pitch="0" vibrato="0"/>
<point time="60" pitch="0" vibrato="0"/>
<lid>33</lid>
</Bend>
<pitch>53</pitch>
<tpc>13</tpc>
Expand Down Expand Up @@ -576,6 +586,7 @@
<point time="40" pitch="0" vibrato="0"/>
<point time="50" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>13</lid>
</Bend>
<Tie id="6">
<lid>14</lid>
Expand Down Expand Up @@ -627,6 +638,7 @@
<point time="30" pitch="100" vibrato="0"/>
<point time="45" pitch="0" vibrato="0"/>
<point time="60" pitch="0" vibrato="0"/>
<lid>23</lid>
</Bend>
<pitch>57</pitch>
<tpc>17</tpc>
Expand All @@ -643,6 +655,7 @@
<point time="0" pitch="0" vibrato="0"/>
<point time="30" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>26</lid>
</Bend>
<pitch>60</pitch>
<tpc>14</tpc>
Expand All @@ -660,6 +673,7 @@
<Bend>
<point time="0" pitch="100" vibrato="0"/>
<point time="60" pitch="100" vibrato="0"/>
<lid>30</lid>
</Bend>
<pitch>57</pitch>
<tpc>17</tpc>
Expand All @@ -677,6 +691,7 @@
<point time="20" pitch="100" vibrato="0"/>
<point time="40" pitch="0" vibrato="0"/>
<point time="60" pitch="0" vibrato="0"/>
<lid>33</lid>
</Bend>
<pitch>53</pitch>
<tpc>13</tpc>
Expand Down
Loading

0 comments on commit 7678bb9

Please sign in to comment.