-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #73 from WolfgangDrescher/fb
[fb] Replace float with double
- Loading branch information
Showing
3 changed files
with
6 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
// | ||
// Programmer: Craig Stuart Sapp <[email protected]> | ||
// Creation Date: Sat Aug 8 12:24:49 PDT 2015 | ||
// Last Modified: Tue Mar 14 00:27:46 PDT 2023 | ||
// Last Modified: Di 14 Mär 2023 19:56:17 CET | ||
// Filename: humlib.h | ||
// URL: https://github.com/craigsapp/humlib/blob/master/include/humlib.h | ||
// Syntax: C++11 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
// | ||
// Programmer: Craig Stuart Sapp <[email protected]> | ||
// Creation Date: Sat Aug 8 12:24:49 PDT 2015 | ||
// Last Modified: Tue Mar 14 00:27:46 PDT 2023 | ||
// Last Modified: Di 14 Mär 2023 19:56:17 CET | ||
// Filename: /include/humlib.cpp | ||
// URL: https://github.com/craigsapp/humlib/blob/master/src/humlib.cpp | ||
// Syntax: C++11 | ||
|
@@ -78696,8 +78696,8 @@ bool Tool_fb::hideNumbersForTokenLine(HTp token, pair<int, HumNum> timeSig) { | |
// Get note duration from --rate option | ||
HumNum rateDuration = Convert::recipToDuration(m_rateQ); | ||
if (rateDuration.toFloat() != 0) { | ||
float timeSigBarDuration = timeSig.first * Convert::recipToDuration(to_string(timeSig.second.getInteger())).toFloat(); | ||
float durationFromBarline = token->getDurationFromBarline().toFloat(); | ||
double timeSigBarDuration = timeSig.first * Convert::recipToDuration(to_string(timeSig.second.getInteger())).toFloat(); | ||
double durationFromBarline = token->getDurationFromBarline().toFloat(); | ||
// Handle upbeats | ||
if (token->getBarlineDuration().toFloat() < timeSigBarDuration) { | ||
// Fix durationFromBarline when current bar duration is shorter than | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters