[rygel] core: satisfied_by() is now async and abstract
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [rygel] core: satisfied_by() is now async and abstract
- Date: Mon, 9 Nov 2009 18:45:45 +0000 (UTC)
commit dc5c6b8cd02e203e131a2bb8341c6bf5b23e0f62
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Tue Nov 3 20:18:14 2009 +0200
core: satisfied_by() is now async and abstract
core: SearchCriteria.satisfied_by() is now async and abstract.
src/rygel/rygel-search-criteria-parser.vala | 8 ++++++++
src/rygel/rygel-search-expression.vala | 12 +++++++++---
2 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/src/rygel/rygel-search-criteria-parser.vala b/src/rygel/rygel-search-criteria-parser.vala
index 4113441..c95f126 100644
--- a/src/rygel/rygel-search-criteria-parser.vala
+++ b/src/rygel/rygel-search-criteria-parser.vala
@@ -150,6 +150,10 @@ internal class Rygel.SearchCriteriaParser : Object, StateMachine {
private class Rygel.OpenningBrace: Rygel.SearchExpression<void *,
void *,
void *> {
+ public override async bool satisfied_by (MediaObject media_object) {
+ assert_not_reached ();
+ }
+
public override string to_string () {
assert_not_reached ();
}
@@ -158,6 +162,10 @@ private class Rygel.OpenningBrace: Rygel.SearchExpression<void *,
private class Rygel.ClosingBrace: Rygel.SearchExpression<void *,
void *,
void *> {
+ public override async bool satisfied_by (MediaObject media_object) {
+ assert_not_reached ();
+ }
+
public override string to_string () {
assert_not_reached ();
}
diff --git a/src/rygel/rygel-search-expression.vala b/src/rygel/rygel-search-expression.vala
index ac9bd8f..775b19d 100644
--- a/src/rygel/rygel-search-expression.vala
+++ b/src/rygel/rygel-search-expression.vala
@@ -36,15 +36,17 @@ public abstract class Rygel.SearchExpression<G,H,I> {
public H operand1;
public I operand2;
- public bool satisfied_by (MediaObject media_object) {
- return true;
- }
+ public abstract async bool satisfied_by (MediaObject media_object);
public abstract string to_string ();
}
public class Rygel.AtomicExpression :
Rygel.SearchExpression<SearchCriteriaOp,string,string> {
+ public override async bool satisfied_by (MediaObject media_object) {
+ return true;
+ }
+
public override string to_string () {
return "%s %d %s".printf (this.operand1, this.op, this.operand2);
}
@@ -54,6 +56,10 @@ public class Rygel.LogicalExpression :
Rygel.SearchExpression<LogicalOperator,
SearchExpression,
SearchExpression> {
+ public override async bool satisfied_by (MediaObject media_object) {
+ return true;
+ }
+
public override string to_string () {
return "(%s %d %s)".printf (this.operand1.to_string (),
this.op,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]