libcore: Added more audiences in Record and Variable

Observing added/removed members and getting value changes with old/new values.
skyjake · May 18, 2014 · c74160d · c74160d
1 parent 6e959cd
commit c74160d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/doomsday/libcore/include/de/data/record.h b/doomsday/libcore/include/de/data/record.h
@@ -71,6 +71,10 @@ class DENG2_PUBLIC Record : public ISerializable, public LogEntry::Arg::Base,
         IgnoreDoubleUnderscoreMembers
     };
 
+    DENG2_DEFINE_AUDIENCE2(Addition, void recordMemberAdded(Record &record, Variable &member))
+
+    DENG2_DEFINE_AUDIENCE2(Removal, void recordMemberRemoved(Record &record, Variable &member))
+
     DENG2_DEFINE_AUDIENCE2(Deletion, void recordBeingDeleted(Record &record))
 
 public:

diff --git a/doomsday/libcore/include/de/data/variable.h b/doomsday/libcore/include/de/data/variable.h
@@ -278,6 +278,9 @@ class DENG2_PUBLIC Variable : public ISerializable
      */
     DENG2_DEFINE_AUDIENCE2(Change, void variableValueChanged(Variable &variable, Value const &newValue))
 
+    DENG2_DEFINE_AUDIENCE2(ChangeFrom, void variableValueChangedFrom(Variable &variable, Value const &oldValue,
+                                                                     Value const &newValue))
+
 private:
     DENG2_PRIVATE(d)
 };

diff --git a/doomsday/libcore/src/data/record.cpp b/doomsday/libcore/src/data/record.cpp
@@ -172,9 +172,13 @@ DENG2_PIMPL(Record)
     }
 
     DENG2_PIMPL_AUDIENCE(Deletion)
+    DENG2_PIMPL_AUDIENCE(Addition)
+    DENG2_PIMPL_AUDIENCE(Removal)
 };
 
 DENG2_AUDIENCE_METHOD(Record, Deletion)
+DENG2_AUDIENCE_METHOD(Record, Addition)
+DENG2_AUDIENCE_METHOD(Record, Removal)
 
 Record::Record() : d(new Instance(*this))
 {}
@@ -188,7 +192,10 @@ Record::Record(Record const &other, CopyBehavior behavior)
 
 Record::~Record()
 {
+    // Notify before deleting members so that observers have full visibility
+    // to the record prior to deletion.
     DENG2_FOR_AUDIENCE2(Deletion, i) i->recordBeingDeleted(*this);
+
     clear();
 }
 
@@ -198,6 +205,8 @@ void Record::clear()
     {
         DENG2_FOR_EACH(Members, i, d->members)
         {
+            DENG2_FOR_AUDIENCE2(Removal, o) o->recordMemberRemoved(*this, **i);
+
             i.value()->audienceForDeletion() -= this;
             delete i.value();
         }
@@ -277,13 +286,19 @@ Variable &Record::add(Variable *variable)
     }
     var->audienceForDeletion() += this;
     d->members[variable->name()] = var.release();
+
+    DENG2_FOR_AUDIENCE2(Addition, i) i->recordMemberAdded(*this, *variable);
+
     return *variable;
 }
 
 Variable *Record::remove(Variable &variable)
 {
     variable.audienceForDeletion() -= this;
     d->members.remove(variable.name());
+
+    DENG2_FOR_AUDIENCE2(Removal, i) i->recordMemberRemoved(*this, variable);
+
     return &variable;
 }
 

diff --git a/doomsday/libcore/src/data/variable.cpp b/doomsday/libcore/src/data/variable.cpp
@@ -59,10 +59,12 @@ DENG2_PIMPL_NOREF(Variable)
 
     DENG2_PIMPL_AUDIENCE(Deletion)
     DENG2_PIMPL_AUDIENCE(Change)
+    DENG2_PIMPL_AUDIENCE(ChangeFrom)
 };
 
 DENG2_AUDIENCE_METHOD(Variable, Deletion)
 DENG2_AUDIENCE_METHOD(Variable, Change)
+DENG2_AUDIENCE_METHOD(Variable, ChangeFrom)
 
 Variable::Variable(String const &name, Value *initial, Flags const &m)
     : d(new Instance)
@@ -131,6 +133,7 @@ Variable &Variable::set(Value *v)
         if(notify)
         {
             DENG2_FOR_AUDIENCE2(Change, i) i->variableValueChanged(*this, *d->value);
+            DENG2_FOR_AUDIENCE2(ChangeFrom, i) i->variableValueChangedFrom(*this, *oldValue, *d->value);
         }
     }
     return *this;