device/bluetooth: Implement Unregister() of BlueotoothAudioSinkChromeOS and disconnection-related c…

device/bluetooth/bluetooth_audio_sink.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_AUDIO_SINK_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_AUDIO_SINK_H_
 
 #include <stdint.h>
 #include <string>
 #include <vector>
@@ skipping 22 matching lines @@
     STATE_INVALID,  // BluetoothAdapter not presented or not powered.
     STATE_DISCONNECTED,  // Not connected.
     STATE_IDLE,  // Connected but not streaming.
     STATE_PENDING,  // Connected, streaming but not acquired.
     STATE_ACTIVE,  // Connected, streaming and acquired.
   };
 
   // Possible types of error raised by Audio Sink object.
   enum ErrorCode {
     ERROR_UNSUPPORTED_PLATFORM,  // A2DP sink not supported on current platform.
-    ERROR_INVALID_ADAPTER,       // BluetoothAdapter not presented/powered.
-    ERROR_NOT_REGISTERED,        // BluetoothAudioSink not registered.
+    ERROR_INVALID_ADAPTER,  // BluetoothAdapter not presented/powered.
+    ERROR_NOT_REGISTERED,  // BluetoothAudioSink not registered.
   };
 
   // Options to configure an A2DP audio sink.
   struct Options {
     Options();
     ~Options();
 
     uint8_t codec;
     std::vector<uint8_t> capabilities;
   };
@@ skipping 21 matching lines @@
     // the streaming. This method should associate with BluetoothAudioSink
     // specific IOBuffer wrapping fd, read_mtu and write_mtu.
   };
 
   // The ErrorCallback is used for the methods that can fail in which case it
   // is called.
   typedef base::Callback<void(ErrorCode)> ErrorCallback;
 
   // Unregisters the audio sink. An audio sink will unregister itself
   // automatically in its destructor, but calling Unregister is recommended,
   // since user applications can be notified of an error returned by the call.

[Ben Chan, 2015/02/19 00:21:45]

is this comment still valid?

"since user applications can be notified of an error returned by the call" 

[Miao, 2015/02/23 21:04:24]

Recovered the error callback, so the the comment stays valid.

-  virtual void Unregister(const base::Closure& callback,
-                          const ErrorCallback& error_callback) = 0;
+  virtual void Unregister(const base::Closure& callback) = 0;

[armansito, 2015/02/19 00:37:46]

Why did you remove the error callback? Also, without the error callback, the
comment above doesn't make much sense, since you can't return an error.

[Miao, 2015/02/23 21:04:24]

Done.

 
   // Adds and removes an observer for events on the BluetoothAudioSink object.
   // If monitoring multiple audio sinks, check the |audio_sink| parameter of
   // observer methods to determine which audio sink is issuing the event.
   virtual void AddObserver(Observer* observer) = 0;
   virtual void RemoveObserver(Observer* observer) = 0;
 
   // Getters for state and volume.
   virtual State GetState() const = 0;
   virtual uint16_t GetVolume() const = 0;
 
  protected:
   friend class base::RefCounted<BluetoothAudioSink>;
   BluetoothAudioSink();
 
   // The destructor invokes Unregister() to ensure the audio sink will be
   // unregistered even if the user applications fail to do so.
   virtual ~BluetoothAudioSink();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BluetoothAudioSink);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_AUDIO_SINK_H_