Permalink
Browse files

Merge branch 'maintenance'

  • Loading branch information...
2 parents 18ec187 + bad32e6 commit 85ad0793eaa03942d0786fecdb04d5eddd0b5252 @kasbah kasbah committed May 15, 2012
Showing with 16 additions and 15 deletions.
  1. +15 −14 OSC
  2. +1 −1 src/engine.cpp
View
29 OSC
@@ -86,10 +86,10 @@ SET PARAMETER VALUES
use_common_outs :: 0 = off, not 0 = on
relative_sync :: 0 = off, not 0 = on
use_safety_feedback :: 0 = off, not 0 = on
- pan1 :: range 0 -> 1
- pan2 :: range 0 -> 1
- pan3 :: range 0 -> 1
- pan4 :: range 0 -> 1
+ pan_1 :: range 0 -> 1
+ pan_2 :: range 0 -> 1
+ pan_3 :: range 0 -> 1
+ pan_4 :: range 0 -> 1
input_latency :: range 0 -> ...
output_latency :: range 0 -> ...
trigger_latency :: range 0 -> ...
@@ -128,15 +128,16 @@ GET PARAMETER VALUES
next_state :: same as state
- loop_len :: in seconds
- loop_pos :: in seconds
- cycle_len :: in seconds
- free_time :: in seconds
- total_time :: in seconds
- rate_output
- in_peak_meter :: absolute float sample value 0.0 -> 1.0 (or higher)
- out_peak_meter :: absolute float sample value 0.0 -> 1.0 (or higher)
- is_soloed :: 1 if soloed, 0 if not
+ loop_len :: in seconds
+ loop_pos :: in seconds
+ cycle_len :: in seconds
+ free_time :: in seconds
+ total_time :: in seconds
+ rate_output ::
+ in_peak_meter :: absolute float sample value 0.0 -> 1.0 (or higher)
+ out_peak_meter :: absolute float sample value 0.0 -> 1.0 (or higher)
+ is_soloed :: 1 if soloed, 0 if not
+ waiting :: 1 if waiting, 0 if not
SAVE/LOAD
@@ -161,7 +162,7 @@ GLOBAL PARAMETERS
where param is one of:
tempo :: bpm
- eigth_per_cycle
+ eighth_per_cycle
dry :: range 0 -> 1 affects common input passthru
wet :: range 0 -> 1 affects common output level
input_gain :: range 0 -> 1 affects common input gain
View
@@ -2075,7 +2075,7 @@ Engine::set_tempo (double tempo, bool rt)
_tempo_counter = 0;
- // adjust eigths per cycle if tempo is > 240 or < 60
+ // adjust eighths per cycle if tempo is > 240 or < 60
if (_smart_eighths &&
_tempo > 1.0 && (_tempo > 240.0 || _tempo < 60.0)) {
//cerr << "tempo is " << _tempo << endl;

0 comments on commit 85ad079

Please sign in to comment.