ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Allow to configure decimals of MinSec clock format

This commit is contained in:
Robin Gareus 2021-02-07 13:31:19 +01:00
parent f91cb13cce
commit dca7cbc963
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gtk2_ardour/audio_clock.cc
View File

@ -1058,7 +1058,7 @@ AudioClock::set_seconds (samplepos_t when, bool /*force*/)
}
void
AudioClock::print_minsec (samplepos_t when, char* buf, size_t bufsize, float sample_rate)
AudioClock::print_minsec (samplepos_t when, char* buf, size_t bufsize, float sample_rate, int decimals)
{
samplecnt_t left;
int hrs;
@ -1074,6 +1074,20 @@ AudioClock::print_minsec (samplepos_t when, char* buf, size_t bufsize, float sam
negative = false;
}
float dmult;
switch (decimals) {
case 1:
dmult = 10.f;
break;
case 2:
dmult = 100.f;
break;
default:
case 3:
dmult = 1000.f;
break;
}
left = when;
hrs = (int) floor (left / (sample_rate * 60.0f * 60.0f));
left -= (samplecnt_t) floor (hrs * sample_rate * 60.0f * 60.0f);
@ -1081,14 +1095,23 @@ AudioClock::print_minsec (samplepos_t when, char* buf, size_t bufsize, float sam
left -= (samplecnt_t) floor (mins * sample_rate * 60.0f);
secs = (int) floor (left / (float) sample_rate);
left -= (samplecnt_t) floor ((double)(secs * sample_rate));
millisecs = floor (left * 1000.0 / (float) sample_rate);
millisecs = floor (left * dmult / (float) sample_rate);
if (negative) {
snprintf (buf, bufsize, "-%02" PRId32 ":%02" PRId32 ":%02" PRId32 ".%03" PRId32, hrs, mins, secs, millisecs);
} else {
snprintf (buf, bufsize, " %02" PRId32 ":%02" PRId32 ":%02" PRId32 ".%03" PRId32, hrs, mins, secs, millisecs);
switch (decimals) {
case 0:
snprintf (buf, bufsize, "%c%02" PRId32 ":%02" PRId32 ":%02" PRId32, negative ? '-' : ' ', hrs, mins, secs);
break;
case 1:
snprintf (buf, bufsize, "%c%02" PRId32 ":%02" PRId32 ":%02" PRId32 ".%01" PRId32, negative ? '-' : ' ', hrs, mins, secs, millisecs);
break;
case 2:
snprintf (buf, bufsize, "%c%02" PRId32 ":%02" PRId32 ":%02" PRId32 ".%02" PRId32, negative ? '-' : ' ', hrs, mins, secs, millisecs);
break;
default:
case 3:
snprintf (buf, bufsize, "%c%02" PRId32 ":%02" PRId32 ":%02" PRId32 ".%03" PRId32, negative ? '-' : ' ', hrs, mins, secs, millisecs);
break;
}
}
void

2
gtk2_ardour/audio_clock.h
View File

@ -100,7 +100,7 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
*/
void set_scale (double x, double y);
static void print_minsec (samplepos_t, char* buf, size_t bufsize, float sample_rate);
static void print_minsec (samplepos_t, char* buf, size_t bufsize, float sample_rate, int decimals = 3);
sigc::signal<void> ValueChanged;
sigc::signal<void> mode_changed;