Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-14 20:22:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 842948 - Patch 4: Handle signal "GetPlayStatus", r=echou

Browse Source
This commit is contained in:
Gina Yeh 2013-07-29 17:32:34 +08:00
parent 1629236996
commit 797a139da7
7 changed files with 134 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dom/bluetooth/BluetoothA2dpManager.cpp
View File

@ -360,5 +360,35 @@ BluetoothA2dpManager::UpdatePlayStatus(uint32_t aDuration,
mPlayStatus = aPlayStatus;
}
uint32_t
BluetoothA2dpManager::GetDuration()
{
return mDuration;
}
ControlPlayStatus
BluetoothA2dpManager::GetPlayStatus()
{
return mPlayStatus;
}
uint32_t
BluetoothA2dpManager::GetPosition()
{
return mPosition;
}
uint32_t
BluetoothA2dpManager::GetMediaNumber()
{
return mMediaNumber;
}
void
BluetoothA2dpManager::GetTitle(nsAString& aTitle)
{
aTitle.Assign(mTitle);
}
NS_IMPL_ISUPPORTS1(BluetoothA2dpManager, nsIObserver)

5
dom/bluetooth/BluetoothA2dpManager.h
View File

@ -58,6 +58,11 @@ public:
void UpdatePlayStatus(uint32_t aDuration,
uint32_t aPosition,
ControlPlayStatus aPlayStatus);
uint32_t GetDuration();
ControlPlayStatus GetPlayStatus();
uint32_t GetPosition();
uint32_t GetMediaNumber();
void GetTitle(nsAString& aTitle);
private:
BluetoothA2dpManager();

5
dom/bluetooth/BluetoothService.h
View File

@ -285,6 +285,11 @@ public:
const nsAString& aPlayStatus,
BluetoothReplyRunnable* aRunnable) = 0;
virtual void
UpdatePlayStatus(uint32_t aDuration,
uint32_t aPosition,
ControlPlayStatus aPlayStatus) = 0;
virtual nsresult
SendSinkMessage(const nsAString& aDeviceAddresses,
const nsAString& aMessage) = 0;

8
dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp
View File

@ -415,3 +415,11 @@ BluetoothServiceChildProcess::SendSinkMessage(const nsAString& aDeviceAddresses,
MOZ_CRASH("This should never be called!");
}
void
BluetoothServiceChildProcess::UpdatePlayStatus(uint32_t aDuration,
uint32_t aPosition,
ControlPlayStatus aPlayStatus)
{
MOZ_CRASH("This should never be called!");
}

5
dom/bluetooth/ipc/BluetoothServiceChildProcess.h
View File

@ -167,6 +167,11 @@ public:
const nsAString& aPlayStatus,
BluetoothReplyRunnable* aRunnable) MOZ_OVERRIDE;
virtual void
UpdatePlayStatus(uint32_t aDuration,
uint32_t aPosition,
ControlPlayStatus aPlayStatus) MOZ_OVERRIDE;
virtual nsresult
SendSinkMessage(const nsAString& aDeviceAddresses,
const nsAString& aMessage) MOZ_OVERRIDE;

84
dom/bluetooth/linux/BluetoothDBusService.cpp
View File

