Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/lib
Modified Files:
Emotion.h emotion_smart.c
Log Message:
EAPI
===================================================================
RCS file: /cvs/e/e17/libs/emotion/src/lib/Emotion.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Emotion.h 14 May 2006 14:32:02 -0000 1.10
+++ Emotion.h 6 Sep 2006 07:12:24 -0000 1.11
@@ -1,6 +1,27 @@
#ifndef EMOTION_H
#define EMOTION_H
+#ifdef EAPI
+#undef EAPI
+#endif
+#ifdef WIN32
+# ifdef BUILDING_DLL
+# define EAPI __declspec(dllexport)
+# 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 <Evas.h>
enum _Emotion_Module
@@ -65,58 +86,58 @@
#endif
/* api calls available */
-Evas_Object *emotion_object_add (Evas *evas);
-Evas_Bool emotion_object_init (Evas_Object *obj, const
char *module_filename);
-void emotion_object_file_set (Evas_Object *obj, const
char *filename);
-const char *emotion_object_file_get (Evas_Object *obj);
-void emotion_object_play_set (Evas_Object *obj, Evas_Bool
play);
-Evas_Bool emotion_object_play_get (Evas_Object *obj);
-void emotion_object_position_set (Evas_Object *obj, double
sec);
-double emotion_object_position_get (Evas_Object *obj);
-Evas_Bool emotion_object_video_handled_get (Evas_Object *obj);
-Evas_Bool emotion_object_audio_handled_get (Evas_Object *obj);
-Evas_Bool emotion_object_seekable_get (Evas_Object *obj);
-double emotion_object_play_length_get (Evas_Object *obj);
-void emotion_object_size_get (Evas_Object *obj, int *iw,
int *ih);
-void emotion_object_smooth_scale_set (Evas_Object *obj, Evas_Bool
smooth);
-Evas_Bool emotion_object_smooth_scale_get (Evas_Object *obj);
-double emotion_object_ratio_get (Evas_Object *obj);
-void emotion_object_event_simple_send (Evas_Object *obj,
Emotion_Event ev);
-void emotion_object_audio_volume_set (Evas_Object *obj, double
vol);
-double emotion_object_audio_volume_get (Evas_Object *obj);
-void emotion_object_audio_mute_set (Evas_Object *obj, Evas_Bool
mute);
-Evas_Bool emotion_object_audio_mute_get (Evas_Object *obj);
-int emotion_object_audio_channel_count (Evas_Object *obj);
-const char *emotion_object_audio_channel_name_get(Evas_Object *obj, int
channel);
-void emotion_object_audio_channel_set (Evas_Object *obj, int
channel);
-int emotion_object_audio_channel_get (Evas_Object *obj);
-void emotion_object_video_mute_set (Evas_Object *obj, Evas_Bool
mute);
-Evas_Bool emotion_object_video_mute_get (Evas_Object *obj);
-int emotion_object_video_channel_count (Evas_Object *obj);
-const char *emotion_object_video_channel_name_get(Evas_Object *obj, int
channel);
-void emotion_object_video_channel_set (Evas_Object *obj, int
channel);
-int emotion_object_video_channel_get (Evas_Object *obj);
-void emotion_object_spu_mute_set (Evas_Object *obj, Evas_Bool
mute);
-Evas_Bool emotion_object_spu_mute_get (Evas_Object *obj);
-int emotion_object_spu_channel_count (Evas_Object *obj);
-const char *emotion_object_spu_channel_name_get (Evas_Object *obj, int
channel);
-void emotion_object_spu_channel_set (Evas_Object *obj, int
channel);
-int emotion_object_spu_channel_get (Evas_Object *obj);
-int emotion_object_chapter_count (Evas_Object *obj);
-void emotion_object_chapter_set (Evas_Object *obj, int
chapter);
-int emotion_object_chapter_get (Evas_Object *obj);
-const char *emotion_object_chapter_name_get (Evas_Object *obj, int
chapter);
-void emotion_object_play_speed_set (Evas_Object *obj, double
speed);
-double emotion_object_play_speed_get (Evas_Object *obj);
-void emotion_object_eject (Evas_Object *obj);
-const char *emotion_object_title_get (Evas_Object *obj);
-const char *emotion_object_progress_info_get (Evas_Object *obj);
-double emotion_object_progress_status_get (Evas_Object *obj);
-const char *emotion_object_ref_file_get (Evas_Object *obj);
-int emotion_object_ref_num_get (Evas_Object *obj);
-int emotion_object_spu_button_count_get (Evas_Object *obj);
-int emotion_object_spu_button_get (Evas_Object *obj);
-const char *emotion_object_meta_info_get (Evas_Object *obj,
Emotion_Meta_Info meta);
+EAPI Evas_Object *emotion_object_add (Evas *evas);
+EAPI Evas_Bool emotion_object_init (Evas_Object *obj,
const char *module_filename);
+EAPI void emotion_object_file_set (Evas_Object *obj,
const char *filename);
+EAPI const char *emotion_object_file_get (Evas_Object *obj);
+EAPI void emotion_object_play_set (Evas_Object *obj,
Evas_Bool play);
+EAPI Evas_Bool emotion_object_play_get (Evas_Object *obj);
+EAPI void emotion_object_position_set (Evas_Object *obj,
double sec);
+EAPI double emotion_object_position_get (Evas_Object *obj);
+EAPI Evas_Bool emotion_object_video_handled_get (Evas_Object *obj);
+EAPI Evas_Bool emotion_object_audio_handled_get (Evas_Object *obj);
+EAPI Evas_Bool emotion_object_seekable_get (Evas_Object *obj);
+EAPI double emotion_object_play_length_get (Evas_Object *obj);
+EAPI void emotion_object_size_get (Evas_Object *obj, int
*iw, int *ih);
+EAPI void emotion_object_smooth_scale_set (Evas_Object *obj,
Evas_Bool smooth);
+EAPI Evas_Bool emotion_object_smooth_scale_get (Evas_Object *obj);
+EAPI double emotion_object_ratio_get (Evas_Object *obj);
+EAPI void emotion_object_event_simple_send (Evas_Object *obj,
Emotion_Event ev);
+EAPI void emotion_object_audio_volume_set (Evas_Object *obj,
double vol);
+EAPI double emotion_object_audio_volume_get (Evas_Object *obj);
+EAPI void emotion_object_audio_mute_set (Evas_Object *obj,
Evas_Bool mute);
+EAPI Evas_Bool emotion_object_audio_mute_get (Evas_Object *obj);
+EAPI int emotion_object_audio_channel_count (Evas_Object *obj);
+EAPI const char *emotion_object_audio_channel_name_get(Evas_Object *obj, int
channel);
+EAPI void emotion_object_audio_channel_set (Evas_Object *obj, int
channel);
+EAPI int emotion_object_audio_channel_get (Evas_Object *obj);
+EAPI void emotion_object_video_mute_set (Evas_Object *obj,
Evas_Bool mute);
+EAPI Evas_Bool emotion_object_video_mute_get (Evas_Object *obj);
+EAPI int emotion_object_video_channel_count (Evas_Object *obj);
+EAPI const char *emotion_object_video_channel_name_get(Evas_Object *obj, int
channel);
+EAPI void emotion_object_video_channel_set (Evas_Object *obj, int
channel);
+EAPI int emotion_object_video_channel_get (Evas_Object *obj);
+EAPI void emotion_object_spu_mute_set (Evas_Object *obj,
Evas_Bool mute);
+EAPI Evas_Bool emotion_object_spu_mute_get (Evas_Object *obj);
+EAPI int emotion_object_spu_channel_count (Evas_Object *obj);
+EAPI const char *emotion_object_spu_channel_name_get (Evas_Object *obj, int
channel);
+EAPI void emotion_object_spu_channel_set (Evas_Object *obj, int
channel);
+EAPI int emotion_object_spu_channel_get (Evas_Object *obj);
+EAPI int emotion_object_chapter_count (Evas_Object *obj);
+EAPI void emotion_object_chapter_set (Evas_Object *obj, int
chapter);
+EAPI int emotion_object_chapter_get (Evas_Object *obj);
+EAPI const char *emotion_object_chapter_name_get (Evas_Object *obj, int
chapter);
+EAPI void emotion_object_play_speed_set (Evas_Object *obj,
double speed);
+EAPI double emotion_object_play_speed_get (Evas_Object *obj);
+EAPI void emotion_object_eject (Evas_Object *obj);
+EAPI const char *emotion_object_title_get (Evas_Object *obj);
+EAPI const char *emotion_object_progress_info_get (Evas_Object *obj);
+EAPI double emotion_object_progress_status_get (Evas_Object *obj);
+EAPI const char *emotion_object_ref_file_get (Evas_Object *obj);
+EAPI int emotion_object_ref_num_get (Evas_Object *obj);
+EAPI int emotion_object_spu_button_count_get (Evas_Object *obj);
+EAPI int emotion_object_spu_button_get (Evas_Object *obj);
+EAPI const char *emotion_object_meta_info_get (Evas_Object *obj,
Emotion_Meta_Info meta);
#ifdef __cplusplus
}
===================================================================
RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- emotion_smart.c 4 Feb 2006 13:43:13 -0000 1.21
+++ emotion_smart.c 6 Sep 2006 07:12:24 -0000 1.22
@@ -141,14 +141,14 @@
-Evas_Object *
+EAPI Evas_Object *
emotion_object_add(Evas *evas)
{
_smart_init();
return evas_object_smart_add(evas, smart);
}
-Evas_Bool
+EAPI Evas_Bool
emotion_object_init(Evas_Object *obj, const char *module_filename)
{
Smart_Data *sd;
@@ -179,7 +179,7 @@
return 1;
}
-void
+EAPI void
emotion_object_file_set(Evas_Object *obj, const char *file)
{
Smart_Data *sd;
@@ -217,7 +217,7 @@
}
}
-const char *
+EAPI const char *
emotion_object_file_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -226,7 +226,7 @@
return sd->file;
}
-void
+EAPI void
emotion_object_play_set(Evas_Object *obj, Evas_Bool play)
{
Smart_Data *sd;
@@ -240,7 +240,7 @@
else sd->module->stop(sd->video);
}
-Evas_Bool
+EAPI Evas_Bool
emotion_object_play_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -251,7 +251,7 @@
return sd->play;
}
-void
+EAPI void
emotion_object_position_set(Evas_Object *obj, double sec)
{
Smart_Data *sd;
@@ -266,7 +266,7 @@
sd->job = ecore_job_add(_pos_set_job, obj);
}
-double
+EAPI double
emotion_object_position_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -277,7 +277,7 @@
return sd->pos;
}
-Evas_Bool
+EAPI Evas_Bool
emotion_object_seekable_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -288,7 +288,7 @@
return sd->module->seekable(sd->video);
}
-Evas_Bool
+EAPI Evas_Bool
emotion_object_video_handled_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -299,7 +299,7 @@
return sd->module->video_handled(sd->video);
}
-Evas_Bool
+EAPI Evas_Bool
emotion_object_audio_handled_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -310,7 +310,7 @@
return sd->module->audio_handled(sd->video);
}
-double
+EAPI double
emotion_object_play_length_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -322,7 +322,7 @@
return sd->len;
}
-void
+EAPI void
emotion_object_size_get(Evas_Object *obj, int *iw, int *ih)
{
Smart_Data *sd;
@@ -333,7 +333,7 @@
evas_object_image_size_get(sd->obj, iw, ih);
}
-void
+EAPI void
emotion_object_smooth_scale_set(Evas_Object *obj, Evas_Bool smooth)
{
Smart_Data *sd;
@@ -342,7 +342,7 @@
evas_object_image_smooth_scale_set(sd->obj, smooth);
}
-Evas_Bool
+EAPI Evas_Bool
emotion_object_smooth_scale_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -351,7 +351,7 @@
return evas_object_image_smooth_scale_get(sd->obj);
}
-double
+EAPI double
emotion_object_ratio_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -362,7 +362,7 @@
return sd->ratio;
}
-void
+EAPI void
emotion_object_event_simple_send(Evas_Object *obj, Emotion_Event ev)
{
Smart_Data *sd;
@@ -373,7 +373,7 @@
sd->module->event_feed(sd->video, ev);
}
-void
+EAPI void
emotion_object_audio_volume_set(Evas_Object *obj, double vol)
{
Smart_Data *sd;
@@ -384,7 +384,7 @@
sd->module->audio_channel_volume_set(sd->video, vol);
}
-double
+EAPI double
emotion_object_audio_volume_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -395,7 +395,7 @@
return sd->module->audio_channel_volume_get(sd->video);
}
-void
+EAPI void
emotion_object_audio_mute_set(Evas_Object *obj, Evas_Bool mute)
{
Smart_Data *sd;
@@ -406,7 +406,7 @@
sd->module->audio_channel_mute_set(sd->video, mute);
}
-Evas_Bool
+EAPI Evas_Bool
emotion_object_audio_mute_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -417,7 +417,7 @@
return sd->module->audio_channel_mute_get(sd->video);
}
-int
+EAPI int
emotion_object_audio_channel_count(Evas_Object *obj)
{
Smart_Data *sd;
@@ -428,7 +428,7 @@
return sd->module->audio_channel_count(sd->video);
}
-const char *
+EAPI const char *
emotion_object_audio_channel_name_get(Evas_Object *obj, int channel)
{
Smart_Data *sd;
@@ -439,7 +439,7 @@
return sd->module->audio_channel_name_get(sd->video, channel);
}
-void
+EAPI void
emotion_object_audio_channel_set(Evas_Object *obj, int channel)
{
Smart_Data *sd;
@@ -450,7 +450,7 @@
sd->module->audio_channel_set(sd->video, channel);
}
-int
+EAPI int
emotion_object_audio_channel_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -461,7 +461,7 @@
return sd->module->audio_channel_get(sd->video);
}
-void
+EAPI void
emotion_object_video_mute_set(Evas_Object *obj, Evas_Bool mute)
{
Smart_Data *sd;
@@ -472,7 +472,7 @@
sd->module->video_channel_mute_set(sd->video, mute);
}
-Evas_Bool
+EAPI Evas_Bool
emotion_object_video_mute_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -483,7 +483,7 @@
return sd->module->video_channel_mute_get(sd->video);
}
-int
+EAPI int
emotion_object_video_channel_count(Evas_Object *obj)
{
Smart_Data *sd;
@@ -494,7 +494,7 @@
return sd->module->video_channel_count(sd->video);
}
-const char *
+EAPI const char *
emotion_object_video_channel_name_get(Evas_Object *obj, int channel)
{
Smart_Data *sd;
@@ -505,7 +505,7 @@
return sd->module->video_channel_name_get(sd->video, channel);
}
-void
+EAPI void
emotion_object_video_channel_set(Evas_Object *obj, int channel)
{
Smart_Data *sd;
@@ -516,7 +516,7 @@
sd->module->video_channel_set(sd->video, channel);
}
-int
+EAPI int
emotion_object_video_channel_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -527,7 +527,7 @@
return sd->module->video_channel_get(sd->video);
}
-void
+EAPI void
emotion_object_spu_mute_set(Evas_Object *obj, Evas_Bool mute)
{
Smart_Data *sd;
@@ -538,7 +538,7 @@
sd->module->spu_channel_mute_set(sd->video, mute);
}
-Evas_Bool
+EAPI Evas_Bool
emotion_object_spu_mute_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -549,7 +549,7 @@
return sd->module->spu_channel_mute_get(sd->video);
}
-int
+EAPI int
emotion_object_spu_channel_count(Evas_Object *obj)
{
Smart_Data *sd;
@@ -560,7 +560,7 @@
return sd->module->spu_channel_count(sd->video);
}
-const char *
+EAPI const char *
emotion_object_spu_channel_name_get(Evas_Object *obj, int channel)
{
Smart_Data *sd;
@@ -571,7 +571,7 @@
return sd->module->spu_channel_name_get(sd->video, channel);
}
-void
+EAPI void
emotion_object_spu_channel_set(Evas_Object *obj, int channel)
{
Smart_Data *sd;
@@ -582,7 +582,7 @@
sd->module->spu_channel_set(sd->video, channel);
}
-int
+EAPI int
emotion_object_spu_channel_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -593,7 +593,7 @@
return sd->module->spu_channel_get(sd->video);
}
-int
+EAPI int
emotion_object_chapter_count(Evas_Object *obj)
{
Smart_Data *sd;
@@ -604,7 +604,7 @@
return sd->module->chapter_count(sd->video);
}
-void
+EAPI void
emotion_object_chapter_set(Evas_Object *obj, int chapter)
{
Smart_Data *sd;
@@ -615,7 +615,7 @@
sd->module->chapter_set(sd->video, chapter);
}
-int
+EAPI int
emotion_object_chapter_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -626,7 +626,7 @@
return sd->module->chapter_get(sd->video);
}
-const char *
+EAPI const char *
emotion_object_chapter_name_get(Evas_Object *obj, int chapter)
{
Smart_Data *sd;
@@ -637,7 +637,7 @@
return sd->module->chapter_name_get(sd->video, chapter);
}
-void
+EAPI void
emotion_object_play_speed_set(Evas_Object *obj, double speed)
{
Smart_Data *sd;
@@ -648,7 +648,7 @@
sd->module->speed_set(sd->video, speed);
}
-double
+EAPI double
emotion_object_play_speed_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -659,7 +659,7 @@
return sd->module->speed_get(sd->video);
}
-void
+EAPI void
emotion_object_eject(Evas_Object *obj)
{
Smart_Data *sd;
@@ -670,7 +670,7 @@
sd->module->eject(sd->video);
}
-const char *
+EAPI const char *
emotion_object_title_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -679,7 +679,7 @@
return sd->title;
}
-const char *
+EAPI const char *
emotion_object_progress_info_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -688,7 +688,7 @@
return sd->progress.info;
}
-double
+EAPI double
emotion_object_progress_status_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -697,7 +697,7 @@
return sd->progress.stat;
}
-const char *
+EAPI const char *
emotion_object_ref_file_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -706,7 +706,7 @@
return sd->ref.file;
}
-int
+EAPI int
emotion_object_ref_num_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -715,7 +715,7 @@
return sd->ref.num;
}
-int
+EAPI int
emotion_object_spu_button_count_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -724,7 +724,7 @@
return sd->spu.button_num;
}
-int
+EAPI int
emotion_object_spu_button_get(Evas_Object *obj)
{
Smart_Data *sd;
@@ -733,7 +733,7 @@
return sd->spu.button;
}
-const char *
+EAPI const char *
emotion_object_meta_info_get(Evas_Object *obj, Emotion_Meta_Info meta)
{
Smart_Data *sd;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
