diff options
| author | Arun Raghavan <ford_prefect@gentoo.org> | 2010-11-18 20:42:52 +0530 |
|---|---|---|
| committer | Zeeshan Ali (Khattak) <zeeshanak@gnome.org> | 2011-01-07 16:43:10 +0200 |
| commit | 6ed026b1b3b660e131229bc027022db257a1f6fc (patch) | |
| tree | 7f69e345b2e468bddd04b8bca902b414c9042eb2 | |
| parent | 165a0354b6f660a692b3eed33069cf151ff23191 (diff) | |
| download | gupnp-vala-6ed026b1b3b660e131229bc027022db257a1f6fc.tar.gz | |
gupnp-dlna: Require and adapt to gupnp-dlna >= 0.5
gupnp-dlna 0.5 doesn't have an internalized version of GstDiscoverer
anymore since GstDiscoverer has been merged into gst-pbutils (part of
gst-plugins-base).
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gupnp-dlna-1.0/gupnp-dlna-1.0.deps | 2 | ||||
| -rw-r--r-- | gupnp-dlna-1.0/gupnp-dlna-1.0.gi | 25 |
3 files changed, 23 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index c08ca18..a599f01 100644 --- a/configure.ac +++ b/configure.ac @@ -42,7 +42,7 @@ PKG_CHECK_MODULES(GUPNP_AV, [gupnp-av-1.0 >= 0.7.0], has_gupnp_av=no) AM_CONDITIONAL(WITH_GUPNP_AV, [test "x$has_gupnp_av" = "xyes"]) -PKG_CHECK_MODULES(GUPNP_DLNA, [gupnp-dlna-1.0 >= 0.3.0], +PKG_CHECK_MODULES(GUPNP_DLNA, [gupnp-dlna-1.0 >= 0.5.0], has_gupnp_dlna=yes, has_gupnp_dlna=no) AM_CONDITIONAL(WITH_GUPNP_DLNA, [test "x$has_gupnp_dlna" = "xyes"]) diff --git a/gupnp-dlna-1.0/gupnp-dlna-1.0.deps b/gupnp-dlna-1.0/gupnp-dlna-1.0.deps index 453ce6a..4dc72c2 100644 --- a/gupnp-dlna-1.0/gupnp-dlna-1.0.deps +++ b/gupnp-dlna-1.0/gupnp-dlna-1.0.deps @@ -1,2 +1,2 @@ -gstreamer-discoverer-gupnp-dlna-0.10 +gstreamer-pbutils-0.10 gstreamer-profile-gupnp-dlna-0.10 diff --git a/gupnp-dlna-1.0/gupnp-dlna-1.0.gi b/gupnp-dlna-1.0/gupnp-dlna-1.0.gi index 20b095c..72bf47c 100644 --- a/gupnp-dlna-1.0/gupnp-dlna-1.0.gi +++ b/gupnp-dlna-1.0/gupnp-dlna-1.0.gi @@ -1,6 +1,23 @@ <?xml version="1.0"?> <api version="1.0"> <namespace name="GUPnP"> + <function name="dlna_load_profiles_from_dir" symbol="gupnp_dlna_load_profiles_from_dir"> + <return-type type="GList*"/> + <parameters> + <parameter name="profile_dir" type="gchar*"/> + </parameters> + </function> + <function name="dlna_load_profiles_from_disk" symbol="gupnp_dlna_load_profiles_from_disk"> + <return-type type="GList*"/> + </function> + <function name="dlna_load_profiles_from_file" symbol="gupnp_dlna_load_profiles_from_file"> + <return-type type="GList*"/> + <parameters> + <parameter name="file_name" type="gchar*"/> + <parameter name="restrictions" type="GHashTable*"/> + <parameter name="profile_ids" type="GHashTable*"/> + </parameters> + </function> <object name="GUPnPDLNADiscoverer" parent="GstDiscoverer" type-name="GUPnPDLNADiscoverer" get-type="gupnp_dlna_discoverer_get_type"> <method name="discover_uri" symbol="gupnp_dlna_discoverer_discover_uri"> <return-type type="gboolean"/> @@ -63,7 +80,7 @@ </object> <object name="GUPnPDLNAInformation" parent="GObject" type-name="GUPnPDLNAInformation" get-type="gupnp_dlna_information_get_type"> <method name="get_info" symbol="gupnp_dlna_information_get_info"> - <return-type type="GstDiscovererInformation*"/> + <return-type type="GstDiscovererInfo*"/> <parameters> <parameter name="self" type="GUPnPDLNAInformation*"/> </parameters> @@ -85,17 +102,17 @@ <parameters> <parameter name="name" type="gchar*"/> <parameter name="mime" type="gchar*"/> - <parameter name="info" type="GstDiscovererInformation*"/> + <parameter name="info" type="GstDiscovererInfo*"/> </parameters> </constructor> <constructor name="new_from_discoverer_info" symbol="gupnp_dlna_information_new_from_discoverer_info"> <return-type type="GUPnPDLNAInformation*"/> <parameters> - <parameter name="info" type="GstDiscovererInformation*"/> + <parameter name="info" type="GstDiscovererInfo*"/> <parameter name="profiles" type="GList*"/> </parameters> </constructor> - <property name="info" type="GstDiscovererInformation*" readable="1" writable="1" construct="0" construct-only="1"/> + <property name="info" type="GstDiscovererInfo" readable="1" writable="1" construct="0" construct-only="1"/> <property name="mime" type="char*" readable="1" writable="1" construct="0" construct-only="1"/> <property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/> </object> |