diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | main/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | main/src/ui/call_window/call_window_controller.vala | 27 | ||||
| -rw-r--r-- | plugins/CMakeLists.txt | 34 |
4 files changed, 11 insertions, 53 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5516dbdb..f8963937 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,6 +127,7 @@ endif () if (NOT ("all" IN_LIST VALA_WARN OR "qualifier" IN_LIST VALA_WARN)) AddCFlagIfSupported(VALA_CFLAGS -Wno-discarded-qualifiers) AddCFlagIfSupported(VALA_CFLAGS -Wno-discarded-array-qualifiers) + AddCFlagIfSupported(VALA_CFLAGS -Wno-incompatible-pointer-types-discards-qualifiers) endif () if (NOT ("all" IN_LIST VALA_WARN OR "deprecated" IN_LIST VALA_WARN)) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 3abe970a..e052785a 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -5,8 +5,6 @@ gettext_compile(${GETTEXT_PACKAGE} SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/po TAR find_packages(MAIN_PACKAGES REQUIRED Gee - Gst - GstVideo GLib GModule GObject diff --git a/main/src/ui/call_window/call_window_controller.vala b/main/src/ui/call_window/call_window_controller.vala index dbf2106c..34f3a910 100644 --- a/main/src/ui/call_window/call_window_controller.vala +++ b/main/src/ui/call_window/call_window_controller.vala @@ -320,31 +320,6 @@ public class Dino.Ui.CallWindowController : Object { });*/ } - public void add_test_video() { - var pipeline = new Gst.Pipeline(null); - var src = Gst.ElementFactory.make("videotestsrc", null); - pipeline.add(src); - Gst.Video.Sink sink = (Gst.Video.Sink) Gst.ElementFactory.make("gtksink", null); - Gtk.Widget widget; - sink.get("widget", out widget); - widget.unparent(); - pipeline.add(sink); - src.link(sink); - widget.visible = true; - - pipeline.set_state(Gst.State.PLAYING); - - sink.get_static_pad("sink").notify["caps"].connect(() => { - int width, height; - sink.get_static_pad("sink").caps.get_structure(0).get_int("width", out width); - sink.get_static_pad("sink").caps.get_structure(0).get_int("height", out height); - widget.width_request = width; - widget.height_request = height; - }); - -// call_window.set_participant_video(Xmpp.random_uuid(), widget); - } - /*private void update_current_video_device(VideoSettingsPopover video_settings_popover) { Xmpp.Xep.JingleRtp.Stream stream = calls.get_video_stream(call); if (stream != null) { @@ -377,4 +352,4 @@ public class Dino.Ui.CallWindowController : Object { base.dispose(); } -}
\ No newline at end of file +} diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 8ff9e16f..4322232b 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,25 +1,9 @@ -if(DINO_PLUGIN_ENABLED_http-files) - add_subdirectory(http-files) -endif(DINO_PLUGIN_ENABLED_http-files) - -if(DINO_PLUGIN_ENABLED_ice) - add_subdirectory(ice) -endif(DINO_PLUGIN_ENABLED_ice) - -if(DINO_PLUGIN_ENABLED_rtp) - add_subdirectory(rtp) -endif(DINO_PLUGIN_ENABLED_rtp) - -if(DINO_PLUGIN_ENABLED_openpgp) - add_subdirectory(gpgme-vala) - add_subdirectory(openpgp) -endif(DINO_PLUGIN_ENABLED_openpgp) - -if(DINO_PLUGIN_ENABLED_omemo) - add_subdirectory(omemo) - add_subdirectory(signal-protocol) -endif(DINO_PLUGIN_ENABLED_omemo) - -if(DINO_PLUGIN_ENABLED_notification-sound) - add_subdirectory(notification-sound) -endif(DINO_PLUGIN_ENABLED_notification-sound) +foreach(plugin ${PLUGINS}) + if ("omemo" STREQUAL ${plugin}) + add_subdirectory(signal-protocol) + endif () + if ("openpgp" STREQUAL ${plugin}) + add_subdirectory(gpgme-vala) + endif () + add_subdirectory(${plugin}) +endforeach(plugin) |