xavi
/
dino
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Remove GStreamer dependencies from main 

Fixes #1060
This commit is contained in:
Marvin W 2022-01-05 13:57:36 +01:00
parent c5461b8536
commit 82a492b33f
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
4 changed files with 11 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -127,6 +127,7 @@ endif ()
if (NOT ("all" IN_LIST VALA_WARN OR "qualifier" IN_LIST VALA_WARN)) if (NOT ("all" IN_LIST VALA_WARN OR "qualifier" IN_LIST VALA_WARN))
AddCFlagIfSupported(VALA_CFLAGS -Wno-discarded-qualifiers) AddCFlagIfSupported(VALA_CFLAGS -Wno-discarded-qualifiers)
AddCFlagIfSupported(VALA_CFLAGS -Wno-discarded-array-qualifiers) AddCFlagIfSupported(VALA_CFLAGS -Wno-discarded-array-qualifiers)
AddCFlagIfSupported(VALA_CFLAGS -Wno-incompatible-pointer-types-discards-qualifiers)
endif () endif ()
if (NOT ("all" IN_LIST VALA_WARN OR "deprecated" IN_LIST VALA_WARN)) if (NOT ("all" IN_LIST VALA_WARN OR "deprecated" IN_LIST VALA_WARN))

2
main/CMakeLists.txt
View File

@ -5,8 +5,6 @@ gettext_compile(${GETTEXT_PACKAGE} SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/po TAR
find_packages(MAIN_PACKAGES REQUIRED find_packages(MAIN_PACKAGES REQUIRED
Gee Gee
Gst
GstVideo
GLib GLib
GModule GModule
GObject GObject

27
main/src/ui/call_window/call_window_controller.vala
View File

@ -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) { /*private void update_current_video_device(VideoSettingsPopover video_settings_popover) {
Xmpp.Xep.JingleRtp.Stream stream = calls.get_video_stream(call); Xmpp.Xep.JingleRtp.Stream stream = calls.get_video_stream(call);
if (stream != null) { if (stream != null) {
@ -377,4 +352,4 @@ public class Dino.Ui.CallWindowController : Object {
base.dispose(); base.dispose();
} }
} }

34
plugins/CMakeLists.txt
View File

@ -1,25 +1,9 @@
if(DINO_PLUGIN_ENABLED_http-files) foreach(plugin ${PLUGINS})
add_subdirectory(http-files) if ("omemo" STREQUAL ${plugin})
endif(DINO_PLUGIN_ENABLED_http-files) add_subdirectory(signal-protocol)
endif ()
if(DINO_PLUGIN_ENABLED_ice) if ("openpgp" STREQUAL ${plugin})
add_subdirectory(ice) add_subdirectory(gpgme-vala)
endif(DINO_PLUGIN_ENABLED_ice) endif ()
add_subdirectory(${plugin})
if(DINO_PLUGIN_ENABLED_rtp) endforeach(plugin)
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)