Rename AudioDataObserver to AudioEventObserver

Change-Id: Id35a4f7ce9f4d1e0408b4ce61bd9f4fb5df2e442

diff --git a/plugins/wakeup-manager/inc/wakeup_audio_manager.h b/plugins/wakeup-manager/inc/wakeup_audio_manager.h
index 1aeb0ac..1315314 100644 (file)
--- a/plugins/wakeup-manager/inc/wakeup_audio_manager.h
+++ b/plugins/wakeup-manager/inc/wakeup_audio_manager.h
@@ -33,10 +33,10 @@ namespace multiassistant
 namespace wakeup
 {
 
-class IAudioDataObserver
+class IAudioEventObserver
 {
 public:
-       virtual ~IAudioDataObserver() {}
+       virtual ~IAudioEventObserver() {}
        virtual bool on_recording_audio_data(long time, void* data, int len) = 0;
        virtual bool on_streaming_audio_data(
                wakeup_speech_streaming_event_e event, void* buffer, unsigned int len) = 0;
@@ -54,8 +54,8 @@ public:
        int initialize();
        int deinitialize();
 
-       void subscribe(IAudioDataObserver *observer);
-       void unsubscribe(IAudioDataObserver *observer);
+       void subscribe(IAudioEventObserver *observer);
+       void unsubscribe(IAudioEventObserver *observer);
 
        void start_recording();
        void stop_recording();
@@ -82,7 +82,7 @@ private:
 
        long get_current_milliseconds_after_epoch();
 
-       std::vector<IAudioDataObserver*> mObservers;
+       std::vector<IAudioEventObserver*> mObservers;
 
        audio_in_h mAudioIn{nullptr};
        sound_stream_info_h mStreamInfo{nullptr};

diff --git a/plugins/wakeup-manager/src/wakeup_audio_manager.cpp b/plugins/wakeup-manager/src/wakeup_audio_manager.cpp
index b43fb05..77f69e8 100644 (file)
--- a/plugins/wakeup-manager/src/wakeup_audio_manager.cpp
+++ b/plugins/wakeup-manager/src/wakeup_audio_manager.cpp
@@ -185,12 +185,12 @@ int CAudioManager::deinitialize(void)
        return 0;
 }
 
-void CAudioManager::subscribe(IAudioDataObserver *observer)
+void CAudioManager::subscribe(IAudioEventObserver *observer)
 {
        mObservers.push_back(observer);
 }
 
-void CAudioManager::unsubscribe(IAudioDataObserver *observer)
+void CAudioManager::unsubscribe(IAudioEventObserver *observer)
 {
        auto iter = std::find(mObservers.begin(), mObservers.end(), observer);
        if (iter != mObservers.end()) {

diff --git a/plugins/wakeup-manager/src/wakeup_manager.cpp b/plugins/wakeup-manager/src/wakeup_manager.cpp
index 37255fd..c46f8d2 100644 (file)
--- a/plugins/wakeup-manager/src/wakeup_manager.cpp
+++ b/plugins/wakeup-manager/src/wakeup_manager.cpp
@@ -106,10 +106,10 @@ public:
 static std::unique_ptr<CWakeupPolicy> g_wakeup_policy;
 static CWakeupEventObserver g_wakeup_event_observer;
 
-class CAudioDataObserver : public IAudioDataObserver
+class CAudioEventObserver : public IAudioEventObserver
 {
 public:
-       CAudioDataObserver(CWakeupEngineManager *manager) : mEngineManager{manager}
+       CAudioEventObserver(CWakeupEngineManager *manager) : mEngineManager{manager}
        {
        }
        bool on_recording_audio_data(long time, void* data, int len) override;
@@ -119,7 +119,7 @@ private:
        CWakeupEngineManager *mEngineManager{nullptr};
 };
 static CAudioManager g_audio_manager;
-static CAudioDataObserver g_audio_data_observer{&g_wakeup_engine_manager};
+static CAudioEventObserver g_audio_event_observer{&g_wakeup_engine_manager};
 
 #ifdef TV_PRODUCT
 Eina_Bool _key_down_cb(void* data, int type, void* event)
@@ -253,7 +253,7 @@ int wakeup_manager_initialize(void)
 
        g_wakeup_settings.initialize();
 
-       g_audio_manager.subscribe(&g_audio_data_observer);
+       g_audio_manager.subscribe(&g_audio_event_observer);
        g_audio_manager.initialize();
 
        g_wakeup_engine_manager.subscribe(&g_engine_event_observer);
@@ -288,7 +288,7 @@ int wakeup_manager_deinitialize(void)
        g_wakeup_engine_manager.unsubscribe(&g_engine_event_observer);
        g_wakeup_engine_manager.deinitialize();
 
-       g_audio_manager.unsubscribe(&g_audio_data_observer);
+       g_audio_manager.unsubscribe(&g_audio_event_observer);
        g_audio_manager.deinitialize();
 
        g_wakeup_settings.deinitialize();
@@ -847,7 +847,7 @@ void CWakeupEventObserver::on_wakeup(wakeup_event_info info)
        }
 }
 
-bool CAudioDataObserver::on_recording_audio_data(long time, void* data, int len)
+bool CAudioEventObserver::on_recording_audio_data(long time, void* data, int len)
 {
        if (nullptr == mEngineManager) return false;
        if (false == mEngineManager->get_audio_data_required()) return false;
@@ -857,7 +857,7 @@ bool CAudioDataObserver::on_recording_audio_data(long time, void* data, int len)
        return true;
 }
 
-bool CAudioDataObserver::on_streaming_audio_data(
+bool CAudioEventObserver::on_streaming_audio_data(
        wakeup_speech_streaming_event_e event, void* buffer, unsigned int len)
 {
        __wakeup_service_streaming_cb(event, buffer, len);