diff --git a/legacy/elementary/data/themes/widgets/player.edc b/legacy/elementary/data/themes/widgets/player.edc index e6f1996351..179945c5a9 100644 --- a/legacy/elementary/data/themes/widgets/player.edc +++ b/legacy/elementary/data/themes/widgets/player.edc @@ -1,6 +1,6 @@ group { name: "elm/player/base/default"; - min: 290 26; + min: 365 60; parts { part { @@ -8,6 +8,7 @@ group { name: "media_player/slider"; description { + fixed: 1 1; rel2 { relative: 1.0 0.0; to_x: "media_player/forward"; @@ -19,6 +20,7 @@ group { name: "media_player/rewind"; description { + fixed: 1 1; rel1 { to_y: "media_player/slider"; offset: 42 0; diff --git a/legacy/elementary/src/lib/elc_player.c b/legacy/elementary/src/lib/elc_player.c index a6327c3238..06e6086dcb 100644 --- a/legacy/elementary/src/lib/elc_player.c +++ b/legacy/elementary/src/lib/elc_player.c @@ -1,31 +1,57 @@ #include #include "elm_priv.h" +#include "elm_widget_layout.h" #ifdef HAVE_EMOTION # include #endif -typedef struct _Widget_Data Widget_Data; -struct _Widget_Data +static const char PLAYER_SMART_NAME[] = "elm_player"; + +typedef struct _Elm_Player_Smart_Data Elm_Player_Smart_Data; +struct _Elm_Player_Smart_Data { - Evas_Object *layout; - Evas_Object *video; - Evas_Object *emotion; + Elm_Layout_Smart_Data base; - Evas_Object *forward; - Evas_Object *info; - Evas_Object *next; - Evas_Object *pause; - Evas_Object *play; - Evas_Object *prev; - Evas_Object *rewind; - Evas_Object *stop; + Evas_Object *video; + Evas_Object *emotion; - Evas_Object *slider; + /* tracking those to ease disabling/enabling them back */ + Evas_Object *forward; + Evas_Object *info; + Evas_Object *next; + Evas_Object *pause; + Evas_Object *play; + Evas_Object *prev; + Evas_Object *rewind; + Evas_Object *stop; + Evas_Object *slider; }; -#ifdef HAVE_EMOTION -static const char *widtype = NULL; +#define ELM_PLAYER_DATA_GET(o, sd) \ + Elm_Player_Smart_Data * sd = evas_object_smart_data_get(o) + +#define ELM_PLAYER_DATA_GET_OR_RETURN(o, ptr) \ + ELM_PLAYER_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return; \ + } + +#define ELM_PLAYER_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ + ELM_PLAYER_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return val; \ + } + +#define ELM_PLAYER_CHECK(obj) \ + if (!obj || !elm_widget_type_check((obj), PLAYER_SMART_NAME, __func__)) \ + return static const char SIG_FORWARD_CLICKED[] = "forward,clicked"; static const char SIG_INFO_CLICKED[] = "info,clicked"; @@ -35,49 +61,52 @@ static const char SIG_PLAY_CLICKED[] = "play,clicked"; static const char SIG_PREV_CLICKED[] = "prev,clicked"; static const char SIG_REWIND_CLICKED[] = "rewind,clicked"; static const char SIG_STOP_CLICKED[] = "stop,clicked"; - -static const Evas_Smart_Cb_Description _signals[] = { - { SIG_FORWARD_CLICKED, "" }, - { SIG_INFO_CLICKED, "" }, - { SIG_NEXT_CLICKED, "" }, - { SIG_PAUSE_CLICKED, "" }, - { SIG_PLAY_CLICKED, "" }, - { SIG_PREV_CLICKED, "" }, - { SIG_REWIND_CLICKED, "" }, - { SIG_STOP_CLICKED, "" }, - { NULL, NULL } +static const Evas_Smart_Cb_Description _smart_callbacks[] = { + { SIG_FORWARD_CLICKED, "" }, + { SIG_INFO_CLICKED, "" }, + { SIG_NEXT_CLICKED, "" }, + { SIG_PAUSE_CLICKED, "" }, + { SIG_PLAY_CLICKED, "" }, + { SIG_PREV_CLICKED, "" }, + { SIG_REWIND_CLICKED, "" }, + { SIG_STOP_CLICKED, "" }, + { NULL, NULL } }; -static void _del_hook(Evas_Object *obj); -static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl); -static void _theme_hook(Evas_Object *obj); -static void _sizing_eval(Evas_Object *obj); -static void _on_focus_hook(void *data, Evas_Object *obj); -static Eina_Bool _event_hook(Evas_Object *obj, Evas_Object *src, - Evas_Callback_Type type, void *event_info); +/* Inheriting from elm_layout. Besides, we need no more than what is + * there */ +EVAS_SMART_SUBCLASS_NEW + (PLAYER_SMART_NAME, _elm_player, Elm_Layout_Smart_Class, + Elm_Layout_Smart_Class, elm_layout_smart_class_get, _smart_callbacks); +#ifdef HAVE_EMOTION static Eina_Bool -_event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type type, void *event_info) +_elm_player_smart_event(Evas_Object *obj, + Evas_Object *src __UNUSED__, + Evas_Callback_Type type, + void *event_info) { - if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE; Evas_Event_Key_Down *ev = event_info; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return EINA_FALSE; - if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE; + + ELM_PLAYER_DATA_GET(obj, sd); + if (elm_widget_disabled_get(obj)) return EINA_FALSE; - if (!wd->video) return EINA_FALSE; + if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE; + if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE; + if (!sd->video) return EINA_FALSE; + if ((!strcmp(ev->keyname, "Left")) || ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string))) { double current, last; - current = elm_video_play_position_get(wd->video); - last = elm_video_play_length_get(wd->video); + current = elm_video_play_position_get(sd->video); + last = elm_video_play_length_get(sd->video); if (current < last) { - current += last / 100; - elm_video_play_position_set(wd->video, current); + current -= last / 100; + elm_video_play_position_set(sd->video, current); } ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; @@ -88,14 +117,14 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty { double current, last; - current = elm_video_play_position_get(wd->video); - last = elm_video_play_length_get(wd->video); + current = elm_video_play_position_get(sd->video); + last = elm_video_play_length_get(sd->video); if (current > 0) { - current -= last / 100; + current += last / 100; if (current < 0) current = 0; - elm_video_play_position_set(wd->video, current); + elm_video_play_position_set(sd->video, current); } ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; @@ -103,329 +132,270 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty } if (!strcmp(ev->keyname, "space")) { - if (elm_video_is_playing_get(wd->video)) - elm_video_pause(wd->video); + if (elm_video_is_playing_get(sd->video)) + elm_video_pause(sd->video); else - elm_video_play(wd->video); + elm_video_play(sd->video); ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; return EINA_TRUE; } fprintf(stderr, "keyname: '%s' not handle\n", ev->keyname); + return EINA_FALSE; } -static void -_on_focus_hook(void *data __UNUSED__, Evas_Object *obj) +static Eina_Bool +_elm_player_smart_theme(Evas_Object *obj) { - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if (elm_widget_focus_get(obj)) - { - edje_object_signal_emit(wd->layout, "elm,action,focus", "elm"); - evas_object_focus_set(wd->layout, EINA_TRUE); - } - else - { - edje_object_signal_emit(wd->layout, "elm,action,unfocus", "elm"); - evas_object_focus_set(wd->layout, EINA_FALSE); - } + ELM_PLAYER_DATA_GET(obj, sd); + + if (!ELM_WIDGET_CLASS(_elm_player_parent_sc)->theme(obj)) return EINA_FALSE; + +#define UPDATE_THEME(Target, Name) \ + if (Target) \ + { \ + elm_object_style_set(Target, elm_widget_style_get(obj)); \ + if (!elm_layout_content_set(obj, Name, Target)) \ + evas_object_hide(Target); \ + elm_object_disabled_set(Target, elm_widget_disabled_get(obj)); \ + } + + UPDATE_THEME(sd->forward, "media_player/forward"); + UPDATE_THEME(sd->info, "media_player/info"); + UPDATE_THEME(sd->next, "media_player/next"); + UPDATE_THEME(sd->pause, "media_player/pause"); + UPDATE_THEME(sd->play, "media_player/play"); + UPDATE_THEME(sd->prev, "media_player/prev"); + UPDATE_THEME(sd->rewind, "media_player/rewind"); + UPDATE_THEME(sd->next, "media_player/next"); + UPDATE_THEME(sd->slider, "media_player/slider"); + + elm_layout_sizing_eval(obj); + + return EINA_TRUE; } static void -_mirrored_set(Evas_Object *obj, Eina_Bool rtl) +_elm_player_smart_sizing_eval(Evas_Object *obj) { - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - edje_object_mirrored_set(wd->layout, rtl); -} - -static void -_theme_hook(Evas_Object *obj) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - _elm_widget_mirrored_reload(obj); - _mirrored_set(obj, elm_widget_mirrored_get(obj)); - _elm_theme_object_set(obj, wd->layout, "video", "base", elm_widget_style_get(obj)); - edje_object_scale_set(wd->layout, elm_widget_scale_get(obj) * - _elm_config->scale); - -#define UPDATE_THEME(Obj, Target, Layout, Name) \ - if (Target) \ - { \ - elm_object_style_set(Target, elm_widget_style_get(Obj)); \ - if (!edje_object_part_swallow(Layout, Name, Target)) \ - evas_object_hide(Target); \ - elm_object_disabled_set(Target, elm_widget_disabled_get(Obj)); \ - } - - UPDATE_THEME(obj, wd->forward, wd->layout, "media_player/forward"); - UPDATE_THEME(obj, wd->info, wd->layout, "media_player/info"); - UPDATE_THEME(obj, wd->next, wd->layout, "media_player/next"); - UPDATE_THEME(obj, wd->pause, wd->layout, "media_player/pause"); - UPDATE_THEME(obj, wd->play, wd->layout, "media_player/play"); - UPDATE_THEME(obj, wd->prev, wd->layout, "media_player/prev"); - UPDATE_THEME(obj, wd->rewind, wd->layout, "media_player/rewind"); - UPDATE_THEME(obj, wd->next, wd->layout, "media_player/next"); - UPDATE_THEME(obj, wd->slider, wd->layout, "media_player/slider"); - - _sizing_eval(obj); -} - -static void -_sizing_eval(Evas_Object *obj) -{ - Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord w, h; - if (!wd) return; - edje_object_size_min_get(wd->layout, &w, &h); - edje_object_size_min_restricted_calc(wd->layout, &w, &h, w, h); + ELM_PLAYER_DATA_GET(obj, sd); + + edje_object_size_min_get(ELM_WIDGET_DATA(sd)->resize_obj, &w, &h); + edje_object_size_min_restricted_calc + (ELM_WIDGET_DATA(sd)->resize_obj, &w, &h, w, h); evas_object_size_hint_min_set(obj, w, h); } static void -_update_slider(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_update_slider(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Evas_Object *player = data; - Widget_Data *wd = elm_widget_data_get(player); double pos, length; Eina_Bool seekable; - if (!wd) return ; - seekable = elm_video_is_seekable_get(wd->video); - length = elm_video_play_length_get(wd->video); - pos = elm_video_play_position_get(wd->video); + ELM_PLAYER_DATA_GET(data, sd); - elm_object_disabled_set(wd->slider, !seekable); - elm_slider_min_max_set(wd->slider, 0, length); - elm_slider_value_set(wd->slider, pos); + seekable = elm_video_is_seekable_get(sd->video); + length = elm_video_play_length_get(sd->video); + pos = elm_video_play_position_get(sd->video); + + elm_object_disabled_set(sd->slider, !seekable); + elm_slider_min_max_set(sd->slider, 0, length); + elm_slider_value_set(sd->slider, pos); } static void -_update_position(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_update_position(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Evas_Object *player = data; - Widget_Data *wd = elm_widget_data_get(player); + ELM_PLAYER_DATA_GET(data, sd); - if (!wd) return ; - elm_video_play_position_set(wd->video, elm_slider_value_get(wd->slider)); + elm_video_play_position_set(sd->video, elm_slider_value_get(sd->slider)); } static void -_forward(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_forward(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Evas_Object *player = data; - Widget_Data *wd = elm_widget_data_get(player); double pos, length; - if (!wd) return ; + ELM_PLAYER_DATA_GET(data, sd); - pos = elm_video_play_position_get(wd->video); - length = elm_video_play_length_get(wd->video); + pos = elm_video_play_position_get(sd->video); + length = elm_video_play_length_get(sd->video); pos += length * 0.3; - elm_video_play_position_set(wd->video, pos); + elm_video_play_position_set(sd->video, pos); - edje_object_signal_emit(wd->layout, "elm,button,forward", "elm"); - evas_object_smart_callback_call(player, SIG_FORWARD_CLICKED, NULL); + elm_layout_signal_emit(data, "elm,button,forward", "elm"); + evas_object_smart_callback_call(data, SIG_FORWARD_CLICKED, NULL); } static void -_info(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_info(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Evas_Object *player = data; - Widget_Data *wd = elm_widget_data_get(player); - - if (!wd) return ; - - edje_object_signal_emit(wd->layout, "elm,button,info", "elm"); - evas_object_smart_callback_call(player, SIG_INFO_CLICKED, NULL); + elm_layout_signal_emit(data, "elm,button,info", "elm"); + evas_object_smart_callback_call(data, SIG_INFO_CLICKED, NULL); } static void -_next(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_next(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Evas_Object *player = data; - Widget_Data *wd = elm_widget_data_get(player); double pos, length; - if (!wd) return ; + ELM_PLAYER_DATA_GET(data, sd); - pos = elm_video_play_position_get(wd->video); - length = elm_video_play_length_get(wd->video); + pos = elm_video_play_position_get(sd->video); + length = elm_video_play_length_get(sd->video); pos += length * 0.1; - elm_video_play_position_set(wd->video, pos); + elm_video_play_position_set(sd->video, pos); - edje_object_signal_emit(wd->layout, "elm,button,next", "elm"); - evas_object_smart_callback_call(player, SIG_NEXT_CLICKED, NULL); + elm_layout_signal_emit(data, "elm,button,next", "elm"); + evas_object_smart_callback_call(data, SIG_NEXT_CLICKED, NULL); } static void -_pause(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_pause(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Evas_Object *player = data; - Widget_Data *wd = elm_widget_data_get(player); + ELM_PLAYER_DATA_GET(data, sd); - if (!wd) return ; + elm_layout_signal_emit(data, "elm,player,pause", "elm"); + elm_video_pause(sd->video); - edje_object_signal_emit(wd->layout, "elm,player,pause", "elm"); - elm_video_pause(wd->video); - - edje_object_signal_emit(wd->layout, "elm,button,pause", "elm"); - evas_object_smart_callback_call(player, SIG_PAUSE_CLICKED, NULL); + elm_layout_signal_emit(data, "elm,button,pause", "elm"); + evas_object_smart_callback_call(data, SIG_PAUSE_CLICKED, NULL); } static void -_play(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_play(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Evas_Object *player = data; - Widget_Data *wd = elm_widget_data_get(player); + ELM_PLAYER_DATA_GET(data, sd); - if (!wd) return ; - elm_video_play(wd->video); - edje_object_signal_emit(wd->layout, "elm,button,play", "elm"); - evas_object_smart_callback_call(player, SIG_PLAY_CLICKED, NULL); + elm_video_play(sd->video); + elm_layout_signal_emit(data, "elm,button,play", "elm"); + evas_object_smart_callback_call(data, SIG_PLAY_CLICKED, NULL); } static void -_prev(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_prev(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Evas_Object *player = data; - Widget_Data *wd = elm_widget_data_get(player); double pos, length; - if (!wd) return ; + ELM_PLAYER_DATA_GET(data, sd); - pos = elm_video_play_position_get(wd->video); - length = elm_video_play_length_get(wd->video); + pos = elm_video_play_position_get(sd->video); + length = elm_video_play_length_get(sd->video); pos -= length * 0.1; - elm_video_play_position_set(wd->video, pos); - evas_object_smart_callback_call(player, SIG_PREV_CLICKED, NULL); - edje_object_signal_emit(wd->layout, "elm,button,prev", "elm"); + elm_video_play_position_set(sd->video, pos); + evas_object_smart_callback_call(data, SIG_PREV_CLICKED, NULL); + elm_layout_signal_emit(data, "elm,button,prev", "elm"); } static void -_rewind(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_rewind(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Evas_Object *player = data; - Widget_Data *wd = elm_widget_data_get(player); + ELM_PLAYER_DATA_GET(data, sd); - if (!wd) return ; - elm_video_play_position_set(wd->video, 0); - edje_object_signal_emit(wd->layout, "elm,button,rewind", "elm"); - evas_object_smart_callback_call(player, SIG_REWIND_CLICKED, NULL); + elm_video_play_position_set(sd->video, 0); + elm_layout_signal_emit(data, "elm,button,rewind", "elm"); + evas_object_smart_callback_call(data, SIG_REWIND_CLICKED, NULL); } static void -_stop(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_stop(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Evas_Object *player = data; - Widget_Data *wd = elm_widget_data_get(player); - - if (!wd) return ; - - edje_object_signal_emit(wd->layout, "elm,button,stop", "elm"); - evas_object_smart_callback_call(player, SIG_STOP_CLICKED, NULL); + elm_layout_signal_emit(data, "elm,button,stop", "elm"); + evas_object_smart_callback_call(data, SIG_STOP_CLICKED, NULL); } static void -_play_started(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_play_started(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Evas_Object *player = data; - Widget_Data *wd = elm_widget_data_get(player); - - if (!wd) return ; - - edje_object_signal_emit(wd->layout, "elm,player,play", "elm"); + elm_layout_signal_emit(data, "elm,player,play", "elm"); } static void -_play_finished(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_play_finished(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Evas_Object *player = data; - Widget_Data *wd = elm_widget_data_get(player); - - if (!wd) return ; - - edje_object_signal_emit(wd->layout, "elm,player,pause", "elm"); + elm_layout_signal_emit(data, "elm,player,pause", "elm"); } static void -_cleanup_callback(Widget_Data *wd) +_on_video_del(Elm_Player_Smart_Data *sd) { - if (!wd || !wd->emotion) return; + elm_object_disabled_set(sd->slider, EINA_TRUE); + elm_object_disabled_set(sd->forward, EINA_TRUE); + elm_object_disabled_set(sd->info, EINA_TRUE); + elm_object_disabled_set(sd->next, EINA_TRUE); + elm_object_disabled_set(sd->pause, EINA_TRUE); + elm_object_disabled_set(sd->play, EINA_TRUE); + elm_object_disabled_set(sd->prev, EINA_TRUE); + elm_object_disabled_set(sd->rewind, EINA_TRUE); + elm_object_disabled_set(sd->next, EINA_TRUE); - evas_object_smart_callback_del(wd->emotion, "frame_decode", - _update_slider); - evas_object_smart_callback_del(wd->emotion, "frame_resize", - _update_slider); - evas_object_smart_callback_del(wd->emotion, "length_change", - _update_slider); - evas_object_smart_callback_del(wd->emotion, "position_update", - _update_slider); - evas_object_smart_callback_del(wd->emotion, "playback_started", - _play_started); - evas_object_smart_callback_del(wd->emotion, "playback_finished", - _play_finished); - elm_object_disabled_set(wd->slider, EINA_TRUE); - elm_object_disabled_set(wd->forward, EINA_TRUE); - elm_object_disabled_set(wd->info, EINA_TRUE); - elm_object_disabled_set(wd->next, EINA_TRUE); - elm_object_disabled_set(wd->pause, EINA_TRUE); - elm_object_disabled_set(wd->play, EINA_TRUE); - elm_object_disabled_set(wd->prev, EINA_TRUE); - elm_object_disabled_set(wd->rewind, EINA_TRUE); - elm_object_disabled_set(wd->next, EINA_TRUE); - wd->video = NULL; - wd->emotion = NULL; + sd->video = NULL; + sd->emotion = NULL; } static void -_track_video(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_video_del(void *data, + Evas *e __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - _cleanup_callback(data); -} - -static void -_del_hook(Evas_Object *obj) -{ - Widget_Data *wd = elm_widget_data_get(obj); - - if (!wd) return; - evas_object_smart_callback_del(wd->forward, "clicked", _forward); - evas_object_smart_callback_del(wd->info, "clicked", _info); - evas_object_smart_callback_del(wd->next, "clicked", _next); - evas_object_smart_callback_del(wd->pause, "clicked", _pause); - evas_object_smart_callback_del(wd->play, "clicked", _play); - evas_object_smart_callback_del(wd->prev, "clicked", _prev); - evas_object_smart_callback_del(wd->rewind, "clicked", _rewind); - evas_object_smart_callback_del(wd->next, "clicked", _next); - _cleanup_callback(wd); - free(wd); + _on_video_del(data); } static Evas_Object * -_player_button_add(Evas_Object *parent, Evas_Object *obj, Evas_Object *layout, const char *name, Evas_Smart_Cb func) +_player_button_add(Evas_Object *obj, + const char *name, + Evas_Smart_Cb func) { Evas_Object *ic; Evas_Object *bt; - ic = elm_icon_add(parent); + ic = elm_icon_add(obj); elm_icon_standard_set(ic, name); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); - bt = elm_button_add(parent); + + bt = elm_button_add(obj); elm_widget_mirrored_automatic_set(bt, EINA_FALSE); elm_object_part_content_set(bt, "icon", ic); evas_object_size_hint_align_set(bt, 0.0, 0.0); elm_object_style_set(bt, "anchor"); evas_object_smart_callback_add(bt, "clicked", func, obj); - elm_widget_sub_object_add(obj, bt); - if (!edje_object_part_swallow(layout, name, bt)) - evas_object_hide(bt); + if (!elm_layout_content_set(obj, name, bt)) + { + elm_widget_sub_object_add(obj, bt); + evas_object_hide(bt); + } + return bt; } @@ -439,6 +409,7 @@ _double_to_time(double value) pm = value / 60 - (ph * 60); ps = value - (pm * 60); pf = value * 100 - (ps * 100) - (pm * 60 * 100) - (ph * 60 * 60 * 100); + if (ph) snprintf(buf, sizeof(buf), "%i:%02i:%02i.%02i", ph, pm, ps, pf); @@ -453,138 +424,156 @@ _double_to_time(double value) } static void -_value_free(char *data) +_str_free(char *data) { eina_stringshare_del(data); } -#endif -#ifdef HAVE_EMOTION -static void -_content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content) +/* a video object is never parented by a player one, just tracked. + * treating this special case here and delegating other objects to own + * layout */ +static Eina_Bool +_elm_player_smart_content_set(Evas_Object *obj, + const char *part, + Evas_Object *content) { - if (part && strcmp(part, "video")) return; - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; double pos, length; Eina_Bool seekable; - if (!_elm_video_check(content)) return; - if (wd->video == content) return; + if (part && strcmp(part, "video")) + return ELM_CONTAINER_CLASS(_elm_player_parent_sc)->content_set + (obj, part, content); - if (wd->video) evas_object_del(wd->video); - _cleanup_callback(wd); + ELM_PLAYER_DATA_GET(obj, sd); - wd->video = content; + if (!_elm_video_check(content)) return EINA_FALSE; + if (sd->video == content) return EINA_TRUE; - if (!wd->video) - { - wd->emotion = NULL; - return ; - } + if (sd->video) evas_object_del(sd->video); - elm_object_disabled_set(wd->slider, EINA_FALSE); - elm_object_disabled_set(wd->forward, EINA_FALSE); - elm_object_disabled_set(wd->info, EINA_FALSE); - elm_object_disabled_set(wd->next, EINA_FALSE); - elm_object_disabled_set(wd->pause, EINA_FALSE); - elm_object_disabled_set(wd->play, EINA_FALSE); - elm_object_disabled_set(wd->prev, EINA_FALSE); - elm_object_disabled_set(wd->rewind, EINA_FALSE); - elm_object_disabled_set(wd->next, EINA_FALSE); + sd->video = content; - wd->emotion = elm_video_emotion_get(wd->video); - emotion_object_priority_set(wd->emotion, EINA_TRUE); - evas_object_event_callback_add(wd->video, EVAS_CALLBACK_DEL, - _track_video, wd); + if (!content) return EINA_TRUE; - seekable = elm_video_is_seekable_get(wd->video); - length = elm_video_play_length_get(wd->video); - pos = elm_video_play_position_get(wd->video); + elm_object_disabled_set(sd->slider, EINA_FALSE); + elm_object_disabled_set(sd->forward, EINA_FALSE); + elm_object_disabled_set(sd->info, EINA_FALSE); + elm_object_disabled_set(sd->next, EINA_FALSE); + elm_object_disabled_set(sd->pause, EINA_FALSE); + elm_object_disabled_set(sd->play, EINA_FALSE); + elm_object_disabled_set(sd->prev, EINA_FALSE); + elm_object_disabled_set(sd->rewind, EINA_FALSE); + elm_object_disabled_set(sd->next, EINA_FALSE); - elm_object_disabled_set(wd->slider, !seekable); - elm_slider_min_max_set(wd->slider, 0, length); - elm_slider_value_set(wd->slider, pos); + sd->emotion = elm_video_emotion_get(sd->video); + emotion_object_priority_set(sd->emotion, EINA_TRUE); + evas_object_event_callback_add + (sd->video, EVAS_CALLBACK_DEL, _video_del, sd); - if (elm_video_is_playing_get(wd->video)) edje_object_signal_emit(wd->layout, "elm,player,play", "elm"); - else edje_object_signal_emit(wd->layout, "elm,player,pause", "elm"); + seekable = elm_video_is_seekable_get(sd->video); + length = elm_video_play_length_get(sd->video); + pos = elm_video_play_position_get(sd->video); - evas_object_smart_callback_add(wd->emotion, "frame_decode", + elm_object_disabled_set(sd->slider, !seekable); + elm_slider_min_max_set(sd->slider, 0, length); + elm_slider_value_set(sd->slider, pos); + + if (elm_video_is_playing_get(sd->video)) + elm_layout_signal_emit(obj, "elm,player,play", "elm"); + else elm_layout_signal_emit(obj, "elm,player,pause", "elm"); + + evas_object_smart_callback_add(sd->emotion, "frame_decode", _update_slider, obj); - evas_object_smart_callback_add(wd->emotion, "frame_resize", + evas_object_smart_callback_add(sd->emotion, "frame_resize", _update_slider, obj); - evas_object_smart_callback_add(wd->emotion, "length_change", + evas_object_smart_callback_add(sd->emotion, "length_change", _update_slider, obj); - evas_object_smart_callback_add(wd->emotion, "position_update", + evas_object_smart_callback_add(sd->emotion, "position_update", _update_slider, obj); - evas_object_smart_callback_add(wd->emotion, "playback_started", + evas_object_smart_callback_add(sd->emotion, "playback_started", _play_started, obj); - evas_object_smart_callback_add(wd->emotion, "playback_finished", + evas_object_smart_callback_add(sd->emotion, "playback_finished", _play_finished, obj); /* FIXME: track info from video */ + + return EINA_TRUE; } + +static void +_elm_player_smart_add(Evas_Object *obj) +{ + EVAS_SMART_DATA_ALLOC(obj, Elm_Player_Smart_Data); + + ELM_WIDGET_CLASS(_elm_player_parent_sc)->base.add(obj); + + elm_layout_theme_set(obj, "player", "base", elm_widget_style_get(obj)); + + priv->forward = _player_button_add(obj, "media_player/forward", _forward); + priv->info = _player_button_add(obj, "media_player/info", _info); + priv->next = _player_button_add(obj, "media_player/next", _next); + priv->pause = _player_button_add(obj, "media_player/pause", _pause); + priv->play = _player_button_add(obj, "media_player/play", _play); + priv->prev = _player_button_add(obj, "media_player/prev", _prev); + priv->rewind = _player_button_add(obj, "media_player/rewind", _rewind); + priv->stop = _player_button_add(obj, "media_player/stop", _stop); + + priv->slider = elm_slider_add(obj); + elm_slider_indicator_format_function_set + (priv->slider, _double_to_time, _str_free); + elm_slider_units_format_function_set + (priv->slider, _double_to_time, _str_free); + elm_slider_min_max_set(priv->slider, 0, 0); + elm_slider_value_set(priv->slider, 0); + elm_object_disabled_set(priv->slider, EINA_TRUE); + evas_object_size_hint_align_set(priv->slider, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set + (priv->slider, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + + elm_layout_content_set(obj, "media_player/slider", priv->slider); + evas_object_smart_callback_add + (priv->slider, "changed", _update_position, obj); + + elm_layout_sizing_eval(obj); + elm_widget_can_focus_set(obj, EINA_TRUE); +} + #endif +static void +_elm_player_smart_set_user(Elm_Layout_Smart_Class *sc) +{ +#ifdef HAVE_EMOTION + ELM_WIDGET_CLASS(sc)->base.add = _elm_player_smart_add; + + ELM_WIDGET_CLASS(sc)->event = _elm_player_smart_event; + ELM_WIDGET_CLASS(sc)->theme = _elm_player_smart_theme; + + ELM_CONTAINER_CLASS(sc)->content_set = _elm_player_smart_content_set; + + sc->sizing_eval = _elm_player_smart_sizing_eval; +#endif +} + EAPI Evas_Object * elm_player_add(Evas_Object *parent) { #ifdef HAVE_EMOTION - Evas_Object *obj; Evas *e; - Widget_Data *wd; + Evas_Object *obj; - ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - ELM_SET_WIDTYPE(widtype, "player"); - elm_widget_type_set(obj, "player"); - elm_widget_sub_object_add(parent, obj); - elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL); - elm_widget_data_set(obj, wd); - elm_widget_del_hook_set(obj, _del_hook); - elm_widget_theme_hook_set(obj, _theme_hook); - elm_widget_can_focus_set(obj, EINA_TRUE); - elm_widget_event_hook_set(obj, _event_hook); - elm_widget_content_set_hook_set(obj, _content_set_hook); - /* TODO: add content_unset and content_get hook */ + EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - wd->layout = edje_object_add(e); - _elm_theme_object_set(obj, wd->layout, "player", "base", "default"); - elm_widget_resize_object_set(obj, wd->layout); - elm_widget_sub_object_add(obj, wd->layout); - evas_object_show(wd->layout); - evas_object_size_hint_weight_set(wd->layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + e = evas_object_evas_get(parent); + if (!e) return NULL; - wd->forward = _player_button_add(parent, obj, wd->layout, "media_player/forward", _forward); - wd->info = _player_button_add(parent, obj, wd->layout, "media_player/info", _info); - wd->next = _player_button_add(parent, obj, wd->layout, "media_player/next", _next); - wd->pause = _player_button_add(parent, obj, wd->layout, "media_player/pause", _pause); - wd->play = _player_button_add(parent, obj, wd->layout, "media_player/play", _play); - wd->prev = _player_button_add(parent, obj, wd->layout, "media_player/prev", _prev); - wd->rewind = _player_button_add(parent, obj, wd->layout, "media_player/rewind", _rewind); - wd->stop = _player_button_add(parent, obj, wd->layout, "media_player/stop", _stop); + obj = evas_object_smart_add(e, _elm_player_smart_class_new()); - wd->slider = elm_slider_add(parent); - elm_widget_sub_object_add(obj, wd->slider); - elm_slider_indicator_format_function_set(wd->slider, _double_to_time, _value_free); - elm_slider_units_format_function_set(wd->slider, _double_to_time, _value_free); - elm_slider_min_max_set(wd->slider, 0, 0); - elm_slider_value_set(wd->slider, 0); - elm_object_disabled_set(wd->slider, EINA_TRUE); - evas_object_size_hint_align_set(wd->slider, EVAS_HINT_FILL, 0.5); - evas_object_size_hint_weight_set(wd->slider, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - edje_object_part_swallow(wd->layout, "media_player/slider", wd->slider); - evas_object_smart_callback_add(wd->slider, "changed", _update_position, obj); - - wd->emotion = NULL; - wd->video = NULL; - - _mirrored_set(obj, elm_widget_mirrored_get(obj)); - _sizing_eval(obj); + if (!elm_widget_sub_object_add(parent, obj)) + ERR("could not add %p as sub object of %p", obj, parent); return obj; #else - (void) parent; return NULL; #endif } diff --git a/legacy/elementary/src/lib/elm_video.c b/legacy/elementary/src/lib/elm_video.c index 173f9ed282..5b0e66f87d 100644 --- a/legacy/elementary/src/lib/elm_video.c +++ b/legacy/elementary/src/lib/elm_video.c @@ -1,49 +1,73 @@ #include #include "elm_priv.h" +#include "elm_widget_layout.h" #ifdef HAVE_EMOTION # include #endif -/* TODO: add buffering support to Emotion and display buffering progression in the theme when needed */ +/* TODO: add buffering support to Emotion and display buffering + * progress in the theme when needed */ -typedef struct _Widget_Data Widget_Data; -struct _Widget_Data +static const char VIDEO_SMART_NAME[] = "elm_video"; + +typedef struct _Elm_Video_Smart_Data Elm_Video_Smart_Data; +struct _Elm_Video_Smart_Data { - Evas_Object *layout; - Evas_Object *emotion; + Elm_Layout_Smart_Data base; - Ecore_Timer *timer; + Evas_Object *emotion; + Ecore_Timer *timer; - Eina_Bool stop : 1; - Eina_Bool remember : 1; + 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_Layout_Smart_Class, elm_layout_smart_class_get, NULL); + #ifdef HAVE_EMOTION -static const char *widtype = NULL; - -static const Evas_Smart_Cb_Description _signals[] = { - { NULL, NULL } -}; - -static void _del_hook(Evas_Object *obj); -static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl); -static void _theme_hook(Evas_Object *obj); -static void _sizing_eval(Evas_Object *obj); -static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _on_focus_hook(void *data, Evas_Object *obj); -static Eina_Bool _event_hook(Evas_Object *obj, Evas_Object *src, - Evas_Callback_Type type, void *event_info); static Eina_Bool -_event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type type, void *event_info) +_elm_video_smart_event(Evas_Object *obj, + Evas_Object *src __UNUSED__, + Evas_Callback_Type type, + void *event_info) { - if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE; Evas_Event_Key_Down *ev = event_info; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return EINA_FALSE; + + if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE; if (elm_widget_disabled_get(obj)) return EINA_FALSE; + if ((!strcmp(ev->keyname, "Left")) || ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string))) { @@ -59,8 +83,10 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty } ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; + return EINA_TRUE; } + if ((!strcmp(ev->keyname, "Right")) || ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string))) { @@ -77,8 +103,10 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty } ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; + return EINA_TRUE; } + if (!strcmp(ev->keyname, "space")) { if (elm_video_is_playing_get(obj)) @@ -86,496 +114,494 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty else elm_video_play(obj); ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; + return EINA_TRUE; } - fprintf(stderr, "keyname: '%s' not handle\n", ev->keyname); + + INF("keyname: '%s' not handled", ev->keyname); + return EINA_FALSE; } static void -_del_hook(Evas_Object *obj) +_elm_video_smart_sizing_eval(Evas_Object *obj) { - Widget_Data *wd = elm_widget_data_get(obj); + ELM_VIDEO_DATA_GET(obj, sd); - if (!wd) return; - if (wd->timer) ecore_timer_del(wd->timer); - free(wd); -} - -static void -_on_focus_hook(void *data __UNUSED__, Evas_Object *obj) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if (elm_widget_focus_get(obj)) - { - edje_object_signal_emit(wd->layout, "elm,action,focus", "elm"); - evas_object_focus_set(wd->layout, EINA_TRUE); - } - else - { - edje_object_signal_emit(wd->layout, "elm,action,unfocus", "elm"); - evas_object_focus_set(wd->layout, EINA_FALSE); - } -} - -static void -_mirrored_set(Evas_Object *obj, Eina_Bool rtl) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - edje_object_mirrored_set(wd->layout, rtl); -} - -static void -_theme_hook(Evas_Object *obj) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - _elm_widget_mirrored_reload(obj); - _mirrored_set(obj, elm_widget_mirrored_get(obj)); - _elm_theme_object_set(obj, wd->layout, "video", "base", elm_widget_style_get(obj)); - edje_object_scale_set(wd->layout, elm_widget_scale_get(obj) * - _elm_config->scale); - _sizing_eval(obj); -} - -static void -_sizing_eval(Evas_Object *obj) -{ - Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord minw = -1, minh = -1; Evas_Coord w, h; - if (!wd) return; - evas_object_size_hint_request_get(wd->emotion, &minw, &minh); - evas_object_size_hint_aspect_set(wd->emotion, EVAS_ASPECT_CONTROL_BOTH, minw, minh); - edje_object_size_min_calc(wd->layout, &w, &h); + evas_object_size_hint_request_get(sd->emotion, &minw, &minh); + evas_object_size_hint_aspect_set + (sd->emotion, EVAS_ASPECT_CONTROL_BOTH, minw, minh); + edje_object_size_min_calc(ELM_WIDGET_DATA(sd)->resize_obj, &w, &h); if (w != 0 && h != 0) { minw = w; minh = h; } + evas_object_size_hint_aspect_set(obj, EVAS_ASPECT_CONTROL_BOTH, minw, minh); } static void -_changed_size_hints(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_on_size_hints_changed(void *data, + Evas *e __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - _sizing_eval(data); + elm_layout_sizing_eval(data); } static void -_sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_on_open_done(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Widget_Data *wd = elm_widget_data_get(obj); - - if (wd->remember) emotion_object_last_position_save(wd->emotion); + elm_layout_signal_emit(data, "elm,video,open", "elm"); } static void -_open_done(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_on_playback_started(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Widget_Data *wd = elm_widget_data_get(data); - - edje_object_signal_emit(wd->layout, "elm,video,open", "elm"); + elm_layout_signal_emit(data, "elm,video,play", "elm"); } static void -_playback_started(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_on_playback_finished(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Widget_Data *wd = elm_widget_data_get(data); - - edje_object_signal_emit(wd->layout, "elm,video,play", "elm"); + elm_layout_signal_emit(data, "elm,video,end", "elm"); } static void -_playback_finished(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_on_aspect_ratio_updated(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Widget_Data *wd = elm_widget_data_get(data); - - edje_object_signal_emit(wd->layout, "elm,video,end", "elm"); + elm_layout_sizing_eval(data); } static void -_update_aspect_ratio(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_on_title_changed(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - _sizing_eval(data); -} - -static void -_title_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) -{ - Widget_Data *wd = elm_widget_data_get(data); const char *title; - title = emotion_object_title_get(wd->emotion); - edje_object_part_text_escaped_set(wd->layout, "elm,title", title); - edje_object_signal_emit(wd->layout, "elm,video,title", "elm"); + ELM_VIDEO_DATA_GET(data, sd); + + title = emotion_object_title_get(sd->emotion); + elm_layout_text_set(data, "elm,title", title); + elm_layout_signal_emit(data, "elm,video,title", "elm"); } static void -_audio_level_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_on_audio_level_changed(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - (void) data; + (void)data; } static Eina_Bool _suspend_cb(void *data) { - Widget_Data *wd = elm_widget_data_get(data); double interval; - interval = ecore_timer_interval_get(wd->timer); + ELM_VIDEO_DATA_GET(data, sd); + + interval = ecore_timer_interval_get(sd->timer); if (interval <= 20) - emotion_object_suspend_set(wd->emotion, EMOTION_SLEEP); + emotion_object_suspend_set(sd->emotion, EMOTION_SLEEP); else if (interval <= 30) - emotion_object_suspend_set(wd->emotion, EMOTION_DEEP_SLEEP); + emotion_object_suspend_set(sd->emotion, EMOTION_DEEP_SLEEP); else { - emotion_object_suspend_set(wd->emotion, EMOTION_HIBERNATE); - wd->timer = NULL; + emotion_object_suspend_set(sd->emotion, EMOTION_HIBERNATE); + sd->timer = NULL; + return ECORE_CALLBACK_CANCEL; } - ecore_timer_interval_set(wd->timer, interval + 10); + ecore_timer_interval_set(sd->timer, interval + 10); return ECORE_CALLBACK_RENEW; } + #endif Eina_Bool _elm_video_check(Evas_Object *video) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype) EINA_FALSE; - return EINA_TRUE; + ELM_VIDEO_CHECK(video) EINA_FALSE; + + return EINA_TRUE; #else - (void) video; - return EINA_FALSE; + (void)video; + + return EINA_FALSE; #endif } +static void +_elm_video_smart_add(Evas_Object *obj) +{ + EVAS_SMART_DATA_ALLOC(obj, Elm_Video_Smart_Data); + + ELM_WIDGET_CLASS(_elm_video_parent_sc)->base.add(obj); + + priv->stop = EINA_FALSE; + priv->remember = EINA_FALSE; + + priv->emotion = emotion_object_add(evas_object_evas_get(obj)); + emotion_object_init(priv->emotion, NULL); + + elm_layout_theme_set(obj, "video", "base", elm_widget_style_get(obj)); + elm_layout_content_set(obj, "elm.swallow.video", priv->emotion); + + evas_object_smart_callback_add + (priv->emotion, "open_done", _on_open_done, obj); + evas_object_smart_callback_add + (priv->emotion, "playback_started", _on_playback_started, obj); + evas_object_smart_callback_add + (priv->emotion, "playback_finished", _on_playback_finished, obj); + evas_object_smart_callback_add + (priv->emotion, "frame_resize", _on_aspect_ratio_updated, obj); + evas_object_smart_callback_add + (priv->emotion, "title_change", _on_title_changed, obj); + evas_object_smart_callback_add + (priv->emotion, "audio_level_change", _on_audio_level_changed, obj); + + evas_object_event_callback_add + (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, NULL); + + elm_widget_can_focus_set(obj, EINA_TRUE); + + priv->timer = ecore_timer_add(20.0, _suspend_cb, obj); +} + +static void +_elm_video_smart_del(Evas_Object *obj) +{ + ELM_VIDEO_DATA_GET(obj, sd); + + if (sd->timer) ecore_timer_del(sd->timer); + if (sd->remember) emotion_object_last_position_save(sd->emotion); + + ELM_WIDGET_CLASS(_elm_video_parent_sc)->base.del(obj); +} + +static void +_elm_video_smart_set_user(Elm_Layout_Smart_Class *sc) +{ + ELM_WIDGET_CLASS(sc)->base.add = _elm_video_smart_add; + ELM_WIDGET_CLASS(sc)->base.del = _elm_video_smart_del; + + ELM_WIDGET_CLASS(sc)->event = _elm_video_smart_event; + ELM_WIDGET_CLASS(sc)->focus_next = NULL; /* not 'focus chain manager' */ + + sc->sizing_eval = _elm_video_smart_sizing_eval; +} + EAPI Evas_Object * elm_video_add(Evas_Object *parent) { #ifdef HAVE_EMOTION - Evas_Object *obj; Evas *e; - Widget_Data *wd; + Evas_Object *obj; - ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - ELM_SET_WIDTYPE(widtype, "video"); - elm_widget_type_set(obj, "video"); - elm_widget_sub_object_add(parent, obj); - elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL); - elm_widget_data_set(obj, wd); - elm_widget_del_hook_set(obj, _del_hook); - elm_widget_theme_hook_set(obj, _theme_hook); - elm_widget_can_focus_set(obj, EINA_TRUE); - elm_widget_event_hook_set(obj, _event_hook); + EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - wd->stop = EINA_FALSE; - wd->remember = EINA_FALSE; + e = evas_object_evas_get(parent); + if (!e) return NULL; - wd->layout = edje_object_add(e); - _elm_theme_object_set(obj, wd->layout, "video", "base", "default"); - elm_widget_resize_object_set(obj, wd->layout); - evas_object_show(wd->layout); - evas_object_size_hint_weight_set(wd->layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + obj = evas_object_smart_add(e, _elm_video_smart_class_new()); - wd->emotion = emotion_object_add(e); - emotion_object_init(wd->emotion, NULL); - elm_widget_sub_object_add(obj, wd->emotion); - edje_object_part_swallow(wd->layout, "elm.swallow.video", wd->emotion); - - evas_object_smart_callback_add(wd->emotion, "open_done", _open_done, obj); - evas_object_smart_callback_add(wd->emotion, "playback_started", _playback_started, obj); - evas_object_smart_callback_add(wd->emotion, "playback_finished", _playback_finished, obj); - evas_object_smart_callback_add(wd->emotion, "frame_resize", _update_aspect_ratio, obj); - evas_object_smart_callback_add(wd->emotion, "title_change", _title_change, obj); - evas_object_smart_callback_add(wd->emotion, "audio_level_change", _audio_level_change, obj); - - evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); - evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, NULL); - evas_object_smart_callbacks_descriptions_set(obj, _signals); - - _mirrored_set(obj, elm_widget_mirrored_get(obj)); - _sizing_eval(obj); - - wd->timer = ecore_timer_add(20.0, _suspend_cb, obj); + if (!elm_widget_sub_object_add(parent, obj)) + ERR("could not add %p as sub object of %p", obj, parent); return obj; #else - (void) parent; + (void)parent; + return NULL; #endif } EAPI Eina_Bool -elm_video_file_set(Evas_Object *video, const char *filename) +elm_video_file_set(Evas_Object *obj, + const char *filename) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(video); + ELM_VIDEO_CHECK(obj) EINA_FALSE; + ELM_VIDEO_DATA_GET(obj, sd); - if (wd->remember) emotion_object_last_position_save(wd->emotion); - wd->stop = EINA_FALSE; - if (!emotion_object_file_set(wd->emotion, filename)) return EINA_FALSE; + if (sd->remember) emotion_object_last_position_save(sd->emotion); + sd->stop = EINA_FALSE; + if (!emotion_object_file_set(sd->emotion, filename)) return EINA_FALSE; if ((!strncmp(filename, "file://", 7)) || (!strstr(filename, "://"))) - emotion_object_last_position_load(wd->emotion); + emotion_object_last_position_load(sd->emotion); - edje_object_signal_emit(wd->layout, "elm,video,load", "elm"); + elm_layout_signal_emit(obj, "elm,video,load", "elm"); return EINA_TRUE; #else - (void) video; - (void) filename; + (void)video; + (void)filename; return EINA_FALSE; #endif } EAPI Evas_Object * -elm_video_emotion_get(const Evas_Object *video) +elm_video_emotion_get(const Evas_Object *obj) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(video); + ELM_VIDEO_CHECK(obj) NULL; + ELM_VIDEO_DATA_GET(obj, sd); - return wd->emotion; + return sd->emotion; #else - (void) video; + (void)video; return NULL; #endif } EAPI void -elm_video_play(Evas_Object *video) +elm_video_play(Evas_Object *obj) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype); - Widget_Data *wd = elm_widget_data_get(video); + ELM_VIDEO_CHECK(obj); + ELM_VIDEO_DATA_GET(obj, sd); - if (emotion_object_play_get(wd->emotion)) return ; + if (emotion_object_play_get(sd->emotion)) return; - if (wd->timer) ecore_timer_del(wd->timer); - wd->timer = NULL; - wd->stop = EINA_FALSE; - emotion_object_play_set(wd->emotion, EINA_TRUE); + if (sd->timer) ecore_timer_del(sd->timer); + sd->timer = NULL; + sd->stop = EINA_FALSE; + emotion_object_play_set(sd->emotion, EINA_TRUE); #else - (void) video; + (void)video; #endif } /* FIXME: pause will setup timer and go into sleep or * hibernate after a while without activity. */ - EAPI void -elm_video_pause(Evas_Object *video) +elm_video_pause(Evas_Object *obj) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype); - Widget_Data *wd = elm_widget_data_get(video); + ELM_VIDEO_CHECK(obj); + ELM_VIDEO_DATA_GET(obj, sd); - if (!emotion_object_play_get(wd->emotion)) return ; + if (!emotion_object_play_get(sd->emotion)) return; - if (!wd->timer) wd->timer = ecore_timer_add(20.0, _suspend_cb, video); - emotion_object_play_set(wd->emotion, EINA_FALSE); - edje_object_signal_emit(wd->layout, "elm,video,pause", "elm"); + if (!sd->timer) sd->timer = ecore_timer_add(20.0, _suspend_cb, obj); + emotion_object_play_set(sd->emotion, EINA_FALSE); + elm_layout_signal_emit(obj, "elm,video,pause", "elm"); #else - (void) video; + (void)video; #endif } /* FIXME: stop should go into hibernate state directly. */ EAPI void -elm_video_stop(Evas_Object *video) +elm_video_stop(Evas_Object *obj) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype); - Widget_Data *wd = elm_widget_data_get(video); + ELM_VIDEO_CHECK(obj); + ELM_VIDEO_DATA_GET(obj, sd); - if (!emotion_object_play_get(wd->emotion) && wd->stop) return ; + if (!emotion_object_play_get(sd->emotion) && sd->stop) return; - if (wd->timer) ecore_timer_del(wd->timer); - wd->timer = NULL; - wd->stop = EINA_TRUE; - emotion_object_play_set(wd->emotion, EINA_FALSE); - edje_object_signal_emit(wd->layout, "elm,video,stop", "elm"); - emotion_object_suspend_set(wd->emotion, EMOTION_HIBERNATE); + if (sd->timer) ecore_timer_del(sd->timer); + sd->timer = NULL; + + sd->stop = EINA_TRUE; + emotion_object_play_set(sd->emotion, EINA_FALSE); + elm_layout_signal_emit(obj, "elm,video,stop", "elm"); + emotion_object_suspend_set(sd->emotion, EMOTION_HIBERNATE); #else - (void) video; + (void)video; #endif } EAPI Eina_Bool -elm_video_is_playing_get(const Evas_Object *video) +elm_video_is_playing_get(const Evas_Object *obj) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(video); + ELM_VIDEO_CHECK(obj) EINA_FALSE; + ELM_VIDEO_DATA_GET(obj, sd); - return emotion_object_play_get(wd->emotion); + return emotion_object_play_get(sd->emotion); #else - (void) video; + (void)video; return EINA_FALSE; #endif } EAPI Eina_Bool -elm_video_is_seekable_get(const Evas_Object *video) +elm_video_is_seekable_get(const Evas_Object *obj) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(video); + ELM_VIDEO_CHECK(obj) EINA_FALSE; + ELM_VIDEO_DATA_GET(obj, sd); - return emotion_object_seekable_get(wd->emotion); + return emotion_object_seekable_get(sd->emotion); #else - (void) video; + (void)video; return EINA_FALSE; #endif } EAPI Eina_Bool -elm_video_audio_mute_get(const Evas_Object *video) +elm_video_audio_mute_get(const Evas_Object *obj) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(video); + ELM_VIDEO_CHECK(obj) EINA_FALSE; + ELM_VIDEO_DATA_GET(obj, sd); - return emotion_object_audio_mute_get(wd->emotion); + return emotion_object_audio_mute_get(sd->emotion); #else - (void) video; + (void)video; return EINA_FALSE; #endif } EAPI void -elm_video_audio_mute_set(Evas_Object *video, Eina_Bool mute) +elm_video_audio_mute_set(Evas_Object *obj, + Eina_Bool mute) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype); - Widget_Data *wd = elm_widget_data_get(video); + ELM_VIDEO_CHECK(obj); + ELM_VIDEO_DATA_GET(obj, sd); - emotion_object_audio_mute_set(wd->emotion, mute); + emotion_object_audio_mute_set(sd->emotion, mute); #else - (void) video; - (void) mute; + (void)video; + (void)mute; #endif } EAPI double -elm_video_audio_level_get(const Evas_Object *video) +elm_video_audio_level_get(const Evas_Object *obj) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype) 0.0; - Widget_Data *wd = elm_widget_data_get(video); + ELM_VIDEO_CHECK(obj) 0.0; + ELM_VIDEO_DATA_GET(obj, sd); - return emotion_object_audio_volume_get(wd->emotion); + return emotion_object_audio_volume_get(sd->emotion); #else - (void) video; + (void)video; return 0.0; #endif } EAPI void -elm_video_audio_level_set(Evas_Object *video, double volume) +elm_video_audio_level_set(Evas_Object *obj, + double volume) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype); - Widget_Data *wd = elm_widget_data_get(video); + ELM_VIDEO_CHECK(obj); + ELM_VIDEO_DATA_GET(obj, sd); - emotion_object_audio_volume_set(wd->emotion, volume); + emotion_object_audio_volume_set(sd->emotion, volume); #else - (void) video; - (void) volume; + (void)video; + (void)volume; #endif } EAPI double -elm_video_play_position_get(const Evas_Object *video) +elm_video_play_position_get(const Evas_Object *obj) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype) 0.0; - Widget_Data *wd = elm_widget_data_get(video); + ELM_VIDEO_CHECK(obj) 0.0; + ELM_VIDEO_DATA_GET(obj, sd); - return emotion_object_position_get(wd->emotion); + return emotion_object_position_get(sd->emotion); #else - (void) video; + (void)video; return 0.0; #endif } EAPI void -elm_video_play_position_set(Evas_Object *video, double position) +elm_video_play_position_set(Evas_Object *obj, + double position) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype); - Widget_Data *wd = elm_widget_data_get(video); + ELM_VIDEO_CHECK(obj); + ELM_VIDEO_DATA_GET(obj, sd); - emotion_object_position_set(wd->emotion, position); + emotion_object_position_set(sd->emotion, position); #else - (void) video; - (void) position; + (void)video; + (void)position; #endif } EAPI double -elm_video_play_length_get(const Evas_Object *video) +elm_video_play_length_get(const Evas_Object *obj) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype) 0.0; - Widget_Data *wd = elm_widget_data_get(video); + ELM_VIDEO_CHECK(obj) 0.0; + ELM_VIDEO_DATA_GET(obj, sd); - return emotion_object_play_length_get(wd->emotion); + return emotion_object_play_length_get(sd->emotion); #else - (void) video; + (void)video; return 0.0; #endif } EAPI const char * -elm_video_title_get(const Evas_Object *video) +elm_video_title_get(const Evas_Object *obj) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(video); + ELM_VIDEO_CHECK(obj) NULL; + ELM_VIDEO_DATA_GET(obj, sd); - return emotion_object_title_get(wd->emotion); + return emotion_object_title_get(sd->emotion); #else - (void) video; + (void)video; return NULL; #endif } EAPI void -elm_video_remember_position_set(Evas_Object *video, Eina_Bool remember) +elm_video_remember_position_set(Evas_Object *obj, + Eina_Bool remember) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype); - Widget_Data *wd = elm_widget_data_get(video); + ELM_VIDEO_CHECK(obj); + ELM_VIDEO_DATA_GET(obj, sd); - wd->remember = remember; + sd->remember = remember; #else - (void) video; - (void) remember; + (void)video; + (void)remember; #endif } EAPI Eina_Bool -elm_video_remember_position_get(const Evas_Object *video) +elm_video_remember_position_get(const Evas_Object *obj) { #ifdef HAVE_EMOTION - ELM_CHECK_WIDTYPE(video, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(video); + ELM_VIDEO_CHECK(obj) EINA_FALSE; + ELM_VIDEO_DATA_GET(obj, sd); - return wd->remember; + return sd->remember; #else - (void) video; + (void)video; return EINA_FALSE; #endif } diff --git a/legacy/elementary/src/lib/elm_video.h b/legacy/elementary/src/lib/elm_video.h index 018f632459..8fd9778a49 100644 --- a/legacy/elementary/src/lib/elm_video.h +++ b/legacy/elementary/src/lib/elm_video.h @@ -20,16 +20,19 @@ * linked Elm_Video so it will use the video decoder, if available. It also * activates the "remember" function on the linked Elm_Video object. * - * Signals that you can add callback for are : + * Both widgets inherit from the @ref Layout one, so that all the + * functions acting on it also work for video objects. * - * "forward,clicked" - the user clicked the forward button. - * "info,clicked" - the user clicked the info button. - * "next,clicked" - the user clicked the next button. - * "pause,clicked" - the user clicked the pause button. - * "play,clicked" - the user clicked the play button. - * "prev,clicked" - the user clicked the prev button. - * "rewind,clicked" - the user clicked the rewind button. - * "stop,clicked" - the user clicked the stop button. + * The player widget emits the following signals, besides the ones + * sent from @ref Layout: + * - @c "forward,clicked" - the user clicked the forward button. + * - @c "info,clicked" - the user clicked the info button. + * - @c "next,clicked" - the user clicked the next button. + * - @c "pause,clicked" - the user clicked the pause button. + * - @c "play,clicked" - the user clicked the play button. + * - @c "prev,clicked" - the user clicked the prev button. + * - @c "rewind,clicked" - the user clicked the rewind button. + * - @c "stop,clicked" - the user clicked the stop button. * * Default content parts of the player widget that you can use for are: * @li "video" - A video of the player