[rygel] core: Sort MediaContainer methods by their visibility
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [rygel] core: Sort MediaContainer methods by their visibility
- Date: Mon, 16 Nov 2009 23:19:41 +0000 (UTC)
commit e0f1356667f4f6a15bc350f39111ca435fb5e8e4
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Tue Nov 17 01:15:42 2009 +0200
core: Sort MediaContainer methods by their visibility
src/rygel/rygel-media-container.vala | 88 +++++++++++++++++-----------------
1 files changed, 44 insertions(+), 44 deletions(-)
---
diff --git a/src/rygel/rygel-media-container.vala b/src/rygel/rygel-media-container.vala
index 281c1e0..580b366 100644
--- a/src/rygel/rygel-media-container.vala
+++ b/src/rygel/rygel-media-container.vala
@@ -74,36 +74,6 @@ public abstract class Rygel.MediaContainer : MediaObject {
Cancellable? cancellable)
throws Error;
- /**
- * Recursively searches for media object with the given id in this container.
- *
- * @param id ID of the media object to search for
- * @param cancellable optional cancellable for this operation
- * @param callback function to call when result is ready
- *
- * return the found media object.
- */
- internal async MediaObject? find_object (string id,
- Cancellable? cancellable)
- throws Error {
- var expression = new RelationalExpression ();
- expression.op = SearchCriteriaOp.EQ;
- expression.operand1 = "@id";
- expression.operand2 = id;
-
- uint total_matches;
- var results = yield this.search (expression,
- 0,
- 1,
- out total_matches,
- cancellable);
- if (results.size > 0) {
- return results[0];
- } else {
- return null;
- }
- }
-
/**
* Recursively searches for all media objects the satisfy the given search
* expression in this container.
@@ -188,6 +158,50 @@ public abstract class Rygel.MediaContainer : MediaObject {
}
}
+ /**
+ * Method to be be called each time this container is updated (metadata
+ * changes for this container, items under it gets removed/added or their
+ * metadata changes etc).
+ *
+ * @param container the container that just got updated.
+ */
+ public void updated () {
+ this.update_id++;
+
+ // Emit the signal that will start the bump-up process for this event.
+ this.container_updated (this);
+ }
+
+ /**
+ * Recursively searches for media object with the given id in this container.
+ *
+ * @param id ID of the media object to search for
+ * @param cancellable optional cancellable for this operation
+ * @param callback function to call when result is ready
+ *
+ * return the found media object.
+ */
+ internal async MediaObject? find_object (string id,
+ Cancellable? cancellable)
+ throws Error {
+ var expression = new RelationalExpression ();
+ expression.op = SearchCriteriaOp.EQ;
+ expression.operand1 = "@id";
+ expression.operand2 = id;
+
+ uint total_matches;
+ var results = yield this.search (expression,
+ 0,
+ 1,
+ out total_matches,
+ cancellable);
+ if (results.size > 0) {
+ return results[0];
+ } else {
+ return null;
+ }
+ }
+
private async Gee.List<MediaObject> search_in_children (
SearchExpression expression,
Gee.List<MediaObject> children,
@@ -219,20 +233,6 @@ public abstract class Rygel.MediaContainer : MediaObject {
}
/**
- * Method to be be called each time this container is updated (metadata
- * changes for this container, items under it gets removed/added or their
- * metadata changes etc).
- *
- * @param container the container that just got updated.
- */
- public void updated () {
- this.update_id++;
-
- // Emit the signal that will start the bump-up process for this event.
- this.container_updated (this);
- }
-
- /**
* handler for container_updated signal on this container. We only forward
* it to the parent, hoping someone will get it from the root container
* and act upon it.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]