Fix sed error that changed "video" to "videfl"
commit c662934be8
seems to have accidentally
renamed a few instances of _video_ to _videfl_, this hopefully changes
them all back.
This commit is contained in:
parent
6319f3831a
commit
fddbf75fc9
|
@ -437,7 +437,7 @@ _play_finished(void *data, const Efl_Event *event EINA_UNUSED)
|
|||
}
|
||||
|
||||
static void
|
||||
_on_videfl_del(Elm_Player_Data *sd)
|
||||
_on_video_del(Elm_Player_Data *sd)
|
||||
{
|
||||
elm_object_disabled_set(sd->forward, EINA_TRUE);
|
||||
elm_object_disabled_set(sd->info, EINA_TRUE);
|
||||
|
@ -458,12 +458,12 @@ _on_videfl_del(Elm_Player_Data *sd)
|
|||
}
|
||||
|
||||
static void
|
||||
_videfl_del(void *data,
|
||||
_video_del(void *data,
|
||||
Evas *e EINA_UNUSED,
|
||||
Evas_Object *obj EINA_UNUSED,
|
||||
void *event_info EINA_UNUSED)
|
||||
{
|
||||
_on_videfl_del(data);
|
||||
_on_video_del(data);
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
|
@ -574,7 +574,7 @@ _elm_player_content_set(Eo *obj, Elm_Player_Data *sd, const char *part, Evas_Obj
|
|||
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, _videfl_del, sd);
|
||||
(sd->video, EVAS_CALLBACK_DEL, _video_del, sd);
|
||||
|
||||
seekable = elm_video_is_seekable_get(sd->video);
|
||||
length = elm_video_play_length_get(sd->video);
|
||||
|
|
|
@ -578,9 +578,9 @@ emotion_engine_instance_format_get(const Emotion_Engine_Instance *inst)
|
|||
}
|
||||
|
||||
void
|
||||
emotion_engine_instance_videfl_data_size_get(const Emotion_Engine_Instance *inst, int *w, int *h)
|
||||
emotion_engine_instance_video_data_size_get(const Emotion_Engine_Instance *inst, int *w, int *h)
|
||||
{
|
||||
EMOTION_ENGINE_INSTANCE_CALL(inst, videfl_data_size_get, w, h);
|
||||
EMOTION_ENGINE_INSTANCE_CALL(inst, video_data_size_get, w, h);
|
||||
}
|
||||
|
||||
Eina_Bool
|
||||
|
|
|
@ -91,7 +91,7 @@ struct _Emotion_Engine
|
|||
int (*seekable) (void *ef);
|
||||
void (*frame_done) (void *ef);
|
||||
Emotion_Format (*format_get) (void *ef);
|
||||
void (*videfl_data_size_get) (void *ef, int *w, int *h);
|
||||
void (*video_data_size_get) (void *ef, int *w, int *h);
|
||||
int (*yuv_rows_get) (void *ef, int w, int h, unsigned char **yrows, unsigned char **urows, unsigned char **vrows);
|
||||
int (*bgra_data_get) (void *ef, unsigned char **bgra_data);
|
||||
void (*event_feed) (void *ef, int event);
|
||||
|
|
|
@ -51,7 +51,7 @@ Eina_Bool emotion_engine_instance_audio_handled(Emotion_Engine_Instance *in
|
|||
Eina_Bool emotion_engine_instance_seekable(Emotion_Engine_Instance *inst);
|
||||
void emotion_engine_instance_frame_done(Emotion_Engine_Instance *inst);
|
||||
Emotion_Format emotion_engine_instance_format_get(const Emotion_Engine_Instance *inst);
|
||||
void emotion_engine_instance_videfl_data_size_get(const Emotion_Engine_Instance *inst, int *w, int *h);
|
||||
void emotion_engine_instance_video_data_size_get(const Emotion_Engine_Instance *inst, int *w, int *h);
|
||||
Eina_Bool emotion_engine_instance_yuv_rows_get(const Emotion_Engine_Instance *inst, int w, int h, unsigned char **yrows, unsigned char **urows, unsigned char **vrows);
|
||||
Eina_Bool emotion_engine_instance_bgra_data_get(const Emotion_Engine_Instance *inst, unsigned char **bgra_data);
|
||||
void emotion_engine_instance_event_feed(Emotion_Engine_Instance *inst, int event);
|
||||
|
|
|
@ -1878,7 +1878,7 @@ _pixels_get(void *data, Evas_Object *obj)
|
|||
|
||||
sd = data;
|
||||
if (!sd->engine_instance) return;
|
||||
emotion_engine_instance_videfl_data_size_get(sd->engine_instance, &w, &h);
|
||||
emotion_engine_instance_video_data_size_get(sd->engine_instance, &w, &h);
|
||||
w = (w >> 1) << 1;
|
||||
h = (h >> 1) << 1;
|
||||
|
||||
|
|
|
@ -3427,7 +3427,7 @@ _evas_object_image_preloading_check(Evas_Object *eo_obj)
|
|||
}
|
||||
|
||||
Evas_Object *
|
||||
_evas_object_image_videfl_parent_get(Evas_Object *eo_obj)
|
||||
_evas_object_image_video_parent_get(Evas_Object *eo_obj)
|
||||
{
|
||||
Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
|
||||
return o->video_surface ? o->pixels->video.parent : NULL;
|
||||
|
|
|
@ -1349,7 +1349,7 @@ _evas_render_can_use_overlay(Evas_Public_Data *e, Evas_Object *eo_obj)
|
|||
Eina_Bool surface_below, stacking_check, object_above = EINA_FALSE;
|
||||
Eina_Bool ignore_window;
|
||||
|
||||
video_parent = _evas_object_image_videfl_parent_get(eo_obj);
|
||||
video_parent = _evas_object_image_video_parent_get(eo_obj);
|
||||
|
||||
/* Check if any one is the stack make this object mapped */
|
||||
eo_tmp = eo_obj;
|
||||
|
|
|
@ -1646,7 +1646,7 @@ Evas_Object *_evas_object_image_source_get(Evas_Object *obj);
|
|||
Eina_Bool _evas_object_image_preloading_get(const Evas_Object *obj);
|
||||
void _evas_object_image_preloading_set(Evas_Object *obj, Eina_Bool preloading);
|
||||
void _evas_object_image_preloading_check(Evas_Object *obj);
|
||||
Evas_Object *_evas_object_image_videfl_parent_get(Evas_Object *obj);
|
||||
Evas_Object *_evas_object_image_video_parent_get(Evas_Object *obj);
|
||||
void _evas_object_image_video_overlay_show(Evas_Object *obj);
|
||||
void _evas_object_image_video_overlay_hide(Evas_Object *obj);
|
||||
void _evas_object_image_video_overlay_do(Evas_Object *obj);
|
||||
|
|
|
@ -1118,7 +1118,7 @@ em_format_get(void *ef EINA_UNUSED)
|
|||
}
|
||||
|
||||
static void
|
||||
em_videfl_data_size_get(void *data, int *w, int *h)
|
||||
em_video_data_size_get(void *data, int *w, int *h)
|
||||
{
|
||||
Emotion_Generic_Video *ev = data;
|
||||
|
||||
|
@ -1684,7 +1684,7 @@ static const Emotion_Engine em_template_engine =
|
|||
em_seekable, /* seekable */
|
||||
em_frame_done, /* frame_done */
|
||||
em_format_get, /* format_get */
|
||||
em_videfl_data_size_get, /* videfl_data_size_get */
|
||||
em_video_data_size_get, /* video_data_size_get */
|
||||
em_yuv_rows_get, /* yuv_rows_get */
|
||||
em_bgra_data_get, /* bgra_data_get */
|
||||
em_event_feed, /* event_feed */
|
||||
|
|
|
@ -656,7 +656,7 @@ em_format_get(void *video)
|
|||
}
|
||||
|
||||
static void
|
||||
em_videfl_data_size_get(void *video, int *w, int *h)
|
||||
em_video_data_size_get(void *video, int *w, int *h)
|
||||
{
|
||||
Emotion_Gstreamer_Video *ev;
|
||||
Emotion_Video_Stream *vstream;
|
||||
|
@ -1168,7 +1168,7 @@ static const Emotion_Engine em_engine =
|
|||
em_seekable, /* seekable */
|
||||
em_frame_done, /* frame_done */
|
||||
em_format_get, /* format_get */
|
||||
em_videfl_data_size_get, /* videfl_data_size_get */
|
||||
em_video_data_size_get, /* video_data_size_get */
|
||||
em_yuv_rows_get, /* yuv_rows_get */
|
||||
em_bgra_data_get, /* bgra_data_get */
|
||||
em_event_feed, /* event_feed */
|
||||
|
|
|
@ -558,7 +558,7 @@ em_format_get(void *video)
|
|||
}
|
||||
|
||||
static void
|
||||
em_videfl_data_size_get(void *video, int *w, int *h)
|
||||
em_video_data_size_get(void *video, int *w, int *h)
|
||||
{
|
||||
em_size_get(video, w, h);
|
||||
}
|
||||
|
@ -1149,7 +1149,7 @@ static const Emotion_Engine em_engine =
|
|||
em_seekable, /* seekable */
|
||||
em_frame_done, /* frame_done */
|
||||
em_format_get, /* format_get */
|
||||
em_videfl_data_size_get, /* videfl_data_size_get */
|
||||
em_video_data_size_get, /* video_data_size_get */
|
||||
em_yuv_rows_get, /* yuv_rows_get */
|
||||
em_bgra_data_get, /* bgra_data_get */
|
||||
em_event_feed, /* event_feed */
|
||||
|
|
|
@ -803,7 +803,7 @@ em_format_get(void *video EINA_UNUSED)
|
|||
}
|
||||
|
||||
static void
|
||||
em_videfl_data_size_get(void *video EINA_UNUSED, int *w EINA_UNUSED, int *h EINA_UNUSED)
|
||||
em_video_data_size_get(void *video EINA_UNUSED, int *w EINA_UNUSED, int *h EINA_UNUSED)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -1345,7 +1345,7 @@ static const Emotion_Engine em_engine =
|
|||
em_seekable, /* seekable */
|
||||
em_frame_done, /* frame_done */
|
||||
em_format_get, /* format_get */
|
||||
em_videfl_data_size_get, /* videfl_data_size_get */
|
||||
em_video_data_size_get, /* video_data_size_get */
|
||||
em_yuv_rows_get, /* yuv_rows_get */
|
||||
em_bgra_data_get, /* bgra_data_get */
|
||||
em_event_feed, /* event_feed */
|
||||
|
|
|
@ -630,7 +630,7 @@ em_format_get(void *ef)
|
|||
}
|
||||
|
||||
static void
|
||||
em_videfl_data_size_get(void *ef, int *w, int *h)
|
||||
em_video_data_size_get(void *ef, int *w, int *h)
|
||||
{
|
||||
Emotion_Xine_Video *ev;
|
||||
volatile Emotion_Xine_Video_Frame *fr;
|
||||
|
@ -1519,7 +1519,7 @@ static const Emotion_Engine em_engine =
|
|||
em_seekable, /* seekable */
|
||||
em_frame_done, /* frame_done */
|
||||
em_format_get, /* format_get */
|
||||
em_videfl_data_size_get, /* videfl_data_size_get */
|
||||
em_video_data_size_get, /* video_data_size_get */
|
||||
em_yuv_rows_get, /* yuv_rows_get */
|
||||
em_bgra_data_get, /* bgra_data_get */
|
||||
em_event_feed, /* event_feed */
|
||||
|
|
Loading…
Reference in New Issue