Remove sound-manager deprecated API

Instead, sound_manager_add_device_running_changed_cb() is used.

Change-Id: I558077b1197697a7297e3dc74dad57c3622c307c
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/gallery/model/SoundManager.cpp b/gallery/model/SoundManager.cpp
index b56c0d4f8a5822d8d78d577213625e829d2fef29..3fece2d3df15b76102509cc46820e3c58c84b8da 100644 (file)
--- 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 4a95acf78e9d3dddfabd92d2c5dc2c3c712bdc2c..142773159897518562b703791e7587acc8c5f4da 100644 (file)
--- 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: