projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel/master' into tizen
[platform/core/uifw/dali-adaptor.git]
/
plugins
/
dali-feedback.h
diff --git
a/plugins/dali-feedback.h
b/plugins/dali-feedback.h
index
c9967ec
..
03b9de2
100644
(file)
--- a/
plugins/dali-feedback.h
+++ b/
plugins/dali-feedback.h
@@
-1,8
+1,8
@@
-#ifndef
__FEEDBACK_PLUGIN_H__
-#define
__FEEDBACK_PLUGIN_H__
+#ifndef
FEEDBACK_PLUGIN_H
+#define
FEEDBACK_PLUGIN_H
/*
/*
- * Copyright (c) 20
14
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
21
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-18,30
+18,19
@@
*
*/
*
*/
-// EXTERNAL INCLUDES
-#if defined(DALI_PROFILE_MOBILE)
-#include <dd-haptic.h>
-#else
-#include <haptic.h>
-#endif
-
// INTERNAL INCLUDES
// INTERNAL INCLUDES
-#include <feedback-plugin.h>
+#include <
dali/devel-api/adaptor-framework/
feedback-plugin.h>
namespace Dali
{
namespace Dali
{
-
namespace Plugin
{
namespace Plugin
{
-
/**
* Plays feedback effects for Dali-Toolkit UI Controls.
*/
class DaliFeedback : public Dali::FeedbackPlugin
{
/**
* Plays feedback effects for Dali-Toolkit UI Controls.
*/
class DaliFeedback : public Dali::FeedbackPlugin
{
-
public: // Construction & Destruction
public: // Construction & Destruction
-
/**
* Constructor
*/
/**
* Constructor
*/
@@
-53,16
+42,15
@@
public: // Construction & Destruction
virtual ~DaliFeedback();
public: // FeedbackPlugin overrides
virtual ~DaliFeedback();
public: // FeedbackPlugin overrides
-
/**
* @copydoc Dali::Integration::FeedbackPlugin::PlayHaptic()
*/
/**
* @copydoc Dali::Integration::FeedbackPlugin::PlayHaptic()
*/
- void PlayHaptic(
const std::string& filePath
);
+ void PlayHaptic(
const std::string& filePath
);
/**
* @copydoc Dali::FeedbackPlugin::PlayHapticMonotone()
*/
/**
* @copydoc Dali::FeedbackPlugin::PlayHapticMonotone()
*/
- void PlayHapticMonotone(
unsigned int duration
);
+ void PlayHapticMonotone(
unsigned int duration
);
/**
* @copydoc Dali::FeedbackPlugin::StopHaptic()
/**
* @copydoc Dali::FeedbackPlugin::StopHaptic()
@@
-72,27
+60,21
@@
public: // FeedbackPlugin overrides
/**
* @copydoc Dali::FeedbackPlugin::PlaySound()
*/
/**
* @copydoc Dali::FeedbackPlugin::PlaySound()
*/
- int PlaySound(
const std::string& fileName
);
+ int PlaySound(
const std::string& fileName
);
/**
* @copydoc Dali::FeedbackPlugin::StopSound()
*/
/**
* @copydoc Dali::FeedbackPlugin::StopSound()
*/
- void StopSound(
int handle
);
+ void StopSound(
int handle
);
/**
* @copydoc Dali::FeedbackPlugin::PlayFeedbackPattern()
*/
/**
* @copydoc Dali::FeedbackPlugin::PlayFeedbackPattern()
*/
- void PlayFeedbackPattern( int type, int pattern );
-
-private:
-
- haptic_device_h mDeviceHandle;
-
- bool mHapticInitialized;
+ void PlayFeedbackPattern(int type, int pattern);
};
};
-}
// namespace Plugin
+} // namespace Plugin
-}
// namespace Dali
+} // namespace Dali
-#endif //
__FEEDBACK_PLUGIN_H__
+#endif //
FEEDBACK_PLUGIN_H