Add PAEOutput::HasFermata helper

rism-digital · Feb 20, 2024 · 7ce8b6d · 7ce8b6d
1 parent 7e54f75
commit 7ce8b6d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/include/vrv/iopae.h b/include/vrv/iopae.h
@@ -166,6 +166,7 @@ class PAEOutput : public Output {
     ///@{
     void WriteDur(DurationInterface *interface);
     void WriteGrace(AttGraced *attGraced);
+    bool HasFermata(Object *object);
     ///@}
 
 public:

diff --git a/src/iopae.cpp b/src/iopae.cpp
@@ -454,9 +454,7 @@ void PAEOutput::WriteNote(Note *note)
         m_streamStringOutput << accid;
     }
 
-    PointingToComparison pointingToComparisonFermata(FERMATA, note);
-    Fermata *fermata
-        = vrv_cast<Fermata *>(m_currentMeasure->FindDescendantByComparison(&pointingToComparisonFermata, 1));
+    bool fermata = this->HasFermata(note);
     if (fermata) m_streamStringOutput << "(";
 
     std::string pname = note->AttPitch::PitchnameToStr(note->GetPname());
@@ -583,6 +581,14 @@ void PAEOutput::WriteGrace(AttGraced *attGraced)
     }
 }
 
+bool PAEOutput::HasFermata(Object *object)
+{
+    PointingToComparison pointingToComparisonFermata(FERMATA, object);
+    Fermata *fermata
+        = vrv_cast<Fermata *>(m_currentMeasure->FindDescendantByComparison(&pointingToComparisonFermata, 1));
+    return (fermata);
+}
+
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 #ifdef USE_PAE_OLD_PARSER
-Original file line number
+Diff line change
@@ Expand Up / @@ -166,6 +166,7 @@ class PAEOutput : public Output { @@
         ///@{
         void WriteDur(DurationInterface *interface);
         void WriteGrace(AttGraced *attGraced);
+        bool HasFermata(Object *object);
         ///@}
     public:
@@ Expand Down @@