summaryrefslogtreecommitdiff
path: root/src/lib/emotion
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-09-24 14:22:11 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-09-24 14:32:12 -0400
commit5e9e33dd91ce623ddb88f2e853b4cbdfa9bfcc73 (patch)
tree81a1e9d3bb080cdb560f29207c0f3b87daf6d7f0 /src/lib/emotion
parentb3adcff0dfb6aae6296cdf4ccabada293332e11a (diff)
efl_player: split off audio related properties
Summary: this commit moves the audio related properties from Efl.Player to Efl.Player_Audio. Reviewers: zmike, Jaehyun_Cho Reviewed By: zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T7877 Differential Revision: https://phab.enlightenment.org/D10106
Diffstat (limited to 'src/lib/emotion')
-rw-r--r--src/lib/emotion/efl_canvas_video.eo8
-rw-r--r--src/lib/emotion/emotion_smart.c16
2 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/emotion/efl_canvas_video.eo b/src/lib/emotion/efl_canvas_video.eo
index 8ee9607..345b14d 100644
--- a/src/lib/emotion/efl_canvas_video.eo
+++ b/src/lib/emotion/efl_canvas_video.eo
@@ -1,5 +1,5 @@
1class @beta Efl.Canvas.Video extends Efl.Canvas.Group 1class @beta Efl.Canvas.Video extends Efl.Canvas.Group
2 implements Efl.File, Efl.Player, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller 2 implements Efl.File, Efl.Audio_Control, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller
3{ 3{
4 [[Efl canvas video class]] 4 [[Efl canvas video class]]
5 methods { 5 methods {
@@ -10,7 +10,7 @@ class @beta Efl.Canvas.Video extends Efl.Canvas.Group
10 emotion object. 10 emotion object.
11 11
12 Please don't use this function, consider using 12 Please don't use this function, consider using
13 @Efl.Player.mute instead. 13 @Efl.Audio_Control.mute instead.
14 ]] 14 ]]
15 set { 15 set {
16 } 16 }
@@ -59,8 +59,8 @@ class @beta Efl.Canvas.Video extends Efl.Canvas.Group
59 Efl.Player.play { get; set; } 59 Efl.Player.play { get; set; }
60 Efl.Player.pos { get; set; } 60 Efl.Player.pos { get; set; }
61 Efl.Player.progress { get; } 61 Efl.Player.progress { get; }
62 Efl.Player.volume { get; set; } 62 Efl.Audio_Control.volume { get; set; }
63 Efl.Player.mute { get; set; } 63 Efl.Audio_Control.mute { get; set; }
64 Efl.Player.length { get; } 64 Efl.Player.length { get; }
65 Efl.Player.seekable { get; } 65 Efl.Player.seekable { get; }
66 Efl.Gfx.Image_Load_Controller.load_size { get; } 66 Efl.Gfx.Image_Load_Controller.load_size { get; }
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index a7a8fa8..73c588b 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -830,11 +830,11 @@ emotion_object_event_simple_send(Evas_Object *obj, Emotion_Event ev)
830EAPI void 830EAPI void
831emotion_object_audio_volume_set(Evas_Object *obj, double vol) 831emotion_object_audio_volume_set(Evas_Object *obj, double vol)
832{ 832{
833 efl_player_volume_set(obj, vol); 833 efl_audio_control_volume_set(obj, vol);
834} 834}
835 835
836EOLIAN static void 836EOLIAN static void
837_efl_canvas_video_efl_player_volume_set(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd, double vol) 837_efl_canvas_video_efl_audio_control_volume_set(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd, double vol)
838{ 838{
839 DBG("vol=%f", vol); 839 DBG("vol=%f", vol);
840 if (!sd->engine_instance) return; 840 if (!sd->engine_instance) return;
@@ -844,11 +844,11 @@ _efl_canvas_video_efl_player_volume_set(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Da
844EAPI double 844EAPI double
845emotion_object_audio_volume_get(const Evas_Object *obj) 845emotion_object_audio_volume_get(const Evas_Object *obj)
846{ 846{
847 return efl_player_volume_get(obj); 847 return efl_audio_control_volume_get(obj);
848} 848}
849 849
850EOLIAN static double 850EOLIAN static double
851_efl_canvas_video_efl_player_volume_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) 851_efl_canvas_video_efl_audio_control_volume_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
852{ 852{
853 if (!sd->engine_instance) return 0.0; 853 if (!sd->engine_instance) return 0.0;
854 return emotion_engine_instance_audio_channel_volume_get(sd->engine_instance); 854 return emotion_engine_instance_audio_channel_volume_get(sd->engine_instance);
@@ -857,11 +857,11 @@ _efl_canvas_video_efl_player_volume_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vi
857EAPI void 857EAPI void
858emotion_object_audio_mute_set(Evas_Object *obj, Eina_Bool mute) 858emotion_object_audio_mute_set(Evas_Object *obj, Eina_Bool mute)
859{ 859{
860 efl_player_mute_set(obj, mute); 860 efl_audio_control_mute_set(obj, mute);
861} 861}
862 862
863EOLIAN static void 863EOLIAN static void
864_efl_canvas_video_efl_player_mute_set(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd, Eina_Bool mute) 864_efl_canvas_video_efl_audio_control_mute_set(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd, Eina_Bool mute)
865{ 865{
866 DBG("mute=" FMT_UCHAR, mute); 866 DBG("mute=" FMT_UCHAR, mute);
867 if (!sd->engine_instance) return; 867 if (!sd->engine_instance) return;
@@ -871,11 +871,11 @@ _efl_canvas_video_efl_player_mute_set(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data
871EAPI Eina_Bool 871EAPI Eina_Bool
872emotion_object_audio_mute_get(const Evas_Object *obj) 872emotion_object_audio_mute_get(const Evas_Object *obj)
873{ 873{
874 return efl_player_mute_get(obj); 874 return efl_audio_control_mute_get(obj);
875} 875}
876 876
877EOLIAN static Eina_Bool 877EOLIAN static Eina_Bool
878_efl_canvas_video_efl_player_mute_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) 878_efl_canvas_video_efl_audio_control_mute_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
879{ 879{
880 if (!sd->engine_instance) return EINA_FALSE; 880 if (!sd->engine_instance) return EINA_FALSE;
881 return emotion_engine_instance_audio_channel_mute_get(sd->engine_instance); 881 return emotion_engine_instance_audio_channel_mute_get(sd->engine_instance);