Bug 1159267: Share Bluedroid's A2DP manager between Bluetooth v1 and v2, r=btian
authorThomas Zimmermann <tdz@users.sourceforge.net>
Wed, 06 May 2015 09:58:04 +0200
changeset 273895 45ae8fa4b2e65ce896e65955782d12b6b394bf82
parent 273894 3698cc94f038209804463850c6e273ce2046df8c
child 273896 f7fe73c7e071492e16a9cbc4ae52b4e0340ef83e
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbtian
bugs1159267, 1062697, 1148311
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1159267: Share Bluedroid's A2DP manager between Bluetooth v1 and v2, r=btian Bluedroid's A2DP manager is the same for Bluetooth v1 and v2, except fixes for bug 1062697 and bug 1148311 in v1. This patch merges both variants. The last remaining difference is a call to |DistributeSignal|, which differs between both implementations.
dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp
--- a/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp
+++ b/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp
@@ -293,21 +293,17 @@ BluetoothA2dpManager::ResetA2dp()
 void
 BluetoothA2dpManager::ResetAvrcp()
 {
   mAvrcpConnected = false;
   mDuration = 0;
   mMediaNumber = 0;
   mTotalMediaCount = 0;
   mPosition = 0;
-#ifdef MOZ_B2G_BT_API_V2
-  mPlayStatus = ControlPlayStatus::PLAYSTATUS_UNKNOWN;
-#else
   mPlayStatus = ControlPlayStatus::PLAYSTATUS_STOPPED;
-#endif
 }
 
 /*
  * Static functions
  */
 
 static BluetoothA2dpManager::SinkState
 StatusStringToSinkState(const nsAString& aStatus)
@@ -928,28 +924,24 @@ BluetoothA2dpManager::UpdateRegisterNoti
       mPlayPosChangedNotifyType = AVRCP_NTF_INTERIM;
       if (mSinkState == BluetoothA2dpManager::SinkState::SINK_PLAYING) {
         param.mSongPos = mPosition;
       } else {
         param.mSongPos = 0xFFFFFFFF;
       }
       mPlaybackInterval = aParam;
       break;
-#ifdef MOZ_B2G_BT_API_V2
-      // Missing in bluetooth2
-#else
     case AVRCP_EVENT_APP_SETTINGS_CHANGED:
       mAppSettingsChangedNotifyType = AVRCP_NTF_INTERIM;
       param.mNumAttr = 2;
       param.mIds[0] = AVRCP_PLAYER_ATTRIBUTE_REPEAT;
       param.mValues[0] = AVRCP_PLAYER_VAL_OFF_REPEAT;
       param.mIds[1] = AVRCP_PLAYER_ATTRIBUTE_SHUFFLE;
       param.mValues[1] = AVRCP_PLAYER_VAL_OFF_SHUFFLE;
       break;
-#endif
     default:
       break;
   }
 
   sBtAvrcpInterface->RegisterNotificationRsp(aEvent, AVRCP_NTF_INTERIM,
                                              param, nullptr);
 }