ivi-shell: several ivi-layout interfaces moved accross source.

Interfaces for properties setting shall be implemented in ivi-layout.

Signed-off-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>

diff --git a/ivi-shell/ivi-layout-transition.c b/ivi-shell/ivi-layout-transition.c
index 6d4a655..8b8261e 100644 (file)
--- a/ivi-shell/ivi-layout-transition.c
+++ b/ivi-shell/ivi-layout-transition.c
@@ -849,69 +849,3 @@ ivi_layout_transition_fade_layer(
        return;
 }
 
-WL_EXPORT int32_t
-ivi_layout_surface_set_transition(struct ivi_layout_surface *ivisurf,
-                                 enum ivi_layout_transition_type type,
-                                 uint32_t duration)
-{
-       struct ivi_layout_surface_properties *prop;
-
-       if (ivisurf == NULL) {
-               weston_log("%s: invalid argument\n", __func__);
-               return -1;
-       }
-
-       prop = &ivisurf->pending.prop;
-       prop->transition_type = type;
-       prop->transition_duration = duration;
-       return 0;
-}
-
-int32_t
-ivi_layout_surface_set_transition_duration(struct ivi_layout_surface *ivisurf,
-                                          uint32_t duration)
-{
-       struct ivi_layout_surface_properties *prop;
-
-       if (ivisurf == NULL) {
-               weston_log("%s: invalid argument\n", __func__);
-               return -1;
-       }
-
-       prop = &ivisurf->pending.prop;
-       prop->transition_duration = duration*10;
-       return 0;
-}
-
-WL_EXPORT int32_t
-ivi_layout_layer_set_transition(struct ivi_layout_layer *ivilayer,
-                               enum ivi_layout_transition_type type,
-                               uint32_t duration)
-{
-       if (ivilayer == NULL) {
-               weston_log("%s: invalid argument\n", __func__);
-               return -1;
-       }
-
-       ivilayer->pending.prop.transition_type = type;
-       ivilayer->pending.prop.transition_duration = duration;
-
-       return 0;
-}
-
-WL_EXPORT int32_t
-ivi_layout_layer_set_fade_info(struct ivi_layout_layer* ivilayer,
-                              uint32_t is_fade_in,
-                              double start_alpha, double end_alpha)
-{
-       if (ivilayer == NULL) {
-               weston_log("%s: invalid argument\n", __func__);
-               return -1;
-       }
-
-       ivilayer->pending.prop.is_fade_in = is_fade_in;
-       ivilayer->pending.prop.start_alpha = start_alpha;
-       ivilayer->pending.prop.end_alpha = end_alpha;
-
-       return 0;
-}

diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index 8683e7d..67ccf6e 100644 (file)
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -2592,6 +2592,73 @@ ivi_layout_commit_changes(void)
        return IVI_SUCCEEDED;
 }
 
+WL_EXPORT int32_t
+ivi_layout_layer_set_transition(struct ivi_layout_layer *ivilayer,
+                               enum ivi_layout_transition_type type,
+                               uint32_t duration)
+{
+       if (ivilayer == NULL) {
+               weston_log("%s: invalid argument\n", __func__);
+               return -1;
+       }
+
+       ivilayer->pending.prop.transition_type = type;
+       ivilayer->pending.prop.transition_duration = duration;
+
+       return 0;
+}
+
+WL_EXPORT int32_t
+ivi_layout_layer_set_fade_info(struct ivi_layout_layer* ivilayer,
+                              uint32_t is_fade_in,
+                              double start_alpha, double end_alpha)
+{
+       if (ivilayer == NULL) {
+               weston_log("%s: invalid argument\n", __func__);
+               return -1;
+       }
+
+       ivilayer->pending.prop.is_fade_in = is_fade_in;
+       ivilayer->pending.prop.start_alpha = start_alpha;
+       ivilayer->pending.prop.end_alpha = end_alpha;
+
+       return 0;
+}
+
+WL_EXPORT int32_t
+ivi_layout_surface_set_transition_duration(struct ivi_layout_surface *ivisurf,
+                                          uint32_t duration)
+{
+       struct ivi_layout_surface_properties *prop;
+
+       if (ivisurf == NULL) {
+               weston_log("%s: invalid argument\n", __func__);
+               return -1;
+       }
+
+       prop = &ivisurf->pending.prop;
+       prop->transition_duration = duration*10;
+       return 0;
+}
+
+WL_EXPORT int32_t
+ivi_layout_surface_set_transition(struct ivi_layout_surface *ivisurf,
+                                 enum ivi_layout_transition_type type,
+                                 uint32_t duration)
+{
+       struct ivi_layout_surface_properties *prop;
+
+       if (ivisurf == NULL) {
+               weston_log("%s: invalid argument\n", __func__);
+               return -1;
+       }
+
+       prop = &ivisurf->pending.prop;
+       prop->transition_type = type;
+       prop->transition_duration = duration;
+       return 0;
+}
+
 /***called from ivi-shell**/
 static struct weston_view *
 ivi_layout_get_weston_view(struct ivi_layout_surface *surface)