summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Andreoli <dave@gurumeditation.it>2012-09-12 20:30:17 +0000
committerDavide Andreoli <dave@gurumeditation.it>2012-09-12 20:30:17 +0000
commitc497bda62358e438934ff0f03bb604680cc43f89 (patch)
tree891bb92061e5bc9d83f10bce2daaa4d2e581c577
parent9a1600c5c71e5e79c8e204e67697921ec3c9a518 (diff)
* 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
-rw-r--r--ChangeLog46
-rw-r--r--data/objects/test_external.edc19
-rw-r--r--src/edje_externals/elm_video.c7
3 files changed, 46 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index b853cdb08..28fccf8fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -420,8 +420,8 @@
420 * Popup widget is now an elm layout. 420 * Popup widget is now an elm layout.
421 * Panel widget is now an elm layout. 421 * Panel widget is now an elm layout.
422 * All internal widget hooks (and related macros) were removed, due 422 * All internal widget hooks (and related macros) were removed, due
423 to deprecation. Thus, people using that (unstable) API will have 423 to deprecation. Thus, people using that (unstable) API will have
424 to adapt themselves. 424 to adapt themselves.
425 425
4262012-08-30 Shilpa Onkar Singh 4262012-08-30 Shilpa Onkar Singh
427 427
@@ -433,47 +433,51 @@
433 433
4342012-09-03 Rajeev Ranjan 4342012-09-03 Rajeev Ranjan
435 435
436 * Fix min/max limit setting to respect field boundaires EXCEPT 436 * Fix min/max limit setting to respect field boundaires EXCEPT
437 for years which have no boundaries with 437 for years which have no boundaries with
438 elm_datetime_field_limit_set() 438 elm_datetime_field_limit_set()
439 439
4402012-09-03 Bluezery 4402012-09-03 Bluezery
441 441
442 * Fix re-order animation when it doesn't end correctly. 442 * Fix re-order animation when it doesn't end correctly.
443 * Improve elm map module loading to onlt init the module needed 443 * Improve elm map module loading to onlt init the module needed
444 when searching and not all modules. 444 when searching and not all modules.
445 445
4462012-09-03 Shinwoo Kim (kimcinoo) 4462012-09-03 Shinwoo Kim (kimcinoo)
447 447
448 * Add in more access subsystem features like activation cb. 448 * Add in more access subsystem features like activation cb.
449 * Fix popup to apply the same style to the notify sub-widget. 449 * Fix popup to apply the same style to the notify sub-widget.
450 450
4512012-09-04 Jihoon Kim (jihoon) 4512012-09-04 Jihoon Kim (jihoon)
452 452
453 * Add ELM_INPUT_PANEL_RETURN_KEY_TYPE_SIGNIN. 453 * Add ELM_INPUT_PANEL_RETURN_KEY_TYPE_SIGNIN.
454 454
4552012-09-11 ChunEon Park (Hermet) 4552012-09-11 ChunEon Park (Hermet)
456 456
457 * Even if the top item is inserted into the naviframe. Any transition 457 * Even if the top item is inserted into the naviframe. Any transition
458 wouldn't be launched. 458 wouldn't be launched.
459 459
4602012-09-12 Jaehwan Kim 4602012-09-12 Jaehwan Kim
461 461
462 * When the number of item is changed, the toolbar emits the signal 462 * When the number of item is changed, the toolbar emits the signal
463 to theme. The theme can be changed something according the number 463 to theme. The theme can be changed something according the number
464 of item. 464 of item.
465 465
4662012-09-12 Shinwoo Kim (kimcinoo) 4662012-09-12 Shinwoo Kim (kimcinoo)
467 467
468 * Add access features to calendar. 468 * Add access features to calendar.
469 * Add icon show/hide handling to diskselector ala button etc. 469 * Add icon show/hide handling to diskselector ala button etc.
470 470
4712012-09-12 Thiep Ha 4712012-09-12 Thiep Ha
472 472
473 * Fix ctxpopup direction if -1 is uses as priority. 473 * Fix ctxpopup direction if -1 is uses as priority.
474 474
4752012-09-15 Jiyoun Park (jypark) 4752012-09-12 Jiyoun Park (jypark)
476 476
477 * Add image deleted signal into plug. it help user notice socket service 477 * Add image deleted signal into plug. it help user notice socket service
478 fail and they can retry service connection. 478 fail and they can retry service connection.
479 * Add test code deal with this signal. 479 * Add test code deal with this signal.
480
4812012-09-12 Davide Andreoli (davemds)
482
483 * Add external property "play length" to Video widget, read-only.
diff --git a/data/objects/test_external.edc b/data/objects/test_external.edc
index a8acebd89..91b6ee6f5 100644
--- a/data/objects/test_external.edc
+++ b/data/objects/test_external.edc
@@ -924,6 +924,7 @@ embryo script and from C code.";
924 params { 924 params {
925 string: "label" "Volume"; 925 string: "label" "Volume";
926 string: "indicator format" "%.3f"; 926 string: "indicator format" "%.3f";
927 bool: "disabled" 1;
927 } 928 }
928 } 929 }
929 } 930 }
@@ -940,7 +941,7 @@ embryo script and from C code.";
940 } 941 }
941 params { 942 params {
942 string: "label" "Position"; 943 string: "label" "Position";
943 string: "indicator format" "%.3f"; 944 string: "indicator format" "%.1f sec";
944 bool: "disabled" 1; 945 bool: "disabled" 1;
945 } 946 }
946 } 947 }
@@ -987,10 +988,10 @@ embryo script and from C code.";
987 signal: "changed"; 988 signal: "changed";
988 source: "ext_slider2"; 989 source: "ext_slider2";
989 script { 990 script {
990 // here we need to get the lenght of the video from external 991 new Float:len = external_param_get_float(PART:"ext_video1", "play length");
991 // to calc the play position... 992 new Float:val = external_param_get_float(PART:"ext_slider2", "value");
992 new Float:myval = external_param_get_float(PART:"ext_slider2", "value"); 993 external_param_set_float(PART:"ext_slider2", "max", len);
993 external_param_set_float(PART:"ext_video1", "play position", myval*100); 994 external_param_set_float(PART:"ext_video1", "play position", val);
994 } 995 }
995 } 996 }
996 program { name: "file_chosen"; 997 program { name: "file_chosen";
@@ -1000,6 +1001,8 @@ embryo script and from C code.";
1000 after: "enable_bt1"; 1001 after: "enable_bt1";
1001 after: "enable_bt2"; 1002 after: "enable_bt2";
1002 after: "enable_bt3"; 1003 after: "enable_bt3";
1004 after: "enable_sl1";
1005 after: "enable_sl2";
1003 after: "update_volume_slider"; 1006 after: "update_volume_slider";
1004 } 1007 }
1005 program { name: "enable_bt1"; 1008 program { name: "enable_bt1";
@@ -1011,6 +1014,12 @@ embryo script and from C code.";
1011 program { name: "enable_bt3"; 1014 program { name: "enable_bt3";
1012 action: PARAM_SET "ext_button3" "disabled" 0; 1015 action: PARAM_SET "ext_button3" "disabled" 0;
1013 } 1016 }
1017 program { name: "enable_sl1";
1018 action: PARAM_SET "ext_slider1" "disabled" 0;
1019 }
1020 program { name: "enable_sl2";
1021 action: PARAM_SET "ext_slider2" "disabled" 0;
1022 }
1014 program { name: "update_volume_slider"; 1023 program { name: "update_volume_slider";
1015 action: PARAM_COPY "ext_video1" "audio level" "ext_slider1" "value"; 1024 action: PARAM_COPY "ext_video1" "audio level" "ext_slider1" "value";
1016 } 1025 }
diff --git a/src/edje_externals/elm_video.c b/src/edje_externals/elm_video.c
index e869afeed..f9ac0cdcd 100644
--- a/src/edje_externals/elm_video.c
+++ b/src/edje_externals/elm_video.c
@@ -163,6 +163,12 @@ external_video_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
163 param->d = elm_video_play_position_get(obj); 163 param->d = elm_video_play_position_get(obj);
164 return EINA_TRUE; 164 return EINA_TRUE;
165 } 165 }
166 else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
167 && (!strcmp(param->name, "play length")))
168 {
169 param->d = elm_video_play_length_get(obj);
170 return EINA_TRUE;
171 }
166 else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 172 else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
167 && (!strcmp(param->name, "remember position"))) 173 && (!strcmp(param->name, "remember position")))
168 { 174 {
@@ -253,6 +259,7 @@ static Edje_External_Param_Info external_video_params[] = {
253 EDJE_EXTERNAL_PARAM_INFO_BOOL("audio mute"), 259 EDJE_EXTERNAL_PARAM_INFO_BOOL("audio mute"),
254 EDJE_EXTERNAL_PARAM_INFO_DOUBLE("audio level"), 260 EDJE_EXTERNAL_PARAM_INFO_DOUBLE("audio level"),
255 EDJE_EXTERNAL_PARAM_INFO_DOUBLE("play position"), 261 EDJE_EXTERNAL_PARAM_INFO_DOUBLE("play position"),
262 EDJE_EXTERNAL_PARAM_INFO_DOUBLE("play length"),
256 EDJE_EXTERNAL_PARAM_INFO_BOOL("remember position"), 263 EDJE_EXTERNAL_PARAM_INFO_BOOL("remember position"),
257 EDJE_EXTERNAL_PARAM_INFO_SENTINEL 264 EDJE_EXTERNAL_PARAM_INFO_SENTINEL
258}; 265};