summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2023-07-16 11:58:24 -0700
committerVito Caputo <vcaputo@pengaru.com>2023-07-16 11:58:24 -0700
commitbd7a68e42a65289c64395363103a5e5ac66d65ca (patch)
treefa78ba13de461637fa86f3ce856d0c9319224cf6
parentcc5be69ae52c4a7a53183482ef97cd88fbce3ca7 (diff)
module/rkt: pull rkt_context_t to sync_get_trackf
Preparatory commit for rewriting track paths a bit to better group things in RocketEditor. I'll need access to rkt_context_t.til_module_context_t.setup->path for prefix matching purposes..
-rw-r--r--src/modules/rkt/rkt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/rkt/rkt.c b/src/modules/rkt/rkt.c
index 02154b0..089d27f 100644
--- a/src/modules/rkt/rkt.c
+++ b/src/modules/rkt/rkt.c
@@ -28,13 +28,13 @@
*/
/* variadic helper wrapping librocket's sync_get_track() */
-static const struct sync_track * sync_get_trackf(struct sync_device *device, const char *format, ...)
+static const struct sync_track * rkt_sync_get_trackf(rkt_context_t *ctxt, const char *format, ...)
{
char buf[4096];
size_t len;
va_list ap;
- assert(device);
+ assert(ctxt);
assert(format);
va_start(ap, format);
@@ -44,7 +44,7 @@ static const struct sync_track * sync_get_trackf(struct sync_device *device, con
if (len >= sizeof(buf))
return NULL;
- return sync_get_track(device, buf);
+ return sync_get_track(ctxt->sync_device, buf);
}
@@ -123,7 +123,7 @@ int rkt_stream_pipe_ctor(void *context, til_stream_t *stream, const void *owner,
return -ENOMEM;
rkt_pipe->tap = til_tap_init(ctxt, tap->type, &rkt_pipe->ptr, 1, &rkt_pipe->var, tap->name);
- rkt_pipe->track = sync_get_trackf(ctxt->sync_device, "%s:%s", parent_path, tap->name);
+ rkt_pipe->track = rkt_sync_get_trackf(ctxt, "%s:%s", parent_path, tap->name);
*res_owner = ctxt;
*res_owner_foo = rkt_pipe;
@@ -220,7 +220,7 @@ static til_module_context_t * rkt_create_context(const til_module_t *module, til
if (s->connect && !sync_tcp_connect(ctxt->sync_device, s->host, s->port))
ctxt->connected = 1;
- ctxt->scene_track = sync_get_trackf(ctxt->sync_device, "%s:scene", setup->path);
+ ctxt->scene_track = rkt_sync_get_trackf(ctxt, "%s:scene", setup->path);
if (!ctxt->scene_track)
return til_module_context_free(&ctxt->til_module_context);
© All Rights Reserved