From 5b9d7f31d517ab027e48eac6d747a04ddbaca7e2 Mon Sep 17 00:00:00 2001 From: "Zeeshan Ali (Khattak)" Date: Tue, 3 Aug 2010 16:40:58 +0300 Subject: [PATCH] core: Internalize many core classes This hides many classes from plugins that were previously exposed to them. Most of these are service/device implementations which the plugins do not need to access to anymore because of recent changes. --- src/rygel/rygel-av-transport.vala | 2 +- src/rygel/rygel-changelog.vala | 2 +- src/rygel/rygel-cmdline-config.vala | 4 ++-- src/rygel/rygel-connection-manager.vala | 2 +- src/rygel/rygel-content-directory.vala | 2 +- src/rygel/rygel-environment-config.vala | 2 +- src/rygel/rygel-media-receiver-registrar.vala | 2 +- src/rygel/rygel-rendering-control.vala | 2 +- src/rygel/rygel-root-device-factory.vala | 12 ++++++------ src/rygel/rygel-root-device.vala | 2 +- src/rygel/rygel-sink-connection-manager.vala | 2 +- src/rygel/rygel-source-connection-manager.vala | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/rygel/rygel-av-transport.vala b/src/rygel/rygel-av-transport.vala index b73a0a2..8243f1d 100644 --- a/src/rygel/rygel-av-transport.vala +++ b/src/rygel/rygel-av-transport.vala @@ -23,7 +23,7 @@ using GUPnP; -public class Rygel.AVTransport : Service { +internal class Rygel.AVTransport : Service { public const string UPNP_ID = "urn:upnp-org:serviceId:AVTransport"; public const string UPNP_TYPE = "urn:schemas-upnp-org:service:AVTransport:2"; diff --git a/src/rygel/rygel-changelog.vala b/src/rygel/rygel-changelog.vala index 1b9f001..2081086 100644 --- a/src/rygel/rygel-changelog.vala +++ b/src/rygel/rygel-changelog.vala @@ -25,7 +25,7 @@ using GUPnP; using Gee; // Helper class for building LastChange messages -public class Rygel.ChangeLog : Object { +internal class Rygel.ChangeLog : Object { public unowned Service service { get; set; } private string service_ns; diff --git a/src/rygel/rygel-cmdline-config.vala b/src/rygel/rygel-cmdline-config.vala index 2fa41e5..e39e04c 100644 --- a/src/rygel/rygel-cmdline-config.vala +++ b/src/rygel/rygel-cmdline-config.vala @@ -24,14 +24,14 @@ using Gee; -public errordomain Rygel.CmdlineConfigError { +internal errordomain Rygel.CmdlineConfigError { VERSION_ONLY } /** * Manages configuration from Commandline arguments. */ -public class Rygel.CmdlineConfig : GLib.Object, Configuration { +internal class Rygel.CmdlineConfig : GLib.Object, Configuration { private static string iface; private static int port; diff --git a/src/rygel/rygel-connection-manager.vala b/src/rygel/rygel-connection-manager.vala index 6ebbeec..b2ef5f3 100644 --- a/src/rygel/rygel-connection-manager.vala +++ b/src/rygel/rygel-connection-manager.vala @@ -28,7 +28,7 @@ using GUPnP; /** * Basic implementation of UPnP ConnectionManager service version 2. */ -public class Rygel.ConnectionManager : Service { +internal class Rygel.ConnectionManager : Service { public const string UPNP_ID = "urn:upnp-org:serviceId:ConnectionManager"; public const string UPNP_TYPE = "urn:schemas-upnp-org:service:ConnectionManager:2"; diff --git a/src/rygel/rygel-content-directory.vala b/src/rygel/rygel-content-directory.vala index a29e2a0..ffbcbb5 100644 --- a/src/rygel/rygel-content-directory.vala +++ b/src/rygel/rygel-content-directory.vala @@ -41,7 +41,7 @@ public errordomain Rygel.ContentDirectoryError { * plugins will provide a child of this class. The inheriting classes should * override create_root_container method. */ -public class Rygel.ContentDirectory: Service { +internal class Rygel.ContentDirectory: Service { public const string UPNP_ID = "urn:upnp-org:serviceId:ContentDirectory"; public const string UPNP_TYPE = "urn:schemas-upnp-org:service:ContentDirectory:2"; diff --git a/src/rygel/rygel-environment-config.vala b/src/rygel/rygel-environment-config.vala index 9b35343..c1e8fb7 100644 --- a/src/rygel/rygel-environment-config.vala +++ b/src/rygel/rygel-environment-config.vala @@ -27,7 +27,7 @@ using Gee; /** * Manages configuration from Environment. */ -public class Rygel.EnvironmentConfig : GLib.Object, Configuration { +internal class Rygel.EnvironmentConfig : GLib.Object, Configuration { private static string RYGEL_PREFIX = "RYGEL"; private static string TITLE_KEY = RYGEL_PREFIX + "_TITLE"; private static string ENABLED_KEY = "ENABLED"; diff --git a/src/rygel/rygel-media-receiver-registrar.vala b/src/rygel/rygel-media-receiver-registrar.vala index 3c7dbe2..b59c3eb 100644 --- a/src/rygel/rygel-media-receiver-registrar.vala +++ b/src/rygel/rygel-media-receiver-registrar.vala @@ -25,7 +25,7 @@ using GUPnP; /** * Basic implementation of MS MediaReceiverRegistrar service version 1. */ -public class Rygel.MediaReceiverRegistrar: Service { +internal class Rygel.MediaReceiverRegistrar: Service { public const string UPNP_ID = "urn:microsoft.com:serviceId:X_MS_MediaReceiverRegistrar"; public const string UPNP_TYPE = diff --git a/src/rygel/rygel-rendering-control.vala b/src/rygel/rygel-rendering-control.vala index e7861bf..7afd1c7 100644 --- a/src/rygel/rygel-rendering-control.vala +++ b/src/rygel/rygel-rendering-control.vala @@ -24,7 +24,7 @@ using GUPnP; using Rygel; -public class Rygel.RenderingControl : Service { +internal class Rygel.RenderingControl : Service { public const string UPNP_ID = "urn:upnp-org:serviceId:RenderingControl"; public const string UPNP_TYPE = "urn:schemas-upnp-org:service:RenderingControl:2"; diff --git a/src/rygel/rygel-root-device-factory.vala b/src/rygel/rygel-root-device-factory.vala index 6ff9723..cb5f772 100644 --- a/src/rygel/rygel-root-device-factory.vala +++ b/src/rygel/rygel-root-device-factory.vala @@ -27,13 +27,13 @@ using GUPnP; [CCode (cname = "uuid_generate", cheader_filename = "uuid/uuid.h")] -public extern static void uuid_generate ([CCode (array_length = false)] - uchar[] uuid); +internal extern static void uuid_generate ([CCode (array_length = false)] + uchar[] uuid); [CCode (cname = "uuid_unparse", cheader_filename = "uuid/uuid.h")] -public extern static void uuid_unparse ([CCode (array_length = false)] - uchar[] uuid, - [CCode (array_length = false)] - uchar[] output); +internal extern static void uuid_unparse ([CCode (array_length = false)] + uchar[] uuid, + [CCode (array_length = false)] + uchar[] output); public errordomain RootDeviceFactoryError { XML_PARSE, diff --git a/src/rygel/rygel-root-device.vala b/src/rygel/rygel-root-device.vala index d1fb494..fcce5f1 100644 --- a/src/rygel/rygel-root-device.vala +++ b/src/rygel/rygel-root-device.vala @@ -27,7 +27,7 @@ using Gee; /** * Represents a Root device. */ -public class Rygel.RootDevice: GUPnP.RootDevice { +internal class Rygel.RootDevice: GUPnP.RootDevice { internal ArrayList services; /* Services we implement */ public RootDevice (GUPnP.Context context, diff --git a/src/rygel/rygel-sink-connection-manager.vala b/src/rygel/rygel-sink-connection-manager.vala index 6800cb0..59d29db 100644 --- a/src/rygel/rygel-sink-connection-manager.vala +++ b/src/rygel/rygel-sink-connection-manager.vala @@ -23,7 +23,7 @@ using GUPnP; -public class Rygel.SinkConnectionManager : Rygel.ConnectionManager { +internal class Rygel.SinkConnectionManager : Rygel.ConnectionManager { private MediaPlayer player; public override void constructed () { diff --git a/src/rygel/rygel-source-connection-manager.vala b/src/rygel/rygel-source-connection-manager.vala index aabbbbb..a27f9e6 100644 --- a/src/rygel/rygel-source-connection-manager.vala +++ b/src/rygel/rygel-source-connection-manager.vala @@ -26,7 +26,7 @@ using GUPnP; /** * UPnP ConnectionManager service for serving end-points (MediaServer). */ -public class Rygel.SourceConnectionManager : Rygel.ConnectionManager { +internal class Rygel.SourceConnectionManager : Rygel.ConnectionManager { public override void constructed () { base.constructed (); -- 2.7.4