diff options
| author | Robin Gareus <robin@gareus.org> | 2012-11-12 16:49:18 +0000 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2012-11-12 16:49:18 +0000 |
| commit | 2c1b2256b6450ce9237678efab7ae40f2b8fb1b1 (patch) | |
| tree | f02d6b621ec6bd959bdec578b9a0073b99d2ab80 /libs/ardour | |
| parent | bdad852b71e369bdd358f44208751abfe64f8e36 (diff) | |
slave delta: move sign next to the digit
git-svn-id: svn://localhost/ardour2/branches/3.0@13457 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/slave.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ltc_slave.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/midi_clock_slave.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/mtc_slave.cc | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index d147059ccd..5b424bab6f 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -38,8 +38,9 @@ #include <ltc.h> #endif -// used for approximate_current_delta(): +/* used for approximate_current_delta(): */ #define PLUSMINUS(A) ( ((A)<0) ? "-" : (((A)>0) ? "+" : "\u00B1") ) +#define LEADINGZERO(A) ( (A)<10 ? " " : (A)<100 ? " " : (A)<1000 ? " " : (A)<10000 ? " " : "" ) namespace MIDI { class Port; diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc index 5aae276457..166c78ce24 100644 --- a/libs/ardour/ltc_slave.cc +++ b/libs/ardour/ltc_slave.cc @@ -546,8 +546,8 @@ LTC_Slave::approximate_current_delta() const } else if ((monotonic_cnt - last_timestamp) > 2 * frames_per_ltc_frame) { snprintf(delta, sizeof(delta), _("flywheel")); } else { - snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\" >%s%5" PRIi64 "</span> sm", - PLUSMINUS(-current_delta), abs(current_delta)); + snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\" >%s%s%" PRIi64 "</span> sm", + LEADINGZERO(abs(current_delta)), PLUSMINUS(-current_delta), abs(current_delta)); } return std::string(delta); } diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc index aa35550435..ef2d22ab18 100644 --- a/libs/ardour/midi_clock_slave.cc +++ b/libs/ardour/midi_clock_slave.cc @@ -363,8 +363,8 @@ MIDIClock_Slave::approximate_current_delta() const if (last_timestamp == 0 || _starting) { snprintf(delta, sizeof(delta), "\u2012\u2012\u2012\u2012"); } else { - snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\" >%s%5" PRIi64 "</span> sm", - PLUSMINUS(-current_delta), abs(current_delta)); + snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\" >%s%s%" PRIi64 "</span> sm", + LEADINGZERO(abs(current_delta)), PLUSMINUS(-current_delta), abs(current_delta)); } return std::string(delta); } diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc index 5a3b9b07f4..1228465f8b 100644 --- a/libs/ardour/mtc_slave.cc +++ b/libs/ardour/mtc_slave.cc @@ -679,8 +679,8 @@ MTC_Slave::approximate_current_delta() const if (last.timestamp == 0 || reset_pending) { snprintf(delta, sizeof(delta), "\u2012\u2012\u2012\u2012"); } else { - snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\">%s%5" PRIi64 "</span> sm", - PLUSMINUS(-current_delta), abs(current_delta)); + snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\" >%s%s%" PRIi64 "</span> sm", + LEADINGZERO(abs(current_delta)), PLUSMINUS(-current_delta), abs(current_delta)); } return std::string(delta); } |