From 0eefcb23b47005333b8fabfe204f31abe1bdb314 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 11 Dec 2017 00:26:36 +0000 Subject: [PATCH] gl: examples: fix c++ code for -Wreturn-aggregate .. and use #ifdef instead of #if --- tests/examples/gl/generic/cubeyuv/main.cpp | 7 +++---- tests/examples/gl/generic/doublecube/main.cpp | 7 +++---- tests/examples/gl/generic/recordgraphic/main.cpp | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/examples/gl/generic/cubeyuv/main.cpp b/tests/examples/gl/generic/cubeyuv/main.cpp index e1f843e..cc1bb51 100644 --- a/tests/examples/gl/generic/cubeyuv/main.cpp +++ b/tests/examples/gl/generic/cubeyuv/main.cpp @@ -73,10 +73,9 @@ static void identityCallback (GstElement *src, GstBuffer *buffer, GstElement* t nbFrames++ ; if (GST_BUFFER_TIMESTAMP(buffer) - last_timestamp >= 1000000000) { - std::ostringstream oss ; - oss << "video framerate = " << nbFrames ; - std::string s(oss.str()) ; - g_object_set(G_OBJECT(textoverlay), "text", s.c_str(), NULL); + gchar *s = g_strdup_printf ("video framerate = %d", nbFrames); + g_object_set(G_OBJECT(textoverlay), "text", s, NULL); + g_free (s); last_timestamp = GST_BUFFER_TIMESTAMP(buffer) ; nbFrames = 0 ; } diff --git a/tests/examples/gl/generic/doublecube/main.cpp b/tests/examples/gl/generic/doublecube/main.cpp index 631a285..73f39cb 100644 --- a/tests/examples/gl/generic/doublecube/main.cpp +++ b/tests/examples/gl/generic/doublecube/main.cpp @@ -73,10 +73,9 @@ static GstPadProbeReturn textoverlay_sink_pad_probe_cb (GstPad *pad, GstPadProbe nbFrames++ ; if (GST_BUFFER_TIMESTAMP(info->data) - last_timestamp >= 1000000000) { - std::ostringstream oss; - oss << "video framerate = " << nbFrames ; - std::string s(oss.str()); - g_object_set(G_OBJECT(textoverlay), "text", s.c_str(), NULL); + gchar *s = g_strdup_printf ("video framerate = %d", nbFrames); + g_object_set(G_OBJECT(textoverlay), "text", s, NULL); + g_free (s); last_timestamp = GST_BUFFER_TIMESTAMP(info->data) ; nbFrames = 0; } diff --git a/tests/examples/gl/generic/recordgraphic/main.cpp b/tests/examples/gl/generic/recordgraphic/main.cpp index 9cac1e9..45477a2 100644 --- a/tests/examples/gl/generic/recordgraphic/main.cpp +++ b/tests/examples/gl/generic/recordgraphic/main.cpp @@ -19,7 +19,7 @@ */ #include -#if __WIN32__ || _WIN32 +#if defined(__WIN32__) || defined(_WIN32) # include #endif #include -- 2.7.4