diff options
| author | Alfred E. Heggestad <aeh@db.org> | 2015-06-20 10:30:54 +0200 |
|---|---|---|
| committer | Alfred E. Heggestad <aeh@db.org> | 2015-06-20 10:30:54 +0200 |
| commit | d2609092150272f3e3a6a4d9859d3c851e1fa270 (patch) | |
| tree | da65ce08d7997e9e67b78d96cb5ceccf8b839b44 /modules/vidbridge | |
| parent | f369fc474a4f629fb08ad8ae4c188e43f68806fc (diff) | |
vidisp: use const pointer to base-class
Diffstat (limited to 'modules/vidbridge')
| -rw-r--r-- | modules/vidbridge/disp.c | 5 | ||||
| -rw-r--r-- | modules/vidbridge/vidbridge.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/modules/vidbridge/disp.c b/modules/vidbridge/disp.c index bce9cff..be1e8e5 100644 --- a/modules/vidbridge/disp.c +++ b/modules/vidbridge/disp.c @@ -18,11 +18,10 @@ static void destructor(void *arg) list_unlink(&st->le); mem_deref(st->device); - mem_deref(st->vd); } -int vidbridge_disp_alloc(struct vidisp_st **stp, struct vidisp *vd, +int vidbridge_disp_alloc(struct vidisp_st **stp, const struct vidisp *vd, struct vidisp_prm *prm, const char *dev, vidisp_resize_h *resizeh, void *arg) { @@ -39,7 +38,7 @@ int vidbridge_disp_alloc(struct vidisp_st **stp, struct vidisp *vd, if (!st) return ENOMEM; - st->vd = mem_ref(vd); + st->vd = vd; err = str_dup(&st->device, dev); if (err) diff --git a/modules/vidbridge/vidbridge.h b/modules/vidbridge/vidbridge.h index 470e917..0fbf68e 100644 --- a/modules/vidbridge/vidbridge.h +++ b/modules/vidbridge/vidbridge.h @@ -17,7 +17,7 @@ struct vidsrc_st { struct vidisp_st { - struct vidisp *vd; /* inheritance (1st) */ + const struct vidisp *vd; /* inheritance (1st) */ struct le le; struct vidsrc_st *vidsrc; @@ -29,7 +29,7 @@ extern struct hash *ht_src; extern struct hash *ht_disp; -int vidbridge_disp_alloc(struct vidisp_st **stp, struct vidisp *vd, +int vidbridge_disp_alloc(struct vidisp_st **stp, const struct vidisp *vd, struct vidisp_prm *prm, const char *dev, vidisp_resize_h *resizeh, void *arg); int vidbridge_disp_display(struct vidisp_st *st, const char *title, |