[rygel] all: Adapt to new GUPnP vapi
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] all: Adapt to new GUPnP vapi
- Date: Sat, 6 Oct 2012 16:18:58 +0000 (UTC)
commit 6d7ce8a05ce0a9855dfda7aca8f4b7a334d92d59
Author: Jens Georg <jensg openismus com>
Date: Sat Oct 6 15:36:59 2012 +0200
all: Adapt to new GUPnP vapi
configure.ac | 7 +--
m4/rygel.m4 | 2 -
src/librygel-core/rygel-connection-manager.vala | 6 +-
src/librygel-renderer/rygel-av-transport.vala | 40 +++++++++---------
src/librygel-renderer/rygel-rendering-control.vala | 24 +++++-----
src/librygel-server/rygel-content-directory.vala | 44 ++++++++++----------
.../rygel-media-receiver-registrar.vala | 4 +-
src/ui/rygel-network-pref-section.vala | 2 +-
8 files changed, 63 insertions(+), 66 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 198bbbd..6b9bbcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,11 +31,10 @@ dnl Required versions of library packages
GLIB_REQUIRED=2.31.13
VALA_REQUIRED=0.16.1
VALADOC_REQUIRED=0.2
-GSSDP_REQUIRED=0.11.0
-GUPNP_REQUIRED=0.17.1
-GUPNP_AV_REQUIRED=0.9.0
+GSSDP_REQUIRED=0.13.0
+GUPNP_REQUIRED=0.19.0
+GUPNP_AV_REQUIRED=0.11.0
GUPNP_DLNA_REQUIRED=0.5.0
-GUPNP_VALA_REQUIRED=0.10.2
GSTREAMER_REQUIRED=0.10.36
GSTPBU_REQUIRED=0.10.35
GIO_REQUIRED=2.26
diff --git a/m4/rygel.m4 b/m4/rygel.m4
index d291433..b1a5a32 100644
--- a/m4/rygel.m4
+++ b/m4/rygel.m4
@@ -113,8 +113,6 @@ AC_DEFUN([RYGEL_CHECK_VALA],
AS_IF([test x$VALAC = "x"],
[AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])],
[
- PKG_CHECK_MODULES(GUPNP_VALA, gupnp-vala-1.0 >= $GUPNP_VALA_REQUIRED)
-
VALA_CHECK_PACKAGES([$2])
])
],
diff --git a/src/librygel-core/rygel-connection-manager.vala b/src/librygel-core/rygel-connection-manager.vala
index 0b8673a..bbf0970 100644
--- a/src/librygel-core/rygel-connection-manager.vala
+++ b/src/librygel-core/rygel-connection-manager.vala
@@ -84,7 +84,7 @@ public class Rygel.ConnectionManager : Service {
}
private void get_protocol_info_cb (Service cm,
- owned ServiceAction action) {
+ ServiceAction action) {
if (action.get_argument_count () != 0) {
action.return_error (402, _("Invalid argument"));
@@ -98,7 +98,7 @@ public class Rygel.ConnectionManager : Service {
}
private void get_current_connection_ids_cb (Service cm,
- owned ServiceAction action) {
+ ServiceAction action) {
if (action.get_argument_count () != 0) {
action.return_error (402, _("Invalid argument"));
@@ -111,7 +111,7 @@ public class Rygel.ConnectionManager : Service {
}
private void get_current_connection_info_cb (Service cm,
- owned ServiceAction action) {
+ ServiceAction action) {
string connection_id;
action.get ("ConnectionID", typeof (string), out connection_id);
diff --git a/src/librygel-renderer/rygel-av-transport.vala b/src/librygel-renderer/rygel-av-transport.vala
index 28b57e4..7d5ff18 100644
--- a/src/librygel-renderer/rygel-av-transport.vala
+++ b/src/librygel-renderer/rygel-av-transport.vala
@@ -226,8 +226,8 @@ internal class Rygel.AVTransport : Service {
return true;
}
- private void set_av_transport_uri_cb (Service service,
- owned ServiceAction action) {
+ private void set_av_transport_uri_cb (Service service,
+ ServiceAction action) {
if (!this.check_instance_id (action)) {
return;
}
@@ -293,8 +293,8 @@ internal class Rygel.AVTransport : Service {
}
}
- private void get_media_info_cb (Service service,
- owned ServiceAction action) {
+ private void get_media_info_cb (Service service,
+ ServiceAction action) {
if (!this.check_instance_id (action)) {
return;
}
@@ -330,8 +330,8 @@ internal class Rygel.AVTransport : Service {
action.return ();
}
- private void get_media_info_ex_cb (Service service,
- owned ServiceAction action) {
+ private void get_media_info_ex_cb (Service service,
+ ServiceAction action) {
if (!this.check_instance_id (action)) {
return;
}
@@ -371,8 +371,8 @@ internal class Rygel.AVTransport : Service {
}
- private void get_transport_info_cb (Service service,
- owned ServiceAction action) {
+ private void get_transport_info_cb (Service service,
+ ServiceAction action) {
if (!this.check_instance_id (action)) {
return;
}
@@ -390,8 +390,8 @@ internal class Rygel.AVTransport : Service {
action.return ();
}
- private void get_position_info_cb (Service service,
- owned ServiceAction action) {
+ private void get_position_info_cb (Service service,
+ ServiceAction action) {
if (!this.check_instance_id (action)) {
return;
}
@@ -424,8 +424,8 @@ internal class Rygel.AVTransport : Service {
action.return ();
}
- private void get_device_capabilities_cb (Service service,
- owned ServiceAction action) {
+ private void get_device_capabilities_cb (Service service,
+ ServiceAction action) {
if (!this.check_instance_id (action)) {
return;
}
@@ -443,8 +443,8 @@ internal class Rygel.AVTransport : Service {
action.return ();
}
- private void get_transport_settings_cb (Service service,
- owned ServiceAction action) {
+ private void get_transport_settings_cb (Service service,
+ ServiceAction action) {
if (!this.check_instance_id (action)) {
return;
}
@@ -459,7 +459,7 @@ internal class Rygel.AVTransport : Service {
action.return ();
}
- private void stop_cb (Service service, owned ServiceAction action) {
+ private void stop_cb (Service service, ServiceAction action) {
if (!this.check_instance_id (action)) {
return;
}
@@ -469,7 +469,7 @@ internal class Rygel.AVTransport : Service {
action.return ();
}
- private void play_cb (Service service, owned ServiceAction action) {
+ private void play_cb (Service service, ServiceAction action) {
if (!this.check_instance_id (action)) {
return;
}
@@ -488,7 +488,7 @@ internal class Rygel.AVTransport : Service {
action.return ();
}
- private void pause_cb (Service service, owned ServiceAction action) {
+ private void pause_cb (Service service, ServiceAction action) {
if (!this.check_instance_id (action)) {
return;
}
@@ -504,7 +504,7 @@ internal class Rygel.AVTransport : Service {
action.return ();
}
- private void seek_cb (Service service, owned ServiceAction action) {
+ private void seek_cb (Service service, ServiceAction action) {
if (!this.check_instance_id (action)) {
return;
}
@@ -538,11 +538,11 @@ internal class Rygel.AVTransport : Service {
}
}
- private void next_cb (Service service, owned ServiceAction action) {
+ private void next_cb (Service service, ServiceAction action) {
action.return_error (701, _("Transition not available"));
}
- private void previous_cb (Service service, owned ServiceAction action) {
+ private void previous_cb (Service service, ServiceAction action) {
action.return_error (701, _("Transition not available"));
}
diff --git a/src/librygel-renderer/rygel-rendering-control.vala b/src/librygel-renderer/rygel-rendering-control.vala
index 0c5e759..a8b2db5 100644
--- a/src/librygel-renderer/rygel-rendering-control.vala
+++ b/src/librygel-renderer/rygel-rendering-control.vala
@@ -134,8 +134,8 @@ internal class Rygel.RenderingControl : Service {
return true;
}
- private void list_presets_cb (Service service,
- owned ServiceAction action) {
+ private void list_presets_cb (Service service,
+ ServiceAction action) {
if (!this.check_instance_id (action)) {
return;
}
@@ -147,8 +147,8 @@ internal class Rygel.RenderingControl : Service {
action.return ();
}
- private void select_preset_cb (Service service,
- owned ServiceAction action) {
+ private void select_preset_cb (Service service,
+ ServiceAction action) {
if (!this.check_instance_id (action)) {
return;
}
@@ -179,8 +179,8 @@ internal class Rygel.RenderingControl : Service {
return true;
}
- private void get_mute_cb (Service service,
- owned ServiceAction action) {
+ private void get_mute_cb (Service service,
+ ServiceAction action) {
if (!this.check_instance_id (action)) {
return;
}
@@ -194,8 +194,8 @@ internal class Rygel.RenderingControl : Service {
action.return ();
}
- private void set_mute_cb (Service service,
- owned ServiceAction action) {
+ private void set_mute_cb (Service service,
+ ServiceAction action) {
if (!this.check_instance_id (action)) {
return;
}
@@ -221,8 +221,8 @@ internal class Rygel.RenderingControl : Service {
action.return ();
}
- private void get_volume_cb (Service service,
- owned ServiceAction action) {
+ private void get_volume_cb (Service service,
+ ServiceAction action) {
if (!this.check_instance_id (action)) {
return;
}
@@ -236,8 +236,8 @@ internal class Rygel.RenderingControl : Service {
action.return ();
}
- private void set_volume_cb (Service service,
- owned ServiceAction action) {
+ private void set_volume_cb (Service service,
+ ServiceAction action) {
if (!this.check_instance_id (action)) {
return;
}
diff --git a/src/librygel-server/rygel-content-directory.vala b/src/librygel-server/rygel-content-directory.vala
index b6a07d5..e68b710 100644
--- a/src/librygel-server/rygel-content-directory.vala
+++ b/src/librygel-server/rygel-content-directory.vala
@@ -138,40 +138,40 @@ internal class Rygel.ContentDirectory: Service {
}
/* Browse action implementation */
- private void browse_cb (Service content_dir,
- owned ServiceAction action) {
+ private void browse_cb (Service content_dir,
+ ServiceAction action) {
Browse browse = new Browse (this, action);
browse.run.begin ();
}
/* Search action implementation */
- private void search_cb (Service content_dir,
- owned ServiceAction action) {
+ private void search_cb (Service content_dir,
+ ServiceAction action) {
var search = new Search (this, action);
search.run.begin ();
}
/* CreateObject action implementation */
- private void create_object_cb (Service content_dir,
- owned ServiceAction action) {
+ private void create_object_cb (Service content_dir,
+ ServiceAction action) {
var creator = new ItemCreator (this, action);
creator.run.begin ();
}
/* DestroyObject action implementation */
- private void destroy_object_cb (Service content_dir,
- owned ServiceAction action) {
+ private void destroy_object_cb (Service content_dir,
+ ServiceAction action) {
var destroyer = new ItemDestroyer (this, action);
destroyer.run.begin ();
}
/* ImportResource action implementation */
- private void import_resource_cb (Service content_dir,
- owned ServiceAction action) {
+ private void import_resource_cb (Service content_dir,
+ ServiceAction action) {
var import = new ImportResource (this, action);
import.completed.connect (this.on_import_completed);
@@ -193,8 +193,8 @@ internal class Rygel.ContentDirectory: Service {
}
/* GetTransferProgress action implementation */
- private void get_transfer_progress_cb (Service content_dir,
- owned ServiceAction action) {
+ private void get_transfer_progress_cb (Service content_dir,
+ ServiceAction action) {
if (action.get_argument_count () != 1) {
action.return_error (402, _("Invalid argument"));
@@ -220,8 +220,8 @@ internal class Rygel.ContentDirectory: Service {
}
/* StopTransferResource action implementation */
- private void stop_transfer_resource_cb (Service content_dir,
- owned ServiceAction action) {
+ private void stop_transfer_resource_cb (Service content_dir,
+ ServiceAction action) {
if (action.get_argument_count () != 1) {
action.return_error (402, _("Invalid argument"));
@@ -239,8 +239,8 @@ internal class Rygel.ContentDirectory: Service {
}
/* GetSystemUpdateID action implementation */
- private void get_system_update_id_cb (Service content_dir,
- owned ServiceAction action) {
+ private void get_system_update_id_cb (Service content_dir,
+ ServiceAction action) {
if (action.get_argument_count () != 0) {
action.return_error (402, _("Invalid argument"));
@@ -274,8 +274,8 @@ internal class Rygel.ContentDirectory: Service {
}
/* action GetSearchCapabilities implementation */
- private void get_search_capabilities_cb (Service content_dir,
- owned ServiceAction action) {
+ private void get_search_capabilities_cb (Service content_dir,
+ ServiceAction action) {
if (action.get_argument_count () != 0) {
action.return_error (402, _("Invalid argument"));
@@ -298,8 +298,8 @@ internal class Rygel.ContentDirectory: Service {
}
/* action GetSortCapabilities implementation */
- private void get_sort_capabilities_cb (Service content_dir,
- owned ServiceAction action) {
+ private void get_sort_capabilities_cb (Service content_dir,
+ ServiceAction action) {
if (action.get_argument_count () != 0) {
action.return_error (402, _("Invalid argument"));
@@ -323,8 +323,8 @@ internal class Rygel.ContentDirectory: Service {
}
/* action GetFeatureList implementation */
- private void get_feature_list_cb (Service content_dir,
- owned ServiceAction action) {
+ private void get_feature_list_cb (Service content_dir,
+ ServiceAction action) {
if (action.get_argument_count () != 0) {
action.return_error (402, _("Invalid argument"));
diff --git a/src/librygel-server/rygel-media-receiver-registrar.vala b/src/librygel-server/rygel-media-receiver-registrar.vala
index cc007fc..aeb6a7b 100644
--- a/src/librygel-server/rygel-media-receiver-registrar.vala
+++ b/src/librygel-server/rygel-media-receiver-registrar.vala
@@ -53,8 +53,8 @@ internal class Rygel.MediaReceiverRegistrar: Service {
}
/* IsAuthorized and IsValided action implementations (fake) */
- private void is_authorized_cb (Service registrar,
- owned ServiceAction action) {
+ private void is_authorized_cb (Service registrar,
+ ServiceAction action) {
if (action.get_argument_count () != 1) {
action.return_error (402, _("Invalid argument"));
diff --git a/src/ui/rygel-network-pref-section.vala b/src/ui/rygel-network-pref-section.vala
index 0e6c8bc..f6dc1a0 100644
--- a/src/ui/rygel-network-pref-section.vala
+++ b/src/ui/rygel-network-pref-section.vala
@@ -37,7 +37,7 @@ public class Rygel.NetworkPrefSection : PreferencesSection {
this.iface_entry = (ComboBoxText) builder.get_object (IFACE_ENTRY);
assert (this.iface_entry != null);
- this.context_manager = new ContextManager (null, 0);
+ this.context_manager = ContextManager.create (0);
try {
this.iface_entry.append_text (config.get_interface ());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
