summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2022-04-29 20:09:32 -0700
committerVito Caputo <vcaputo@pengaru.com>2022-04-29 20:09:32 -0700
commitf203d1b61b07f1c87df46b576d57f378247db07d (patch)
tree4d7b8c2f72033b2bb0ccfbdbd3db6a1caae67d60
parent0ec8f688605d5c3bec561ba0b6ab4f96110ca120 (diff)
modules/rtv: except snow_module=none,snow_duration=0
The code was deliberately showing a single frame of snow when snow_duration=0, since the durations are integral seconds ther was no way to have a sub 1-second snow otherwise. snow_module=none just means cleared for the snow_duration, not no snow mechanism whatsoever. So the combination of 0 duration and "none" was still flashing a single blank frame. With this commit the combination of "none" and 0 snow_duration prevents even a single frame of blank snow from being rendered.
-rw-r--r--src/modules/rtv/rtv.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/modules/rtv/rtv.c b/src/modules/rtv/rtv.c
index 7db9c9d..f50d9a8 100644
--- a/src/modules/rtv/rtv.c
+++ b/src/modules/rtv/rtv.c
@@ -76,6 +76,7 @@ static rtv_setup_t rtv_default_setup = {
.channels = { NULL }, /* NULL == "all" */
};
+static til_module_t rtv_none_module = {};
til_module_t rtv_module = {
.create_context = rtv_create_context,
@@ -132,7 +133,9 @@ static void setup_next_channel(rtv_context_t *ctxt, unsigned ticks)
}
}
- if (!ctxt->n_channels || ctxt->channel != &ctxt->snow_channel) {
+ if (!ctxt->n_channels ||
+ (ctxt->channel != &ctxt->snow_channel && (ctxt->snow_channel.module != &rtv_none_module || ctxt->snow_duration))) {
+
ctxt->last_channel = ctxt->channel;
ctxt->channel = &ctxt->snow_channel;
ctxt->caption = NULL;
@@ -209,7 +212,6 @@ static void * rtv_create_context(unsigned ticks, unsigned num_cpus, til_setup_t
rtv_context_t *ctxt;
const til_module_t **modules;
size_t n_modules, n_channels = 0;
- static til_module_t none_module = {};
if (!setup)
setup = &rtv_default_setup.til_setup;
@@ -232,7 +234,7 @@ static void * rtv_create_context(unsigned ticks, unsigned num_cpus, til_setup_t
ctxt->snow_duration = ((rtv_setup_t *)setup)->snow_duration;
ctxt->caption_duration = ((rtv_setup_t *)setup)->caption_duration;
- ctxt->snow_channel.module = &none_module;
+ ctxt->snow_channel.module = &rtv_none_module;
if (((rtv_setup_t *)setup)->snow_module) {
ctxt->snow_channel.module = til_lookup_module(((rtv_setup_t *)setup)->snow_module);
(void) til_module_create_context(ctxt->snow_channel.module, ticks, NULL, &ctxt->snow_channel.module_ctxt);
© All Rights Reserved