Merge "CanvasRenderer:: Add Picture class" into devel/master

[platform/core/uifw/dali-adaptor.git] / plugins / dali-feedback.cpp

diff --git a/plugins/dali-feedback.cpp b/plugins/dali-feedback.cpp
index 99fb1be..f4c79b6 100644 (file)
--- a/plugins/dali-feedback.cpp
+++ b/plugins/dali-feedback.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,31 +21,29 @@
 #include "dali-feedback.h"
 
 // EXTERNAL INCLUDES
-#include <iostream>
-#include <fstream>
 #include <feedback.h>
 #include <mm_sound.h>
 #include <mm_sound_private.h>
+#include <fstream>
+#include <iostream>
 
 #include <dlog.h>
 
-#define DEBUG_PRINTF(fmt, arg...)  LOGD(" " fmt, ##arg)
+#define DEBUG_PRINTF(fmt, arg...) LOGD(" " fmt, ##arg)
 
 using std::string;
 using namespace Dali;
 
 // The plugin factories
-extern "C" DALI_EXPORT_API Dali::FeedbackPlugin* CreateFeedbackPlugin(void)
+extern "C" DALI_ADAPTOR_API Dali::FeedbackPlugin* CreateFeedbackPlugin(void)
 {
   return new Dali::Plugin::DaliFeedback;
 }
 
 namespace Dali
 {
-
 namespace Plugin
 {
-
 DaliFeedback::DaliFeedback()
 {
   feedback_initialize();
@@ -56,11 +54,11 @@ DaliFeedback::~DaliFeedback()
   feedback_deinitialize();
 }
 
-void DaliFeedback::PlayHaptic( const std::string& filePath )
+void DaliFeedback::PlayHaptic(const std::string& filePath)
 {
 }
 
-void DaliFeedback::PlayHapticMonotone( unsigned int duration )
+void DaliFeedback::PlayHapticMonotone(unsigned int duration)
 {
 }
 
@@ -68,41 +66,40 @@ void DaliFeedback::StopHaptic()
 {
 }
 
-int DaliFeedback::PlaySound( const std::string& fileName )
+int DaliFeedback::PlaySound(const std::string& fileName)
 {
-  int handle = -1;
-  int errorCode = mm_sound_play_keysound( fileName.c_str(), VOLUME_TYPE_SYSTEM & VOLUME_GAIN_TOUCH );
-  if( errorCode < 0 )
+  int handle    = -1;
+  int errorCode = mm_sound_play_keysound(fileName.c_str(), VOLUME_TYPE_SYSTEM & VOLUME_GAIN_TOUCH);
+  if(errorCode < 0)
   {
-    DEBUG_PRINTF( "PlaySound() %s failed with error code = %d\n", fileName.c_str(), errorCode );
+    DEBUG_PRINTF("PlaySound() %s failed with error code = %d\n", fileName.c_str(), errorCode);
   }
 
   return handle;
 }
 
-void DaliFeedback::StopSound( int handle )
+void DaliFeedback::StopSound(int handle)
 {
-  int errorCode = mm_sound_stop_sound( handle );
-  if( errorCode < 0 )
+  int errorCode = mm_sound_stop_keysound(NULL);
+  if(errorCode < 0)
   {
-    DEBUG_PRINTF( "StopSound() handle = %d failed with error code = %d\n", handle, errorCode);
+    DEBUG_PRINTF("StopSound() handle = %d failed with error code = %d\n", handle, errorCode);
   }
   else
   {
-    DEBUG_PRINTF( "stop handle %d success\n", handle );
+    DEBUG_PRINTF("stop handle %d success\n", handle);
   }
 }
 
-void DaliFeedback::PlayFeedbackPattern( int type, int pattern )
+void DaliFeedback::PlayFeedbackPattern(int type, int pattern)
 {
-  int errorCode = feedback_play_type( static_cast<feedback_type_e>(type), static_cast<feedback_pattern_e>(pattern) );
-  if( errorCode != 0 )
+  int errorCode = feedback_play_type(static_cast<feedback_type_e>(type), static_cast<feedback_pattern_e>(pattern));
+  if(errorCode != 0)
   {
-    DEBUG_PRINTF( "DaliFeedback::PlayFeedbackPattern() with type = %d, pattern = %d returned with error = %d\n", (int)type, (int)pattern, errorCode );
+    DEBUG_PRINTF("DaliFeedback::PlayFeedbackPattern() with type = %d, pattern = %d returned with error = %d\n", (int)type, (int)pattern, errorCode);
   }
 }
 
 } // namespace Plugin
 
 } // namespace Dali
-