[rygel] core: MediaObject handles 'restricted' prop on its own
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] core: MediaObject handles 'restricted' prop on its own
- Date: Mon, 8 Nov 2010 21:34:45 +0000 (UTC)
commit c1005731eb290aeb29fd05cc260e8b7cc8525cc1
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Thu Nov 4 20:02:19 2010 +0200
core: MediaObject handles 'restricted' prop on its own
There is no need for inheriting classes to provides it's value as MediaObject
can do that based on the value of abstract property 'ocm_flags' provided by
inheriting classes.
src/rygel/rygel-media-container.vala | 6 ------
src/rygel/rygel-media-item.vala | 6 ------
src/rygel/rygel-media-object.vala | 7 ++++++-
3 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/src/rygel/rygel-media-container.vala b/src/rygel/rygel-media-container.vala
index be57402..a0677f2 100644
--- a/src/rygel/rygel-media-container.vala
+++ b/src/rygel/rygel-media-container.vala
@@ -58,12 +58,6 @@ public abstract class Rygel.MediaContainer : MediaObject {
}
}
- internal override bool restricted {
- get {
- return this.ocm_flags == OCMFlags.NONE;
- }
- }
-
public MediaContainer (string id,
MediaContainer? parent,
string title,
diff --git a/src/rygel/rygel-media-item.vala b/src/rygel/rygel-media-item.vala
index 02ae9cb..2b1a1ff 100644
--- a/src/rygel/rygel-media-item.vala
+++ b/src/rygel/rygel-media-item.vala
@@ -63,12 +63,6 @@ public abstract class Rygel.MediaItem : MediaObject {
}
}
- internal override bool restricted {
- get {
- return this.ocm_flags == OCMFlags.NONE && !this.place_holder;
- }
- }
-
public MediaItem (string id,
MediaContainer parent,
string title,
diff --git a/src/rygel/rygel-media-object.vala b/src/rygel/rygel-media-object.vala
index f7d131b..6f31a18 100644
--- a/src/rygel/rygel-media-object.vala
+++ b/src/rygel/rygel-media-object.vala
@@ -86,9 +86,14 @@ public abstract class Rygel.MediaObject : GLib.Object {
}
}
- internal abstract bool restricted { get; }
internal abstract OCMFlags ocm_flags { get; }
+ internal bool restricted {
+ get {
+ return this.ocm_flags == OCMFlags.NONE;
+ }
+ }
+
static construct {
try {
real_name_regex = new Regex (Regex.escape_string ("@REALNAME@"));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]