diff options
| author | Thomas White <taw@physics.org> | 2021-06-28 18:07:50 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2021-06-28 18:07:50 +0200 |
| commit | 2e09f09966a15aa838af9ae96daef702cac09569 (patch) | |
| tree | 5bb67a3e3d8dca9ecb4f4437fccd2cfb17503a42 /src | |
| parent | 6f08467687d4f87ad051d64b3a73da3eb77ff8be (diff) | |
Fixture display: Handle grouped fixtures
Diffstat (limited to 'src')
| -rw-r--r-- | src/starlet-fixture-display.c | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/src/starlet-fixture-display.c b/src/starlet-fixture-display.c index c75a7c4..8f1d34c 100644 --- a/src/starlet-fixture-display.c +++ b/src/starlet-fixture-display.c @@ -316,6 +316,18 @@ static char *symbol_to_str(SCM symbol) } +static char *group_fixture_name(SCM item) +{ + char tmp[64]; + SCM group_name = scm_list_ref(item, scm_from_int(1)); + SCM idx = scm_list_ref(item, scm_from_int(2)); + SCM name = scm_symbol_to_string(group_name); + snprintf(tmp, 63, "%s/%i", scm_to_locale_string(name), + scm_to_int(idx)); + return strdup(tmp); +} + + static void handle_patched_fixtures(struct fixture_display *fixd, SCM list) { @@ -338,19 +350,17 @@ static void handle_patched_fixtures(struct fixture_display *fixd, if ( is_list(item) && (scm_to_int(scm_length(item)) == 3) ) { char tmp[64]; - SCM group_name = scm_list_ref(item, scm_from_int(1)); SCM idx = scm_list_ref(item, scm_from_int(2)); + SCM group_name = scm_list_ref(item, scm_from_int(1)); SCM name = scm_symbol_to_string(group_name); - snprintf(tmp, 63, "%s/%i", - scm_to_locale_string(name), - scm_to_int(idx)); - fixd->fixtures[i].label = strdup(tmp); snprintf(tmp, 63, "(list-ref %s %i)", scm_to_locale_string(name), scm_to_int(idx)); fixd->fixtures[i].scheme_name = strdup(tmp); + fixd->fixtures[i].label = group_fixture_name(item); + } else { SCM name = scm_symbol_to_string(item); fixd->fixtures[i].label = scm_to_locale_string(name); @@ -405,7 +415,16 @@ static void handle_selection(struct fixture_display *fixd, SCM list) for ( i=0; i<nfix; i++ ) { SCM item = scm_list_ref(list, scm_from_int(i)); - char *name_str = symbol_to_str(item); + char *name_str; + if ( scm_is_symbol(item) ) { + name_str = symbol_to_str(item); + } else if ( is_list(item) ) { + name_str = group_fixture_name(item); + } else { + fprintf(stderr, "Unrecognised type in selection list\n"); + name_str = NULL; + } + if ( name_str != NULL ) { struct fixture *fix = find_fixture(fixd, name_str); if ( fix != NULL ) { @@ -415,8 +434,6 @@ static void handle_selection(struct fixture_display *fixd, SCM list) name_str); } free(name_str); - } else { - fprintf(stderr, "Unrecognised symbol in selection list\n"); } } } |