Merge pull request #3869 from DDMAL/c4-fix

fix: change default octave to c4 when adjusting pitch
rism-digital · Nov 28, 2024 · ea0397e · ea0397e
2 parents d178cac + a0278a8
commit ea0397e
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/editortoolkit_neume.cpp b/src/editortoolkit_neume.cpp
@@ -4252,11 +4252,10 @@ bool EditorToolkitNeume::AdjustPitchFromPosition(Object *obj, Clef *clef)
             LogError("Clef %s does not have valid shape. Shape is %s", clef->GetID().c_str(), clef->GetShape());
             return false;
         }
-        pi->SetOct(3);
 
-        // The default octave = 3, but the actual octave is calculated by
+        // The default octave = 4, but the actual octave is calculated by
         // taking into account the displacement of the clef
-        int octave = 3;
+        int octave = 4;
         if (clef->GetDis() && clef->GetDisPlace()) {
             octave += (clef->GetDisPlace() == STAFFREL_basic_above ? 1 : -1) * (clef->GetDis() / 7);
         }
@@ -4323,9 +4322,9 @@ bool EditorToolkitNeume::AdjustPitchFromPosition(Object *obj, Clef *clef)
             assert(pi);
             pi->SetPname(pname);
 
-            // The default octave = 3, but the actual octave is calculated by
+            // The default octave = 4, but the actual octave is calculated by
             // taking into account the displacement of the clef
-            int octave = 3;
+            int octave = 4;
             if (clef->GetDis() && clef->GetDisPlace()) {
                 octave += (clef->GetDisPlace() == STAFFREL_basic_above ? 1 : -1) * (clef->GetDis() / 7);
             }