summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@igalia.com>2018-12-06 16:39:19 -0300
committerThibault Saunier <tsaunier@igalia.com>2018-12-06 17:03:05 -0300
commit03ceb07dc85ac662378362faf105da54a90a240a (patch)
tree2d17abac49495a4842649e114fcf88553437aa3f
parentc58cfe4b6e27f02869f964558373e4644e181429 (diff)
ges: Remove GESPitiviFormatter as it is deprecated and useless
-rw-r--r--ges/generated/GtkSharp/ObjectManager.cs1
-rw-r--r--ges/generated/gst-editing-services-abi.c3
-rw-r--r--ges/generated/gst-editing-services-abi.cs3
-rw-r--r--ges/generated/gst-editing-services-api.xml20
-rw-r--r--ges/gst-editing-services.metadata1
-rw-r--r--ges/meson.build2
6 files changed, 2 insertions, 28 deletions
diff --git a/ges/generated/GtkSharp/ObjectManager.cs b/ges/generated/GtkSharp/ObjectManager.cs
index 05d7d95..c841006 100644
--- a/ges/generated/GtkSharp/ObjectManager.cs
+++ b/ges/generated/GtkSharp/ObjectManager.cs
@@ -39,7 +39,6 @@ namespace GtkSharp.GstEditingServices {
GLib.GType.Register (GES.OperationClip.GType, typeof (GES.OperationClip));
GLib.GType.Register (GES.OverlayClip.GType, typeof (GES.OverlayClip));
GLib.GType.Register (GES.Pipeline.GType, typeof (GES.Pipeline));
- GLib.GType.Register (GES.PitiviFormatter.GType, typeof (GES.PitiviFormatter));
GLib.GType.Register (GES.Project.GType, typeof (GES.Project));
GLib.GType.Register (GES.Source.GType, typeof (GES.Source));
GLib.GType.Register (GES.SourceClip.GType, typeof (GES.SourceClip));
diff --git a/ges/generated/gst-editing-services-abi.c b/ges/generated/gst-editing-services-abi.c
index 2dfd7f3..513c11d 100644
--- a/ges/generated/gst-editing-services-abi.c
+++ b/ges/generated/gst-editing-services-abi.c
@@ -121,9 +121,6 @@ int main (int argc, char *argv[]) {
g_print("\"sizeof(GESPipelineClass)\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) sizeof(GESPipelineClass));
g_print("\"sizeof(GESPipeline)\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) sizeof(GESPipeline));
g_print("\"GESPipeline.priv\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GESPipeline, priv));
- g_print("\"sizeof(GESPitiviFormatterClass)\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) sizeof(GESPitiviFormatterClass));
- g_print("\"sizeof(GESPitiviFormatter)\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) sizeof(GESPitiviFormatter));
- g_print("\"GESPitiviFormatter.priv\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GESPitiviFormatter, priv));
g_print("\"sizeof(GESProjectClass)\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) sizeof(GESProjectClass));
g_print("\"GESProjectClass.asset_added\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GESProjectClass, asset_added));
g_print("\"GESProjectClass.asset_loading\": \"%" G_GUINT64_FORMAT "\"\n", (guint64) G_STRUCT_OFFSET(GESProjectClass, asset_loading));
diff --git a/ges/generated/gst-editing-services-abi.cs b/ges/generated/gst-editing-services-abi.cs
index 8d08b7d..2572c00 100644
--- a/ges/generated/gst-editing-services-abi.cs
+++ b/ges/generated/gst-editing-services-abi.cs
@@ -136,9 +136,6 @@ namespace AbiTester {
Console.WriteLine("\"sizeof(GESPipelineClass)\": \"" + GES.Pipeline.class_abi.Size + "\"");
Console.WriteLine("\"sizeof(GESPipeline)\": \"" + GES.Pipeline.abi_info.Size + "\"");
Console.WriteLine("\"GESPipeline.priv\": \"" + GES.Pipeline.abi_info.GetFieldOffset("priv") + "\"");
- Console.WriteLine("\"sizeof(GESPitiviFormatterClass)\": \"" + GES.PitiviFormatter.class_abi.Size + "\"");
- Console.WriteLine("\"sizeof(GESPitiviFormatter)\": \"" + GES.PitiviFormatter.abi_info.Size + "\"");
- Console.WriteLine("\"GESPitiviFormatter.priv\": \"" + GES.PitiviFormatter.abi_info.GetFieldOffset("priv") + "\"");
Console.WriteLine("\"sizeof(GESProjectClass)\": \"" + GES.Project.class_abi.Size + "\"");
Console.WriteLine("\"GESProjectClass.asset_added\": \"" + GES.Project.class_abi.GetFieldOffset("asset_added") + "\"");
Console.WriteLine("\"GESProjectClass.asset_loading\": \"" + GES.Project.class_abi.GetFieldOffset("asset_loading") + "\"");
diff --git a/ges/generated/gst-editing-services-api.xml b/ges/generated/gst-editing-services-api.xml
index fc5675f..e77b03b 100644
--- a/ges/generated/gst-editing-services-api.xml
+++ b/ges/generated/gst-editing-services-api.xml
@@ -1794,26 +1794,6 @@
</field>
<field cname="_ges_reserved" access="private" writeable="false" readable="false" is_callback="false" name="_gesGesReserved" type="gpointer" array="true" array_len="4" padding="true" />
</object>
- <object name="PitiviFormatter" cname="GESPitiviFormatter" opaque="false" hidden="false" parent="GESFormatter">
- <implements>
- <interface cname="GESExtractable" />
- </implements>
- <class_struct cname="GESPitiviFormatterClass">
- <field cname="parent_class" access="private" writeable="false" readable="false" is_callback="false" name="ParentClass" type="GESFormatterClass">
- <warning>missing glib:type-name</warning>
- </field>
- <field cname="_ges_reserved" access="private" writeable="false" readable="false" is_callback="false" name="_gesGesReserved" type="gpointer" array="true" array_len="4" padding="true" />
- </class_struct>
- <method name="GetType" cname="ges_pitivi_formatter_get_type" shared="true">
- <return-type type="GType" />
- </method>
- <constructor cname="ges_pitivi_formatter_new" disable_void_ctor="" />
- <field cname="parent" access="public" writeable="false" readable="true" is_callback="false" name="Parent" type="GESFormatter*" />
- <field cname="priv" access="private" writeable="false" readable="false" is_callback="false" name="Priv" type="GESPitiviFormatterPrivate*">
- <warning>missing glib:type-name</warning>
- </field>
- <field cname="_ges_reserved" access="private" writeable="false" readable="false" is_callback="false" name="_gesGesReserved" type="gpointer" array="true" array_len="4" padding="true" />
- </object>
<object name="Project" cname="GESProject" opaque="false" hidden="false" parent="GESAsset">
<implements>
<interface cname="GESMetaContainer" />
diff --git a/ges/gst-editing-services.metadata b/ges/gst-editing-services.metadata
index 16c5e28..dcbebc1 100644
--- a/ges/gst-editing-services.metadata
+++ b/ges/gst-editing-services.metadata
@@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-->
<metadata>
<remove-node path="/api/namespace/object[@cname='GESSmartAdder']"/>
+ <remove-node path="/api/namespace/object[@cname='GESPitiviFormatter']"/>
<remove-node path="/api/namespace/object/method[@cname='ges_uri_clip_is_image']"/>
<remove-node path="/api/namespace/object/method[@cname='ges_uri_clip_set_is_image']"/>
<!--FIXME- This fix should not be needed (ie. bindinator is messing with us).-->
diff --git a/ges/meson.build b/ges/meson.build
index 092b72d..f60fdcb 100644
--- a/ges/meson.build
+++ b/ges/meson.build
@@ -16,7 +16,7 @@ configure_file(
output: pkg + '-sharp.dll.config',
configuration: configuration_data())
-if add_languages('c', required: false) and csc.get_id() == 'mono'
+if add_languages('c', required: false) and csc.get_id() == 'mono' and dependency('libxml2', required: false).found()
c_abi_exe = executable(pkg + '_c_abi', c_abi,
c_args: ['-Wno-deprecated', '-Wno-deprecated-declarations'],
dependencies: [gst_deps, ges_dep])