diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/emotion/Emotion.h | 193 | ||||
| -rw-r--r-- | src/lib/emotion/efl_canvas_video.eo | 8 | ||||
| -rw-r--r-- | src/lib/emotion/efl_canvas_video_eo.legacy.c | 4 | ||||
| -rw-r--r-- | src/lib/emotion/efl_canvas_video_eo.legacy.h | 4 | ||||
| -rw-r--r-- | src/lib/emotion/emotion_api.h | 34 | ||||
| -rw-r--r-- | src/lib/emotion/emotion_main.c | 18 | ||||
| -rw-r--r-- | src/lib/emotion/emotion_modules.c | 4 | ||||
| -rw-r--r-- | src/lib/emotion/emotion_modules.h | 89 | ||||
| -rw-r--r-- | src/lib/emotion/emotion_smart.c | 178 | ||||
| -rw-r--r-- | src/lib/emotion/emotion_webcam.c | 14 | ||||
| -rw-r--r-- | src/lib/emotion/meson.build | 3 |
11 files changed, 265 insertions, 284 deletions
diff --git a/src/lib/emotion/Emotion.h b/src/lib/emotion/Emotion.h index 5f68c09fa7..b4495c12f2 100644 --- a/src/lib/emotion/Emotion.h +++ b/src/lib/emotion/Emotion.h @@ -93,31 +93,7 @@ #include <Evas.h> #include <Efl_Config.h> -#ifdef EAPI -# undef EAPI -#endif - -#ifdef _WIN32 -# ifdef EFL_BUILD -# ifdef DLL_EXPORT -# define EAPI __declspec(dllexport) -# else -# define EAPI -# endif -# else -# define EAPI __declspec(dllimport) -# endif -#else -# ifdef __GNUC__ -# if __GNUC__ >= 4 -# define EAPI __attribute__ ((visibility("default"))) -# else -# define EAPI -# endif -# else -# define EAPI -# endif -#endif +#include <emotion_api.h> #ifdef __cplusplus extern "C" { @@ -282,7 +258,7 @@ typedef struct _Emotion_Version int revision; /** < git revision (0 if a proper release or the git revision number Emotion is built from) */ } Emotion_Version; -EAPI extern Emotion_Version *emotion_version; +EMOTION_API extern Emotion_Version *emotion_version; /* api calls available */ @@ -371,14 +347,14 @@ EAPI extern Emotion_Version *emotion_version; * Initialise needed libraries like eina ecore eet * Initialise needed modules like webcam */ -EAPI Eina_Bool emotion_init(void); +EMOTION_API Eina_Bool emotion_init(void); /** * @brief Shutdown Emotion library * * Proper shutdown of all loaded modules and initialised libraries. */ -EAPI Eina_Bool emotion_shutdown(void); +EMOTION_API Eina_Bool emotion_shutdown(void); /** * @brief Add an emotion object to the canvas. @@ -405,7 +381,7 @@ EAPI Eina_Bool emotion_shutdown(void); * * @ingroup Emotion_Init */ -EAPI Evas_Object *emotion_object_add (Evas *evas); +EMOTION_API Evas_Object *emotion_object_add (Evas *evas); /** * @brief Set borders for the emotion object. @@ -435,7 +411,7 @@ EAPI Evas_Object *emotion_object_add (Evas *evas); * * @ingroup Emotion_Video */ -EAPI void emotion_object_border_set(Evas_Object *obj, int l, int r, int t, int b); +EMOTION_API void emotion_object_border_set(Evas_Object *obj, int l, int r, int t, int b); /** * @brief Get the borders set for the emotion object. @@ -450,7 +426,7 @@ EAPI void emotion_object_border_set(Evas_Object *obj, int l, int r, int t, int b * * @ingroup Emotion_Video */ -EAPI void emotion_object_border_get(const Evas_Object *obj, int *l, int *r, int *t, int *b); +EMOTION_API void emotion_object_border_get(const Evas_Object *obj, int *l, int *r, int *t, int *b); /** * @brief Set a color for the background rectangle of this emotion object. @@ -471,7 +447,7 @@ EAPI void emotion_object_border_get(const Evas_Object *obj, int *l, int *r, int * * @ingroup Emotion_Video */ -EAPI void emotion_object_bg_color_set(Evas_Object *obj, int r, int g, int b, int a); +EMOTION_API void emotion_object_bg_color_set(Evas_Object *obj, int r, int g, int b, int a); /** * @brief Get the background color set for the emotion object. @@ -486,7 +462,7 @@ EAPI void emotion_object_bg_color_set(Evas_Object *obj, int r, int g, int b, int * * @ingroup Emotion_Video */ -EAPI void emotion_object_bg_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a); +EMOTION_API void emotion_object_bg_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a); /** * @brief Set whether emotion should keep the aspect ratio of the video. @@ -530,7 +506,7 @@ EAPI void emotion_object_bg_color_get(const Evas_Object *obj, int *r, int *g, in * * @ingroup Emotion_Video */ -EAPI void emotion_object_keep_aspect_set(Evas_Object *obj, Emotion_Aspect a); +EMOTION_API void emotion_object_keep_aspect_set(Evas_Object *obj, Emotion_Aspect a); /** * @brief Get the current emotion aspect ratio policy. @@ -543,7 +519,7 @@ EAPI void emotion_object_keep_aspect_set(Evas_Object *obj, Emotion_Aspect a); * * @ingroup Emotion_Video */ -EAPI Emotion_Aspect emotion_object_keep_aspect_get(const Evas_Object *obj); +EMOTION_API Emotion_Aspect emotion_object_keep_aspect_get(const Evas_Object *obj); /** * @brief Set the file to be played in the Emotion object. @@ -574,7 +550,7 @@ EAPI Emotion_Aspect emotion_object_keep_aspect_get(const Evas_Object *obj); * * @ingroup Emotion_Init */ -EAPI Eina_Bool emotion_object_file_set (Evas_Object *obj, const char *filename); +EMOTION_API Eina_Bool emotion_object_file_set (Evas_Object *obj, const char *filename); /** * @brief Get the filename of the file associated with the emotion object. @@ -592,7 +568,7 @@ EAPI Eina_Bool emotion_object_file_set (Evas_Object *obj, const * * @ingroup Emotion_Init */ -EAPI const char *emotion_object_file_get (const Evas_Object *obj); +EMOTION_API const char *emotion_object_file_get (const Evas_Object *obj); /** * @defgroup Emotion_Play Play control functions * @ingroup Emotion @@ -609,14 +585,14 @@ EAPI const char *emotion_object_file_get (const Evas_Object *obj); * This functions sets the currently playing status of the video. Using this * function to play or pause the video doesn't alter it's current position. */ -EAPI void emotion_object_play_set (Evas_Object *obj, Eina_Bool play); +EMOTION_API void emotion_object_play_set (Evas_Object *obj, Eina_Bool play); /** * @brief Get play/pause state of the media file. * * @param obj The emotion object from which the state will be retrieved. * @return EINA_TRUE if playing. EINA_FALSE if not playing. */ -EAPI Eina_Bool emotion_object_play_get (const Evas_Object *obj); +EMOTION_API Eina_Bool emotion_object_play_get (const Evas_Object *obj); /** * @brief Set the position in the media file. * @@ -629,7 +605,7 @@ EAPI Eina_Bool emotion_object_play_get (const Evas_Object *obj); * * @see emotion_object_seekable_get */ -EAPI void emotion_object_position_set (Evas_Object *obj, double sec); +EMOTION_API void emotion_object_position_set (Evas_Object *obj, double sec); /** * @brief Get the position in the media file. * @@ -639,7 +615,7 @@ EAPI void emotion_object_position_set (Evas_Object *obj, double * The position is returned as the number of seconds since the beginning of the * media file. */ -EAPI double emotion_object_position_get (const Evas_Object *obj); +EMOTION_API double emotion_object_position_get (const Evas_Object *obj); /** * @brief Get the percentual size of the buffering cache. @@ -655,7 +631,7 @@ EAPI double emotion_object_position_get (const Evas_Object *obj); * * @warning Generic backend don't implement this (will return 1.0). */ -EAPI double emotion_object_buffer_size_get (const Evas_Object *obj); +EMOTION_API double emotion_object_buffer_size_get (const Evas_Object *obj); /** * @brief Get whether the media file is seekable. @@ -664,7 +640,7 @@ EAPI double emotion_object_buffer_size_get (const Evas_Object *obj); * retrieved. * @return EINA_TRUE if the media file is seekable, EINA_FALSE otherwise. */ -EAPI Eina_Bool emotion_object_seekable_get (const Evas_Object *obj); +EMOTION_API Eina_Bool emotion_object_seekable_get (const Evas_Object *obj); /** * @brief Get the length of play for the media file. * @@ -676,7 +652,7 @@ EAPI Eina_Bool emotion_object_seekable_get (const Evas_Object *obj); * @warning This will return 0 if called before the "length_change" signal has, * been emitted. */ -EAPI double emotion_object_play_length_get (const Evas_Object *obj); +EMOTION_API double emotion_object_play_length_get (const Evas_Object *obj); /** * @brief Set the play speed of the media file. @@ -690,7 +666,7 @@ EAPI double emotion_object_play_length_get (const Evas_Object *obj); * @warning The only backend that implements this is the experimental VLC * backend. */ -EAPI void emotion_object_play_speed_set (Evas_Object *obj, double speed); +EMOTION_API void emotion_object_play_speed_set (Evas_Object *obj, double speed); /** * @brief Get the play speed of the media file. * @@ -699,7 +675,7 @@ EAPI void emotion_object_play_speed_set (Evas_Object *obj, double * * @see emotion_object_play_speed_set */ -EAPI double emotion_object_play_speed_get (const Evas_Object *obj); +EMOTION_API double emotion_object_play_speed_get (const Evas_Object *obj); /** * @brief Get how much of the file has been played. * @@ -709,7 +685,7 @@ EAPI double emotion_object_play_speed_get (const Evas_Object *obj); * @warning Don't change of free the returned string. * @warning gstreamer xine backends don't implement this(will return NULL). */ -EAPI const char *emotion_object_progress_info_get (const Evas_Object *obj); +EMOTION_API const char *emotion_object_progress_info_get (const Evas_Object *obj); /** * @brief Get how much of the file has been played. * @@ -721,12 +697,12 @@ EAPI const char *emotion_object_progress_info_get (const Evas_Object *obj); * * @warning gstreamer xine backends don't implement this(will return 0). */ -EAPI double emotion_object_progress_status_get (const Evas_Object *obj); +EMOTION_API double emotion_object_progress_status_get (const Evas_Object *obj); /** * @} */ -EAPI Eina_Bool emotion_object_video_handled_get (const Evas_Object *obj); -EAPI Eina_Bool emotion_object_audio_handled_get (const Evas_Object *obj); +EMOTION_API Eina_Bool emotion_object_video_handled_get (const Evas_Object *obj); +EMOTION_API Eina_Bool emotion_object_audio_handled_get (const Evas_Object *obj); /** * @brief Retrieve the video aspect ratio of the media file loaded. @@ -809,7 +785,7 @@ EAPI Eina_Bool emotion_object_audio_handled_get (const Evas_Object *obj); * * @ingroup Emotion_Video */ -EAPI double emotion_object_ratio_get (const Evas_Object *obj); +EMOTION_API double emotion_object_ratio_get (const Evas_Object *obj); /** * @brief Retrieve the video size of the loaded file. @@ -833,7 +809,7 @@ EAPI double emotion_object_ratio_get (const Evas_Object *obj); * * @ingroup Emotion_Video */ -EAPI void emotion_object_size_get (const Evas_Object *obj, int *iw, int *ih); +EMOTION_API void emotion_object_size_get (const Evas_Object *obj, int *iw, int *ih); /** * @brief Sets whether to use of high-quality image scaling algorithm @@ -850,7 +826,7 @@ EAPI void emotion_object_size_get (const Evas_Object *obj, * * @ingroup Emotion_Video */ -EAPI void emotion_object_smooth_scale_set (Evas_Object *obj, Eina_Bool smooth); +EMOTION_API void emotion_object_smooth_scale_set (Evas_Object *obj, Eina_Bool smooth); /** * @brief Gets whether the high-quality image scaling algorithm @@ -863,7 +839,7 @@ EAPI void emotion_object_smooth_scale_set (Evas_Object *obj, Eina_B * * @ingroup Emotion_Video */ -EAPI Eina_Bool emotion_object_smooth_scale_get (const Evas_Object *obj); +EMOTION_API Eina_Bool emotion_object_smooth_scale_get (const Evas_Object *obj); /** * @brief Send an Emotion Event to an Evas object @@ -873,7 +849,7 @@ EAPI Eina_Bool emotion_object_smooth_scale_get (const Evas_Object *obj); * * @see Emotion_Event */ -EAPI void emotion_object_event_simple_send (Evas_Object *obj, Emotion_Event ev); +EMOTION_API void emotion_object_event_simple_send (Evas_Object *obj, Emotion_Event ev); /** * @brief Set the audio volume. @@ -893,7 +869,7 @@ EAPI void emotion_object_event_simple_send (Evas_Object *obj, Emotio * * @ingroup Emotion_Audio */ -EAPI void emotion_object_audio_volume_set (Evas_Object *obj, double vol); +EMOTION_API void emotion_object_audio_volume_set (Evas_Object *obj, double vol); /** * @brief Get the audio volume. @@ -908,7 +884,7 @@ EAPI void emotion_object_audio_volume_set (Evas_Object *obj, double * * @ingroup Emotion_Audio */ -EAPI double emotion_object_audio_volume_get (const Evas_Object *obj); +EMOTION_API double emotion_object_audio_volume_get (const Evas_Object *obj); /** * @brief Set the mute audio option for this object. @@ -926,7 +902,7 @@ EAPI double emotion_object_audio_volume_get (const Evas_Object *obj); * * @ingroup Emotion_Audio */ -EAPI void emotion_object_audio_mute_set (Evas_Object *obj, Eina_Bool mute); +EMOTION_API void emotion_object_audio_mute_set (Evas_Object *obj, Eina_Bool mute); /** * @brief Get the mute audio option of this object. @@ -941,11 +917,11 @@ EAPI void emotion_object_audio_mute_set (Evas_Object *obj, Eina_B * * @ingroup Emotion_Audio */ -EAPI Eina_Bool emotion_object_audio_mute_get (const Evas_Object *obj); -EAPI int emotion_object_audio_channel_count (const Evas_Object *obj); -EAPI const char *emotion_object_audio_channel_name_get(const Evas_Object *obj, int channel); -EAPI void emotion_object_audio_channel_set (Evas_Object *obj, int channel); -EAPI int emotion_object_audio_channel_get (const Evas_Object *obj); +EMOTION_API Eina_Bool emotion_object_audio_mute_get (const Evas_Object *obj); +EMOTION_API int emotion_object_audio_channel_count (const Evas_Object *obj); +EMOTION_API const char *emotion_object_audio_channel_name_get(const Evas_Object *obj, int channel); +EMOTION_API void emotion_object_audio_channel_set (Evas_Object *obj, int channel); +EMOTION_API int emotion_object_audio_channel_get (const Evas_Object *obj); /** * @brief Set the mute video option for this object. @@ -963,7 +939,7 @@ EAPI int emotion_object_audio_channel_get (const Evas_Object *obj); * * @ingroup Emotion_Video */ -EAPI void emotion_object_video_mute_set (Evas_Object *obj, Eina_Bool mute); +EMOTION_API void emotion_object_video_mute_set (Evas_Object *obj, Eina_Bool mute); /** * @brief Get the mute video option of this object. @@ -978,7 +954,7 @@ EAPI void emotion_object_video_mute_set (Evas_Object *obj, Eina_B * * @ingroup Emotion_Video */ -EAPI Eina_Bool emotion_object_video_mute_get (const Evas_Object *obj); +EMOTION_API Eina_Bool emotion_object_video_mute_get (const Evas_Object *obj); /** * @brief Set the video's subtitle file path. @@ -994,7 +970,7 @@ EAPI Eina_Bool emotion_object_video_mute_get (const Evas_Object *obj); * @ingroup Emotion_Video * @since 1.8 */ -EAPI void emotion_object_video_subtitle_file_set (Evas_Object *obj, const char *filepath); +EMOTION_API void emotion_object_video_subtitle_file_set (Evas_Object *obj, const char *filepath); /** * @brief Get the video's subtitle file path. @@ -1010,7 +986,7 @@ EAPI void emotion_object_video_subtitle_file_set (Evas_Object *obj, cons * @ingroup Emotion_Video * @since 1.8 */ -EAPI const char *emotion_object_video_subtitle_file_get (const Evas_Object *obj); +EMOTION_API const char *emotion_object_video_subtitle_file_get (const Evas_Object *obj); /** * @brief Get the number of available video channel @@ -1022,7 +998,7 @@ EAPI const char *emotion_object_video_subtitle_file_get (const Evas_Object *ob * * @ingroup Emotion_Video */ -EAPI int emotion_object_video_channel_count (const Evas_Object *obj); +EMOTION_API int emotion_object_video_channel_count (const Evas_Object *obj); /** * @brief Get the name of a given video channel @@ -1035,7 +1011,7 @@ EAPI int emotion_object_video_channel_count (const Evas_Object *obj); * * @ingroup Emotion_Video */ -EAPI const char *emotion_object_video_channel_name_get(const Evas_Object *obj, int channel); +EMOTION_API const char *emotion_object_video_channel_name_get(const Evas_Object *obj, int channel); /** * @brief Set the channel for a given video object @@ -1045,7 +1021,7 @@ EAPI const char *emotion_object_video_channel_name_get(const Evas_Object *obj, * * @ingroup Emotion_Video */ -EAPI void emotion_object_video_channel_set (Evas_Object *obj, int channel); +EMOTION_API void emotion_object_video_channel_set (Evas_Object *obj, int channel); /** * @brief Get the channel for a given video object @@ -1055,18 +1031,18 @@ EAPI void emotion_object_video_channel_set (Evas_Object *obj, int ch * * @ingroup Emotion_Video */ -EAPI int emotion_object_video_channel_get (const Evas_Object *obj); -EAPI void emotion_object_spu_mute_set (Evas_Object *obj, Eina_Bool mute); -EAPI Eina_Bool emotion_object_spu_mute_get (const Evas_Object *obj); -EAPI int emotion_object_spu_channel_count (const Evas_Object *obj); -EAPI const char *emotion_object_spu_channel_name_get (const Evas_Object *obj, int channel); -EAPI void emotion_object_spu_channel_set (Evas_Object *obj, int channel); -EAPI int emotion_object_spu_channel_get (const Evas_Object *obj); -EAPI int emotion_object_chapter_count (const Evas_Object *obj); -EAPI void emotion_object_chapter_set (Evas_Object *obj, int chapter); -EAPI int emotion_object_chapter_get (const Evas_Object *obj); -EAPI const char *emotion_object_chapter_name_get (const Evas_Object *obj, int chapter); -EAPI void emotion_object_eject (Evas_Object *obj); +EMOTION_API int emotion_object_video_channel_get (const Evas_Object *obj); +EMOTION_API void emotion_object_spu_mute_set (Evas_Object *obj, Eina_Bool mute); +EMOTION_API Eina_Bool emotion_object_spu_mute_get (const Evas_Object *obj); +EMOTION_API int emotion_object_spu_channel_count (const Evas_Object *obj); +EMOTION_API const char *emotion_object_spu_channel_name_get (const Evas_Object *obj, int channel); +EMOTION_API void emotion_object_spu_channel_set (Evas_Object *obj, int channel); +EMOTION_API int emotion_object_spu_channel_get (const Evas_Object *obj); +EMOTION_API int emotion_object_chapter_count (const Evas_Object *obj); +EMOTION_API void emotion_object_chapter_set (Evas_Object *obj, int chapter); +EMOTION_API int emotion_object_chapter_get (const Evas_Object *obj); +EMOTION_API const char *emotion_object_chapter_name_get (const Evas_Object *obj, int chapter); +EMOTION_API void emotion_object_eject (Evas_Object *obj); /** * @brief Get the dvd title from this emotion object. @@ -1080,11 +1056,11 @@ EAPI void emotion_object_eject (Evas_Object *obj); * * @ingroup Emotion_Info */ -EAPI const char *emotion_object_title_get (const Evas_Object *obj); -EAPI const char *emotion_object_ref_file_get (const Evas_Object *obj); -EAPI int emotion_object_ref_num_get (const Evas_Object *obj); -EAPI int emotion_object_spu_button_count_get (const Evas_Object *obj); -EAPI int emotion_object_spu_button_get (const Evas_Object *obj); +EMOTION_API const char *emotion_object_title_get (const Evas_Object *obj); +EMOTION_API const char *emotion_object_ref_file_get (const Evas_Object *obj); +EMOTION_API int emotion_object_ref_num_get (const Evas_Object *obj); +EMOTION_API int emotion_object_spu_button_count_get (const Evas_Object *obj); +EMOTION_API int emotion_object_spu_button_get (const Evas_Object *obj); /** * @brief Retrieve meta information from this file being played. @@ -1106,7 +1082,7 @@ EAPI int emotion_object_spu_button_get (const Evas_Object *obj); * * @ingroup Emotion_Info */ -EAPI const char *emotion_object_meta_info_get (const Evas_Object *obj, Emotion_Meta_Info meta); +EMOTION_API const char *emotion_object_meta_info_get (const Evas_Object *obj, Emotion_Meta_Info meta); /** * @brief Set the visualization to be used with this object. @@ -1125,7 +1101,7 @@ EAPI const char *emotion_object_meta_info_get (const Evas_Object *obj, * * @ingroup Emotion_Visualization */ -EAPI void emotion_object_vis_set (Evas_Object *obj, Emotion_Vis visualization); +EMOTION_API void emotion_object_vis_set (Evas_Object *obj, Emotion_Vis visualization); /** * @brief Get the type of visualization in use by this emotion object. @@ -1142,7 +1118,7 @@ EAPI void emotion_object_vis_set (Evas_Object *obj, Emotio * * @ingroup Emotion_Visualization */ -EAPI Emotion_Vis emotion_object_vis_get (const Evas_Object *obj); +EMOTION_API Emotion_Vis emotion_object_vis_get (const Evas_Object *obj); /** * @brief Query whether a type of visualization is supported by this object. @@ -1160,7 +1136,7 @@ EAPI Emotion_Vis emotion_object_vis_get (const Evas_Object *obj); * * @ingroup Emotion_Visualization */ -EAPI Eina_Bool emotion_object_vis_supported (const Evas_Object *obj, Emotion_Vis visualization); +EMOTION_API Eina_Bool emotion_object_vis_supported (const Evas_Object *obj, Emotion_Vis visualization); /** * @brief Raise priority of an object so it will have a priviledged access to hardware resources. @@ -1180,7 +1156,7 @@ EAPI Eina_Bool emotion_object_vis_supported (const Evas_Object *obj, * * @ingroup Emotion_Ressource */ -EAPI void emotion_object_priority_set(Evas_Object *obj, Eina_Bool priority); +EMOTION_API void emotion_object_priority_set(Evas_Object *obj, Eina_Bool priority); /** * @brief Get the actual priority of an object. @@ -1195,7 +1171,7 @@ EAPI void emotion_object_priority_set(Evas_Object *obj, Eina_Bool priori * * @ingroup Emotion_Ressource */ -EAPI Eina_Bool emotion_object_priority_get(const Evas_Object *obj); +EMOTION_API Eina_Bool emotion_object_priority_get(const Evas_Object *obj); /** * @brief Change the state of an object pipeline. @@ -1212,7 +1188,7 @@ EAPI Eina_Bool emotion_object_priority_get(const Evas_Object *obj); * * @ingroup Emotion_Ressource */ -EAPI void emotion_object_suspend_set(Evas_Object *obj, Emotion_Suspend state); +EMOTION_API void emotion_object_suspend_set(Evas_Object *obj, Emotion_Suspend state); /** * @brief Get the current state of the pipeline @@ -1225,7 +1201,7 @@ EAPI void emotion_object_suspend_set(Evas_Object *obj, Emotion_Suspend s * * @ingroup Emotion_Ressource */ -EAPI Emotion_Suspend emotion_object_suspend_get(Evas_Object *obj); +EMOTION_API Emotion_Suspend emotion_object_suspend_get(Evas_Object *obj); /** * @brief Load the last known position if available @@ -1241,7 +1217,7 @@ EAPI Emotion_Suspend emotion_object_suspend_get(Evas_Object *obj); * * @ingroup Emotion_Info */ -EAPI void emotion_object_last_position_load(Evas_Object *obj); +EMOTION_API void emotion_object_last_position_load(Evas_Object *obj); /** * @brief Save the lastest position if possible @@ -1257,7 +1233,7 @@ EAPI void emotion_object_last_position_load(Evas_Object *obj); * * @ingroup Emotion_Info */ -EAPI void emotion_object_last_position_save(Evas_Object *obj); +EMOTION_API void emotion_object_last_position_save(Evas_Object *obj); /** * @brief Do we have a chance to play that file @@ -1269,7 +1245,7 @@ EAPI void emotion_object_last_position_save(Evas_Object *obj); * * @see emotion_object_extension_may_play_get() */ -EAPI Eina_Bool emotion_object_extension_may_play_fast_get(const char *file); +EMOTION_API Eina_Bool emotion_object_extension_may_play_fast_get(const char *file); /** * @brief Do we have a chance to play that file @@ -1281,7 +1257,7 @@ EAPI Eina_Bool emotion_object_extension_may_play_fast_get(const char *file); * * @see emotion_object_extension_may_play_fast_get() */ -EAPI Eina_Bool emotion_object_extension_may_play_get(const char *file); +EMOTION_API Eina_Bool emotion_object_extension_may_play_get(const char *file); /** * @brief Get the actual image object that contains the pixels of the video stream @@ -1292,7 +1268,7 @@ EAPI Eina_Bool emotion_object_extension_may_play_get(const char *file); * * @see emotion_object_image_get() */ -EAPI Evas_Object *emotion_object_image_get(const Evas_Object *obj); +EMOTION_API Evas_Object *emotion_object_image_get(const Evas_Object *obj); /** * @defgroup Emotion_Webcam API available for accessing webcam @@ -1301,9 +1277,9 @@ EAPI Evas_Object *emotion_object_image_get(const Evas_Object *obj); typedef struct _Emotion_Webcam Emotion_Webcam; /**< Webcam description */ -EAPI extern int EMOTION_WEBCAM_UPDATE; /**< Ecore_Event triggered when a new webcam is plugged or unplugged */ -EAPI extern int EMOTION_WEBCAM_ADD; /**< Ecore_Event triggered when a new webcam is plugged in @since 1.8*/ -EAPI extern int EMOTION_WEBCAM_DEL; /**< Ecore_Event triggered when a webcam is unplugged @since 1.8 */ +EMOTION_API extern int EMOTION_WEBCAM_UPDATE; /**< Ecore_Event triggered when a new webcam is plugged or unplugged */ +EMOTION_API extern int EMOTION_WEBCAM_ADD; /**< Ecore_Event triggered when a new webcam is plugged in @since 1.8*/ +EMOTION_API extern int EMOTION_WEBCAM_DEL; /**< Ecore_Event triggered when a webcam is unplugged @since 1.8 */ /** * @brief Get a list of active and available webcam @@ -1315,7 +1291,7 @@ EAPI extern int EMOTION_WEBCAM_DEL; /**< Ecore_Event triggered when a webcam is * * @ingroup Emotion_Webcam */ -EAPI const Eina_List *emotion_webcams_get(void); +EMOTION_API const Eina_List *emotion_webcams_get(void); /** * @brief Get the human understandable name of a Webcam @@ -1325,7 +1301,7 @@ EAPI const Eina_List *emotion_webcams_get(void); * * @ingroup Emotion_Webcam */ -EAPI const char *emotion_webcam_name_get(const Emotion_Webcam *ew); +EMOTION_API const char *emotion_webcam_name_get(const Emotion_Webcam *ew); /** * @brief Get the uri of a Webcam that will be understood by emotion @@ -1335,7 +1311,7 @@ EAPI const char *emotion_webcam_name_get(const Emotion_Webcam *ew); * * @ingroup Emotion_Webcam */ -EAPI const char *emotion_webcam_device_get(const Emotion_Webcam *ew); +EMOTION_API const char *emotion_webcam_device_get(const Emotion_Webcam *ew); /** * @brief Get the album artwork from file meta data tags. @@ -1349,7 +1325,7 @@ EAPI const char *emotion_webcam_device_get(const Emotion_Webcam *ew); * @since 1.19 */ -EAPI Evas_Object *emotion_file_meta_artwork_get(const Evas_Object *obj, const char *path, Emotion_Artwork_Info type); +EMOTION_API Evas_Object *emotion_file_meta_artwork_get(const Evas_Object *obj, const char *path, Emotion_Artwork_Info type); /** * @} */ @@ -1358,7 +1334,4 @@ EAPI Evas_Object *emotion_file_meta_artwork_get(const Evas_Object *obj, cons } #endif -#undef EAPI -#define EAPI - #endif diff --git a/src/lib/emotion/efl_canvas_video.eo b/src/lib/emotion/efl_canvas_video.eo index 0f2ffa7435..33549391a9 100644 --- a/src/lib/emotion/efl_canvas_video.eo +++ b/src/lib/emotion/efl_canvas_video.eo @@ -92,14 +92,14 @@ class @beta Efl.Canvas.Video extends Efl.Canvas.Group } /* FIXME: Need to be added: -EAPI double emotion_object_buffer_size_get (const Evas_Object *obj); -EAPI const char *emotion_object_progress_info_get (const Evas_Object *obj); +EMOTION_API double emotion_object_buffer_size_get (const Evas_Object *obj); +EMOTION_API const char *emotion_object_progress_info_get (const Evas_Object *obj); Everything starting from (needs to be added): -EAPI int emotion_object_audio_channel_count (const Evas_Object *obj); +EMOTION_API int emotion_object_audio_channel_count (const Evas_Object *obj); Should this be part of player or emotion object? -EAPI void emotion_object_event_simple_send (Evas_Object *obj, Emotion_Event ev); +EMOTION_API void emotion_object_event_simple_send (Evas_Object *obj, Emotion_Event ev); Deliberations: Should this really implement the image interface? diff --git a/src/lib/emotion/efl_canvas_video_eo.legacy.c b/src/lib/emotion/efl_canvas_video_eo.legacy.c index e7e0dcee67..987408dd7b 100644 --- a/src/lib/emotion/efl_canvas_video_eo.legacy.c +++ b/src/lib/emotion/efl_canvas_video_eo.legacy.c @@ -1,11 +1,11 @@ -EAPI void +EMOTION_API void emotion_object_module_option_set(Efl_Canvas_Video *obj, const char *opt, const char *val) { efl_canvas_video_option_set(obj, opt, val); } -EAPI Eina_Bool +EMOTION_API Eina_Bool emotion_object_init(Efl_Canvas_Video *obj, const char *module_filename) { return efl_canvas_video_engine_set(obj, module_filename); diff --git a/src/lib/emotion/efl_canvas_video_eo.legacy.h b/src/lib/emotion/efl_canvas_video_eo.legacy.h index 205c305aea..19a8a33270 100644 --- a/src/lib/emotion/efl_canvas_video_eo.legacy.h +++ b/src/lib/emotion/efl_canvas_video_eo.legacy.h @@ -29,7 +29,7 @@ typedef Eo Efl_Canvas_Video; * * @ingroup (null)_Group */ -EAPI void emotion_object_module_option_set(Efl_Canvas_Video *obj, const char *opt, const char *val); +EMOTION_API void emotion_object_module_option_set(Efl_Canvas_Video *obj, const char *opt, const char *val); /** * @brief Initializes an emotion object with the specified module. @@ -55,6 +55,6 @@ EAPI void emotion_object_module_option_set(Efl_Canvas_Video *obj, const char *op * * @ingroup (null)_Group */ -EAPI Eina_Bool emotion_object_init(Efl_Canvas_Video *obj, const char *module_filename); +EMOTION_API Eina_Bool emotion_object_init(Efl_Canvas_Video *obj, const char *module_filename); #endif diff --git a/src/lib/emotion/emotion_api.h b/src/lib/emotion/emotion_api.h new file mode 100644 index 0000000000..2a9f8e33cd --- /dev/null +++ b/src/lib/emotion/emotion_api.h @@ -0,0 +1,34 @@ +#ifndef _EFL_EMOTION_API_H +#define _EFL_EMOTION_API_H + +#ifdef EMOTION_API +#error EMOTION_API should not be already defined +#endif + +#ifdef _WIN32 +# ifndef EMOTION_STATIC +# ifdef EMOTION_BUILD +# define EMOTION_API __declspec(dllexport) +# else +# define EMOTION_API __declspec(dllimport) +# endif +# else +# define EMOTION_API +# endif +# define EMOTION_API_WEAK +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +# define EMOTION_API __attribute__ ((visibility("default"))) +# define EMOTION_API_WEAK __attribute__ ((weak)) +# else +# define EMOTION_API +# define EMOTION_API_WEAK +# endif +# else +# define EMOTION_API +# define EMOTION_API_WEAK +# endif +#endif + +#endif diff --git a/src/lib/emotion/emotion_main.c b/src/lib/emotion/emotion_main.c index f9ab316b09..8ad5877f70 100644 --- a/src/lib/emotion/emotion_main.c +++ b/src/lib/emotion/emotion_main.c @@ -20,7 +20,7 @@ static Emotion_Version _version = { VMAJ, VMIN, VMIC, VREV }; static int emotion_pending_objects = 0; static Eina_Lock emotion_pending_lock; -EAPI Emotion_Version *emotion_version = &_version; +EMOTION_API Emotion_Version *emotion_version = &_version; Eina_Prefix *_emotion_pfx = NULL; int _emotion_log_domain = -1; @@ -115,14 +115,14 @@ _emotion_object_extension_can_play_generic_get(const void *data EINA_UNUSED, con return EINA_FALSE; } -EAPI Eina_Bool +EMOTION_API Eina_Bool emotion_object_extension_may_play_fast_get(const char *file) { EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE); return _emotion_object_extension_can_play_generic_get(NULL, file); } -EAPI Eina_Bool +EMOTION_API Eina_Bool emotion_object_extension_may_play_get(const char *file) { const char *tmp; @@ -138,7 +138,7 @@ emotion_object_extension_may_play_get(const char *file) static int _emotion_init_count = 0; -EAPI Eina_Bool +EMOTION_API Eina_Bool emotion_init(void) { char buffer[PATH_MAX]; @@ -196,7 +196,7 @@ emotion_init(void) static int emotion_pendig_events = 0; -EAPI void +EMOTION_API void _emotion_pending_ecore_begin(void) { eina_lock_take(&emotion_pending_lock); @@ -204,7 +204,7 @@ _emotion_pending_ecore_begin(void) eina_lock_release(&emotion_pending_lock); } -EAPI void +EMOTION_API void _emotion_pending_ecore_end(void) { eina_lock_take(&emotion_pending_lock); @@ -212,7 +212,7 @@ _emotion_pending_ecore_end(void) eina_lock_release(&emotion_pending_lock); } -EAPI Eina_Bool +EMOTION_API Eina_Bool emotion_shutdown(void) { double start; @@ -272,7 +272,7 @@ emotion_shutdown(void) return EINA_TRUE; } -EAPI void +EMOTION_API void _emotion_pending_object_ref(void) { eina_lock_take(&emotion_pending_lock); @@ -280,7 +280,7 @@ _emotion_pending_object_ref(void) eina_lock_release(&emotion_pending_lock); } -EAPI void +EMOTION_API void _emotion_pending_object_unref(void) { eina_lock_take(&emotion_pending_lock); diff --git a/src/lib/emotion/emotion_modules.c b/src/lib/emotion/emotion_modules.c index e3ee96c3a6..0662556868 100644 --- a/src/lib/emotion/emotion_modules.c +++ b/src/lib/emotion/emotion_modules.c @@ -140,7 +140,7 @@ emotion_modules_shutdown(void) _emotion_modules_loaded = EINA_FALSE; } -EAPI Eina_Bool +EMOTION_API Eina_Bool _emotion_module_register(const Emotion_Engine *api) { Emotion_Engine_Registry_Entry *re; @@ -171,7 +171,7 @@ _emotion_module_register(const Emotion_Engine *api) return EINA_TRUE; } -EAPI Eina_Bool +EMOTION_API Eina_Bool _emotion_module_unregister(const Emotion_Engine *api) { Eina_List *n; diff --git a/src/lib/emotion/emotion_modules.h b/src/lib/emotion/emotion_modules.h index 8e41121796..3d05ff795c 100644 --- a/src/lib/emotion/emotion_modules.h +++ b/src/lib/emotion/emotion_modules.h @@ -3,31 +3,7 @@ #include "Emotion.h" -#ifdef EAPI -# undef EAPI -#endif - -#ifdef _WIN32 -# ifdef EFL_BUILD -# ifdef DLL_EXPORT -# define EAPI __declspec(dllexport) -# else -# define EAPI -# endif -# else -# define EAPI __declspec(dllimport) -# endif -#else -# ifdef __GNUC__ -# if __GNUC__ >= 4 -# define EAPI __attribute__ ((visibility("default"))) -# else -# define EAPI -# endif -# else -# define EAPI -# endif -#endif +#include <emotion_api.h> #define META_TRACK_TITLE 1 #define META_TRACK_ARTIST 2 @@ -132,38 +108,35 @@ struct _Emotion_Engine void * (*meta_artwork_get)(void *ef, Evas_Object *img, const char *path, Emotion_Artwork_Info type); }; -EAPI void *_emotion_video_get(const Evas_Object *obj); -EAPI void _emotion_frame_new(Evas_Object *obj); -EAPI void _emotion_video_pos_update(Evas_Object *obj, double pos, double len); -EAPI void _emotion_frame_resize(Evas_Object *obj, int w, int h, double ratio); -EAPI void _emotion_frame_refill(Evas_Object *obj, double w, double h); -EAPI void _emotion_decode_stop(Evas_Object *obj); -EAPI void _emotion_open_done(Evas_Object *obj); -EAPI void _emotion_playback_started(Evas_Object *obj); -EAPI void _emotion_playback_finished(Evas_Object *obj); -EAPI void _emotion_audio_level_change(Evas_Object *obj); -EAPI void _emotion_channels_change(Evas_Object *obj); -EAPI void _emotion_title_set(Evas_Object *obj, char *title); -EAPI void _emotion_progress_set(Evas_Object *obj, char *info, double stat); -EAPI void _emotion_file_ref_set(Evas_Object *obj, const char *file, int num); -EAPI void _emotion_spu_button_num_set(Evas_Object *obj, int num); -EAPI void _emotion_spu_button_set(Evas_Object *obj, int button); -EAPI void _emotion_seek_done(Evas_Object *obj); -EAPI void _emotion_image_reset(Evas_Object *obj); - -EAPI void _emotion_pending_object_ref(void); -EAPI void _emotion_pending_object_unref(void); - -EAPI void _emotion_pending_ecore_begin(void); -EAPI void _emotion_pending_ecore_end(void); - - -EAPI const char *emotion_webcam_custom_get(const char *device); - -EAPI Eina_Bool _emotion_module_register(const Emotion_Engine *api); -EAPI Eina_Bool _emotion_module_unregister(const Emotion_Engine *api); - -#undef EAPI -#define EAPI +EMOTION_API void *_emotion_video_get(const Evas_Object *obj); +EMOTION_API void _emotion_frame_new(Evas_Object *obj); +EMOTION_API void _emotion_video_pos_update(Evas_Object *obj, double pos, double len); +EMOTION_API void _emotion_frame_resize(Evas_Object *obj, int w, int h, double ratio); +EMOTION_API void _emotion_frame_refill(Evas_Object *obj, double w, double h); +EMOTION_API void _emotion_decode_stop(Evas_Object *obj); +EMOTION_API void _emotion_open_done(Evas_Object *obj); +EMOTION_API void _emotion_playback_started(Evas_Object *obj); +EMOTION_API void _emotion_playback_finished(Evas_Object *obj); +EMOTION_API void _emotion_audio_level_change(Evas_Object *obj); +EMOTION_API void _emotion_channels_change(Evas_Object *obj); +EMOTION_API void _emotion_title_set(Evas_Object *obj, char *title); +EMOTION_API void _emotion_progress_set(Evas_Object *obj, char *info, double stat); +EMOTION_API void _emotion_file_ref_set(Evas_Object *obj, const char *file, int num); +EMOTION_API void _emotion_spu_button_num_set(Evas_Object *obj, int num); +EMOTION_API void _emotion_spu_button_set(Evas_Object *obj, int button); +EMOTION_API void _emotion_seek_done(Evas_Object *obj); +EMOTION_API void _emotion_image_reset(Evas_Object *obj); + +EMOTION_API void _emotion_pending_object_ref(void); +EMOTION_API void _emotion_pending_object_unref(void); + +EMOTION_API void _emotion_pending_ecore_begin(void); +EMOTION_API void _emotion_pending_ecore_end(void); + + +EMOTION_API const char *emotion_webcam_custom_get(const char *device); + +EMOTION_API Eina_Bool _emotion_module_register(const Emotion_Engine *api); +EMOTION_API Eina_Bool _emotion_module_unregister(const Emotion_Engine *api); #endif diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c index 9f723e5bef..e8c22e912c 100644 --- a/src/lib/emotion/emotion_smart.c +++ b/src/lib/emotion/emotion_smart.c @@ -233,7 +233,7 @@ _clipper_position_size_update(Evas_Object *obj, int x, int y, int w, int h, int -EAPI Evas_Object * +EMOTION_API Evas_Object * emotion_object_add(Evas *evas) { evas = evas_find(evas); @@ -251,7 +251,7 @@ _efl_canvas_video_efl_object_constructor(Eo *obj, Efl_Canvas_Video_Data *pd EINA return obj; } -EAPI Evas_Object * +EMOTION_API Evas_Object * emotion_object_image_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); @@ -346,7 +346,7 @@ _efl_canvas_video_engine_set(Eo *obj, Efl_Canvas_Video_Data *pd, const char *eng return EINA_TRUE; } -EAPI Eina_Bool +EMOTION_API Eina_Bool emotion_object_file_set(Evas_Object *obj, const char *file) { return efl_file_simple_load(obj, file, NULL); @@ -439,7 +439,7 @@ _efl_canvas_video_efl_file_load(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) return 0; } -EAPI const char * +EMOTION_API const char * emotion_object_file_get(const Evas_Object *obj) { return efl_file_get(obj); @@ -574,7 +574,7 @@ _efl_canvas_video_aspect_border_apply(Evas_Object *obj, Efl_Canvas_Video_Data *s _emotion_aspect_borders_apply(obj, sd, w, h, iw, ih); } -EAPI void +EMOTION_API void emotion_object_border_set(Evas_Object *obj, int l, int r, int t, int b) { Efl_Canvas_Video_Data *sd; @@ -591,7 +591,7 @@ emotion_object_border_set(Evas_Object *obj, int l, int r, int t, int b) _efl_canvas_video_aspect_border_apply(obj, sd, w, h); } -EAPI void +EMOTION_API void emotion_object_border_get(const Evas_Object *obj, int *l, int *r, int *t, int *b) { Efl_Canvas_Video_Data *sd; @@ -603,7 +603,7 @@ emotion_object_border_get(const Evas_Object *obj, int *l, int *r, int *t, int *b *b = -sd->crop.b; } -EAPI void +EMOTION_API void emotion_object_bg_color_set(Evas_Object *obj, int r, int g, int b, int a) { Efl_Canvas_Video_Data *sd; @@ -612,7 +612,7 @@ emotion_object_bg_color_set(Evas_Object *obj, int r, int g, int b, int a) evas_object_color_set(sd->bg, r, g, b, a); } -EAPI void +EMOTION_API void emotion_object_bg_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a) { Efl_Canvas_Video_Data *sd; @@ -621,7 +621,7 @@ emotion_object_bg_color_get(const Evas_Object *obj, int *r, int *g, int *b, int evas_object_color_get(sd->bg, r, g, b, a); } -EAPI void +EMOTION_API void emotion_object_keep_aspect_set(Evas_Object *obj, Emotion_Aspect a) { Efl_Canvas_Video_Data *sd; @@ -635,7 +635,7 @@ emotion_object_keep_aspect_set(Evas_Object *obj, Emotion_Aspect a) _efl_canvas_video_aspect_border_apply(obj, sd, w, h); } -EAPI Emotion_Aspect +EMOTION_API Emotion_Aspect emotion_object_keep_aspect_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -644,7 +644,7 @@ emotion_object_keep_aspect_get(const Evas_Object *obj) return sd->aspect; } -EAPI void +EMOTION_API void emotion_object_play_set(Evas_Object *obj, Eina_Bool play) { /* avoid calling playback_position_set(0) for legacy */ @@ -705,7 +705,7 @@ _efl_canvas_video_efl_player_paused_set(Eo *obj, Efl_Canvas_Video_Data *sd, Eina return EINA_TRUE; } -EAPI Eina_Bool +EMOTION_API Eina_Bool emotion_object_play_get(const Evas_Object *obj) { return efl_player_playing_get(obj) && !efl_player_paused_get(obj); @@ -726,7 +726,7 @@ _efl_canvas_video_efl_player_paused_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vi return sd->pause; } -EAPI void +EMOTION_API void emotion_object_position_set(Evas_Object *obj, double sec) { efl_player_playback_position_set(obj, sec); @@ -751,7 +751,7 @@ _efl_canvas_video_efl_player_playback_position_set(Eo *obj, Efl_Canvas_Video_Dat sd->job = ecore_job_add(_pos_set_job, obj); } -EAPI double +EMOTION_API double emotion_object_position_get(const Evas_Object *obj) { return efl_player_playback_position_get(obj); @@ -765,7 +765,7 @@ _efl_canvas_video_efl_player_playback_position_get(const Eo *obj EINA_UNUSED, Ef return sd->pos; } -EAPI double +EMOTION_API double emotion_object_buffer_size_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -775,13 +775,13 @@ emotion_object_buffer_size_get(const Evas_Object *obj) return emotion_engine_instance_buffer_size_get(sd->engine_instance); } -EAPI Eina_Bool +EMOTION_API Eina_Bool emotion_object_seekable_get(const Evas_Object *obj) { return efl_playable_seekable_get(obj); } -EAPI Eina_Bool +EMOTION_API Eina_Bool emotion_object_video_handled_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -791,7 +791,7 @@ emotion_object_video_handled_get(const Evas_Object *obj) return emotion_engine_instance_video_handled(sd->engine_instance); } -EAPI Eina_Bool +EMOTION_API Eina_Bool emotion_object_audio_handled_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -801,13 +801,13 @@ emotion_object_audio_handled_get(const Evas_Object *obj) return emotion_engine_instance_audio_handled(sd->engine_instance); } -EAPI double +EMOTION_API double emotion_object_play_length_get(const Evas_Object *obj) { return efl_playable_length_get(obj); } -EAPI void +EMOTION_API void emotion_object_size_get(const Evas_Object *obj, int *iw, int *ih) { Eina_Size2D sz; @@ -824,7 +824,7 @@ _efl_canvas_video_efl_gfx_image_load_controller_load_size_get(const Eo *obj EINA return EINA_SIZE2D(sd->video.w, sd->video.h); } -EAPI void +EMOTION_API void emotion_object_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth) { efl_gfx_image_smooth_scale_set(obj, smooth); @@ -836,7 +836,7 @@ _efl_canvas_video_efl_gfx_image_smooth_scale_set(Eo *obj EINA_UNUSED, Efl_Canvas evas_object_image_smooth_scale_set(sd->obj, smooth); } -EAPI Eina_Bool +EMOTION_API Eina_Bool emotion_object_smooth_scale_get(const Evas_Object *obj) { return efl_gfx_image_smooth_scale_get(obj); @@ -848,7 +848,7 @@ _efl_canvas_video_efl_gfx_image_smooth_scale_get(const Eo *obj EINA_UNUSED, Efl_ return evas_object_image_smooth_scale_get(sd->obj); } -EAPI double +EMOTION_API double emotion_object_ratio_get(const Evas_Object *obj) { return efl_gfx_image_ratio_get(obj); @@ -864,7 +864,7 @@ _efl_canvas_video_efl_gfx_image_ratio_get(const Eo *obj EINA_UNUSED, Efl_Canvas_ /* * Send a control event to the DVD. */ -EAPI void +EMOTION_API void emotion_object_event_simple_send(Evas_Object *obj, Emotion_Event ev) { Efl_Canvas_Video_Data *sd; @@ -874,7 +874,7 @@ emotion_object_event_simple_send(Evas_Object *obj, Emotion_Event ev) emotion_engine_instance_event_feed(sd->engine_instance, ev); } -EAPI void +EMOTION_API void emotion_object_audio_volume_set(Evas_Object *obj, double vol) { efl_audio_control_volume_set(obj, vol); @@ -888,7 +888,7 @@ _efl_canvas_video_efl_audio_control_volume_set(Eo *obj EINA_UNUSED, Efl_Canvas_V emotion_engine_instance_audio_channel_volume_set(sd->engine_instance, vol); } -EAPI double +EMOTION_API double emotion_object_audio_volume_get(const Evas_Object *obj) { return efl_audio_control_volume_get(obj); @@ -901,7 +901,7 @@ _efl_canvas_video_efl_audio_control_volume_get(const Eo *obj EINA_UNUSED, Efl_Ca return emotion_engine_instance_audio_channel_volume_get(sd->engine_instance); } -EAPI void +EMOTION_API void emotion_object_audio_mute_set(Evas_Object *obj, Eina_Bool mute) { efl_audio_control_mute_set(obj, mute); @@ -915,7 +915,7 @@ _efl_canvas_video_efl_audio_control_mute_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vid emotion_engine_instance_audio_channel_mute_set(sd->engine_instance, mute); } -EAPI Eina_Bool +EMOTION_API Eina_Bool emotion_object_audio_mute_get(const Evas_Object *obj) { return efl_audio_control_mute_get(obj); @@ -928,7 +928,7 @@ _efl_canvas_video_efl_audio_control_mute_get(const Eo *obj EINA_UNUSED, Efl_Canv return emotion_engine_instance_audio_channel_mute_get(sd->engine_instance); } -EAPI int +EMOTION_API int emotion_object_audio_channel_count(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -938,7 +938,7 @@ emotion_object_audio_channel_count(const Evas_Object *obj) return emotion_engine_instance_audio_channel_count(sd->engine_instance); } -EAPI const char * +EMOTION_API const char * emotion_object_audio_channel_name_get(const Evas_Object *obj, int channel) { Efl_Canvas_Video_Data *sd; @@ -948,7 +948,7 @@ emotion_object_audio_channel_name_get(const Evas_Object *obj, int channel) return emotion_engine_instance_audio_channel_name_get(sd->engine_instance, channel); } -EAPI void +EMOTION_API void emotion_object_audio_channel_set(Evas_Object *obj, int channel) { Efl_Canvas_Video_Data *sd; @@ -959,7 +959,7 @@ emotion_object_audio_channel_set(Evas_Object *obj, int channel) emotion_engine_instance_audio_channel_set(sd->engine_instance, channel); } -EAPI int +EMOTION_API int emotion_object_audio_channel_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -969,7 +969,7 @@ emotion_object_audio_channel_get(const Evas_Object *obj) return emotion_engine_instance_audio_channel_get(sd->engine_instance); } -EAPI void +EMOTION_API void emotion_object_video_mute_set(Evas_Object *obj, Eina_Bool mute) { Efl_Canvas_Video_Data *sd; @@ -980,7 +980,7 @@ emotion_object_video_mute_set(Evas_Object *obj, Eina_Bool mute) emotion_engine_instance_video_channel_mute_set(sd->engine_instance, mute); } -EAPI Eina_Bool +EMOTION_API Eina_Bool emotion_object_video_mute_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -990,7 +990,7 @@ emotion_object_video_mute_get(const Evas_Object *obj) return emotion_engine_instance_video_channel_mute_get(sd->engine_instance); } -EAPI void +EMOTION_API void emotion_object_video_subtitle_file_set(Evas_Object *obj, const char *filepath) { Efl_Canvas_Video_Data *sd; @@ -1002,7 +1002,7 @@ emotion_object_video_subtitle_file_set(Evas_Object *obj, const char *filepath) emotion_engine_instance_video_subtitle_file_set(sd->engine_instance, filepath); } -EAPI const char * +EMOTION_API const char * emotion_object_video_subtitle_file_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1012,7 +1012,7 @@ emotion_object_video_subtitle_file_get(const Evas_Object *obj) return emotion_engine_instance_video_subtitle_file_get(sd->engine_instance); } -EAPI int +EMOTION_API int emotion_object_video_channel_count(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1022,7 +1022,7 @@ emotion_object_video_channel_count(const Evas_Object *obj) return emotion_engine_instance_video_channel_count(sd->engine_instance); } -EAPI const char * +EMOTION_API const char * emotion_object_video_channel_name_get(const Evas_Object *obj, int channel) { Efl_Canvas_Video_Data *sd; @@ -1032,7 +1032,7 @@ emotion_object_video_channel_name_get(const Evas_Object *obj, int channel) return emotion_engine_instance_video_channel_name_get(sd->engine_instance, channel); } -EAPI void +EMOTION_API void emotion_object_video_channel_set(Evas_Object *obj, int channel) { Efl_Canvas_Video_Data *sd; @@ -1043,7 +1043,7 @@ emotion_object_video_channel_set(Evas_Object *obj, int channel) emotion_engine_instance_video_channel_set(sd->engine_instance, channel); } -EAPI int +EMOTION_API int emotion_object_video_channel_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1053,7 +1053,7 @@ emotion_object_video_channel_get(const Evas_Object *obj) return emotion_engine_instance_video_channel_get(sd->engine_instance); } -EAPI void +EMOTION_API void emotion_object_spu_mute_set(Evas_Object *obj, Eina_Bool mute) { Efl_Canvas_Video_Data *sd; @@ -1064,7 +1064,7 @@ emotion_object_spu_mute_set(Evas_Object *obj, Eina_Bool mute) emotion_engine_instance_spu_channel_mute_set(sd->engine_instance, mute); } -EAPI Eina_Bool +EMOTION_API Eina_Bool emotion_object_spu_mute_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1074,7 +1074,7 @@ emotion_object_spu_mute_get(const Evas_Object *obj) return emotion_engine_instance_spu_channel_mute_get(sd->engine_instance); } -EAPI int +EMOTION_API int emotion_object_spu_channel_count(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1084,7 +1084,7 @@ emotion_object_spu_channel_count(const Evas_Object *obj) return emotion_engine_instance_spu_channel_count(sd->engine_instance); } -EAPI const char * +EMOTION_API const char * emotion_object_spu_channel_name_get(const Evas_Object *obj, int channel) { Efl_Canvas_Video_Data *sd; @@ -1094,7 +1094,7 @@ emotion_object_spu_channel_name_get(const Evas_Object *obj, int channel) return emotion_engine_instance_spu_channel_name_get(sd->engine_instance, channel); } -EAPI void +EMOTION_API void emotion_object_spu_channel_set(Evas_Object *obj, int channel) { Efl_Canvas_Video_Data *sd; @@ -1105,7 +1105,7 @@ emotion_object_spu_channel_set(Evas_Object *obj, int channel) emotion_engine_instance_spu_channel_set(sd->engine_instance, channel); } -EAPI int +EMOTION_API int emotion_object_spu_channel_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1115,7 +1115,7 @@ emotion_object_spu_channel_get(const Evas_Object *obj) return emotion_engine_instance_spu_channel_get(sd->engine_instance); } -EAPI int +EMOTION_API int emotion_object_chapter_count(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1125,7 +1125,7 @@ emotion_object_chapter_count(const Evas_Object *obj) return emotion_engine_instance_chapter_count(sd->engine_instance); } -EAPI void +EMOTION_API void emotion_object_chapter_set(Evas_Object *obj, int chapter) { Efl_Canvas_Video_Data *sd; @@ -1136,7 +1136,7 @@ emotion_object_chapter_set(Evas_Object *obj, int chapter) emotion_engine_instance_chapter_set(sd->engine_instance, chapter); } -EAPI int +EMOTION_API int emotion_object_chapter_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1146,7 +1146,7 @@ emotion_object_chapter_get(const Evas_Object *obj) return emotion_engine_instance_chapter_get(sd->engine_instance); } -EAPI const char * +EMOTION_API const char * emotion_object_chapter_name_get(const Evas_Object *obj, int chapter) { Efl_Canvas_Video_Data *sd; @@ -1156,7 +1156,7 @@ emotion_object_chapter_name_get(const Evas_Object *obj, int chapter) return emotion_engine_instance_chapter_name_get(sd->engine_instance, chapter); } -EAPI void +EMOTION_API void emotion_object_play_speed_set(Evas_Object *obj, double speed) { Efl_Canvas_Video_Data *sd; @@ -1167,7 +1167,7 @@ emotion_object_play_speed_set(Evas_Object *obj, double speed) emotion_engine_instance_speed_set(sd->engine_instance, speed); } -EAPI double +EMOTION_API double emotion_object_play_speed_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1177,7 +1177,7 @@ emotion_object_play_speed_get(const Evas_Object *obj) return emotion_engine_instance_speed_get(sd->engine_instance); } -EAPI void +EMOTION_API void emotion_object_eject(Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1187,7 +1187,7 @@ emotion_object_eject(Evas_Object *obj) emotion_engine_instance_eject(sd->engine_instance); } -EAPI const char * +EMOTION_API const char * emotion_object_title_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1196,7 +1196,7 @@ emotion_object_title_get(const Evas_Object *obj) return sd->title; } -EAPI const char * +EMOTION_API const char * emotion_object_progress_info_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1205,7 +1205,7 @@ emotion_object_progress_info_get(const Evas_Object *obj) return sd->progress.info; } -EAPI double +EMOTION_API double emotion_object_progress_status_get(const Evas_Object *obj) { return efl_player_playback_progress_get(obj); @@ -1239,7 +1239,7 @@ _efl_canvas_video_efl_playable_seekable_get(const Eo *obj EINA_UNUSED, Efl_Canva return emotion_engine_instance_seekable(sd->engine_instance); } -EAPI const char * +EMOTION_API const char * emotion_object_ref_file_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1248,7 +1248,7 @@ emotion_object_ref_file_get(const Evas_Object *obj) return sd->ref.file; } -EAPI int +EMOTION_API int emotion_object_ref_num_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1257,7 +1257,7 @@ emotion_object_ref_num_get(const Evas_Object *obj) return sd->ref.num; } -EAPI int +EMOTION_API int emotion_object_spu_button_count_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1266,7 +1266,7 @@ emotion_object_spu_button_count_get(const Evas_Object *obj) return sd->spu.button_num; } -EAPI int +EMOTION_API int emotion_object_spu_button_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1275,7 +1275,7 @@ emotion_object_spu_button_get(const Evas_Object *obj) return sd->spu.button; } -EAPI const char * +EMOTION_API const char * emotion_object_meta_info_get(const Evas_Object *obj, Emotion_Meta_Info meta) { Efl_Canvas_Video_Data *sd; @@ -1315,7 +1315,7 @@ emotion_object_meta_info_get(const Evas_Object *obj, Emotion_Meta_Info meta) } -EAPI Evas_Object * +EMOTION_API Evas_Object * emotion_file_meta_artwork_get(const Evas_Object *obj, const char *path, Emotion_Artwork_Info type) { Efl_Canvas_Video_Data *sd; @@ -1334,7 +1334,7 @@ emotion_file_meta_artwork_get(const Evas_Object *obj, const char *path, Emotion_ return result; } -EAPI void +EMOTION_API void emotion_object_vis_set(Evas_Object *obj, Emotion_Vis visualization) { Efl_Canvas_Video_Data *sd; @@ -1345,7 +1345,7 @@ emotion_object_vis_set(Evas_Object *obj, Emotion_Vis visualization) emotion_engine_instance_vis_set(sd->engine_instance, visualization); } -EAPI Emotion_Vis +EMOTION_API Emotion_Vis emotion_object_vis_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1355,7 +1355,7 @@ emotion_object_vis_get(const Evas_Object *obj) return emotion_engine_instance_vis_get(sd->engine_instance); } -EAPI Eina_Bool +EMOTION_API Eina_Bool emotion_object_vis_supported(const Evas_Object *obj, Emotion_Vis visualization) { Efl_Canvas_Video_Data *sd; @@ -1365,7 +1365,7 @@ emotion_object_vis_supported(const Evas_Object *obj, Emotion_Vis visualization) return emotion_engine_instance_vis_supported(sd->engine_instance, visualization); } -EAPI void +EMOTION_API void emotion_object_priority_set(Evas_Object *obj, Eina_Bool priority) { Efl_Canvas_Video_Data *sd; @@ -1375,7 +1375,7 @@ emotion_object_priority_set(Evas_Object *obj, Eina_Bool priority) emotion_engine_instance_priority_set(sd->engine_instance, priority); } -EAPI Eina_Bool +EMOTION_API Eina_Bool emotion_object_priority_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1415,7 +1415,7 @@ _eio_load_xattr_error(void *data, Eio_File *handler, int err EINA_UNUSED) } #endif -EAPI void +EMOTION_API void emotion_object_last_position_load(Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1486,7 +1486,7 @@ _eio_save_xattr_error(void *data, Eio_File *handler, int err EINA_UNUSED) } #endif -EAPI void +EMOTION_API void emotion_object_last_position_save(Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1525,7 +1525,7 @@ emotion_object_last_position_save(Evas_Object *obj) #endif } -EAPI void +EMOTION_API void emotion_object_suspend_set(Evas_Object *obj, Emotion_Suspend state) { Efl_Canvas_Video_Data *sd; @@ -1547,7 +1547,7 @@ emotion_object_suspend_set(Evas_Object *obj, Emotion_Suspend state) sd->state = state; } -EAPI Emotion_Suspend +EMOTION_API Emotion_Suspend emotion_object_suspend_get(Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1560,7 +1560,7 @@ emotion_object_suspend_get(Evas_Object *obj) /* Utility calls for modules */ /*****************************/ -EAPI void * +EMOTION_API void * _emotion_video_get(const Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1587,7 +1587,7 @@ _emotion_frame_anim(void *data) return EINA_FALSE; } -EAPI void +EMOTION_API void _emotion_frame_new(Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1597,7 +1597,7 @@ _emotion_frame_new(Evas_Object *obj) sd->anim = ecore_evas_animator_add(obj, _emotion_frame_anim, obj); } -EAPI void +EMOTION_API void _emotion_video_pos_update(Evas_Object *obj, double pos, double len) { Efl_Canvas_Video_Data *sd; @@ -1620,7 +1620,7 @@ _emotion_video_pos_update(Evas_Object *obj, double pos, double len) } } -EAPI void +EMOTION_API void _emotion_frame_resize(Evas_Object *obj, int w, int h, double ratio) { Efl_Canvas_Video_Data *sd; @@ -1653,7 +1653,7 @@ _emotion_frame_resize(Evas_Object *obj, int w, int h, double ratio) } } -EAPI void +EMOTION_API void _emotion_image_reset(Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1662,7 +1662,7 @@ _emotion_image_reset(Evas_Object *obj) _emotion_image_data_zero(sd->obj); } -EAPI void +EMOTION_API void _emotion_decode_stop(Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1675,7 +1675,7 @@ _emotion_decode_stop(Evas_Object *obj) } } -EAPI void +EMOTION_API void _emotion_open_done(Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1696,14 +1696,14 @@ _emotion_open_done(Evas_Object *obj) evas_object_smart_callback_call(obj, "open_done", NULL); } -EAPI void +EMOTION_API void _emotion_playback_started(Evas_Object *obj) { efl_event_callback_call(obj, EFL_CANVAS_VIDEO_EVENT_PLAYBACK_START, NULL); evas_object_smart_callback_call(obj, "playback_started", NULL); } -EAPI void +EMOTION_API void _emotion_playback_finished(Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1713,14 +1713,14 @@ _emotion_playback_finished(Evas_Object *obj) evas_object_smart_callback_call(obj, "playback_finished", NULL); } -EAPI void +EMOTION_API void _emotion_audio_level_change(Evas_Object *obj) { efl_event_callback_call(obj, EFL_CANVAS_VIDEO_EVENT_VOLUME_CHANGE, NULL); evas_object_smart_callback_call(obj, "audio_level_change", NULL); } -EAPI void +EMOTION_API void _emotion_channels_change(Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1730,7 +1730,7 @@ _emotion_channels_change(Evas_Object *obj) evas_object_smart_callback_call(obj, "channels_change", NULL); } -EAPI void +EMOTION_API void _emotion_title_set(Evas_Object *obj, char *title) { Efl_Canvas_Video_Data *sd; @@ -1741,7 +1741,7 @@ _emotion_title_set(Evas_Object *obj, char *title) evas_object_smart_callback_call(obj, "title_change", NULL); } -EAPI void +EMOTION_API void _emotion_progress_set(Evas_Object *obj, char *info, double st) { Efl_Canvas_Video_Data *sd; @@ -1753,7 +1753,7 @@ _emotion_progress_set(Evas_Object *obj, char *info, double st) evas_object_smart_callback_call(obj, "progress_change", NULL); } -EAPI void +EMOTION_API void _emotion_file_ref_set(Evas_Object *obj, const char *file, int num) { Efl_Canvas_Video_Data *sd; @@ -1765,7 +1765,7 @@ _emotion_file_ref_set(Evas_Object *obj, const char *file, int num) evas_object_smart_callback_call(obj, "ref_change", NULL); } -EAPI void +EMOTION_API void _emotion_spu_button_num_set(Evas_Object *obj, int num) { Efl_Canvas_Video_Data *sd; @@ -1776,7 +1776,7 @@ _emotion_spu_button_num_set(Evas_Object *obj, int num) evas_object_smart_callback_call(obj, "button_num_change", NULL); } -EAPI void +EMOTION_API void _emotion_spu_button_set(Evas_Object *obj, int button) { Efl_Canvas_Video_Data *sd; @@ -1787,7 +1787,7 @@ _emotion_spu_button_set(Evas_Object *obj, int button) evas_object_smart_callback_call(obj, "button_change", NULL); } -EAPI void +EMOTION_API void _emotion_seek_done(Evas_Object *obj) { Efl_Canvas_Video_Data *sd; @@ -1800,7 +1800,7 @@ _emotion_seek_done(Evas_Object *obj) } } -EAPI void +EMOTION_API void _emotion_frame_refill(Evas_Object *obj, double w, double h) { Efl_Canvas_Video_Data *sd; diff --git a/src/lib/emotion/emotion_webcam.c b/src/lib/emotion/emotion_webcam.c index 8b46b9a724..65a012c6f5 100644 --- a/src/lib/emotion/emotion_webcam.c +++ b/src/lib/emotion/emotion_webcam.c @@ -18,9 +18,9 @@ #include "emotion_private.h" -EAPI int EMOTION_WEBCAM_UPDATE = 0; -EAPI int EMOTION_WEBCAM_ADD = 0; -EAPI int EMOTION_WEBCAM_DEL = 0; +EMOTION_API int EMOTION_WEBCAM_UPDATE = 0; +EMOTION_API int EMOTION_WEBCAM_ADD = 0; +EMOTION_API int EMOTION_WEBCAM_DEL = 0; typedef struct _Emotion_Webcams Emotion_Webcams; @@ -295,7 +295,7 @@ emotion_webcam_shutdown(void) #endif } -EAPI const Eina_List * +EMOTION_API const Eina_List * emotion_webcams_get(void) { EINA_SAFETY_ON_NULL_RETURN_VAL(_emotion_webcams, NULL); @@ -303,21 +303,21 @@ emotion_webcams_get(void) return _emotion_webcams->webcams; } -EAPI const char * +EMOTION_API const char * emotion_webcam_name_get(const Emotion_Webcam *ew) { EINA_SAFETY_ON_NULL_RETURN_VAL(ew, NULL); return ew->name; } -EAPI const char * +EMOTION_API const char * emotion_webcam_device_get(const Emotion_Webcam *ew) { EINA_SAFETY_ON_NULL_RETURN_VAL(ew, NULL); return ew->device; } -EAPI const char * +EMOTION_API const char * emotion_webcam_custom_get(const char *device EINA_UNUSED) { return NULL; diff --git a/src/lib/emotion/meson.build b/src/lib/emotion/meson.build index 8404fab3fd..ddb7d3213d 100644 --- a/src/lib/emotion/meson.build +++ b/src/lib/emotion/meson.build @@ -16,6 +16,7 @@ foreach eo_file : pub_eo_file '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), + '-e', 'EMOTION_API', '-gchd', '@INPUT@']) endforeach @@ -53,7 +54,7 @@ emotion_lib = library('emotion', dependencies: emotion_deps + emotion_pub_deps + emotion_ext_deps, include_directories : config_dir + [include_directories('.')], install: true, - c_args : emotion_package_c_args, + c_args : [emotion_package_c_args, '-DEMOTION_BUILD'], version : meson.project_version() ) |