From 33203781baeb3d8ef188e93686283746837f60d6 Mon Sep 17 00:00:00 2001 From: Jasper Hugo Date: Mon, 16 Aug 2021 09:54:49 +0700 Subject: [PATCH] removed workspace member not committed to repo yet, updated cbindgen --- Cargo.toml | 1 - README.md | 2 +- lib-gst-meet-c/cbindgen.toml | 2 ++ lib-gst-meet-c/{ => include}/gstmeet.h | 7 +++++++ 4 files changed, 10 insertions(+), 2 deletions(-) rename lib-gst-meet-c/{ => include}/gstmeet.h (92%) diff --git a/Cargo.toml b/Cargo.toml index 2c7493e..47ae19e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,6 @@ members = [ "gst-meet", "lib-gst-meet", "lib-gst-meet-c", - "lib-gst-meet-py", "nice-gst-meet", "nice-gst-meet-sys", ] diff --git a/README.md b/README.md index 6df9006..873ff46 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # gst-meet: Integrate Jitsi Meet conferences with GStreamer pipelines -Note: gst-meet is in an **alpha** state and is under active development. The command-line options and the lib-gst-meet API are subject to change, and some important features (TURN, RTX, TCC, simulcast) are not yet fully functional. +Note: gst-meet is in an **alpha** state and is under active development. The command-line options and the lib-gst-meet API are subject to change, and some important features (simulcast, RTX, TCC) are not yet fully functional. gst-meet provides a library and tool for integrating Jitsi Meet conferences with GStreamer pipelines. You can pipe audio and video into a conference as a participant, and pipe out other participants' audio and video streams. diff --git a/lib-gst-meet-c/cbindgen.toml b/lib-gst-meet-c/cbindgen.toml index 3f6060e..f1d8a18 100644 --- a/lib-gst-meet-c/cbindgen.toml +++ b/lib-gst-meet-c/cbindgen.toml @@ -1,3 +1,5 @@ language = "C" include_guard = "gstmeet_h" autogen_warning = "/* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */" +sys_includes = ["glib/glib.h", "gst/gst.h"] +after_includes = "\ntypedef struct JitsiConnection JitsiConnection;\ntypedef struct JitsiConference JitsiConference;" \ No newline at end of file diff --git a/lib-gst-meet-c/gstmeet.h b/lib-gst-meet-c/include/gstmeet.h similarity index 92% rename from lib-gst-meet-c/gstmeet.h rename to lib-gst-meet-c/include/gstmeet.h index eb17739..8b5654a 100644 --- a/lib-gst-meet-c/gstmeet.h +++ b/lib-gst-meet-c/include/gstmeet.h @@ -7,6 +7,11 @@ #include #include #include +#include +#include + +typedef struct JitsiConnection JitsiConnection; +typedef struct JitsiConference JitsiConference; typedef struct Context Context; @@ -24,6 +29,8 @@ typedef struct Participant { const char *nick; } Participant; +typedef enum {VIDEO, AUDIO} MediaType; + struct Context *gstmeet_init(void); void gstmeet_deinit(struct Context *context);