Vidsrc api reentrant (#256)

* vidsrc: make the API re-entrant

* vidsrc: update all modules to new API

14 files changed, 27 insertions, 14 deletions

diff --git a/modules/avcapture/avcapture.m b/modules/avcapture/avcapture.m
index e037246..f276c96 100644
--- a/modules/avcapture/avcapture.m
+++ b/modules/avcapture/avcapture.m
@@ -373,7 +373,8 @@ static int module_init(void)
 		debug("avcapture: found video device '%s'\n", name);
 	}
 
-	err = vidsrc_register(&vidsrc, "avcapture", alloc, update);
+	err = vidsrc_register(&vidsrc, baresip_vidsrcl(),
+			      "avcapture", alloc, update);
 
 	[pool drain];
 
diff --git a/modules/avformat/avformat.c b/modules/avformat/avformat.c
index 66bc9f1..c0338a2 100644
--- a/modules/avformat/avformat.c
+++ b/modules/avformat/avformat.c
@@ -413,7 +413,8 @@ static int module_init(void)
 
 	av_register_all();
 
-	return vidsrc_register(&mod_avf, "avformat", alloc, NULL);
+	return vidsrc_register(&mod_avf, baresip_vidsrcl(),
+			       "avformat", alloc, NULL);
 }
 
 
diff --git a/modules/cairo/cairo.c b/modules/cairo/cairo.c
index 9ebb571..9f1b573 100644
--- a/modules/cairo/cairo.c
+++ b/modules/cairo/cairo.c
@@ -250,7 +250,8 @@ static int alloc(struct vidsrc_st **stp, const struct vidsrc *vs,
 
 static int module_init(void)
 {
-	return vidsrc_register(&vidsrc, "cairo", alloc, NULL);
+	return vidsrc_register(&vidsrc, baresip_vidsrcl(),
+			       "cairo", alloc, NULL);
 }
 
 
diff --git a/modules/dshow/dshow.cpp b/modules/dshow/dshow.cpp
index df84ee9..d081f69 100644
--- a/modules/dshow/dshow.cpp
+++ b/modules/dshow/dshow.cpp
@@ -514,7 +514,8 @@ static int module_init(void)
 	if (CoInitialize(NULL) != S_OK)
 		return ENODATA;
 
-	return vidsrc_register(&vsrc, "dshow", alloc, NULL);
+	return vidsrc_register(&vsrc, baresip_vidsrcl(),
+			       "dshow", alloc, NULL);
 }
 
 
