[gnome-flashback] gvc: update submodule
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback] gvc: update submodule
- Date: Wed, 25 Dec 2019 17:06:37 +0000 (UTC)
commit 56c3521db0923aa23fc670b5eebc8ae90f5e9f39
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Wed Dec 25 19:04:11 2019 +0200
gvc: update submodule
gvc/Makefile.am | 28 ++++++++++++++++++++++++++++
gvc/gvc | 2 +-
gvc/gvc-enum-types.c.in | 41 +++++++++++++++++++++++++++++++++++++++++
gvc/gvc-enum-types.h.in | 21 +++++++++++++++++++++
4 files changed, 91 insertions(+), 1 deletion(-)
---
diff --git a/gvc/Makefile.am b/gvc/Makefile.am
index 3f111dc..56211a3 100644
--- a/gvc/Makefile.am
+++ b/gvc/Makefile.am
@@ -11,6 +11,7 @@ noinst_PROGRAMS = \
libgvc_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"gvc\" \
-DG_LOG_USE_STRUCTURED=1 \
+ -I$(top_builddir)/gvc \
-I$(top_srcdir)/gvc/gvc \
$(NULL)
@@ -45,6 +46,7 @@ libgvc_la_SOURCES = \
gvc/gvc-mixer-ui-device.c \
gvc/gvc-mixer-ui-device.h \
gvc/gvc-pulseaudio-fake.h \
+ $(BUILT_SOURCES) \
$(NULL)
libgvc_la_LDFLAGS = \
@@ -81,4 +83,30 @@ test_audio_device_selection_LDADD = \
$(GVC_LIBS) \
$(NULL)
+ENUM_TYPES = \
+ gvc/gvc-mixer-stream.h \
+ $(NULL)
+
+gvc-enum-types.c: gvc-enum-types.c.in gvc-enum-types.h $(ENUM_TYPES)
+ $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gvc-enum-types.c.in $(ENUM_TYPES) > \
+ gvc-enum-types.c.tmp && mv gvc-enum-types.c.tmp gvc-enum-types.c
+
+gvc-enum-types.h: gvc-enum-types.h.in $(ENUM_TYPES)
+ $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gvc-enum-types.h.in $(ENUM_TYPES) > \
+ gvc-enum-types.h.tmp && mv gvc-enum-types.h.tmp gvc-enum-types.h
+
+BUILT_SOURCES = \
+ gvc-enum-types.c \
+ gvc-enum-types.h \
+ $(NULL)
+
+EXTRA_DIST = \
+ gvc-enum-types.c.in \
+ gvc-enum-types.h.in \
+ $(NULL)
+
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ $(NULL)
+
-include $(top_srcdir)/git.mk
diff --git a/gvc/gvc b/gvc/gvc
index 43be5d2..ec5cf3e 160000
--- a/gvc/gvc
+++ b/gvc/gvc
@@ -1 +1 @@
-Subproject commit 43be5d272ca2d5d9e9bed4b5ad3ac28719f07a2a
+Subproject commit ec5cf3e0de6715803e64b65abb059e2155b3d6de
diff --git a/gvc/gvc-enum-types.c.in b/gvc/gvc-enum-types.c.in
new file mode 100644
index 0000000..b10f23e
--- /dev/null
+++ b/gvc/gvc-enum-types.c.in
@@ -0,0 +1,41 @@
+/*** BEGIN file-header ***/
+#include "config.h"
+#include "gvc-enum-types.h"
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+#include "@filename@"
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+
+GType
+@enum_name@_get_type (void)
+{
+ static volatile gsize g_enum_type_id;
+ static const G@Type@Value values[] =
+ {
+/*** END value-header ***/
+
+/*** BEGIN value-production ***/
+ { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
+/*** END value-production ***/
+
+/*** BEGIN value-tail ***/
+ { 0, NULL, NULL }
+ };
+
+ if (g_once_init_enter (&g_enum_type_id))
+ {
+ const gchar *string;
+ GType id;
+
+ string = g_intern_static_string ("@EnumName@");
+ id = g_@type@_register_static (string, values);
+
+ g_once_init_leave (&g_enum_type_id, id);
+ }
+
+ return g_enum_type_id;
+}
+/*** END value-tail ***/
diff --git a/gvc/gvc-enum-types.h.in b/gvc/gvc-enum-types.h.in
new file mode 100644
index 0000000..e666a9d
--- /dev/null
+++ b/gvc/gvc-enum-types.h.in
@@ -0,0 +1,21 @@
+/*** BEGIN file-header ***/
+#ifndef GVC_ENUM_TYPES_H
+#define GVC_ENUM_TYPES_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/*** END file-header ***/
+
+/*** BEGIN value-header ***/
+GType @enum_name@_get_type (void) G_GNUC_CONST;
+#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
+
+/*** END value-header ***/
+
+/*** BEGIN file-tail ***/
+G_END_DECLS
+
+#endif
+/*** END file-tail ***/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]