[elm] Video now inheritable.

SVN revision: 74751
This commit is contained in:
Gustavo Lima Chaves 2012-08-01 21:02:42 +00:00
parent b1cd1f5d49
commit 1558e6af27
3 changed files with 188 additions and 44 deletions

View File

@ -80,6 +80,7 @@ elm_widget_slider.h \
elm_widget_slideshow.h \
elm_widget_table.h \
elm_widget_thumb.h \
elm_widget_video.h \
elm_widget_web.h
includesunstabledir = $(includedir)/elementary-@VMAJ@

View File

@ -1,6 +1,6 @@
#include <Elementary.h>
#include "elm_priv.h"
#include "elm_widget_layout.h"
#include "elm_widget_video.h"
#ifdef HAVE_EMOTION
# include <Emotion.h>
@ -9,49 +9,10 @@
/* TODO: add buffering support to Emotion and display buffering
* progress in the theme when needed */
static const char VIDEO_SMART_NAME[] = "elm_video";
EAPI const char ELM_VIDEO_SMART_NAME[] = "elm_video";
typedef struct _Elm_Video_Smart_Data Elm_Video_Smart_Data;
struct _Elm_Video_Smart_Data
{
Elm_Layout_Smart_Data base;
Evas_Object *emotion;
Ecore_Timer *timer;
Eina_Bool stop : 1;
Eina_Bool remember : 1;
};
#define ELM_VIDEO_DATA_GET(o, sd) \
Elm_Video_Smart_Data * sd = evas_object_smart_data_get(o)
#define ELM_VIDEO_DATA_GET_OR_RETURN(o, ptr) \
ELM_VIDEO_DATA_GET(o, ptr); \
if (!ptr) \
{ \
CRITICAL("No widget data for object %p (%s)", \
o, evas_object_type_get(o)); \
return; \
}
#define ELM_VIDEO_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
ELM_VIDEO_DATA_GET(o, ptr); \
if (!ptr) \
{ \
CRITICAL("No widget data for object %p (%s)", \
o, evas_object_type_get(o)); \
return val; \
}
#define ELM_VIDEO_CHECK(obj) \
if (!obj || !elm_widget_type_check((obj), VIDEO_SMART_NAME, __func__)) \
return
/* Inheriting from elm_layout. Besides, we need no more than what is
* there */
EVAS_SMART_SUBCLASS_NEW
(VIDEO_SMART_NAME, _elm_video, Elm_Layout_Smart_Class,
(ELM_VIDEO_SMART_NAME, _elm_video, Elm_Video_Smart_Class,
Elm_Layout_Smart_Class, elm_layout_smart_class_get, NULL);
static Eina_Bool
@ -318,7 +279,7 @@ _elm_video_smart_del(Evas_Object *obj)
}
static void
_elm_video_smart_set_user(Elm_Layout_Smart_Class *sc)
_elm_video_smart_set_user(Elm_Video_Smart_Class *sc)
{
ELM_WIDGET_CLASS(sc)->base.add = _elm_video_smart_add;
ELM_WIDGET_CLASS(sc)->base.del = _elm_video_smart_del;
@ -329,7 +290,23 @@ _elm_video_smart_set_user(Elm_Layout_Smart_Class *sc)
ELM_WIDGET_CLASS(sc)->focus_next = NULL;
ELM_WIDGET_CLASS(sc)->focus_direction = NULL;
sc->sizing_eval = _elm_video_smart_sizing_eval;
ELM_LAYOUT_CLASS(sc)->sizing_eval = _elm_video_smart_sizing_eval;
}
EAPI const Elm_Video_Smart_Class *
elm_video_smart_class_get(void)
{
static Elm_Video_Smart_Class _sc =
ELM_VIDEO_SMART_CLASS_INIT_NAME_VERSION(ELM_VIDEO_SMART_NAME);
static const Elm_Video_Smart_Class *class = NULL;
if (class)
return class;
_elm_video_smart_set(&_sc);
class = &_sc;
return class;
}
EAPI Evas_Object *

View File

