[rygel] All: Get rid of most deprecations
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] All: Get rid of most deprecations
- Date: Sat, 30 Apr 2022 12:54:01 +0000 (UTC)
commit a3d1985297589c1daf29ecc826550862eaef15b3
Author: Jens Georg <mail jensge org>
Date: Sat Apr 30 14:53:27 2022 +0200
All: Get rid of most deprecations
meson.build | 4 +--
src/librygel-core/rygel-basic-management.vala | 18 +++++-----
src/librygel-core/rygel-connection-manager.vala | 6 ++--
src/librygel-core/rygel-energy-management.vala | 2 +-
src/librygel-core/rygel-v1-hacks.vala | 2 +-
.../rygel-playbin-player.vala | 2 +-
src/librygel-renderer/rygel-av-transport.vala | 38 +++++++++++-----------
src/librygel-renderer/rygel-rendering-control.vala | 12 +++----
src/librygel-ruih/rygel-ruih-service.vala | 2 +-
src/librygel-server/rygel-content-directory.vala | 16 ++++-----
src/librygel-server/rygel-import-resource.vala | 2 +-
src/librygel-server/rygel-item-destroyer.vala | 2 +-
src/librygel-server/rygel-item-updater.vala | 2 +-
src/librygel-server/rygel-media-query-action.vala | 2 +-
.../rygel-media-receiver-registrar.vala | 2 +-
src/librygel-server/rygel-object-creator.vala | 2 +-
src/librygel-server/rygel-reference-creator.vala | 2 +-
src/librygel-server/rygel-xbox-hacks.vala | 2 +-
tests/object-creator/test.vala | 2 +-
19 files changed, 60 insertions(+), 60 deletions(-)
---
diff --git a/meson.build b/meson.build
index 42fefeecd..a47e30762 100644
--- a/meson.build
+++ b/meson.build
@@ -76,9 +76,9 @@ gtkdoc = dependency('gtk-doc', required : false)
glib_minimal_version = '>= 2.56'
-gupnp = dependency('gupnp-1.2', version : '>= 1.1')
+gupnp = dependency('gupnp-1.2', version : '>= 1.4.2')
gee = dependency('gee-0.8', version: '>= 0.8.0')
-gssdp = dependency('gssdp-1.2', version : '>= 1.1')
+gssdp = dependency('gssdp-1.2', version : '>= 1.4.0')
glib = dependency('glib-2.0', version : glib_minimal_version)
gio = dependency('gio-2.0', version : glib_minimal_version)
gio_unix = dependency('gio-unix-2.0', version : glib_minimal_version)
diff --git a/src/librygel-core/rygel-basic-management.vala b/src/librygel-core/rygel-basic-management.vala
index 0e498a76f..a5695e28c 100644
--- a/src/librygel-core/rygel-basic-management.vala
+++ b/src/librygel-core/rygel-basic-management.vala
@@ -140,7 +140,7 @@ public class Rygel.BasicManagement : Service {
action.set ("TestID", typeof (string), id);
- action.return ();
+ action.return_success ();
}
private bool ensure_test_exists (ServiceAction action,
@@ -219,7 +219,7 @@ public class Rygel.BasicManagement : Service {
typeof (string),
this.device_status);
- action.return ();
+ action.return_success ();
}
private void ping_cb (Service bm,
@@ -319,7 +319,7 @@ public class Rygel.BasicManagement : Service {
typeof (uint32),
max_response_time);
- action.return ();
+ action.return_success ();
}
private void nslookup_cb (Service bm,
@@ -405,7 +405,7 @@ public class Rygel.BasicManagement : Service {
typeof (string),
result);
- action.return ();
+ action.return_success ();
}
private void traceroute_cb (Service bm,
@@ -494,7 +494,7 @@ public class Rygel.BasicManagement : Service {
typeof (string),
hop_hosts);
- action.return ();
+ action.return_success ();
}
private void get_test_ids_cb (Service bm,
@@ -509,7 +509,7 @@ public class Rygel.BasicManagement : Service {
typeof (string),
create_test_ids_list (false));
- action.return ();
+ action.return_success ();
}
private void get_active_test_ids_cb (Service bm,
@@ -524,7 +524,7 @@ public class Rygel.BasicManagement : Service {
typeof (string),
create_test_ids_list (true));
- action.return ();
+ action.return_success ();
}
private void get_test_info_cb (Service bm,
@@ -548,7 +548,7 @@ public class Rygel.BasicManagement : Service {
typeof (string),
bm_test.execution_state.to_string ());
- action.return ();
+ action.return_success ();
}
private void cancel_test_cb (Service bm,
@@ -570,6 +570,6 @@ public class Rygel.BasicManagement : Service {
/* ActiveTestIDs notification is handled by
* the tests' run callback */
- action.return ();
+ action.return_success ();
}
}
diff --git a/src/librygel-core/rygel-connection-manager.vala b/src/librygel-core/rygel-connection-manager.vala
index 8b4ff8a1e..c47a1be1f 100644
--- a/src/librygel-core/rygel-connection-manager.vala
+++ b/src/librygel-core/rygel-connection-manager.vala
@@ -100,7 +100,7 @@ public class Rygel.ConnectionManager : Service {
action.set ("Source", typeof (string), source_protocol_info,
"Sink", typeof (string), sink_protocol_info);
- action.return ();
+ action.return_success ();
}
private void get_current_connection_ids_cb (Service cm,
@@ -113,7 +113,7 @@ public class Rygel.ConnectionManager : Service {
action.set ("ConnectionIDs", typeof (string), connection_ids);
- action.return ();
+ action.return_success ();
}
private void get_current_connection_info_cb (Service cm,
@@ -156,6 +156,6 @@ public class Rygel.ConnectionManager : Service {
typeof (string),
"OK");
- action.return ();
+ action.return_success ();
}
}
diff --git a/src/librygel-core/rygel-energy-management.vala b/src/librygel-core/rygel-energy-management.vala
index a2118e519..fe93f53e8 100644
--- a/src/librygel-core/rygel-energy-management.vala
+++ b/src/librygel-core/rygel-energy-management.vala
@@ -233,6 +233,6 @@ public class Rygel.EnergyManagement : Service {
typeof (string),
this.create_proxied_network_interface_info ());
- action.return ();
+ action.return_success ();
}
}
diff --git a/src/librygel-core/rygel-v1-hacks.vala b/src/librygel-core/rygel-v1-hacks.vala
index 32bcaae2c..09a220a36 100644
--- a/src/librygel-core/rygel-v1-hacks.vala
+++ b/src/librygel-core/rygel-v1-hacks.vala
@@ -139,7 +139,7 @@ public class Rygel.V1Hacks : Object {
this.description_path = template_path.replace (".xml", "-v1.xml");
description_file.save (this.description_path);
- var server_path = "/" + device.get_relative_location ();
+ var server_path = "/" + device.get_description_document_name ();
if (this.agent_regex.get_pattern () != "") {
device.context.host_path_for_agent (this.description_path,
server_path,
diff --git a/src/librygel-renderer-gst/rygel-playbin-player.vala
b/src/librygel-renderer-gst/rygel-playbin-player.vala
index 63c15560f..1cfdaa160 100644
--- a/src/librygel-renderer-gst/rygel-playbin-player.vala
+++ b/src/librygel-renderer-gst/rygel-playbin-player.vala
@@ -95,7 +95,7 @@ public class Rygel.PlaybinPlayer : GLib.Object, Rygel.MediaPlayer {
private static bool has_dlna_src;
static construct {
- PlaybinPlayer.has_dlna_src = Gst.URI.protocol_is_supported (URIType.SRC,
+ PlaybinPlayer.has_dlna_src = Gst.Uri.protocol_is_supported (URIType.SRC,
"dlna+http");
}
diff --git a/src/librygel-renderer/rygel-av-transport.vala b/src/librygel-renderer/rygel-av-transport.vala
index 5d448cf55..f9fe11ad3 100644
--- a/src/librygel-renderer/rygel-av-transport.vala
+++ b/src/librygel-renderer/rygel-av-transport.vala
@@ -298,7 +298,7 @@ internal class Rygel.AVTransport : Service {
typeof (string),
"NOT_IMPLEMENTED");
- action.return ();
+ action.return_success ();
}
private void get_media_info_ex_cb (Service service,
@@ -347,7 +347,7 @@ internal class Rygel.AVTransport : Service {
typeof (string),
"NOT_IMPLEMENTED");
- action.return ();
+ action.return_success ();
}
@@ -367,7 +367,7 @@ internal class Rygel.AVTransport : Service {
typeof (string),
this.player.playback_speed);
- action.return ();
+ action.return_success ();
}
private void get_transport_actions_cb (Service service,
@@ -380,7 +380,7 @@ internal class Rygel.AVTransport : Service {
typeof (string),
this.controller.current_transport_actions);
- action.return ();
+ action.return_success ();
}
private void get_position_info_cb (Service service,
@@ -414,7 +414,7 @@ internal class Rygel.AVTransport : Service {
typeof (int64),
this.player.byte_position);
- action.return ();
+ action.return_success ();
}
private void get_device_capabilities_cb (Service service,
@@ -433,7 +433,7 @@ internal class Rygel.AVTransport : Service {
typeof (string),
"NOT_IMPLEMENTED");
- action.return ();
+ action.return_success ();
}
private void get_transport_settings_cb (Service service,
@@ -449,7 +449,7 @@ internal class Rygel.AVTransport : Service {
typeof (string),
"NOT_IMPLEMENTED");
- action.return ();
+ action.return_success ();
}
private void stop_cb (Service service, ServiceAction action) {
@@ -459,7 +459,7 @@ internal class Rygel.AVTransport : Service {
this.controller.playback_state = "STOPPED";
- action.return ();
+ action.return_success ();
}
private void play_cb (Service service, ServiceAction action) {
@@ -487,7 +487,7 @@ internal class Rygel.AVTransport : Service {
this.player.playback_speed = speed;
this.controller.playback_state = "PLAYING";
- action.return ();
+ action.return_success ();
}
private void pause_cb (Service service, ServiceAction action) {
@@ -503,7 +503,7 @@ internal class Rygel.AVTransport : Service {
this.controller.playback_state = "PAUSED_PLAYBACK";
- action.return ();
+ action.return_success ();
}
private void seek_cb (Service service, ServiceAction action) {
@@ -537,7 +537,7 @@ internal class Rygel.AVTransport : Service {
return;
}
- action.return ();
+ action.return_success ();
return;
case "REL_COUNT":
@@ -562,7 +562,7 @@ internal class Rygel.AVTransport : Service {
return;
}
- action.return ();
+ action.return_success ();
return;
case "TRACK_NR":
@@ -577,7 +577,7 @@ internal class Rygel.AVTransport : Service {
this.controller.track = track;
- action.return();
+ action.return_success ();
break;
default:
@@ -593,7 +593,7 @@ internal class Rygel.AVTransport : Service {
}
if (this.controller.next ()) {
- action.return ();
+ action.return_success ();
} else {
action.return_error (711, _("Illegal seek target"));
}
@@ -605,7 +605,7 @@ internal class Rygel.AVTransport : Service {
}
if (this.controller.previous ()) {
- action.return ();
+ action.return_success ();
} else {
action.return_error (711, _("Illegal seek target"));
}
@@ -640,7 +640,7 @@ internal class Rygel.AVTransport : Service {
position);
}
- action.return ();
+ action.return_success ();
}
private void set_play_mode_cb (Service service,
@@ -662,7 +662,7 @@ internal class Rygel.AVTransport : Service {
this.controller.play_mode = play_mode;
- action.return ();
+ action.return_success ();
}
private void notify_state_cb (Object controller, ParamSpec p) {
@@ -812,7 +812,7 @@ internal class Rygel.AVTransport : Service {
assert_not_reached ();
}
- action.return ();
+ action.return_success ();
}
private bool is_playlist (string? mime, string? features) {
@@ -967,6 +967,6 @@ internal class Rygel.AVTransport : Service {
assert_not_reached ();
}
- action.return ();
+ action.return_success ();
}
}
diff --git a/src/librygel-renderer/rygel-rendering-control.vala
b/src/librygel-renderer/rygel-rendering-control.vala
index 872cb0a1d..b5852c90e 100644
--- a/src/librygel-renderer/rygel-rendering-control.vala
+++ b/src/librygel-renderer/rygel-rendering-control.vala
@@ -152,7 +152,7 @@ internal class Rygel.RenderingControl : Service {
typeof (string),
this.preset_name_list);
- action.return ();
+ action.return_success ();
}
private void select_preset_cb (Service service,
@@ -170,7 +170,7 @@ internal class Rygel.RenderingControl : Service {
return;
}
- action.return ();
+ action.return_success ();
}
// Error out if 'Channel' is not 'Master'
@@ -199,7 +199,7 @@ internal class Rygel.RenderingControl : Service {
action.set ("CurrentMute", typeof (bool), this.mute);
- action.return ();
+ action.return_success ();
}
private void set_mute_cb (Service service,
@@ -226,7 +226,7 @@ internal class Rygel.RenderingControl : Service {
this.mute = mute;
- action.return ();
+ action.return_success ();
}
private void get_volume_cb (Service service,
@@ -241,7 +241,7 @@ internal class Rygel.RenderingControl : Service {
action.set ("CurrentVolume", typeof (uint), this.volume);
- action.return ();
+ action.return_success ();
}
private void set_volume_cb (Service service,
@@ -273,7 +273,7 @@ internal class Rygel.RenderingControl : Service {
this.volume = volume;
- action.return ();
+ action.return_success ();
}
private void notify_volume_cb (Object player, ParamSpec p) {
diff --git a/src/librygel-ruih/rygel-ruih-service.vala b/src/librygel-ruih/rygel-ruih-service.vala
index bfd08ba3a..60e38b26e 100644
--- a/src/librygel-ruih/rygel-ruih-service.vala
+++ b/src/librygel-ruih/rygel-ruih-service.vala
@@ -70,7 +70,7 @@ internal class Rygel.RuihService: Service {
input_ui_filter);
action.set ("UIListing", typeof (string), compat_ui);
- action.return ();
+ action.return_success ();
} catch (RuihServiceError e) {
action.return_error (e.code, e.message);
}
diff --git a/src/librygel-server/rygel-content-directory.vala
b/src/librygel-server/rygel-content-directory.vala
index 99f2b9c63..7c5c3ee1f 100644
--- a/src/librygel-server/rygel-content-directory.vala
+++ b/src/librygel-server/rygel-content-directory.vala
@@ -276,7 +276,7 @@ public class Rygel.ContentDirectory: Service {
typeof (int64),
import.bytes_total);
- action.return ();
+ action.return_success ();
} catch (Error error) {
action.return_error (error.code, error.message);
}
@@ -295,7 +295,7 @@ public class Rygel.ContentDirectory: Service {
var import = find_import_for_action (action);
import.cancellable.cancel ();
- action.return ();
+ action.return_success ();
} catch (Error error) {
action.return_error (error.code, error.message);
}
@@ -313,7 +313,7 @@ public class Rygel.ContentDirectory: Service {
/* Set action return arguments */
action.set ("Id", typeof (uint32), this.system_update_id);
- action.return ();
+ action.return_success ();
}
/* Query GetSystemUpdateID */
@@ -350,7 +350,7 @@ public class Rygel.ContentDirectory: Service {
/* Set action return arguments */
action.set ("SearchCaps", typeof (string), plugin.search_caps);
- action.return ();
+ action.return_success ();
}
/* Query SearchCapabilities */
@@ -377,7 +377,7 @@ public class Rygel.ContentDirectory: Service {
/* Set action return arguments */
action.set ("SortCaps", typeof (string), MediaObjects.SORT_CAPS);
- action.return ();
+ action.return_success ();
}
/* Query SortCapabilities */
@@ -402,7 +402,7 @@ public class Rygel.ContentDirectory: Service {
/* Set action return arguments */
action.set ("FeatureList", typeof (string), this.feature_list);
- action.return ();
+ action.return_success ();
}
/* Query FeatureList */
@@ -693,7 +693,7 @@ public class Rygel.ContentDirectory: Service {
private void get_service_reset_token_cb (Service content_dir,
ServiceAction action) {
action.set ("ResetToken", typeof (string), this.service_reset_token);
- action.return ();
+ action.return_success ();
}
private void query_service_reset_token (Service content_dir,
@@ -793,6 +793,6 @@ public class Rygel.ContentDirectory: Service {
}
action.set ("SupportedUploadProfiles", typeof (string), builder.str);
- action.return ();
+ action.return_success ();
}
}
diff --git a/src/librygel-server/rygel-import-resource.vala b/src/librygel-server/rygel-import-resource.vala
index 78f9a6d75..a0c6ee6bf 100644
--- a/src/librygel-server/rygel-import-resource.vala
+++ b/src/librygel-server/rygel-import-resource.vala
@@ -207,7 +207,7 @@ internal class Rygel.ImportResource : GLib.Object, Rygel.StateMachine {
this.bytes_total = message.response_headers.get_content_length ();
if (message.status_code >= 200 && message.status_code <= 299) {
- this.action.return ();
+ this.action.return_success ();
} else {
this.handle_transfer_error (message);
}
diff --git a/src/librygel-server/rygel-item-destroyer.vala b/src/librygel-server/rygel-item-destroyer.vala
index be43da3fe..8244955c9 100644
--- a/src/librygel-server/rygel-item-destroyer.vala
+++ b/src/librygel-server/rygel-item-destroyer.vala
@@ -55,7 +55,7 @@ internal class Rygel.ItemDestroyer: GLib.Object, Rygel.StateMachine {
yield this.remove_object ();
- this.action.return ();
+ this.action.return_success ();
debug (_("Successfully destroyed object “%s”"), this.object_id);
} catch (Error error) {
diff --git a/src/librygel-server/rygel-item-updater.vala b/src/librygel-server/rygel-item-updater.vala
index 2e0c3c881..6c8f1f58c 100644
--- a/src/librygel-server/rygel-item-updater.vala
+++ b/src/librygel-server/rygel-item-updater.vala
@@ -76,7 +76,7 @@ internal class Rygel.ItemUpdater: GLib.Object, Rygel.StateMachine {
yield this.update_object ();
- this.action.return ();
+ this.action.return_success ();
debug (_("Successfully updated object “%s”"), this.object_id);
} catch (Error error) {
diff --git a/src/librygel-server/rygel-media-query-action.vala
b/src/librygel-server/rygel-media-query-action.vala
index e3a0edec8..af4c2083f 100644
--- a/src/librygel-server/rygel-media-query-action.vala
+++ b/src/librygel-server/rygel-media-query-action.vala
@@ -228,7 +228,7 @@ internal abstract class Rygel.MediaQueryAction : GLib.Object, StateMachine {
typeof (uint),
this.update_id);
- this.action.return ();
+ this.action.return_success ();
this.completed ();
}
diff --git a/src/librygel-server/rygel-media-receiver-registrar.vala
b/src/librygel-server/rygel-media-receiver-registrar.vala
index 790c656c4..aeab1d436 100644
--- a/src/librygel-server/rygel-media-receiver-registrar.vala
+++ b/src/librygel-server/rygel-media-receiver-registrar.vala
@@ -65,7 +65,7 @@ internal class Rygel.MediaReceiverRegistrar: Service {
action.set ("Result", typeof (int), 1);
- action.return ();
+ action.return_success ();
}
private void query_state (Service registrar,
diff --git a/src/librygel-server/rygel-object-creator.vala b/src/librygel-server/rygel-object-creator.vala
index 86dda358f..e7ddd9826 100644
--- a/src/librygel-server/rygel-object-creator.vala
+++ b/src/librygel-server/rygel-object-creator.vala
@@ -445,7 +445,7 @@ internal class Rygel.ObjectCreator: GLib.Object, Rygel.StateMachine {
this.action.set ("ObjectID", typeof (string), this.object.id,
"Result", typeof (string), didl);
- this.action.return ();
+ this.action.return_success ();
this.completed ();
}
diff --git a/src/librygel-server/rygel-reference-creator.vala
b/src/librygel-server/rygel-reference-creator.vala
index 4fc7a487a..d328c586c 100644
--- a/src/librygel-server/rygel-reference-creator.vala
+++ b/src/librygel-server/rygel-reference-creator.vala
@@ -74,7 +74,7 @@ internal class Rygel.ReferenceCreator : GLib.Object, Rygel.StateMachine {
this.cancellable);
this.action.set ("NewID", typeof (string), new_id);
- this.action.return ();
+ this.action.return_success ();
this.completed ();
} catch (Error error) {
if (error is ContentDirectoryError) {
diff --git a/src/librygel-server/rygel-xbox-hacks.vala b/src/librygel-server/rygel-xbox-hacks.vala
index 26aae8b2e..f42f2b48c 100644
--- a/src/librygel-server/rygel-xbox-hacks.vala
+++ b/src/librygel-server/rygel-xbox-hacks.vala
@@ -88,7 +88,7 @@ internal class Rygel.XBoxHacks : ClientHacks {
var desc_path = template_path.replace ("v1.xml", "xbox.xml");
description_file.save (desc_path);
- var server_path = "/" + device.get_relative_location ();
+ var server_path = "/" + device.get_description_document_name ();
device.context.host_path_for_agent (desc_path,
server_path,
this.agent_regex);
diff --git a/tests/object-creator/test.vala b/tests/object-creator/test.vala
index db7382a31..cd4d781f7 100644
--- a/tests/object-creator/test.vala
+++ b/tests/object-creator/test.vala
@@ -50,7 +50,7 @@ public class Rygel.ServiceAction : GLib.Object {
this.elements = elements;
}
- public void @return() {}
+ public void return_success() {}
public void return_error (int code, string message) {
this.error_code = code;
this.error_message = message;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
