summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/directfb/directfb.c3
-rw-r--r--modules/directfb/module.mk3
-rw-r--r--modules/fakevideo/fakevideo.c3
-rw-r--r--modules/omx/module.c2
-rw-r--r--modules/opengl/opengl.m3
-rw-r--r--modules/opengles/opengles.c3
-rw-r--r--modules/sdl/sdl.c3
-rw-r--r--modules/sdl2/sdl.c3
-rw-r--r--modules/selfview/selfview.c3
-rw-r--r--modules/vidbridge/vidbridge.c3
-rw-r--r--modules/vidloop/vidloop.c3
-rw-r--r--modules/x11/x11.c3
12 files changed, 23 insertions, 12 deletions
diff --git a/modules/directfb/directfb.c b/modules/directfb/directfb.c
index 4d3b83f..0dfb122 100644
--- a/modules/directfb/directfb.c
+++ b/modules/directfb/directfb.c
@@ -160,7 +160,8 @@ static int module_init(void)
return (int) ret;
}
- err = vidisp_register(&vid, "directfb", alloc, NULL, display, hide);
+ err = vidisp_register(&vid, baresip_vidispl(),
+ "directfb", alloc, NULL, display, hide);
if (err)
return err;
diff --git a/modules/directfb/module.mk b/modules/directfb/module.mk
index daafe15..57fa045 100644
--- a/modules/directfb/module.mk
+++ b/modules/directfb/module.mk
@@ -8,6 +8,7 @@
MOD := directfb
$(MOD)_SRCS += directfb.c
$(MOD)_LFLAGS += $(shell pkg-config --libs directfb)
-$(MOD)_CFLAGS += $(shell pkg-config --cflags directfb)
+$(MOD)_CFLAGS += $(shell pkg-config --cflags directfb \
+ | sed -e 's/-I/-isystem/g')
include mk/mod.mk
diff --git a/modules/fakevideo/fakevideo.c b/modules/fakevideo/fakevideo.c
index 4fbc9ea..e0552d6 100644
--- a/modules/fakevideo/fakevideo.c
+++ b/modules/fakevideo/fakevideo.c
@@ -176,7 +176,8 @@ static int module_init(void)
int err = 0;
err |= vidsrc_register(&vidsrc, baresip_vidsrcl(),
"fakevideo", src_alloc, NULL);
- err |= vidisp_register(&vidisp, "fakevideo", disp_alloc, NULL,
+ err |= vidisp_register(&vidisp, baresip_vidispl(),
+ "fakevideo", disp_alloc, NULL,
display, NULL);
return err;
}
diff --git a/modules/omx/module.c b/modules/omx/module.c
index eaf2340..e9bd590 100644
--- a/modules/omx/module.c
+++ b/modules/omx/module.c
@@ -115,7 +115,7 @@ static int module_init(void)
return ENODEV;
}
- return vidisp_register(&vid, "omx",
+ return vidisp_register(&vid, baresip_vidispl(), "omx",
omx_vidisp_alloc, NULL, omx_vidisp_display, NULL);
}
diff --git a/modules/opengl/opengl.m b/modules/opengl/opengl.m
index 21c8aaf..a95649c 100644
--- a/modules/opengl/opengl.m
+++ b/modules/opengl/opengl.m
@@ -509,7 +509,8 @@ static int module_init(void)
if (!app)
return ENOSYS;
- err = vidisp_register(&vid, "opengl", alloc, NULL, display, hide);
+ err = vidisp_register(&vid, baresip_vidispl(),
+ "opengl", alloc, NULL, display, hide);
if (err)
return err;
diff --git a/modules/opengles/opengles.c b/modules/opengles/opengles.c
index 712f868..1284de8 100644
--- a/modules/opengles/opengles.c
+++ b/modules/opengles/opengles.c
@@ -275,7 +275,8 @@ static int opengles_display(struct vidisp_st *st, const char *title,
static int module_init(void)
{
- return vidisp_register(&vid, "opengles", opengles_alloc, NULL,
+ return vidisp_register(&vid, baresip_vidispl(),
+ "opengles", opengles_alloc, NULL,
opengles_display, NULL);
}
diff --git a/modules/sdl/sdl.c b/modules/sdl/sdl.c
index 3ef4cf6..c9f6b76 100644
--- a/modules/sdl/sdl.c
+++ b/modules/sdl/sdl.c
@@ -306,7 +306,8 @@ static int display(struct vidisp_st *st, const char *title,
static int module_init(void)
{
- return vidisp_register(&vid, "sdl", alloc, NULL, display, NULL);
+ return vidisp_register(&vid, baresip_vidispl(),
+ "sdl", alloc, NULL, display, NULL);
}
diff --git a/modules/sdl2/sdl.c b/modules/sdl2/sdl.c
index 498f1fa..aefe0ca 100644
--- a/modules/sdl2/sdl.c
+++ b/modules/sdl2/sdl.c
@@ -269,7 +269,8 @@ static int module_init(void)
return ENODEV;
}
- err = vidisp_register(&vid, "sdl2", alloc, NULL, display, hide);
+ err = vidisp_register(&vid, baresip_vidispl(),
+ "sdl2", alloc, NULL, display, hide);
if (err)
return err;
diff --git a/modules/selfview/selfview.c b/modules/selfview/selfview.c
index 77f0b81..af27b1a 100644
--- a/modules/selfview/selfview.c
+++ b/modules/selfview/selfview.c
@@ -162,7 +162,8 @@ static int encode_win(struct vidfilt_enc_st *st, struct vidframe *frame)
if (!enc->disp) {
- err = vidisp_alloc(&enc->disp, NULL, NULL, NULL, NULL, NULL);
+ err = vidisp_alloc(&enc->disp, baresip_vidispl(),
+ NULL, NULL, NULL, NULL, NULL);
if (err)
return err;
}
diff --git a/modules/vidbridge/vidbridge.c b/modules/vidbridge/vidbridge.c
index 95d0a4e..557e175 100644
--- a/modules/vidbridge/vidbridge.c
+++ b/modules/vidbridge/vidbridge.c
@@ -43,7 +43,8 @@ static int module_init(void)
if (err)
return err;
- err = vidisp_register(&vidisp, "vidbridge", vidbridge_disp_alloc,
+ err = vidisp_register(&vidisp, baresip_vidispl(),
+ "vidbridge", vidbridge_disp_alloc,
NULL, vidbridge_disp_display, 0);
if (err)
return err;
diff --git a/modules/vidloop/vidloop.c b/modules/vidloop/vidloop.c
index 090c440..21f4ea1 100644
--- a/modules/vidloop/vidloop.c
+++ b/modules/vidloop/vidloop.c
@@ -394,7 +394,8 @@ static int video_loop_alloc(struct video_loop **vlp, const struct vidsz *size)
info("vidloop: open video display (%s.%s)\n",
vl->cfg.disp_mod, vl->cfg.disp_dev);
- err = vidisp_alloc(&vl->vidisp, vl->cfg.disp_mod, NULL,
+ err = vidisp_alloc(&vl->vidisp, baresip_vidispl(),
+ vl->cfg.disp_mod, NULL,
vl->cfg.disp_dev, NULL, vl);
if (err) {
warning("vidloop: video display failed: %m\n", err);
diff --git a/modules/x11/x11.c b/modules/x11/x11.c
index c2d2346..eafb0d6 100644
--- a/modules/x11/x11.c
+++ b/modules/x11/x11.c
@@ -431,7 +431,8 @@ static void hide(struct vidisp_st *st)
static int module_init(void)
{
- return vidisp_register(&vid, "x11", alloc, NULL, display, hide);
+ return vidisp_register(&vid, baresip_vidispl(),
+ "x11", alloc, NULL, display, hide);
}