diff options
author | Alfred E. Heggestad <aeh@db.org> | 2015-06-20 10:01:35 +0200 |
---|---|---|
committer | Alfred E. Heggestad <aeh@db.org> | 2015-06-20 10:01:35 +0200 |
commit | eb6b9567bbcd400773e7801f60dd34b92edace31 (patch) | |
tree | eb3f419966f7bc25e506f823b90680cd52425125 /modules/rst | |
parent | 92f52bf6180f03d0d148cd4db15e07dfb97a5d53 (diff) |
vidsrc: use const pointer to base-class
Diffstat (limited to 'modules/rst')
-rw-r--r-- | modules/rst/video.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/rst/video.c b/modules/rst/video.c index db6bfc9..adf2495 100644 --- a/modules/rst/video.c +++ b/modules/rst/video.c @@ -15,7 +15,7 @@ struct vidsrc_st { - struct vidsrc *vs; + const struct vidsrc *vs; /* pointer to base-class (inheritance) */ pthread_mutex_t mutex; pthread_t thread; struct vidsrc_prm prm; @@ -52,7 +52,6 @@ static void destructor(void *arg) cairo_surface_destroy(st->surface); mem_deref(st->frame); - mem_deref(st->vs); } @@ -188,7 +187,7 @@ void rst_video_update(struct vidsrc_st *st, const char *name, const char *meta) } -static int alloc_handler(struct vidsrc_st **stp, struct vidsrc *vs, +static int alloc_handler(struct vidsrc_st **stp, const struct vidsrc *vs, struct media_ctx **ctx, struct vidsrc_prm *prm, const struct vidsz *size, const char *fmt, const char *dev, vidsrc_frame_h *frameh, @@ -211,7 +210,7 @@ static int alloc_handler(struct vidsrc_st **stp, struct vidsrc *vs, if (err) goto out; - st->vs = mem_ref(vs); + st->vs = vs; st->prm = *prm; st->size = *size; st->frameh = frameh; |