Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_media.h ewl_media.c
Log Message:
fix warnings and remove trailing spaces
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_media.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_media.h 15 Mar 2006 04:03:48 -0000 1.11
+++ ewl_media.h 4 Apr 2006 18:14:39 -0000 1.12
@@ -1,10 +1,6 @@
#ifndef EWL_MEDIA_H
#define EWL_MEDIA_H
-#ifdef BUILD_EMOTION_SUPPORT
-#include <Emotion.h>
-#endif
-
/**
* @addtogroup Ewl_Media Ewl_Media: A Multi media widget
* @brief Defines a class for displaing video
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_media.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_media.c 10 Mar 2006 04:06:43 -0000 1.12
+++ ewl_media.c 4 Apr 2006 18:14:39 -0000 1.13
@@ -3,6 +3,10 @@
#include "ewl_macros.h"
#include "ewl_private.h"
+#ifdef BUILD_EMOTION_SUPPORT
+#include <Emotion.h>
+#endif
+
static void ewl_media_size_update(Ewl_Media *m);
static void ewl_media_update_timer_cb(void *data, Evas_Object *obj, void
*event_info);
@@ -84,11 +88,11 @@
/**
* @param m: the media area widget to set the module
- * @param module: the module to set in the media widget @a m
+ * @param module: the module to set in the media widget @a m
* @return Returns FALSE if we failed to load the module, TRUE otherwise.
* @brief Set the module of a media widget
*
- * Sets the module of the media widget @a m
+ * Sets the module of the media widget @a m
*/
int
ewl_media_module_set(Ewl_Media *m, Ewl_Media_Module_Type module)
@@ -110,7 +114,7 @@
switch (module)
{
case EWL_MEDIA_MODULE_GSTREAMER:
- ret = emotion_object_init(m->video,
+ ret = emotion_object_init(m->video,
"emotion_decoder_gstreamer.so");
break;
@@ -143,11 +147,11 @@
/**
* @param m: the media area widget to set the media
- * @param media: the media to set in the media widget @a m
+ * @param media: the media to set in the media widget @a m
* @return Returns no value.
* @brief Set the media of a media widget
*
- * Sets the media of the media widget @a m
+ * Sets the media of the media widget @a m
*/
void
ewl_media_media_set(Ewl_Media *m, const char *media)
@@ -204,7 +208,7 @@
#ifdef BUILD_EMOTION_SUPPORT
if (m->video)
- length = emotion_object_play_length_get(m->video);
+ length = emotion_object_play_length_get(m->video);
#endif
DRETURN_INT(length, DLEVEL_STABLE);
@@ -249,7 +253,7 @@
* @brief Sets the media widget into the given state
*/
void
-ewl_media_play_set(Ewl_Media *m, int p)
+ewl_media_play_set(Ewl_Media *m, int p)
{
DENTER_FUNCTION(DLEVEL_STABLE)
DCHECK_PARAM_PTR("m", m);
@@ -324,7 +328,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("m", m);
DCHECK_TYPE("m", m, EWL_MEDIA_TYPE);
-
+
pos = ewl_media_position_get(m);
/* stolen from envision by benr */
mh = (int)pos / (60 * 60);
@@ -391,7 +395,7 @@
* @brief Mutes the media widget
*/
void
-ewl_media_audio_mute_set(Ewl_Media *m, int mute)
+ewl_media_audio_mute_set(Ewl_Media *m, int mute)
{
DENTER_FUNCTION(DLEVEL_STABLE)
DCHECK_PARAM_PTR("m", m);
@@ -411,7 +415,7 @@
* @brief Gets the current volume from the media widget
*/
double
-ewl_media_audio_volume_get(Ewl_Media *m)
+ewl_media_audio_volume_get(Ewl_Media *m)
{
double v = 0.0;
@@ -525,7 +529,7 @@
evas_object_move(m->video, CURRENT_X(w), CURRENT_Y(w));
evas_object_resize(m->video, CURRENT_W(w), CURRENT_H(w));
evas_object_layer_set(m->video, ewl_widget_layer_sum_get(w));
- evas_object_smart_callback_add(m->video, "frame_decode",
+ evas_object_smart_callback_add(m->video, "frame_decode",
ewl_media_update_timer_cb, m);
}
@@ -566,6 +570,3 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-
-
-
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
