Browse Source

Make -c c an alias for -c s

The cycle counting clock is no longer supported. For backwards
compatibility with scripts, allow the user to request the cycle clock on
the command line, but use the system clock instead.

Cross-ported from jackd1.
tags/v1.9.10
Adrian Knoth 11 years ago
parent
commit
c52f751b73
2 changed files with 10 additions and 2 deletions
  1. +5
    -1
      common/JackServerGlobals.cpp
  2. +5
    -1
      common/Jackdmp.cpp

+ 5
- 1
common/JackServerGlobals.cpp View File

@@ -203,7 +203,11 @@ bool JackServerGlobals::Init()
if (tolower (optarg[0]) == 'h') {
clock_source = JACK_TIMER_HPET;
} else if (tolower (optarg[0]) == 'c') {
clock_source = JACK_TIMER_CYCLE_COUNTER;
/* For backwards compatibility with scripts, allow
* the user to request the cycle clock on the
* command line, but use the system clock instead
*/
clock_source = JACK_TIMER_SYSTEM_CLOCK;
} else if (tolower (optarg[0]) == 's') {
clock_source = JACK_TIMER_SYSTEM_CLOCK;
} else {


+ 5
- 1
common/Jackdmp.cpp View File

@@ -329,7 +329,11 @@ int main(int argc, char** argv)
value.ui = JACK_TIMER_HPET;
jackctl_parameter_set_value(param, &value);
} else if (tolower (optarg[0]) == 'c') {
value.ui = JACK_TIMER_CYCLE_COUNTER;
/* For backwards compatibility with scripts, allow
* the user to request the cycle clock on the
* command line, but use the system clock instead
*/
value.ui = JACK_TIMER_SYSTEM_CLOCK;
jackctl_parameter_set_value(param, &value);
} else if (tolower (optarg[0]) == 's') {
value.ui = JACK_TIMER_SYSTEM_CLOCK;


Loading…
Cancel
Save