summaryrefslogtreecommitdiff
path: root/legacy/emotion
diff options
context:
space:
mode:
authorThiago Thamada <tiba@profusion.mobi>2012-04-17 17:04:33 +0000
committerJonas M. Gastal <jgastal@profusion.mobi>2012-04-17 17:04:33 +0000
commitac06f667ecbeeff08d449bad99425260d1114591 (patch)
tree6675ae062c06c23f776023b762e60a8e72bc2c01 /legacy/emotion
parent3b776bb1fe3a2c062cf0e7d21a6daebc75a8dcc9 (diff)
Fixing doc for out of tree build and some doxygen warnings.
Patch by: Thiago Thamada <tiba@profusion.mobi> SVN revision: 70278
Diffstat (limited to 'legacy/emotion')
-rw-r--r--legacy/emotion/doc/Doxyfile.in2
-rw-r--r--legacy/emotion/src/lib/Emotion.h7
2 files changed, 6 insertions, 3 deletions
diff --git a/legacy/emotion/doc/Doxyfile.in b/legacy/emotion/doc/Doxyfile.in
index 0a7ca2833e..907be04f03 100644
--- a/legacy/emotion/doc/Doxyfile.in
+++ b/legacy/emotion/doc/Doxyfile.in
@@ -3,7 +3,7 @@ PROJECT_NUMBER = @PACKAGE_VERSION@
3OUTPUT_DIRECTORY = . 3OUTPUT_DIRECTORY = .
4INPUT = @top_srcdir@/src/lib \ 4INPUT = @top_srcdir@/src/lib \
5 @srcdir@/examples.dox 5 @srcdir@/examples.dox
6IMAGE_PATH = img 6IMAGE_PATH = @srcdir@/img
7OUTPUT_LANGUAGE = English 7OUTPUT_LANGUAGE = English
8GENERATE_HTML = YES 8GENERATE_HTML = YES
9HTML_OUTPUT = html 9HTML_OUTPUT = html
diff --git a/legacy/emotion/src/lib/Emotion.h b/legacy/emotion/src/lib/Emotion.h
index 736a6aada9..7695a68287 100644
--- a/legacy/emotion/src/lib/Emotion.h
+++ b/legacy/emotion/src/lib/Emotion.h
@@ -220,6 +220,10 @@ typedef enum
220 EMOTION_HIBERNATE /**< destroy the pipeline, and keep half resolution or object resolution if lower */ 220 EMOTION_HIBERNATE /**< destroy the pipeline, and keep half resolution or object resolution if lower */
221} Emotion_Suspend; 221} Emotion_Suspend;
222 222
223/**
224 * @enum _Emotion_Aspect
225 * Defines the aspect ratio option.
226 */
223enum _Emotion_Aspect 227enum _Emotion_Aspect
224{ 228{
225 EMOTION_ASPECT_KEEP_NONE, /**< ignore video aspect ratio */ 229 EMOTION_ASPECT_KEEP_NONE, /**< ignore video aspect ratio */
@@ -382,8 +386,7 @@ EAPI Evas_Object *emotion_object_add (Evas *evas);
382 * @see emotion_object_audio_mute_set() 386 * @see emotion_object_audio_mute_set()
383 * @see emotion_object_video_mute_set() 387 * @see emotion_object_video_mute_set()
384 * 388 *
385 * @ingroup Emotion_Audio 389 * @ingroup Emotion_Init
386 * @ingroup Emotion_Video
387 */ 390 */
388EAPI void emotion_object_module_option_set (Evas_Object *obj, const char *opt, const char *val); 391EAPI void emotion_object_module_option_set (Evas_Object *obj, const char *opt, const char *val);
389 392