gl/examples/generic: remove trailing whitespaces

This commit is contained in:
Luis de Bethencourt 2014-05-03 21:05:19 -04:00 committed by Tim-Philipp Müller
parent ea7c8f9771
commit f29a98cc5f
4 changed files with 84 additions and 93 deletions

View file

@ -75,7 +75,6 @@ static void reshapeCallback (GLuint width, GLuint height, gpointer data)
} }
//client draw callback //client draw callback
static gboolean drawCallback (GLuint texture, GLuint width, GLuint height, gpointer data) static gboolean drawCallback (GLuint texture, GLuint width, GLuint height, gpointer data)
{ {
static GLfloat xrot = 0; static GLfloat xrot = 0;
@ -244,5 +243,4 @@ gint main (gint argc, gchar *argv[])
gst_object_unref (pipeline); gst_object_unref (pipeline);
return 0; return 0;
} }

View file

@ -100,7 +100,6 @@ static void reshapeCallback (GLuint width, GLuint height)
//client draw callback //client draw callback
static gboolean drawCallback (GLuint texture, GLuint width, GLuint height) static gboolean drawCallback (GLuint texture, GLuint width, GLuint height)
{ {
static GLfloat xrot = 0; static GLfloat xrot = 0;
static GLfloat yrot = 0; static GLfloat yrot = 0;
static GLfloat zrot = 0; static GLfloat zrot = 0;
@ -320,6 +319,4 @@ gint main (gint argc, gchar *argv[])
gst_object_unref (pipeline); gst_object_unref (pipeline);
return 0; return 0;
} }

View file

@ -76,12 +76,12 @@ static GstPadProbeReturn textoverlay_sink_pad_probe_cb (GstPad *pad, GstPadProbe
nbFrames++ ; nbFrames++ ;
if (GST_BUFFER_TIMESTAMP(info->data) - last_timestamp >= 1000000000) if (GST_BUFFER_TIMESTAMP(info->data) - last_timestamp >= 1000000000)
{ {
std::ostringstream oss ; std::ostringstream oss;
oss << "video framerate = " << nbFrames ; oss << "video framerate = " << nbFrames ;
std::string s(oss.str()) ; std::string s(oss.str());
g_object_set(G_OBJECT(textoverlay), "text", s.c_str(), NULL); g_object_set(G_OBJECT(textoverlay), "text", s.c_str(), NULL);
last_timestamp = GST_BUFFER_TIMESTAMP(info->data) ; last_timestamp = GST_BUFFER_TIMESTAMP(info->data) ;
nbFrames = 0 ; nbFrames = 0;
} }
return GST_PAD_PROBE_OK; return GST_PAD_PROBE_OK;
@ -224,7 +224,6 @@ static void cb_new_pad (GstElement* decodebin, GstPad* pad, GstElement* element)
gint main (gint argc, gchar *argv[]) gint main (gint argc, gchar *argv[])
{ {
if (argc != 2) if (argc != 2)
{ {
g_warning ("usage: doublecube.exe videolocation\n"); g_warning ("usage: doublecube.exe videolocation\n");
@ -363,6 +362,4 @@ gint main (gint argc, gchar *argv[])
gst_object_unref (pipeline); gst_object_unref (pipeline);
return 0; return 0;
} }

View file

@ -274,5 +274,4 @@ gint main (gint argc, gchar *argv[])
gst_object_unref (pipeline); gst_object_unref (pipeline);
return 0; return 0;
} }