X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fdali-feedback.cpp;h=f4c79b6dd07c3415313f21d5533918828bb5ac2a;hb=ef857a5e021fed9b1b36fb35b1cfb1be414b5b66;hp=c53935f57c9ed688b3e56da4d827a3ff980b6395;hpb=b4dc79f0000a3103453f1a0e1c7f5e66637bafbd;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/plugins/dali-feedback.cpp b/plugins/dali-feedback.cpp index c53935f..f4c79b6 100644 --- a/plugins/dali-feedback.cpp +++ b/plugins/dali-feedback.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 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,15 +21,15 @@ #include "dali-feedback.h" // EXTERNAL INCLUDES -#include -#include #include #include #include +#include +#include #include -#define DEBUG_PRINTF(fmt, arg...) LOGD(" " fmt, ##arg) +#define DEBUG_PRINTF(fmt, arg...) LOGD(" " fmt, ##arg) using std::string; using namespace Dali; @@ -42,10 +42,8 @@ extern "C" DALI_ADAPTOR_API Dali::FeedbackPlugin* CreateFeedbackPlugin(void) 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(type), static_cast(pattern) ); - if( errorCode != 0 ) + int errorCode = feedback_play_type(static_cast(type), static_cast(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 -