diff --git a/ChangeLog b/ChangeLog index 93636e997a..92be8b6c5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2008-01-14 Edward Hervey + + * configure.ac: + * gst/Makefile.am: + * gst/base.defs: + * gst/gst-0.10.15.ignore: + * gst/gst-0.10.16.ignore: + * gst/gst-pb-0.10.15.ignore: + * gst/gst-pb-0.10.16.ignore: + * gst/gst.defs: + * gst/gstversion.override.in: + * gst/pbutils.override: + * testsuite/test_pbutils.py: + Series of update for new API added to 0.10.16. + Remove wrong ignore file for 0.10.15 -base. + 2008-01-13 Edward Hervey * configure.ac: diff --git a/configure.ac b/configure.ac index eb1fbe9e76..823b9bf85e 100644 --- a/configure.ac +++ b/configure.ac @@ -118,6 +118,13 @@ then IGNORE_GST_0_10_15="" fi + if test $GST_MINOR_VERSION -lt "16" + then + IGNORE_GST_0_10_16="gst-0.10.16.ignore" + else + IGNORE_GST_0_10_16="" + fi + dnl plugins base if test $GST_PB_MINOR_VERSION -lt "14" then @@ -126,28 +133,32 @@ then IGNORE_GST_PB_0_10_14="" fi - if test $GST_PB_MINOR_VERSION -lt "15" + if test $GST_PB_MINOR_VERSION -lt "16" then - IGNORE_GST_PB_0_10_15="gst-pb-0.10.15.ignore" + IGNORE_GST_PB_0_10_16="gst-pb-0.10.16.ignore" else - IGNORE_GST_PB_0_10_15="" + IGNORE_GST_PB_0_10_16="" + AC_DEFINE_UNQUOTED(HAVE_PLUGINS_INSTALL, 1, [We can use the plugins-install methods]) fi - else IGNORE_GST_0_10_13="" IGNORE_GST_0_10_14="" IGNORE_GST_0_10_15="" + IGNORE_GST_0_10_16="" IGNORE_GST_PB_0_10_14="" - IGNORE_GST_PB_0_10_15="" + IGNORE_GST_PB_0_10_16="" + AC_DEFINE_UNQUOTED(HAVE_PLUGINS_INSTALL, 1, [We can use the plugins-install methods]) fi AC_DEFINE_UNQUOTED(HAVE_VIDEO_ORIENTATION_INTERFACE, 1, [We can use the videoorientation interface]) AC_SUBST(IGNORE_GST_0_10_13) AC_SUBST(IGNORE_GST_0_10_14) AC_SUBST(IGNORE_GST_0_10_15) +AC_SUBST(IGNORE_GST_0_10_16) AC_SUBST(IGNORE_GST_PB_0_10_14) -AC_SUBST(IGNORE_GST_PB_0_10_15) +AC_SUBST(IGNORE_GST_PB_0_10_16) AC_SUBST(HAVE_VIDEO_ORIENTATION) +AC_SUBST(HAVE_PLUGINS_INSTALL) dnl check for gstreamer-base; uninstalled is selected preferentially PKG_CHECK_MODULES(GST_BASE, gstreamer-base-$GST_MAJORMINOR >= $GST_REQ, diff --git a/gst/Makefile.am b/gst/Makefile.am index f287e79966..2c621d9ae1 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -28,8 +28,9 @@ versioned_overrides = \ gst-0.10.13.ignore \ gst-0.10.14.ignore \ gst-0.10.15.ignore \ + gst-0.10.16.ignore \ gst-pb-0.10.14.ignore \ - gst-pb-0.10.15.ignore \ + gst-pb-0.10.16.ignore \ gst-disable-loadsave.ignore INCLUDES = $(PYTHON_INCLUDES) diff --git a/gst/base.defs b/gst/base.defs index b9f731c5a1..931facefa3 100644 --- a/gst/base.defs +++ b/gst/base.defs @@ -617,6 +617,15 @@ (return-type "gboolean") ) +(define-method set_gap_aware + (of-object "GstBaseTransform") + (c-name "gst_base_transform_set_gap_aware") + (return-type "none") + (parameters + '("gboolean" "gap_aware") + ) +) + (define-virtual transform_caps (of-object "GstBaseTransform") (return-type "GstCaps*") diff --git a/gst/gst-0.10.15.ignore b/gst/gst-0.10.15.ignore index 7bd8fc6823..aecf76342b 100644 --- a/gst/gst-0.10.15.ignore +++ b/gst/gst-0.10.15.ignore @@ -6,6 +6,12 @@ ignore gst_bus_pop_filtered gst_bus_timed_pop_filtered gst_base_sink_get_last_buffer + gst_base_sink_set_async_enabled + gst_base_sink_is_async_enabled + gst_base_sink_set_ts_offset + gst_base_sink_get_ts_offset + gst_base_src_set_do_timestamp + gst_base_src_get_do_timestamp GstURIHandler__do_get_protocols_full GstURIHandler__proxy_do_get_protocols_full GstURIHandler__do_get_type_full diff --git a/gst/gst-0.10.16.ignore b/gst/gst-0.10.16.ignore new file mode 100644 index 0000000000..5c4d0fb5db --- /dev/null +++ b/gst/gst-0.10.16.ignore @@ -0,0 +1,8 @@ +%% +ignore + gst_plugin_register_static + gst_util_get_timestamp + gst_base_transform_set_gap_aware +%% +ignore-type +%% diff --git a/gst/gst-pb-0.10.15.ignore b/gst/gst-pb-0.10.15.ignore deleted file mode 100644 index dff8d9fd99..0000000000 --- a/gst/gst-pb-0.10.15.ignore +++ /dev/null @@ -1,13 +0,0 @@ -%% -ignore - gst_base_sink_set_async_enabled - gst_base_sink_is_async_enabled - gst_base_sink_set_ts_offset - gst_base_sink_get_ts_offset - gst_base_src_set_do_timestamp - gst_base_src_get_do_timestamp -%% -ignore-type - LFOControlSource - LFOWaveform -%% \ No newline at end of file diff --git a/gst/gst-pb-0.10.16.ignore b/gst/gst-pb-0.10.16.ignore new file mode 100644 index 0000000000..f9b5855b2b --- /dev/null +++ b/gst/gst-pb-0.10.16.ignore @@ -0,0 +1,13 @@ +%% +ignore + gst_install_plugins_context_new + gst_install_plugins_context_free + gst_install_plugins_context_set_xid + gst_install_plugins_async + gst_install_plugins_sync + gst_install_plugins_return_get_name +%% +ignore-type + GstInstallPluginsContext + GstInstallPluginsReturn +%% diff --git a/gst/gst.defs b/gst/gst.defs index 785946edf8..e754c70075 100644 --- a/gst/gst.defs +++ b/gst/gst.defs @@ -4245,6 +4245,11 @@ ) ) +(define-function util_get_timestamp + (c-name "gst_util_get_timestamp") + (return-type "GstClockTime") +) + (define-function pad_load_and_link (c-name "gst_pad_load_and_link") (return-type "none") @@ -4444,6 +4449,14 @@ (return-type "GType") ) +(define-function plugin_register_static + (c-name "gst_plugin_register_static") + (return-type "gboolean") + (parameters + '("const-GstPluginDesc*" "desc") + ) +) + (define-method get_name (of-object "GstPlugin") (c-name "gst_plugin_get_name") diff --git a/gst/gstversion.override.in b/gst/gstversion.override.in index ee56486243..f760ccff57 100644 --- a/gst/gstversion.override.in +++ b/gst/gstversion.override.in @@ -4,6 +4,7 @@ include @IGNORE_GST_0_10_14@ @IGNORE_GST_PB_0_10_14@ @IGNORE_GST_0_10_15@ -@IGNORE_GST_PB_0_10_15@ +@IGNORE_GST_0_10_16@ +@IGNORE_GST_PB_0_10_16@ @IGNORE_GST_LOADSAVE@ %% diff --git a/gst/pbutils.override b/gst/pbutils.override index db42182603..27a992fa02 100644 --- a/gst/pbutils.override +++ b/gst/pbutils.override @@ -33,6 +33,7 @@ headers GST_DEBUG_CATEGORY_EXTERN (pygst_debug); #define GST_CAT_DEFAULT pygst_debug +#ifdef HAVE_PLUGINS_INSTALL static void install_plugins_result_handler(GstInstallPluginsReturn result, gpointer user_data) { @@ -70,6 +71,7 @@ install_plugins_result_handler(GstInstallPluginsReturn result, gpointer user_dat pyg_gil_state_release(state); } +#endif %% modulename gst.pbutils %% diff --git a/testsuite/test_pbutils.py b/testsuite/test_pbutils.py index b5540c6566..94325e39ec 100644 --- a/testsuite/test_pbutils.py +++ b/testsuite/test_pbutils.py @@ -55,12 +55,9 @@ class Descriptions(TestCase): def testAddCodecDescription(self): assert hasattr(gst.pbutils, 'add_codec_description_to_tag_list') -class InstallPlugins(TestCase): - - def testPluginsContext(self): - assert hasattr(gst.pbutils, "InstallPluginsContext") - # TODO # Add tests for the other parts of pbutils: # * missing-plugins -# * install-plugins +# * install-plugins (and detect if there weren't compiled because of a version +# of plugins-base too low) +