Merge branch 'master' into feature/faust_double_fix

jcelerier · web-flow · commit 3b9dcd256f85 · 2024-12-25T17:20:52.000-05:00
diff --git a/ci/nix.build.nix b/ci/nix.build.nix
@@ -8,7 +8,7 @@
 , avahi
 , avahi-compat
 , bluez
-, boost185
+, boost
 # , faust
 , fmt
 , git
diff --git a/src/plugins/score-plugin-midi/Patternist/PatternModel.cpp b/src/plugins/score-plugin-midi/Patternist/PatternModel.cpp
@@ -75,7 +75,7 @@ void ProcessModel::setCurrentPattern(int n)
     for(auto& lane : pattern.lanes)
       std::fill(lane.pattern.begin(), lane.pattern.end(), false);
 
-    while(n >= patterns)
+    while(n >= std::ssize(m_patterns))
       m_patterns.push_back(pattern);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ void ProcessModel::setCurrentPattern(int n)`
`75`	`75`	`for(auto& lane : pattern.lanes)`
`76`	`76`	`std::fill(lane.pattern.begin(), lane.pattern.end(), false);`
`77`	`77`
`78`		`- while(n >= patterns)`
	`78`	`+ while(n >= std::ssize(m_patterns))`
`79`	`79`	`m_patterns.push_back(pattern);`
`80`	`80`	`}`
`81`	`81`