@ -0,0 +1,166 @@
#ifndef ELM_WIDGET_VIDEO_H
#define ELM_WIDGET_VIDEO_H
#include "elm_widget_layout.h"
/**
* @addtogroup Widget
* @{
*
* @section elm-video-class The Elementary Video Class
*
* Elementary, besides having the @ref Video widget, exposes its
* foundation -- the Elementary Video Class -- in order to create other
* widgets which are a video with some more logic on top.
*/
/**
* @def ELM_VIDEO_CLASS
*
* Use this macro to cast whichever subclass of
* #Elm_Video_Smart_Class into it, so to access its fields.
*
* @ingroup Widget
*/
#define ELM_VIDEO_CLASS(x) ((Elm_Video_Smart_Class *)x)
/**
* @def ELM_VIDEO_DATA
*
* Use this macro to cast whichever subdata of
* #Elm_Video_Smart_Data into it, so to access its fields.
*
* @ingroup Widget
*/
#define ELM_VIDEO_DATA(x) ((Elm_Video_Smart_Data *)x)
/**
* @def ELM_VIDEO_SMART_CLASS_VERSION
*
* Current version for Elementary video @b base smart class, a value
* which goes to _Elm_Video_Smart_Class::version.
*
* @ingroup Widget
*/
#define ELM_VIDEO_SMART_CLASS_VERSION 1
/**
* @def ELM_VIDEO_SMART_CLASS_INIT
*
* Initializer for a whole #Elm_Video_Smart_Class structure, with
* @c NULL values on its specific fields.
*
* @param smart_class_init initializer to use for the "base" field
* (#Evas_Smart_Class).
*
* @see EVAS_SMART_CLASS_INIT_NULL
* @see EVAS_SMART_CLASS_INIT_NAME_VERSION
* @see ELM_VIDEO_SMART_CLASS_INIT_NULL
* @see ELM_VIDEO_SMART_CLASS_INIT_NAME_VERSION
*
* @ingroup Widget
*/
#define ELM_VIDEO_SMART_CLASS_INIT(smart_class_init) \
{smart_class_init, ELM_VIDEO_SMART_CLASS_VERSION}
/**
* @def ELM_VIDEO_SMART_CLASS_INIT_NULL
*
* Initializer to zero out a whole #Elm_Video_Smart_Class structure.
*
* @see ELM_VIDEO_SMART_CLASS_INIT_NAME_VERSION
* @see ELM_VIDEO_SMART_CLASS_INIT
*
* @ingroup Widget
*/
#define ELM_VIDEO_SMART_CLASS_INIT_NULL \
ELM_VIDEO_SMART_CLASS_INIT(EVAS_SMART_CLASS_INIT_NULL)
/**
* @def ELM_VIDEO_SMART_CLASS_INIT_NAME_VERSION
*
* Initializer to zero out a whole #Elm_Video_Smart_Class structure and
* set its name and version.
*
* This is similar to #ELM_VIDEO_SMART_CLASS_INIT_NULL, but it will
* also set the version field of #Elm_Video_Smart_Class (base field)
* to the latest #ELM_VIDEO_SMART_CLASS_VERSION and name it to the
* specific value.
*
* It will keep a reference to the name field as a <c>"const char *"</c>,
* i.e., the name must be available while the structure is
* used (hint: static or global variable!) and must not be modified.
*
* @see ELM_VIDEO_SMART_CLASS_INIT_NULL
* @see ELM_VIDEO_SMART_CLASS_INIT
*
* @ingroup Widget
*/
#define ELM_VIDEO_SMART_CLASS_INIT_NAME_VERSION(name) \
ELM_VIDEO_SMART_CLASS_INIT \
(ELM_LAYOUT_SMART_CLASS_INIT_NAME_VERSION(name))
/**
* Elementary video base smart class. This inherits directly from
* #Elm_Layout_Smart_Class and is meant to build widgets extending the
* behavior of a video.
*
* All of the functions listed on @ref Video namespace will work for
* objects deriving from #Elm_Video_Smart_Class.
*/
typedef struct _Elm_Video_Smart_Class
{
Elm_Layout_Smart_Class base;
int version; /**< Version of this smart class definition */
} Elm_Video_Smart_Class;
/**
* Base layout smart data extended with video instance data.
*/
typedef struct _Elm_Video_Smart_Data Elm_Video_Smart_Data;
struct _Elm_Video_Smart_Data
{
Elm_Layout_Smart_Data base;
Evas_Object *emotion;
Ecore_Timer *timer;
Eina_Bool stop : 1;
Eina_Bool remember : 1;
};
/**
* @}
*/
EAPI extern const char ELM_VIDEO_SMART_NAME[];
EAPI const Elm_Video_Smart_Class *elm_video_smart_class_get(void);
#define ELM_VIDEO_DATA_GET(o, sd) \
Elm_Video_Smart_Data * sd = evas_object_smart_data_get(o)
#define ELM_VIDEO_DATA_GET_OR_RETURN(o, ptr) \
ELM_VIDEO_DATA_GET(o, ptr); \
if (!ptr) \
{ \
CRITICAL("No widget data for object %p (%s)", \
o, evas_object_type_get(o)); \
return; \
}
#define ELM_VIDEO_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
ELM_VIDEO_DATA_GET(o, ptr); \
if (!ptr) \
{ \
CRITICAL("No widget data for object %p (%s)", \
o, evas_object_type_get(o)); \
return val; \
}
#define ELM_VIDEO_CHECK(obj) \
if (!obj || !elm_widget_type_check((obj), ELM_VIDEO_SMART_NAME, \
__func__)) \
return
#endif