diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn index 8701c295b3..363e318a76 100644 --- a/modules/desktop_capture/BUILD.gn +++ b/modules/desktop_capture/BUILD.gn @@ -565,7 +565,6 @@ rtc_library("desktop_capture_generic") { "linux/wayland/base_capturer_pipewire.h", "linux/wayland/egl_dmabuf.cc", "linux/wayland/egl_dmabuf.h", - "linux/wayland/scoped_glib.cc", "linux/wayland/scoped_glib.h", "linux/wayland/screencast_portal.cc", "linux/wayland/screencast_portal.h", diff --git a/modules/desktop_capture/linux/wayland/scoped_glib.cc b/modules/desktop_capture/linux/wayland/scoped_glib.cc deleted file mode 100644 index df588f0f1e..0000000000 --- a/modules/desktop_capture/linux/wayland/scoped_glib.cc +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2022 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#include "modules/desktop_capture/linux/wayland/scoped_glib.h" - -#include - -namespace webrtc { - -template <> -Scoped::~Scoped() { - if (ptr_) { - g_error_free(ptr_); - } -} - -template <> -Scoped::~Scoped() { - if (ptr_) { - g_free(ptr_); - } -} - -template <> -Scoped::~Scoped() { - if (ptr_) { - g_variant_unref(ptr_); - } -} - -template <> -Scoped::~Scoped() { - if (ptr_) { - g_variant_iter_free(ptr_); - } -} - -template <> -Scoped::~Scoped() { - if (ptr_) { - g_object_unref(ptr_); - } -} - -template <> -Scoped::~Scoped() { - if (ptr_) { - g_object_unref(ptr_); - } -} - -} // namespace webrtc diff --git a/modules/desktop_capture/linux/wayland/scoped_glib.h b/modules/desktop_capture/linux/wayland/scoped_glib.h index de825577dd..3af43ce578 100644 --- a/modules/desktop_capture/linux/wayland/scoped_glib.h +++ b/modules/desktop_capture/linux/wayland/scoped_glib.h @@ -11,6 +11,8 @@ #ifndef MODULES_DESKTOP_CAPTURE_LINUX_WAYLAND_SCOPED_GLIB_H_ #define MODULES_DESKTOP_CAPTURE_LINUX_WAYLAND_SCOPED_GLIB_H_ +#include + #include "rtc_base/checks.h" namespace webrtc { @@ -45,6 +47,48 @@ class Scoped { T* ptr_ = nullptr; }; +template <> +Scoped::~Scoped() { + if (ptr_) { + g_error_free(ptr_); + } +} + +template <> +Scoped::~Scoped() { + if (ptr_) { + g_free(ptr_); + } +} + +template <> +Scoped::~Scoped() { + if (ptr_) { + g_variant_unref(ptr_); + } +} + +template <> +Scoped::~Scoped() { + if (ptr_) { + g_variant_iter_free(ptr_); + } +} + +template <> +Scoped::~Scoped() { + if (ptr_) { + g_object_unref(ptr_); + } +} + +template <> +Scoped::~Scoped() { + if (ptr_) { + g_object_unref(ptr_); + } +} + } // namespace webrtc #endif // MODULES_DESKTOP_CAPTURE_LINUX_WAYLAND_SCOPED_GLIB_H_