fix measure delete of repeat measure

kirkhansen · Feb 25, 2013 · a873ef1 · a873ef1
1 parent 8538412
commit a873ef1
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 19 deletions.
diff --git a/libmscore/chordrest.h b/libmscore/chordrest.h
@@ -65,7 +65,7 @@ class ChordRest : public DurationElement {
       virtual Element* drop(const DropData&);
 
       Segment* segment() const                   { return (Segment*)parent(); }
-      virtual Measure* measure() const           { return (Measure*)(parent()->parent()); }
+      virtual Measure* measure() const           { return parent() ? (Measure*)(parent()->parent()) : 0; }
 
       virtual void read(XmlReader&) = 0;
       void writeProperties(Xml& xml) const;

diff --git a/libmscore/duration.cpp b/libmscore/duration.cpp
@@ -69,20 +69,6 @@ int DurationElement::actualTicks() const
       return Fraction(staff()->timeStretch(tick()) * globalDuration()).ticks();
       }
 
-#if 0
-//---------------------------------------------------------
-//   properties
-//---------------------------------------------------------
-
-QList<Prop> DurationElement::properties(Xml& xml, bool /*clipboardmode*/) const
-      {
-      QList<Prop> pl = Element::properties(xml);
-      if (tuplet())
-            pl.append(Prop("Tuplet", tuplet()->id()));
-      return pl;
-      }
-#endif
-
 //---------------------------------------------------------
 //   readProperties
 //---------------------------------------------------------

diff --git a/libmscore/duration.h b/libmscore/duration.h
@@ -52,7 +52,7 @@ class DurationElement : public Element {
       virtual int tick() const = 0;
       int actualTicks() const;
 
-      Fraction duration() const           { return _duration; }
+      virtual Fraction duration() const   { return _duration; }
       Fraction globalDuration() const;
       void setDuration(const Fraction& f) { _duration = f;    }
       void setDuration(int ticks)         { _duration = Fraction::fromTicks(ticks); }

diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -1451,8 +1451,7 @@ void Score::add(Element* el)
                   break;
 
             default:
-                  qDebug("Score::add() invalid element <%s>\n", el->name());
-                  delete el;
+                  qFatal("Score::add() invalid element <%s>\n", el->name());
                   break;
             }
       }

diff --git a/libmscore/repeat.cpp b/libmscore/repeat.cpp
@@ -65,6 +65,17 @@ void RepeatMeasure::layout()
       setbbox(path.boundingRect());
       }
 
+//---------------------------------------------------------
+//   duration
+//---------------------------------------------------------
+
+Fraction RepeatMeasure::duration() const
+      {
+      if (measure())
+            return measure()->len();
+      return Fraction(0, 1);
+      }
+
 //---------------------------------------------------------
 //   Marker
 //---------------------------------------------------------

diff --git a/libmscore/repeat.h b/libmscore/repeat.h
@@ -36,6 +36,7 @@ class RepeatMeasure : public Rest {
       virtual ElementType type() const      { return REPEAT_MEASURE; }
       virtual void draw(QPainter*) const;
       virtual void layout();
+      virtual Fraction duration() const;
       };
 
 enum MarkerType {

diff --git a/mscore/mididriver.cpp b/mscore/mididriver.cpp
@@ -133,7 +133,7 @@ bool AlsaMidiDriver::init()
       //-----------------------------------------
 
       snd_seq_addr_t src, dst;
-      int rv = snd_seq_create_simple_port(alsaSeq, "MusE Port 0",
+      int rv = snd_seq_create_simple_port(alsaSeq, "MuseScore Port 0",
          inCap | outCap | SND_SEQ_PORT_CAP_READ
          | SND_SEQ_PORT_CAP_WRITE
          | SND_SEQ_PORT_CAP_NO_EXPORT,