Skip to content

Commit

Permalink
Merge pull request #73 from WolfgangDrescher/fb
Browse files Browse the repository at this point in the history
[fb] Replace float with double
  • Loading branch information
craigsapp authored Mar 14, 2023
2 parents 757ef53 + 78b31af commit 3cebf1c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion include/humlib.h
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
Expand Down
6 changes: 3 additions & 3 deletions src/humlib.cpp
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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/tool-fb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,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
Expand Down

0 comments on commit 3cebf1c

Please sign in to comment.