Emotion: use eina log wherever it's possible

SVN revision: 82099

diff --git a/legacy/emotion/src/lib/emotion_main.c b/legacy/emotion/src/lib/emotion_main.c
index 01c36f2..d816424 100644 (file)
--- 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)
 
  on_error:
 #endif
-   fprintf(stderr, "'%s' is not a webcam ['%s']\n", ew->name, strerror(errno));
+   EINA_LOG_ERR("'%s' is not a webcam ['%s']", ew->name, strerror(errno));
    eina_stringshare_del(ew->syspath);
    eina_stringshare_del(ew->device);
    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 648be6d..2ee2720 100644 (file)
--- 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)
 
 static int em_video_handled(void *ef __UNUSED__)
 {
-   fprintf(stderr, "video handled!\n");
+   DBG("video handled!");
    return 1;
 }
 
 static int em_audio_handled(void *ef __UNUSED__)
 {
-   fprintf(stderr, "audio handled!\n");
+   DBG("audio handled!");
    return 1;
 }
 

diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
index 395d931..329c8be 100644 (file)
--- 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)
        ev->src_height = 0;
 
 #ifdef HAVE_ECORE_X
-       fprintf(stderr, "destroying window: %i\n", ev->win);
+       INF("destroying window: %i", ev->win);
        if (ev->win) ecore_x_window_free(ev->win);
        ev->win = 0;
 #endif
@@ -1337,7 +1337,7 @@ _ecore_event_x_destroy(void *data __UNUSED__, int type __UNUSED__, void *event _
 {
    Ecore_X_Event_Window_Destroy *ev = event;
 
-   fprintf(stderr, "killed window: %x (%x)\n", ev->win, ev->event_win);
+   INF("killed window: %x (%x).", ev->win, ev->event_win);
 
    return EINA_TRUE;
 }

diff --git a/legacy/emotion/src/modules/gstreamer/emotion_sink.c b/legacy/emotion/src/modules/gstreamer/emotion_sink.c
index 17a1bc5..b91d90f 100644 (file)
--- 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)
         for (i = 0; colorspace_fourcc_convertion[i].name != NULL; ++i)
           if (fourcc == colorspace_fourcc_convertion[i].fourcc)
             {
-               fprintf(stderr, "Found '%s'\n", colorspace_fourcc_convertion[i].name);
+               DBG("Found '%s'", colorspace_fourcc_convertion[i].name);
                priv->eformat = colorspace_fourcc_convertion[i].eformat;
                priv->func = colorspace_fourcc_convertion[i].func;
                if (colorspace_fourcc_convertion[i].force_height)
@@ -244,7 +244,7 @@ gboolean evas_video_sink_set_caps(GstBaseSink *bsink, GstCaps *caps)
 
         if (fourcc == GST_MAKE_FOURCC('S', 'T', '1', '2'))
           {
-             fprintf(stderr, "Found '%s'\n", "ST12");
+             DBG("Found '%s'", "ST12");
              priv->eformat = EVAS_COLORSPACE_YCBCR420TM12601_PL;
              priv->samsung = EINA_TRUE;
              priv->func = NULL;
@@ -269,7 +269,7 @@ gboolean evas_video_sink_set_caps(GstBaseSink *bsink, GstCaps *caps)
    for (i = 0; colorspace_format_convertion[i].name != NULL; ++i)
      if (format == colorspace_format_convertion[i].format)
        {
-          fprintf(stderr, "Found '%s'\n", colorspace_format_convertion[i].name);
+          DBG("Found '%s'", colorspace_format_convertion[i].name);
           priv->eformat = colorspace_format_convertion[i].eformat;
           priv->func = colorspace_format_convertion[i].func;
           if (priv->ev)
@@ -881,7 +881,7 @@ _video_resize(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface
    Emotion_Gstreamer_Video *ev = data;
 
    ecore_x_window_resize(ev->win, w, h);
-   fprintf(stderr, "resize: %i, %i\n", w, h);
+   DBG("resize: %i, %i", w, h);
 #endif
 }
 
@@ -893,7 +893,7 @@ _video_move(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface *s
    Emotion_Gstreamer_Video *ev = data;
    unsigned int pos[2];
 
-   fprintf(stderr, "move: %i, %i\n", x, y);
+   DBG("move: %i, %i", x, y);
    pos[0] = x; pos[1] = y;
    ecore_x_window_prop_card32_set(ev->win, ECORE_X_ATOM_E_VIDEO_POSITION, pos, 2);
 #endif
@@ -939,7 +939,7 @@ _video_show(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface *s
 #ifdef HAVE_ECORE_X
    Emotion_Gstreamer_Video *ev = data;
 
-   fprintf(stderr, "show xv\n");
+   DBG("show xv");
    ecore_x_window_show(ev->win);
 #endif
    /* 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
 #ifdef HAVE_ECORE_X
    Emotion_Gstreamer_Video *ev = data;
 
-   fprintf(stderr, "hide xv\n");
+   DBG("hide xv");
    ecore_x_window_hide(ev->win);
 #endif
    /* 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,
 
           /* Here we really need to have the help of the window manager, this code will change when we update E17. */
           parent = (Ecore_X_Window) ecore_evas_window_get(ee);
-          fprintf(stderr, "parent: %x\n", parent);
+          DBG("parent: %x", parent);
 
           win = ecore_x_window_new(0, x, y, w, h);
-          fprintf(stderr, "creating window: %x [%i, %i, %i, %i]\n", win, x, y, w, h);
+          DBG("creating window: %x [%i, %i, %i, %i]", win, x, y, w, h);
           if (win)
             {
               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,
                 }
               else
                 {
-                  fprintf(stderr, "destroying win: %x\n", win);
+                  DBG("destroying win: %x", win);
                   ecore_x_window_free(win);
                 }
             }