Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / copresence / handlers / directive_handler.h

diff --git a/src/components/copresence/handlers/directive_handler.h b/src/components/copresence/handlers/directive_handler.h
index f36aa88..5fe733d 100644 (file)
--- a/src/components/copresence/handlers/directive_handler.h
+++ b/src/components/copresence/handlers/directive_handler.h
@@ -5,43 +5,56 @@
 #ifndef COMPONENTS_COPRESENCE_HANDLERS_DIRECTIVE_HANDLER_H_
 #define COMPONENTS_COPRESENCE_HANDLERS_DIRECTIVE_HANDLER_H_
 
+#include <map>
 #include <string>
+#include <vector>
 
-#include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "components/copresence/handlers/audio/audio_directive_handler.h"
-#include "components/copresence/mediums/audio/audio_recorder.h"
+#include "components/copresence/handlers/audio/audio_directive_handler_impl.h"
+#include "components/copresence/public/copresence_constants.h"
 
 namespace copresence {
 
+class AudioDirectiveHandler;
 class Directive;
+class WhispernetClient;
 
-// The directive handler manages transmit and receive directives
-// given to it by the manager.
+// The directive handler manages transmit and receive directives.
+// TODO(ckehoe): Turn this into an interface.
 class DirectiveHandler {
  public:
-  DirectiveHandler();
+  explicit DirectiveHandler(scoped_ptr<AudioDirectiveHandler> audio_handler =
+      make_scoped_ptr(new AudioDirectiveHandlerImpl));
   virtual ~DirectiveHandler();
 
-  // Initialize the |audio_handler_| with the appropriate callbacks.
-  // This function must be called before any others.
-  // TODO(ckehoe): Instead of this, use a static Create() method
-  //               and make the constructor private.
-  virtual void Initialize(
-      const AudioRecorder::DecodeSamplesCallback& decode_cb,
-      const AudioDirectiveHandler::EncodeTokenCallback& encode_cb);
+  // Starts processing directives with the provided Whispernet client.
+  // Directives will be queued until this function is called.
+  // |whispernet_client| is owned by the caller and must outlive the
+  // DirectiveHandler.
+  // |tokens_cb| is called for all audio tokens found in recorded audio.
+  virtual void Start(WhispernetClient* whispernet_client,
+                     const TokensCallback& tokens_cb);
 
   // Adds a directive to handle.
-  virtual void AddDirective(const copresence::Directive& directive);
+  virtual void AddDirective(const Directive& directive);
+
   // Removes any directives associated with the given operation id.
   virtual void RemoveDirectives(const std::string& op_id);
 
-  const std::string& CurrentAudibleToken() const;
-  const std::string& CurrentInaudibleToken() const;
+  // TODO(rkc): Too many audio specific functions here, find a better way to
+  // get this information to the copresence manager.
+  virtual const std::string GetCurrentAudioToken(AudioType type) const;
+  virtual bool IsAudioTokenHeard(AudioType type) const;
 
  private:
+  // Starts actually running a directive.
+  void StartDirective(const std::string& op_id, const Directive& directive);
+
   scoped_ptr<AudioDirectiveHandler> audio_handler_;
+  std::map<std::string, std::vector<Directive>> pending_directives_;
+
+  bool is_started_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectiveHandler);
 };