summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeandro Dorileo <dorileo@profusion.mobi>2013-01-03 20:27:17 +0000
committerLeandro Dorileo <dorileo@profusion.mobi>2013-01-03 20:27:17 +0000
commitf7cc32f78bf86c804a3f3ae7b8428a408092fbdf (patch)
tree87b3de310a8d7806e27b72fdb5440fb16006ed61
parentd9c28e87a207b60c5dc3c83a174e28c6ceee447e (diff)
Emotion: use eina log wherever it's possible
SVN revision: 82099
-rw-r--r--legacy/emotion/src/lib/emotion_main.c2
-rw-r--r--legacy/emotion/src/modules/generic/emotion_generic.c4
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c4
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_sink.c20
4 files changed, 15 insertions, 15 deletions
diff --git a/legacy/emotion/src/lib/emotion_main.c b/legacy/emotion/src/lib/emotion_main.c
index 01c36f298e..d816424bf7 100644
--- a/legacy/emotion/src/lib/emotion_main.c
+++ b/legacy/emotion/src/lib/emotion_main.c
@@ -254,7 +254,7 @@ _emotion_check_device(Emotion_Webcam *ew)
254 254
255 on_error: 255 on_error:
256#endif 256#endif
257 fprintf(stderr, "'%s' is not a webcam ['%s']\n", ew->name, strerror(errno)); 257 EINA_LOG_ERR("'%s' is not a webcam ['%s']", ew->name, strerror(errno));
258 eina_stringshare_del(ew->syspath); 258 eina_stringshare_del(ew->syspath);
259 eina_stringshare_del(ew->device); 259 eina_stringshare_del(ew->device);
260 eina_stringshare_del(ew->name); 260 eina_stringshare_del(ew->name);
diff --git a/legacy/emotion/src/modules/generic/emotion_generic.c b/legacy/emotion/src/modules/generic/emotion_generic.c
index 648be6dfd8..2ee27201de 100644
--- a/legacy/emotion/src/modules/generic/emotion_generic.c
+++ b/legacy/emotion/src/modules/generic/emotion_generic.c
@@ -1298,13 +1298,13 @@ em_ratio_get(void *data)
1298 1298
1299static int em_video_handled(void *ef __UNUSED__) 1299static int em_video_handled(void *ef __UNUSED__)
1300{ 1300{
1301 fprintf(stderr, "video handled!\n"); 1301 DBG("video handled!");
1302 return 1; 1302 return 1;
1303} 1303}
1304 1304
1305static int em_audio_handled(void *ef __UNUSED__) 1305static int em_audio_handled(void *ef __UNUSED__)
1306{ 1306{
1307 fprintf(stderr, "audio handled!\n"); 1307 DBG("audio handled!");
1308 return 1; 1308 return 1;
1309} 1309}
1310 1310
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
index 395d9310cd..329c8be84f 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
@@ -444,7 +444,7 @@ em_cleanup(Emotion_Gstreamer_Video *ev)
444 ev->src_height = 0; 444 ev->src_height = 0;
445 445
446#ifdef HAVE_ECORE_X 446#ifdef HAVE_ECORE_X
447 fprintf(stderr, "destroying window: %i\n", ev->win); 447 INF("destroying window: %i", ev->win);
448 if (ev->win) ecore_x_window_free(ev->win); 448 if (ev->win) ecore_x_window_free(ev->win);
449 ev->win = 0; 449 ev->win = 0;
450#endif 450#endif
@@ -1337,7 +1337,7 @@ _ecore_event_x_destroy(void *data __UNUSED__, int type __UNUSED__, void *event _
1337{ 1337{
1338 Ecore_X_Event_Window_Destroy *ev = event; 1338 Ecore_X_Event_Window_Destroy *ev = event;
1339 1339
1340 fprintf(stderr, "killed window: %x (%x)\n", ev->win, ev->event_win); 1340 INF("killed window: %x (%x).", ev->win, ev->event_win);
1341 1341
1342 return EINA_TRUE; 1342 return EINA_TRUE;
1343} 1343}
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_sink.c b/legacy/emotion/src/modules/gstreamer/emotion_sink.c
index 17a1bc56cd..b91d90f96b 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_sink.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_sink.c
@@ -230,7 +230,7 @@ gboolean evas_video_sink_set_caps(GstBaseSink *bsink, GstCaps *caps)
230 for (i = 0; colorspace_fourcc_convertion[i].name != NULL; ++i) 230 for (i = 0; colorspace_fourcc_convertion[i].name != NULL; ++i)
231 if (fourcc == colorspace_fourcc_convertion[i].fourcc) 231 if (fourcc == colorspace_fourcc_convertion[i].fourcc)
232 { 232 {
233 fprintf(stderr, "Found '%s'\n", colorspace_fourcc_convertion[i].name); 233 DBG("Found '%s'", colorspace_fourcc_convertion[i].name);
234 priv->eformat = colorspace_fourcc_convertion[i].eformat; 234 priv->eformat = colorspace_fourcc_convertion[i].eformat;
235 priv->func = colorspace_fourcc_convertion[i].func; 235 priv->func = colorspace_fourcc_convertion[i].func;
236 if (colorspace_fourcc_convertion[i].force_height) 236 if (colorspace_fourcc_convertion[i].force_height)
@@ -244,7 +244,7 @@ gboolean evas_video_sink_set_caps(GstBaseSink *bsink, GstCaps *caps)
244 244
245 if (fourcc == GST_MAKE_FOURCC('S', 'T', '1', '2')) 245 if (fourcc == GST_MAKE_FOURCC('S', 'T', '1', '2'))
246 { 246 {
247 fprintf(stderr, "Found '%s'\n", "ST12"); 247 DBG("Found '%s'", "ST12");
248 priv->eformat = EVAS_COLORSPACE_YCBCR420TM12601_PL; 248 priv->eformat = EVAS_COLORSPACE_YCBCR420TM12601_PL;
249 priv->samsung = EINA_TRUE; 249 priv->samsung = EINA_TRUE;
250 priv->func = NULL; 250 priv->func = NULL;
@@ -269,7 +269,7 @@ gboolean evas_video_sink_set_caps(GstBaseSink *bsink, GstCaps *caps)
269 for (i = 0; colorspace_format_convertion[i].name != NULL; ++i) 269 for (i = 0; colorspace_format_convertion[i].name != NULL; ++i)
270 if (format == colorspace_format_convertion[i].format) 270 if (format == colorspace_format_convertion[i].format)
271 { 271 {
272 fprintf(stderr, "Found '%s'\n", colorspace_format_convertion[i].name); 272 DBG("Found '%s'", colorspace_format_convertion[i].name);
273 priv->eformat = colorspace_format_convertion[i].eformat; 273 priv->eformat = colorspace_format_convertion[i].eformat;
274 priv->func = colorspace_format_convertion[i].func; 274 priv->func = colorspace_format_convertion[i].func;
275 if (priv->ev) 275 if (priv->ev)
@@ -881,7 +881,7 @@ _video_resize(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface
881 Emotion_Gstreamer_Video *ev = data; 881 Emotion_Gstreamer_Video *ev = data;
882 882
883 ecore_x_window_resize(ev->win, w, h); 883 ecore_x_window_resize(ev->win, w, h);
884 fprintf(stderr, "resize: %i, %i\n", w, h); 884 DBG("resize: %i, %i", w, h);
885#endif 885#endif
886} 886}
887 887
@@ -893,7 +893,7 @@ _video_move(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface *s
893 Emotion_Gstreamer_Video *ev = data; 893 Emotion_Gstreamer_Video *ev = data;
894 unsigned int pos[2]; 894 unsigned int pos[2];
895 895
896 fprintf(stderr, "move: %i, %i\n", x, y); 896 DBG("move: %i, %i", x, y);
897 pos[0] = x; pos[1] = y; 897 pos[0] = x; pos[1] = y;
898 ecore_x_window_prop_card32_set(ev->win, ECORE_X_ATOM_E_VIDEO_POSITION, pos, 2); 898 ecore_x_window_prop_card32_set(ev->win, ECORE_X_ATOM_E_VIDEO_POSITION, pos, 2);
899#endif 899#endif
@@ -939,7 +939,7 @@ _video_show(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface *s
939#ifdef HAVE_ECORE_X 939#ifdef HAVE_ECORE_X
940 Emotion_Gstreamer_Video *ev = data; 940 Emotion_Gstreamer_Video *ev = data;
941 941
942 fprintf(stderr, "show xv\n"); 942 DBG("show xv");
943 ecore_x_window_show(ev->win); 943 ecore_x_window_show(ev->win);
944#endif 944#endif
945 /* gst_pad_set_blocked_async(ev->xvteepad, TRUE, _block_pad_link_cb, ev); */ 945 /* gst_pad_set_blocked_async(ev->xvteepad, TRUE, _block_pad_link_cb, ev); */
@@ -951,7 +951,7 @@ _video_hide(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface *s
951#ifdef HAVE_ECORE_X 951#ifdef HAVE_ECORE_X
952 Emotion_Gstreamer_Video *ev = data; 952 Emotion_Gstreamer_Video *ev = data;
953 953
954 fprintf(stderr, "hide xv\n"); 954 DBG("hide xv");
955 ecore_x_window_hide(ev->win); 955 ecore_x_window_hide(ev->win);
956#endif 956#endif
957 /* gst_pad_set_blocked_async(ev->xvteepad, TRUE, _block_pad_unlink_cb, ev); */ 957 /* gst_pad_set_blocked_async(ev->xvteepad, TRUE, _block_pad_unlink_cb, ev); */
@@ -1214,10 +1214,10 @@ gstreamer_video_sink_new(Emotion_Gstreamer_Video *ev,
1214 1214
1215 /* Here we really need to have the help of the window manager, this code will change when we update E17. */ 1215 /* Here we really need to have the help of the window manager, this code will change when we update E17. */
1216 parent = (Ecore_X_Window) ecore_evas_window_get(ee); 1216 parent = (Ecore_X_Window) ecore_evas_window_get(ee);
1217 fprintf(stderr, "parent: %x\n", parent); 1217 DBG("parent: %x", parent);
1218 1218
1219 win = ecore_x_window_new(0, x, y, w, h); 1219 win = ecore_x_window_new(0, x, y, w, h);
1220 fprintf(stderr, "creating window: %x [%i, %i, %i, %i]\n", win, x, y, w, h); 1220 DBG("creating window: %x [%i, %i, %i, %i]", win, x, y, w, h);
1221 if (win) 1221 if (win)
1222 { 1222 {
1223 Ecore_X_Window_State state[] = { ECORE_X_WINDOW_STATE_SKIP_TASKBAR, ECORE_X_WINDOW_STATE_SKIP_PAGER }; 1223 Ecore_X_Window_State state[] = { ECORE_X_WINDOW_STATE_SKIP_TASKBAR, ECORE_X_WINDOW_STATE_SKIP_PAGER };
@@ -1243,7 +1243,7 @@ gstreamer_video_sink_new(Emotion_Gstreamer_Video *ev,
1243 } 1243 }
1244 else 1244 else
1245 { 1245 {
1246 fprintf(stderr, "destroying win: %x\n", win); 1246 DBG("destroying win: %x", win);
1247 ecore_x_window_free(win); 1247 ecore_x_window_free(win);
1248 } 1248 }
1249 } 1249 }