summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2021-02-14 18:35:00 -0800
committerVito Caputo <vcaputo@pengaru.com>2021-02-14 18:44:48 -0800
commit950d6abb1ffd126a3200044de31b631ac987ed7e (patch)
treea6faa21274022ef384118aba90d2ab7f3d2eff54
parentb31ee4be7739ccd8cf36048da212410514758949 (diff)
compose,montage,rtv: drop author and license fields
These modules are meta modules, and the only place this information is presented currently is in the rtv module captions overlaying the visual output of unrelated modules. So it's rather misleading to put the meta module's author and license on-screen when what's being shown is arguably just a tiny fraction of the meta module's contribution. Rather than bother with constructing license and author lists at runtime from the modules incorporated by these meta modules, let's instead adopt a policy of meta modules omit any declaration of license or authorship outside of the source. This is a simple solution for now, it can be revisited later if necessary. Changing the .author member of rototiller_module_t to an .authors() function pointer wouldn't be difficult. But it does open up something of a can of worms when considering recursive dependencies and needing to construct unique authors and licenses lists from things like nested meta modules. Obviously there can't be infinite recursion as that would manifest in the rendering path as well, but what I'm more concerned about is properly handling potentialy quite long lists. It's already annoying when rtv has to deal with a long settings string, which I believe currently is just truncated. The same would have to be done with long authors/licenses I guess. In any case, I think it's probably fine to just leave authorship and license ambiguous when a meta module is shown in rtv. It's certainly preferable to vcaputo@pengaru.com getting credit for everything shown in the three meta modules currently implemented, or more specifically, the two shown in rtv; compose and montage. Note this required making rtv tolerante of NULL .license and .author rototiller_module_t members.
-rw-r--r--src/modules/compose/compose.c2
-rw-r--r--src/modules/montage/montage.c2
-rw-r--r--src/modules/rtv/rtv.c10
3 files changed, 5 insertions, 9 deletions
diff --git a/src/modules/compose/compose.c b/src/modules/compose/compose.c
index b90b1f6..5cf994e 100644
--- a/src/modules/compose/compose.c
+++ b/src/modules/compose/compose.c
@@ -50,8 +50,6 @@ rototiller_module_t compose_module = {
.prepare_frame = compose_prepare_frame,
.name = "compose",
.description = "Layered modules compositor",
- .author = "Vito Caputo <vcaputo@pengaru.com>",
- .license = "GPLv2",
.setup = compose_setup,
};
diff --git a/src/modules/montage/montage.c b/src/modules/montage/montage.c
index 0e8ad1b..f791ac1 100644
--- a/src/modules/montage/montage.c
+++ b/src/modules/montage/montage.c
@@ -30,8 +30,6 @@ rototiller_module_t montage_module = {
.render_fragment = montage_render_fragment,
.name = "montage",
.description = "Rototiller montage (threaded)",
- .author = "Vito Caputo <vcaputo@pengaru.com>",
- .license = "GPLv2",
};
diff --git a/src/modules/rtv/rtv.c b/src/modules/rtv/rtv.c
index c9ff986..373da93 100644
--- a/src/modules/rtv/rtv.c
+++ b/src/modules/rtv/rtv.c
@@ -64,8 +64,6 @@ rototiller_module_t rtv_module = {
.finish_frame = rtv_finish_frame,
.name = "rtv",
.description = "Rototiller TV",
- .author = "Vito Caputo <vcaputo@pengaru.com>",
- .license = "GPLv2",
.setup = rtv_setup,
};
@@ -186,11 +184,13 @@ static void setup_next_channel(rtv_context_t *ctxt, unsigned ticks)
txt_t *caption;
settings = randomize_module_setup(ctxt->channel->module);
- caption = txt_newf("Title: %s\nAuthor: %s\nDescription: %s\nLicense: %s%s%s",
+ caption = txt_newf("Title: %s%s%s\nDescription: %s%s%s%s%s",
ctxt->channel->module->name,
- ctxt->channel->module->author,
+ ctxt->channel->module->author ? "\nAuthor: " : "",
+ ctxt->channel->module->author ? : "",
ctxt->channel->module->description,
- ctxt->channel->module->license,
+ ctxt->channel->module->license ? "\nLicense: " : "",
+ ctxt->channel->module->license ? : "",
settings ? "\nSettings: " : "",
settings ? settings : "");
© All Rights Reserved