diff options
author | Stefan Schmidt <stefan@osg.samsung.com> | 2016-05-19 09:19:06 +0200 |
---|---|---|
committer | Stefan Schmidt <stefan@osg.samsung.com> | 2016-05-19 09:19:06 +0200 |
commit | 2009ae225d919f14c1c2f78d3ea5184420894000 (patch) | |
tree | 39c80834eb35d97f751990090203687587cd34b9 /src/examples | |
parent | e0bbc2aceddce568be3d702cd6d8d25ac04a16ea (diff) |
examples: emotion: adapt to name change from obj to object
In commit 75a53ece1007d927b8f0b6c5d3f269726afb9108 obj was changed to object.
As one can claerly see though make examples have not been run to verify this
change. Catch up in examples with this rename.
Diffstat (limited to 'src/examples')
-rw-r--r-- | src/examples/emotion/emotion_border_example.c | 10 | ||||
-rw-r--r-- | src/examples/emotion/emotion_generic_example.c | 12 | ||||
-rw-r--r-- | src/examples/emotion/emotion_signals_example.c | 18 |
3 files changed, 20 insertions, 20 deletions
diff --git a/src/examples/emotion/emotion_border_example.c b/src/examples/emotion/emotion_border_example.c index b345597..aac68fd 100644 --- a/src/examples/emotion/emotion_border_example.c +++ b/src/examples/emotion/emotion_border_example.c | |||
@@ -118,7 +118,7 @@ _frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) | |||
118 | static Eina_Bool | 118 | static Eina_Bool |
119 | _length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) | 119 | _length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) |
120 | { | 120 | { |
121 | fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->obj)); | 121 | fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->object)); |
122 | 122 | ||
123 | return EINA_TRUE; | 123 | return EINA_TRUE; |
124 | } | 124 | } |
@@ -126,7 +126,7 @@ _length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) | |||
126 | static Eina_Bool | 126 | static Eina_Bool |
127 | _position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) | 127 | _position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) |
128 | { | 128 | { |
129 | fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->obj)); | 129 | fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->object)); |
130 | 130 | ||
131 | return EINA_TRUE; | 131 | return EINA_TRUE; |
132 | } | 132 | } |
@@ -135,8 +135,8 @@ static Eina_Bool | |||
135 | _progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) | 135 | _progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) |
136 | { | 136 | { |
137 | fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n", | 137 | fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n", |
138 | emotion_object_progress_status_get(ev->obj), | 138 | emotion_object_progress_status_get(ev->object), |
139 | emotion_object_progress_info_get(ev->obj)); | 139 | emotion_object_progress_info_get(ev->object)); |
140 | 140 | ||
141 | return EINA_TRUE; | 141 | return EINA_TRUE; |
142 | } | 142 | } |
@@ -145,7 +145,7 @@ static Eina_Bool | |||
145 | _frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev) | 145 | _frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev) |
146 | { | 146 | { |
147 | int w, h; | 147 | int w, h; |
148 | emotion_object_size_get(ev->obj, &w, &h); | 148 | emotion_object_size_get(ev->object, &w, &h); |
149 | fprintf(stderr, "smartcb: frame_resize: %dx%d\n", w, h); | 149 | fprintf(stderr, "smartcb: frame_resize: %dx%d\n", w, h); |
150 | 150 | ||
151 | return EINA_TRUE; | 151 | return EINA_TRUE; |
diff --git a/src/examples/emotion/emotion_generic_example.c b/src/examples/emotion/emotion_generic_example.c index c585b20..ec15a61 100644 --- a/src/examples/emotion/emotion_generic_example.c +++ b/src/examples/emotion/emotion_generic_example.c | |||
@@ -30,8 +30,8 @@ static Eina_Bool | |||
30 | _playback_stopped_cb(void *data EINA_UNUSED, const Eo_Event *ev) | 30 | _playback_stopped_cb(void *data EINA_UNUSED, const Eo_Event *ev) |
31 | { | 31 | { |
32 | printf("Emotion playback stopped.\n"); | 32 | printf("Emotion playback stopped.\n"); |
33 | emotion_object_play_set(ev->obj, EINA_FALSE); | 33 | emotion_object_play_set(ev->object, EINA_FALSE); |
34 | emotion_object_position_set(ev->obj, 0); | 34 | emotion_object_position_set(ev->object, 0); |
35 | 35 | ||
36 | return EINA_TRUE; | 36 | return EINA_TRUE; |
37 | } | 37 | } |
@@ -141,7 +141,7 @@ _frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) | |||
141 | static Eina_Bool | 141 | static Eina_Bool |
142 | _length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) | 142 | _length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) |
143 | { | 143 | { |
144 | fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->obj)); | 144 | fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->object)); |
145 | 145 | ||
146 | return EINA_TRUE; | 146 | return EINA_TRUE; |
147 | } | 147 | } |
@@ -149,7 +149,7 @@ _length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) | |||
149 | static Eina_Bool | 149 | static Eina_Bool |
150 | _position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) | 150 | _position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) |
151 | { | 151 | { |
152 | fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->obj)); | 152 | fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->object)); |
153 | 153 | ||
154 | return EINA_TRUE; | 154 | return EINA_TRUE; |
155 | } | 155 | } |
@@ -158,8 +158,8 @@ static Eina_Bool | |||
158 | _progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) | 158 | _progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) |
159 | { | 159 | { |
160 | fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n", | 160 | fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n", |
161 | emotion_object_progress_status_get(ev->obj), | 161 | emotion_object_progress_status_get(ev->object), |
162 | emotion_object_progress_info_get(ev->obj)); | 162 | emotion_object_progress_info_get(ev->object)); |
163 | 163 | ||
164 | return EINA_TRUE; | 164 | return EINA_TRUE; |
165 | } | 165 | } |
diff --git a/src/examples/emotion/emotion_signals_example.c b/src/examples/emotion/emotion_signals_example.c index f8fc49d..1a9dcbd 100644 --- a/src/examples/emotion/emotion_signals_example.c +++ b/src/examples/emotion/emotion_signals_example.c | |||
@@ -37,7 +37,7 @@ static Eina_Bool | |||
37 | _playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev) | 37 | _playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev) |
38 | { | 38 | { |
39 | printf(">>> Emotion object started playback.\n"); | 39 | printf(">>> Emotion object started playback.\n"); |
40 | _display_info(ev->obj); | 40 | _display_info(ev->object); |
41 | 41 | ||
42 | return EINA_TRUE; | 42 | return EINA_TRUE; |
43 | } | 43 | } |
@@ -46,7 +46,7 @@ static Eina_Bool | |||
46 | _playback_finished_cb(void *data EINA_UNUSED, const Eo_Event *ev) | 46 | _playback_finished_cb(void *data EINA_UNUSED, const Eo_Event *ev) |
47 | { | 47 | { |
48 | printf(">>> Emotion object finished playback.\n"); | 48 | printf(">>> Emotion object finished playback.\n"); |
49 | _display_info(ev->obj); | 49 | _display_info(ev->object); |
50 | 50 | ||
51 | return EINA_TRUE; | 51 | return EINA_TRUE; |
52 | } | 52 | } |
@@ -55,7 +55,7 @@ static Eina_Bool | |||
55 | _open_done_cb(void *data EINA_UNUSED, const Eo_Event *ev) | 55 | _open_done_cb(void *data EINA_UNUSED, const Eo_Event *ev) |
56 | { | 56 | { |
57 | printf(">>> Emotion object open done.\n"); | 57 | printf(">>> Emotion object open done.\n"); |
58 | _display_info(ev->obj); | 58 | _display_info(ev->object); |
59 | 59 | ||
60 | return EINA_TRUE; | 60 | return EINA_TRUE; |
61 | } | 61 | } |
@@ -64,8 +64,8 @@ static Eina_Bool | |||
64 | _position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) | 64 | _position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) |
65 | { | 65 | { |
66 | printf(">>> Emotion object first position update.\n"); | 66 | printf(">>> Emotion object first position update.\n"); |
67 | eo_event_callback_del(ev->obj, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL); | 67 | eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL); |
68 | _display_info(ev->obj); | 68 | _display_info(ev->object); |
69 | 69 | ||
70 | return EINA_TRUE; | 70 | return EINA_TRUE; |
71 | } | 71 | } |
@@ -74,8 +74,8 @@ static Eina_Bool | |||
74 | _frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev) | 74 | _frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev) |
75 | { | 75 | { |
76 | printf(">>> Emotion object first frame decode.\n"); | 76 | printf(">>> Emotion object first frame decode.\n"); |
77 | eo_event_callback_del(ev->obj, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL); | 77 | eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL); |
78 | _display_info(ev->obj); | 78 | _display_info(ev->object); |
79 | 79 | ||
80 | return EINA_TRUE; | 80 | return EINA_TRUE; |
81 | } | 81 | } |
@@ -84,7 +84,7 @@ static Eina_Bool | |||
84 | _decode_stop_cb(void *data EINA_UNUSED, const Eo_Event *ev) | 84 | _decode_stop_cb(void *data EINA_UNUSED, const Eo_Event *ev) |
85 | { | 85 | { |
86 | printf(">>> Emotion object decode stop.\n"); | 86 | printf(">>> Emotion object decode stop.\n"); |
87 | _display_info(ev->obj); | 87 | _display_info(ev->object); |
88 | 88 | ||
89 | return EINA_TRUE; | 89 | return EINA_TRUE; |
90 | } | 90 | } |
@@ -93,7 +93,7 @@ static Eina_Bool | |||
93 | _frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev) | 93 | _frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev) |
94 | { | 94 | { |
95 | printf(">>> Emotion object frame resize.\n"); | 95 | printf(">>> Emotion object frame resize.\n"); |
96 | _display_info(ev->obj); | 96 | _display_info(ev->object); |
97 | 97 | ||
98 | return EINA_TRUE; | 98 | return EINA_TRUE; |
99 | } | 99 | } |