@ -517,17 +517,13 @@ GetIntCallback(DBusMessage* aMsg, void* aBluetoothReplyRunnable)
#ifdef DEBUG
static void
CheckForSinkError(bool aConnect, DBusMessage* aMsg, void *aParam)
CheckForError(DBusMessage* aMsg, void *aParam, const nsAString& aError)
{
BluetoothValue v;
nsAutoString replyError;
UnpackVoidMessage(aMsg, nullptr, v, replyError);
if (!v.get_bool()) {
if (aConnect) {
BT_WARNING("Failed to connect sink.");
return;
}
BT_WARNING("Failed to disconnect sink.");
BT_WARNING(NS_ConvertUTF16toUTF8(aError).get());
}
}
#endif
@ -536,7 +532,8 @@ static void
SinkConnectCallback(DBusMessage* aMsg, void* aParam)
{
#ifdef DEBUG
CheckForSinkError(true, aMsg, aParam);
NS_NAMED_LITERAL_STRING(errorStr, "Failed to connect sink");
CheckForError(aMsg, aParam, errorStr);
#endif
}
@ -544,7 +541,8 @@ static void
SinkDisconnectCallback(DBusMessage* aMsg, void* aParam)
{
#ifdef DEBUG
CheckForSinkError(false, aMsg, aParam);
NS_NAMED_LITERAL_STRING(errorStr, "Failed to disconnect sink");
CheckForError(false, aMsg, errorStr);
#endif
}
@ -1304,6 +1302,31 @@ private:
nsString mPath;
};
class SendPlayStatusTask : public nsRunnable
{
public:
SendPlayStatusTask()
{
MOZ_ASSERT(!NS_IsMainThread());
}
nsresult Run()
{
MOZ_ASSERT(NS_IsMainThread());
BluetoothA2dpManager* a2dp = BluetoothA2dpManager::Get();
NS_ENSURE_TRUE(a2dp, NS_ERROR_FAILURE);
BluetoothService* bs = BluetoothService::Get();
NS_ENSURE_TRUE(bs, NS_ERROR_FAILURE);
bs->UpdatePlayStatus(a2dp->GetDuration(),
a2dp->GetPosition(),
a2dp->GetPlayStatus());
return NS_OK;
}
};
// Called by dbus during WaitForAndDispatchEventNative()
// This function is called on the IOThread
static DBusHandlerResult
@ -1489,6 +1512,9 @@ EventFilter(DBusConnection* aConn, DBusMessage* aMsg, void* aData)
errorStr,
sSinkProperties,
ArrayLength(sSinkProperties));
} else if (dbus_message_is_signal(aMsg, DBUS_CTL_IFACE, "GetPlayStatus")) {
NS_DispatchToMainThread(new SendPlayStatusTask());
return DBUS_HANDLER_RESULT_HANDLED;
} else if (dbus_message_is_signal(aMsg, DBUS_CTL_IFACE, "PropertyChanged")) {
ParsePropertyChange(aMsg,
v,
@ -3008,3 +3034,45 @@ BluetoothDBusService::SendPlayStatus(uint32_t aDuration,
a2dp->UpdatePlayStatus(aDuration, aPosition, playStatus);
}
static void
ControlCallback(DBusMessage* aMsg, void* aParam)
{
#ifdef DEBUG
NS_NAMED_LITERAL_STRING(errorStr, "Failed to update playstatus");
CheckForError(aMsg, aParam, errorStr);
#endif
}
void
BluetoothDBusService::UpdatePlayStatus(uint32_t aDuration,
uint32_t aPosition,
ControlPlayStatus aPlayStatus)
{
MOZ_ASSERT(NS_IsMainThread());
NS_ENSURE_TRUE_VOID(this->IsReady());
BluetoothA2dpManager* a2dp = BluetoothA2dpManager::Get();
NS_ENSURE_TRUE_VOID(a2dp);
MOZ_ASSERT(a2dp->IsConnected());
MOZ_ASSERT(a2dp->IsAvrcpConnected());
nsAutoString address;
a2dp->GetAddress(address);
nsString objectPath =
GetObjectPathFromAddress(sAdapterPath, address);
uint32_t tempPlayStatus = aPlayStatus;
bool ret = dbus_func_args_async(mConnection,
-1,
ControlCallback,
nullptr,
NS_ConvertUTF16toUTF8(objectPath).get(),
DBUS_CTL_IFACE,
"UpdatePlayStatus",
DBUS_TYPE_UINT32, &aDuration,
DBUS_TYPE_UINT32, &aPosition,
DBUS_TYPE_UINT32, &tempPlayStatus,
DBUS_TYPE_INVALID);
NS_ENSURE_TRUE_VOID(ret);
}

5
dom/bluetooth/linux/BluetoothDBusService.h
View File

@ -153,6 +153,11 @@ public:
const nsAString& aPlayStatus,
BluetoothReplyRunnable* aRunnable) MOZ_OVERRIDE;
virtual void
UpdatePlayStatus(uint32_t aDuration,
uint32_t aPosition,
ControlPlayStatus aPlayStatus) MOZ_OVERRIDE;
virtual nsresult
SendSinkMessage(const nsAString& aDeviceAddresses,
const nsAString& aMessage) MOZ_OVERRIDE;