vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Add external property "play length" to Video widget and fix the test accordingly 

also fix ChangeLog whitespacing: every news need a single tab


SVN revision: 76557
This commit is contained in:
Davide Andreoli 2012-09-12 20:30:17 +00:00
parent e77bd359ad
commit d9c1ca2207
3 changed files with 46 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/elementary/ChangeLog
View File

@ -472,8 +472,12 @@
* Fix ctxpopup direction if -1 is uses as priority.
2012-09-15 Jiyoun Park (jypark)
2012-09-12 Jiyoun Park (jypark)
* Add image deleted signal into plug. it help user notice socket service
fail and they can retry service connection.
* Add test code deal with this signal.
2012-09-12 Davide Andreoli (davemds)
* Add external property "play length" to Video widget, read-only.

19
legacy/elementary/data/objects/test_external.edc
View File

@ -924,6 +924,7 @@ embryo script and from C code.";
params {
string: "label" "Volume";
string: "indicator format" "%.3f";
bool: "disabled" 1;
}
}
}
@ -940,7 +941,7 @@ embryo script and from C code.";
}
params {
string: "label" "Position";
string: "indicator format" "%.3f";
string: "indicator format" "%.1f sec";
bool: "disabled" 1;
}
}
@ -987,10 +988,10 @@ embryo script and from C code.";
signal: "changed";
source: "ext_slider2";
script {
// here we need to get the lenght of the video from external
// to calc the play position...
new Float:myval = external_param_get_float(PART:"ext_slider2", "value");
external_param_set_float(PART:"ext_video1", "play position", myval*100);
new Float:len = external_param_get_float(PART:"ext_video1", "play length");
new Float:val = external_param_get_float(PART:"ext_slider2", "value");
external_param_set_float(PART:"ext_slider2", "max", len);
external_param_set_float(PART:"ext_video1", "play position", val);
}
}
program { name: "file_chosen";
@ -1000,6 +1001,8 @@ embryo script and from C code.";
after: "enable_bt1";
after: "enable_bt2";
after: "enable_bt3";
after: "enable_sl1";
after: "enable_sl2";
after: "update_volume_slider";
}
program { name: "enable_bt1";
@ -1011,6 +1014,12 @@ embryo script and from C code.";
program { name: "enable_bt3";
action: PARAM_SET "ext_button3" "disabled" 0;
}
program { name: "enable_sl1";
action: PARAM_SET "ext_slider1" "disabled" 0;
}
program { name: "enable_sl2";
action: PARAM_SET "ext_slider2" "disabled" 0;
}
program { name: "update_volume_slider";
action: PARAM_COPY "ext_video1" "audio level" "ext_slider1" "value";
}

7
legacy/elementary/src/edje_externals/elm_video.c
View File

@ -163,6 +163,12 @@ external_video_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
param->d = elm_video_play_position_get(obj);
return EINA_TRUE;
}
else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
&& (!strcmp(param->name, "play length")))
{
param->d = elm_video_play_length_get(obj);
return EINA_TRUE;
}
else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
&& (!strcmp(param->name, "remember position")))
{
@ -253,6 +259,7 @@ static Edje_External_Param_Info external_video_params[] = {
EDJE_EXTERNAL_PARAM_INFO_BOOL("audio mute"),
EDJE_EXTERNAL_PARAM_INFO_DOUBLE("audio level"),
EDJE_EXTERNAL_PARAM_INFO_DOUBLE("play position"),
EDJE_EXTERNAL_PARAM_INFO_DOUBLE("play length"),
EDJE_EXTERNAL_PARAM_INFO_BOOL("remember position"),
EDJE_EXTERNAL_PARAM_INFO_SENTINEL
};