display: move error_message to utils

16 files changed, 31 insertions, 35 deletions

diff --git a/gst/gl/effects/gstgleffectbulge.c b/gst/gl/effects/gstgleffectbulge.c
index e124db6..74b9571 100644
--- a/gst/gl/effects/gstgleffectbulge.c
+++ b/gst/gl/effects/gstgleffectbulge.c
@@ -40,7 +40,7 @@ gst_gl_effects_bulge_callback (gint width, gint height, guint texture,
           bulge_fragment_source, GST_GL_SHADER_FRAGMENT_SOURCE)) {
     gst_gl_display_set_error (display, "Failed to initialize bulge shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
diff --git a/gst/gl/effects/gstgleffectfisheye.c b/gst/gl/effects/gstgleffectfisheye.c
index a64fd70..d818dcc 100644
--- a/gst/gl/effects/gstgleffectfisheye.c
+++ b/gst/gl/effects/gstgleffectfisheye.c
@@ -40,7 +40,7 @@ gst_gl_effects_fisheye_callback (gint width, gint height, guint texture,
           fisheye_fragment_source, GST_GL_SHADER_FRAGMENT_SOURCE)) {
     gst_gl_display_set_error (display, "Failed to initialize fisheye shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
diff --git a/gst/gl/effects/gstgleffectglow.c b/gst/gl/effects/gstgleffectglow.c
index 1b41259..5c7b148 100644
--- a/gst/gl/effects/gstgleffectglow.c
+++ b/gst/gl/effects/gstgleffectglow.c
@@ -44,7 +44,7 @@ gst_gl_effects_glow_step_one (gint width, gint height, guint texture,
     gst_gl_display_set_error (display,
         "Failed to initialize luma threshold shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
@@ -87,7 +87,7 @@ gst_gl_effects_glow_step_two (gint width, gint height, guint texture,
           hconv7_fragment_source, GST_GL_SHADER_FRAGMENT_SOURCE)) {
     gst_gl_display_set_error (display, "Failed to initialize hconv7 shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
@@ -127,7 +127,7 @@ gst_gl_effects_glow_step_three (gint width, gint height, guint texture,
           vconv7_fragment_source, GST_GL_SHADER_FRAGMENT_SOURCE)) {
     gst_gl_display_set_error (display, "Failed to initialize vcon7 shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
@@ -167,7 +167,7 @@ gst_gl_effects_glow_step_four (gint width, gint height, guint texture,
           sum_fragment_source, GST_GL_SHADER_FRAGMENT_SOURCE)) {
     gst_gl_display_set_error (display, "Failed to initialize sum shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
diff --git a/gst/gl/effects/gstgleffectlumatocurve.c b/gst/gl/effects/gstgleffectlumatocurve.c
index 24a5b8a..21de805 100644
--- a/gst/gl/effects/gstgleffectlumatocurve.c
+++ b/gst/gl/effects/gstgleffectlumatocurve.c
@@ -42,7 +42,7 @@ gst_gl_effects_luma_to_curve (GstGLEffects * effects,
     gst_gl_display_set_error (display,
         "Failed to initialize luma to curve shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
diff --git a/gst/gl/effects/gstgleffectmirror.c b/gst/gl/effects/gstgleffectmirror.c
index 7fd2473..29d01f0 100644
--- a/gst/gl/effects/gstgleffectmirror.c
+++ b/gst/gl/effects/gstgleffectmirror.c
@@ -58,7 +58,7 @@ gst_gl_effects_mirror_callback (gint width, gint height, guint texture,
           error = NULL;
           gst_gl_shader_use (NULL);
           GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-              GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+              ("%s", gst_gl_display_get_error ()), (NULL));
         } else {
           effects->draw_attr_position_loc =
               gst_gl_shader_get_attribute_location (shader, "a_position");
@@ -75,7 +75,7 @@ gst_gl_effects_mirror_callback (gint width, gint height, guint texture,
         gst_gl_display_set_error (display,
             "Failed to initialize mirror shader");
         GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-            GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+            ("%s", gst_gl_display_get_error ()), (NULL));
         return;
       }
 
diff --git a/gst/gl/effects/gstgleffectrgbtocurve.c b/gst/gl/effects/gstgleffectrgbtocurve.c
index 192d01d..0c4d55e 100644
--- a/gst/gl/effects/gstgleffectrgbtocurve.c
+++ b/gst/gl/effects/gstgleffectrgbtocurve.c
@@ -42,7 +42,7 @@ gst_gl_effects_rgb_to_curve (GstGLEffects * effects,
     gst_gl_display_set_error (display,
         "Failed to initialize rgb to curve shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
diff --git a/gst/gl/effects/gstgleffectsin.c b/gst/gl/effects/gstgleffectsin.c
index 2926fdf..73240ac 100644
--- a/gst/gl/effects/gstgleffectsin.c
+++ b/gst/gl/effects/gstgleffectsin.c
@@ -40,7 +40,7 @@ gst_gl_effects_sin_callback (gint width, gint height, guint texture,
           sin_fragment_source, GST_GL_SHADER_FRAGMENT_SOURCE)) {
     gst_gl_display_set_error (display, "Failed to initialize sin shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
diff --git a/gst/gl/effects/gstgleffectsquare.c b/gst/gl/effects/gstgleffectsquare.c
index a54104b..9057e3b 100644
--- a/gst/gl/effects/gstgleffectsquare.c
+++ b/gst/gl/effects/gstgleffectsquare.c
@@ -40,7 +40,7 @@ gst_gl_effects_square_callback (gint width, gint height, guint texture,
           square_fragment_source, GST_GL_SHADER_FRAGMENT_SOURCE)) {
     gst_gl_display_set_error (display, "Failed to initialize square shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
diff --git a/gst/gl/effects/gstgleffectsqueeze.c b/gst/gl/effects/gstgleffectsqueeze.c
index 0cdadfc..0a8d61a 100644
--- a/gst/gl/effects/gstgleffectsqueeze.c
+++ b/gst/gl/effects/gstgleffectsqueeze.c
@@ -58,7 +58,7 @@ gst_gl_effects_squeeze_callback (gint width, gint height, guint texture,
           error = NULL;
           gst_gl_shader_use (NULL);
           GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-              GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+              ("%s", gst_gl_display_get_error ()), (NULL));
         } else {
           effects->draw_attr_position_loc =
               gst_gl_shader_get_attribute_location (shader, "a_position");
@@ -75,7 +75,7 @@ gst_gl_effects_squeeze_callback (gint width, gint height, guint texture,
         gst_gl_display_set_error (display,
             "Failed to initialize squeeze shader");
         GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-            GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+            ("%s", gst_gl_display_get_error ()), (NULL));
         return;
       }
     }
diff --git a/gst/gl/effects/gstgleffectstretch.c b/gst/gl/effects/gstgleffectstretch.c
index 6d217bc..f9535f8 100644
--- a/gst/gl/effects/gstgleffectstretch.c
+++ b/gst/gl/effects/gstgleffectstretch.c
@@ -40,7 +40,7 @@ gst_gl_effects_stretch_callback (gint width, gint height, guint texture,
           stretch_fragment_source, GST_GL_SHADER_FRAGMENT_SOURCE)) {
     gst_gl_display_set_error (display, "Failed to initialize stretch shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
diff --git a/gst/gl/effects/gstgleffecttunnel.c b/gst/gl/effects/gstgleffecttunnel.c
index 0d37aac..983d07f 100644
--- a/gst/gl/effects/gstgleffecttunnel.c
+++ b/gst/gl/effects/gstgleffecttunnel.c
@@ -40,7 +40,7 @@ gst_gl_effects_tunnel_callback (gint width, gint height, guint texture,
           tunnel_fragment_source, GST_GL_SHADER_FRAGMENT_SOURCE)) {
     gst_gl_display_set_error (display, "Failed to initialize tunnel shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
diff --git a/gst/gl/effects/gstgleffecttwirl.c b/gst/gl/effects/gstgleffecttwirl.c
index 494c9fb..8e3b2b3 100644
--- a/gst/gl/effects/gstgleffecttwirl.c
+++ b/gst/gl/effects/gstgleffecttwirl.c
@@ -40,7 +40,7 @@ gst_gl_effects_twirl_callback (gint width, gint height, guint texture,
           twirl_fragment_source, GST_GL_SHADER_FRAGMENT_SOURCE)) {
     gst_gl_display_set_error (display, "Failed to initialize twirl shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
diff --git a/gst/gl/effects/gstgleffectxray.c b/gst/gl/effects/gstgleffectxray.c
index eef63d8..e759d6c 100644
--- a/gst/gl/effects/gstgleffectxray.c
+++ b/gst/gl/effects/gstgleffectxray.c
@@ -60,7 +60,7 @@ gst_gl_effects_xray_step_two (gint width, gint height, guint texture,
           hconv7_fragment_source, GST_GL_SHADER_FRAGMENT_SOURCE)) {
     gst_gl_display_set_error (display, "Failed to initialize hconv7 shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
@@ -100,7 +100,7 @@ gst_gl_effects_xray_step_three (gint width, gint height, guint texture,
           vconv7_fragment_source, GST_GL_SHADER_FRAGMENT_SOURCE)) {
     gst_gl_display_set_error (display, "Failed to initialize vconv7 shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
@@ -142,7 +142,7 @@ gst_gl_effects_xray_desaturate (gint width, gint height, guint texture,
     gst_gl_display_set_error (display,
         "Failed to initialize desaturate shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
@@ -181,7 +181,7 @@ gst_gl_effects_xray_sobel_hconv (gint width, gint height, guint texture,
     gst_gl_display_set_error (display,
         "Failed to initialize sobel hvonc3 shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
@@ -220,7 +220,7 @@ gst_gl_effects_xray_sobel_vconv (gint width, gint height, guint texture,
     gst_gl_display_set_error (display,
         "Failed to initialize sobel vconv3 shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
@@ -259,7 +259,7 @@ gst_gl_effects_xray_sobel_length (gint width, gint height, guint texture,
     gst_gl_display_set_error (display,
         "Failed to initialize seobel length shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
@@ -300,7 +300,7 @@ gst_gl_effects_xray_step_five (gint width, gint height, guint texture,
           multiply_fragment_source, GST_GL_SHADER_FRAGMENT_SOURCE)) {
     gst_gl_display_set_error (display, "Failed to initialize multiply shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
diff --git a/gst/gl/gstgldifferencematte.c b/gst/gl/gstgldifferencematte.c
index e7a5444..ac41ff3 100644
--- a/gst/gl/gstgldifferencematte.c
+++ b/gst/gl/gstgldifferencematte.c
@@ -106,8 +106,7 @@ gst_gl_differencematte_init_gl_resources (GstGLFilter * filter)
     gst_gl_display_set_error (GST_GL_FILTER (differencematte)->display,
         "Failed to initialize difference shader");
     GST_ELEMENT_ERROR (differencematte, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display),
-        (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
@@ -116,8 +115,7 @@ gst_gl_differencematte_init_gl_resources (GstGLFilter * filter)
     gst_gl_display_set_error (GST_GL_FILTER (differencematte)->display,
         "Failed to initialize hconv7 shader");
     GST_ELEMENT_ERROR (differencematte, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display),
-        (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
@@ -126,8 +124,7 @@ gst_gl_differencematte_init_gl_resources (GstGLFilter * filter)
     gst_gl_display_set_error (GST_GL_FILTER (differencematte)->display,
         "Failed to initialize vconv7 shader");
     GST_ELEMENT_ERROR (differencematte, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display),
-        (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 
@@ -136,8 +133,7 @@ gst_gl_differencematte_init_gl_resources (GstGLFilter * filter)
     gst_gl_display_set_error (GST_GL_FILTER (differencematte)->display,
         "Failed to initialize interp shader");
     GST_ELEMENT_ERROR (differencematte, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display),
-        (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return;
   }
 }
diff --git a/gst/gl/gstglimagesink.c b/gst/gl/gstglimagesink.c
index 22f72ff..cacc13c 100644
--- a/gst/gl/gstglimagesink.c
+++ b/gst/gl/gstglimagesink.c
@@ -677,7 +677,7 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf)
 
   if (g_atomic_int_get (&glimage_sink->to_quit) != 0) {
     GST_ELEMENT_ERROR (glimage_sink, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (glimage_sink->display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return GST_FLOW_ERROR;
   }
 
@@ -688,7 +688,7 @@ redisplay_failed:
   {
     gst_video_frame_unmap (&frame);
     GST_ELEMENT_ERROR (glimage_sink, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (glimage_sink->display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return GST_FLOW_ERROR;
   }
 }
diff --git a/gst/gl/gstgltestsrc.c b/gst/gl/gstgltestsrc.c
index ee93a49..39deca4 100644
--- a/gst/gl/gstgltestsrc.c
+++ b/gst/gl/gstgltestsrc.c
@@ -332,7 +332,7 @@ wrong_caps:
 display_error:
   {
     GST_ELEMENT_ERROR (gltestsrc, RESOURCE, NOT_FOUND,
-        GST_GL_DISPLAY_ERR_MSG (gltestsrc->display), (NULL));
+        ("%s", gst_gl_display_get_error ()), (NULL));
     return FALSE;
   }
 }