summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gallery/model/SoundManager.cpp8
-rw-r--r--gallery/model/SoundManager.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/gallery/model/SoundManager.cpp b/gallery/model/SoundManager.cpp
index b56c0d4..3fece2d 100644
--- a/gallery/model/SoundManager.cpp
+++ b/gallery/model/SoundManager.cpp
@@ -47,7 +47,7 @@ namespace gallery {
m_devConnChangedCbId);
}
if (m_devStateChangedCbId >= 0) {
- sound_manager_remove_device_state_changed_cb(m_devStateChangedCbId);
+ sound_manager_remove_device_running_changed_cb(m_devStateChangedCbId);
}
if (m_volumeChangedCbId >= 0) {
sound_manager_remove_volume_changed_cb(m_volumeChangedCbId);
@@ -63,10 +63,10 @@ namespace gallery {
CALLBACK_B(SoundManager::onDeviceConnectionChanged), this),
"sound_manager_add_device_connection_changed_cb() failed!");
- FAIL_RETURN(util::get(sound_manager_add_device_state_changed_cb,
+ FAIL_RETURN(util::get(sound_manager_add_device_running_changed_cb,
m_devStateChangedCbId, devMask,
CALLBACK_B(SoundManager::onDeviceStateChanged), this),
- "sound_manager_add_device_state_changed_cb() failed!");
+ "sound_manager_add_device_running_changed_cb() failed!");
FAIL_RETURN(util::get(sound_manager_add_volume_changed_cb,
m_volumeChangedCbId,
@@ -170,7 +170,7 @@ namespace gallery {
}
void SoundManager::onDeviceStateChanged(sound_device_h device,
- sound_device_state_e state)
+ bool isRunning)
{
updateMediaDeviceState();
}
diff --git a/gallery/model/SoundManager.h b/gallery/model/SoundManager.h
index 4a95acf..1427731 100644
--- a/gallery/model/SoundManager.h
+++ b/gallery/model/SoundManager.h
@@ -57,7 +57,7 @@ namespace gallery {
void onDeviceConnectionChanged(sound_device_h device, bool isConnected);
void onDeviceStateChanged(sound_device_h device,
- sound_device_state_e state);
+ bool isRunning);
void onVolumeChanged(sound_type_e type, unsigned int volume);
private: