diff options
| author | Robin Gareus <robin@gareus.org> | 2012-11-11 02:45:01 +0000 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2012-11-11 02:45:01 +0000 |
| commit | 23f00184c8ad5373bdf76daeb198f5c981b3e857 (patch) | |
| tree | 84f9b7bb4743dc218ec806593a1f3aa9c8e2c507 /libs | |
| parent | 2bc4b879b653ea26c6e18082e58ab6ff5c820bfb (diff) | |
first round of audio-clock font rendering update
git-svn-id: svn://localhost/ardour2/branches/3.0@13425 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/slave.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ltc_slave.cc | 6 | ||||
| -rw-r--r-- | libs/ardour/midi_clock_slave.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/mtc_slave.cc | 5 |
4 files changed, 8 insertions, 9 deletions
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index de58e07e36..d147059ccd 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -39,7 +39,7 @@ #endif // used for approximate_current_delta(): -#define PLUSMINUS(A) ( ((A)<0) ? "\u2012" : (((A)>0) ? "+" : "\u00B1") ) +#define PLUSMINUS(A) ( ((A)<0) ? "-" : (((A)>0) ? "+" : "\u00B1") ) namespace MIDI { class Port; diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc index 3efc2eef78..8cc12c2b5d 100644 --- a/libs/ardour/ltc_slave.cc +++ b/libs/ardour/ltc_slave.cc @@ -540,13 +540,13 @@ LTC_Slave::approximate_current_position() const std::string LTC_Slave::approximate_current_delta() const { - char delta[24]; + char delta[80]; if (last_timestamp == 0 || engine_dll_initstate == 0) { snprintf(delta, sizeof(delta), "\u2012\u2012\u2012\u2012"); } else if ((monotonic_cnt - last_timestamp) > 2 * frames_per_ltc_frame) { - snprintf(delta, sizeof(delta), "flywheel"); + snprintf(delta, sizeof(delta), _("flywheel")); } else { - snprintf(delta, sizeof(delta), "\u0394 %s%4" PRIi64 " sm", + snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\" >%s%5" PRIi64 "</span>sm", 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 967626278e..3a9792a6df 100644 --- a/libs/ardour/midi_clock_slave.cc +++ b/libs/ardour/midi_clock_slave.cc @@ -359,11 +359,11 @@ MIDIClock_Slave::resolution() const std::string MIDIClock_Slave::approximate_current_delta() const { - char delta[24]; + char delta[80]; if (last_timestamp == 0 || _starting) { snprintf(delta, sizeof(delta), "\u2012\u2012\u2012\u2012"); } else { - snprintf(delta, sizeof(delta), "\u0394 %s%4" PRIi64 " sm", + snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\" >%s%5" PRIi64 "</span>sm", 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 e7c2fde199..c74958997f 100644 --- a/libs/ardour/mtc_slave.cc +++ b/libs/ardour/mtc_slave.cc @@ -673,14 +673,13 @@ MTC_Slave::approximate_current_position() const std::string MTC_Slave::approximate_current_delta() const { - char delta[24]; + char delta[80]; SafeTime last; read_current (&last); if (last.timestamp == 0 || reset_pending) { snprintf(delta, sizeof(delta), "\u2012\u2012\u2012\u2012"); } else { - // TODO if current_delta > 1 frame -> display timecode. - snprintf(delta, sizeof(delta), "\u0394 %s%4" PRIi64 " sm", + snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\">%s%5" PRIi64 "</span>sm", PLUSMINUS(-current_delta), abs(current_delta)); } return std::string(delta); |