comparison data/model/Model.h @ 1365:3382d914e110

Merge from branch 3.0-integration

 #include "base/XmlExportable.h"
 #include "base/Playable.h"
 #include "base/BaseTypes.h"
 #include "base/DataExportOptions.h"
 
-typedef std::vector<float> SampleBlock;
-
 class ZoomConstraint;
 class AlignmentModel;
 
 /** 
  * Model is the base class for all data models that represent any sort

      *
      * If "completion" is non-NULL, this function should return
      * through it an estimated percentage value showing how far
      * through the background operation it thinks it is (for progress
      * reporting).  If it has no way to calculate progress, it may
-     * return the special value COMPLETION_UNKNOWN.
+     * return the special value COMPLETION_UNKNOWN.  See also
+     * getCompletion().
      */
     virtual bool isReady(int *completion = 0) const {
 	bool ok = isOK();
 	if (completion) *completion = (ok ? 100 : 0);
 	return ok;