X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fhomescreen.cpp;h=892fcbac5194d93fdede43037cab2a3bfea7af8a;hb=2f7789558c98d8b79b41d62ac97f5bd6de557dc9;hp=10cc9bccc8a2a76d7334ad674db0760e446ee348;hpb=6c3015a7607c45313fa10792b9914864f8c25831;p=apps%2Fagl-service-homescreen.git

diff --git a/src/homescreen.cpp b/src/homescreen.cpp
index 10cc9bc..892fcba 100644
--- a/src/homescreen.cpp
+++ b/src/homescreen.cpp
@@ -20,7 +20,6 @@
 #include <memory>
 #include <algorithm>
 #include "hs-helper.h"
-#include "hmi-debug.h"
 #include "hs-clientmanager.h"
 #include "hs-appinfo.h"
 
@@ -54,13 +53,13 @@ struct hs_instance {
 int hs_instance::init(afb_api_t api)
 {
     if(client_manager == nullptr) {
-        HMI_ERROR("homescreen-service","FATAL ERROR: client_manager is nullptr.");
+        AFB_ERROR("FATAL ERROR: client_manager is nullptr.");
         return -1;
     }
     client_manager->init();
 
     if(app_info == nullptr) {
-        HMI_ERROR("homescreen-service","FATAL ERROR: app_info is nullptr.");
+        AFB_ERROR("FATAL ERROR: app_info is nullptr.");
         return -1;
     }
     app_info->init(api);
@@ -78,7 +77,7 @@ static void pingSample(afb_req_t request)
 {
    static int pingcount = 0;
    afb_req_success_f(request, json_object_new_int(pingcount), "Ping count = %d", pingcount);
-   HMI_NOTICE("homescreen-service","Verbosity macro at level notice invoked at ping invocation count = %d", pingcount);
+   AFB_DEBUG("Verbosity macro at level notice invoked at ping invocation count = %d", pingcount);
    pingcount++;
 }
 
@@ -96,11 +95,11 @@ static void pingSample(afb_req_t request)
  */
 static void tap_shortcut (afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","called.");
+    AFB_DEBUG("called.");
     int ret = 0;
     const char* value = afb_req_value(request, _application_id);
     if (value) {
-        HMI_NOTICE("homescreen-service","request appid = %s.", value);
+        AFB_INFO("request appid = %s.", value);
         ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value);
         if(ret == AFB_REQ_NOT_STARTED_APPLICATION) {
             std::string id = g_hs_instance->app_info->getAppProperty(value, _keyId);
@@ -137,7 +136,7 @@ static void tap_shortcut (afb_req_t request)
  */
 static void on_screen_message (afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","called.");
+    AFB_DEBUG("called.");
     int ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__);
     if (ret) {
         afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__);
@@ -163,7 +162,7 @@ static void on_screen_message (afb_req_t request)
  */
 static void on_screen_reply (afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","called.");
+    AFB_DEBUG("called.");
     int ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__);
     if (ret) {
         afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__);
@@ -188,7 +187,7 @@ static void on_screen_reply (afb_req_t request)
  */
 static void subscribe(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","called.");
+    AFB_DEBUG("called.");
     int ret = 0;
     std::string req_appid = std::move(get_application_id(request));
     if(!req_appid.empty()) {
@@ -221,7 +220,7 @@ static void subscribe(afb_req_t request)
  */
 static void unsubscribe(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","called.");
+    AFB_DEBUG("called.");
     int ret = 0;
     std::string req_appid = std::move(get_application_id(request));
     if(!req_appid.empty()) {
@@ -254,7 +253,7 @@ static void unsubscribe(afb_req_t request)
  */
 static void showWindow(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","called.");
+    AFB_DEBUG("called.");
     int ret = 0;
     const char* value = afb_req_value(request, _application_id);
     if (value) {
@@ -293,7 +292,7 @@ static void showWindow(afb_req_t request)
  */
 static void hideWindow(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","called.");
+    AFB_DEBUG("called.");
     int ret = 0;
     const char* value = afb_req_value(request, _application_id);
     if (value) {
@@ -326,7 +325,7 @@ static void hideWindow(afb_req_t request)
  */
 static void replyShowWindow(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","called.");
+    AFB_DEBUG("called.");
     int ret = 0;
     const char* value = afb_req_value(request, _application_id);
     if (value) {
@@ -361,7 +360,7 @@ static void replyShowWindow(afb_req_t request)
  */
 static void showNotification(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","called.");
+    AFB_DEBUG("called.");
     int ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, "homescreen");
     if (ret) {
         afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__);
@@ -388,7 +387,7 @@ static void showNotification(afb_req_t request)
  */
 static void showInformation(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","called.");
+    AFB_DEBUG("called.");
     int ret = g_hs_instance->client_manager->handleRequest(request,  __FUNCTION__, "homescreen");
     if (ret) {
         afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__);
@@ -413,7 +412,7 @@ static void showInformation(afb_req_t request)
  */
 static void getRunnables(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","called.");
+    AFB_DEBUG("called.");
     struct json_object* j_runnable = json_object_new_array();
     g_hs_instance->app_info->getRunnables(&j_runnable);
 
@@ -456,7 +455,7 @@ static const afb_verb_t verbs[]= {
  */
 static int preinit(afb_api_t api)
 {
-   HMI_NOTICE("homescreen-service","binding preinit (was register)");
+   AFB_DEBUG("binding preinit (was register)");
    return 0;
 }
 
@@ -472,10 +471,10 @@ static int preinit(afb_api_t api)
  */
 static int init(afb_api_t api)
 {
-    HMI_NOTICE("homescreen-service","binding init");
+    AFB_DEBUG("binding init");
 
     if(g_hs_instance != nullptr) {
-        HMI_WARNING("homescreen-service", "g_hs_instance isn't null.");
+        AFB_WARNING( "g_hs_instance isn't null.");
         delete g_hs_instance->client_manager;
         delete g_hs_instance->app_info;
         delete g_hs_instance;
@@ -483,7 +482,7 @@ static int init(afb_api_t api)
     }
     g_hs_instance = new hs_instance();
     if(g_hs_instance == nullptr) {
-        HMI_ERROR("homescreen-service", "Fatal Error: new g_hs_instance failed.");
+        AFB_ERROR( "Fatal Error: new g_hs_instance failed.");
         return -1;
     }
 
@@ -504,7 +503,7 @@ static int init(afb_api_t api)
  */
 static void onevent(afb_api_t api, const char *event, struct json_object *object)
 {
-    HMI_NOTICE("homescreen-service","on_event %s", event);
+    AFB_DEBUG("on_event %s", event);
     g_hs_instance->app_info->onEvent(api, event, object);
 }