diff --git a/modules/fakevideo/fakevideo.c b/modules/fakevideo/fakevideo.c
index c750814..4fbc9ea 100644
--- a/modules/fakevideo/fakevideo.c
+++ b/modules/fakevideo/fakevideo.c
@@ -174,7 +174,8 @@ static int display(struct vidisp_st *st, const char *title,
 static int module_init(void)
 {
 	int err = 0;
-	err |= vidsrc_register(&vidsrc, "fakevideo", src_alloc, NULL);
+	err |= vidsrc_register(&vidsrc, baresip_vidsrcl(),
+			       "fakevideo", src_alloc, NULL);
 	err |= vidisp_register(&vidisp, "fakevideo", disp_alloc, NULL,
 			       display, NULL);
 	return err;
diff --git a/modules/qtcapture/qtcapture.m b/modules/qtcapture/qtcapture.m
index 08f66ab..e4fddc2 100644
--- a/modules/qtcapture/qtcapture.m
+++ b/modules/qtcapture/qtcapture.m
@@ -381,7 +381,8 @@ static void device_info(void)
 static int module_init(void)
 {
 	device_info();
-	return vidsrc_register(&vidsrc, "qtcapture", alloc, NULL);
+	return vidsrc_register(&vidsrc, baresip_vidsrcl(),
+			       "qtcapture", alloc, NULL);
 }
 
 
diff --git a/modules/quicktime/quicktime.c b/modules/quicktime/quicktime.c
index 504338c..3811add 100644
--- a/modules/quicktime/quicktime.c
+++ b/modules/quicktime/quicktime.c
@@ -303,7 +303,8 @@ static int alloc(struct vidsrc_st **stp, const struct vidsrc *vs,
 
 static int qt_init(void)
 {
-	return vidsrc_register(&vidsrc, "quicktime", alloc, NULL);
+	return vidsrc_register(&vidsrc, baresip_vidsrcl(),
+			       "quicktime", alloc, NULL);
 }
 
 
diff --git a/modules/rst/video.c b/modules/rst/video.c
index b252504..bf59daf 100644
--- a/modules/rst/video.c
+++ b/modules/rst/video.c
@@ -269,7 +269,8 @@ static int alloc_handler(struct vidsrc_st **stp, const struct vidsrc *vs,
 
 int rst_video_init(void)
 {
-	return vidsrc_register(&vidsrc, "rst", alloc_handler, NULL);
+	return vidsrc_register(&vidsrc, baresip_vidsrcl(),
+			       "rst", alloc_handler, NULL);
 }
 
 
diff --git a/modules/v4l/v4l.c b/modules/v4l/v4l.c
index 46d4ca7..25b7640 100644
--- a/modules/v4l/v4l.c
+++ b/modules/v4l/v4l.c
@@ -245,7 +245,7 @@ static int alloc(struct vidsrc_st **stp, const struct vidsrc *vs,
 
 static int v4l_init(void)
 {
-	return vidsrc_register(&vidsrc, "v4l", alloc, NULL);
+	return vidsrc_register(&vidsrc, baresip_vidsrcl(), "v4l", alloc, NULL);
 }
 
 
diff --git a/modules/v4l2/v4l2.c b/modules/v4l2/v4l2.c
index 5f7244a..e079fed 100644
--- a/modules/v4l2/v4l2.c
+++ b/modules/v4l2/v4l2.c
@@ -491,7 +491,8 @@ static int alloc(struct vidsrc_st **stp, const struct vidsrc *vs,
 
 static int v4l_init(void)
 {
-	return vidsrc_register(&vidsrc, "v4l2", alloc, NULL);
+	return vidsrc_register(&vidsrc, baresip_vidsrcl(),
+			       "v4l2", alloc, NULL);
 }
 
 
diff --git a/modules/v4l2_codec/v4l2_codec.c b/modules/v4l2_codec/v4l2_codec.c
index bf77029..5570c09 100644
--- a/modules/v4l2_codec/v4l2_codec.c
+++ b/modules/v4l2_codec/v4l2_codec.c
@@ -563,7 +563,8 @@ static int module_init(void)
 	info("v4l2_codec inited\n");
 
 	vidcodec_register(baresip_vidcodecl(), &h264);
-	return vidsrc_register(&vidsrc, "v4l2_codec", src_alloc, NULL);
+	return vidsrc_register(&vidsrc, baresip_vidsrcl(),
+			       "v4l2_codec", src_alloc, NULL);
 }
 
 
diff --git a/modules/vidbridge/vidbridge.c b/modules/vidbridge/vidbridge.c
index 495264e..95d0a4e 100644
--- a/modules/vidbridge/vidbridge.c
+++ b/modules/vidbridge/vidbridge.c
@@ -48,7 +48,8 @@ static int module_init(void)
 	if (err)
 		return err;
 
-	err = vidsrc_register(&vidsrc, "vidbridge", vidbridge_src_alloc, NULL);
+	err = vidsrc_register(&vidsrc, baresip_vidsrcl(),
+			      "vidbridge", vidbridge_src_alloc, NULL);
 	if (err)
 		return err;
 
diff --git a/modules/vidloop/vidloop.c b/modules/vidloop/vidloop.c
index 69dbb56..090c440 100644
--- a/modules/vidloop/vidloop.c
+++ b/modules/vidloop/vidloop.c
@@ -342,7 +342,8 @@ static int vsrc_reopen(struct video_loop *vl, const struct vidsz *sz)
 	prm.fps    = vl->cfg.fps;
 
 	vl->vsrc = mem_deref(vl->vsrc);
-	err = vidsrc_alloc(&vl->vsrc, vl->cfg.src_mod, NULL, &prm, sz,
+	err = vidsrc_alloc(&vl->vsrc, baresip_vidsrcl(),
+			   vl->cfg.src_mod, NULL, &prm, sz,
 			   NULL, vl->cfg.src_dev, vidsrc_frame_handler,
 			   NULL, vl);
 	if (err) {
diff --git a/modules/x11grab/x11grab.c b/modules/x11grab/x11grab.c
index ecbcba5..d3aa287 100644
--- a/modules/x11grab/x11grab.c
+++ b/modules/x11grab/x11grab.c
@@ -203,7 +203,8 @@ static int alloc(struct vidsrc_st **stp, const struct vidsrc *vs,
 
 static int x11grab_init(void)
 {
-	return vidsrc_register(&vidsrc, "x11grab", alloc, NULL);
+	return vidsrc_register(&vidsrc, baresip_vidsrcl(),
+			       "x11grab", alloc, NULL);
 }