Use unique names for static globals in GStreamer cgo

Author: Sean-Der

examples/gstreamer-receive/gst/gst.c

@@ -2,11 +2,11 @@
 
 #include <gst/app/gstappsrc.h>
 
-GMainLoop *main_loop = NULL;
-void gstreamer_recieve_mainloop(void) {
-  main_loop = g_main_loop_new(NULL, FALSE);
+GMainLoop *gstreamer_recieve_main_loop = NULL;
+void gstreamer_recieve_start_mainloop(void) {
+  gstreamer_recieve_main_loop = g_main_loop_new(NULL, FALSE);
 
-  g_main_loop_run(main_loop);
+  g_main_loop_run(gstreamer_recieve_main_loop);
 }
 
 static gboolean gstreamer_recieve_bus_call(GstBus *bus, GstMessage *msg, gpointer data) {
@@ -47,7 +47,7 @@ void gstreamer_recieve_start_pipeline(GstElement *pipeline) {
   guint bus_watch_id;
 
   bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline));
-  bus_watch_id = gst_bus_add_watch(bus, gstreamer_recieve_bus_call, main_loop);
+  bus_watch_id = gst_bus_add_watch(bus, gstreamer_recieve_bus_call, NULL);
   gst_object_unref(bus);
 
   gst_element_set_state(pipeline, GST_STATE_PLAYING);

examples/gstreamer-receive/gst/gst.go

@@ -14,7 +14,7 @@ import (
 )
 
 func init() {
-	go C.gstreamer_recieve_mainloop()
+	go C.gstreamer_recieve_start_mainloop()
 }
 
 // Pipeline is a wrapper for a GStreamer Pipeline

examples/gstreamer-receive/gst/gst.h

@@ -10,6 +10,6 @@ GstElement *gstreamer_recieve_create_pipeline(char *pipeline);
 void gstreamer_recieve_start_pipeline(GstElement *pipeline);
 void gstreamer_recieve_stop_pipeline(GstElement *pipeline);
 void gstreamer_recieve_push_buffer(GstElement *pipeline, void *buffer, int len);
-void gstreamer_recieve_mainloop(void);
+void gstreamer_recieve_start_mainloop(void);
 
 #endif

examples/gstreamer-send/gst/gst.c

@@ -6,37 +6,35 @@ typedef struct SampleHandlerUserData {
   int pipelineId;
 } SampleHandlerUserData;
 
-GMainLoop *main_loop = NULL;
-void gstreamer_send_mainloop(void) {
-  main_loop = g_main_loop_new(NULL, FALSE);
+GMainLoop *gstreamer_send_main_loop = NULL;
+void gstreamer_send_start_mainloop(void) {
+  gstreamer_send_main_loop = g_main_loop_new(NULL, FALSE);
 
-  g_main_loop_run(main_loop);
+  g_main_loop_run(gstreamer_send_main_loop);
 }
 
 static gboolean gstreamer_send_bus_call(GstBus *bus, GstMessage *msg, gpointer data) {
-  GMainLoop *loop = (GMainLoop *)data;
-
   switch (GST_MESSAGE_TYPE(msg)) {
-    case GST_MESSAGE_EOS:
-      g_print("End of stream\n");
-      g_main_loop_quit(loop);
-      break;
 
-    case GST_MESSAGE_ERROR: {
-      gchar *debug;
-      GError *error;
+  case GST_MESSAGE_EOS:
+    g_print("End of stream\n");
+    exit(1);
+    break;
 
-      gst_message_parse_error(msg, &error, &debug);
-      g_free(debug);
+  case GST_MESSAGE_ERROR: {
+    gchar *debug;
+    GError *error;
 
-      g_printerr("Error: %s\n", error->message);
-      g_error_free(error);
+    gst_message_parse_error(msg, &error, &debug);
+    g_free(debug);
 
-      g_main_loop_quit(loop);
-      break;
-    }
-    default:
-      break;
+    g_printerr("Error: %s\n", error->message);
+    g_error_free(error);
+    exit(1);
+    break;
+  }
+  default:
+    break;
   }
 
   return TRUE;
@@ -69,13 +67,11 @@ GstElement *gstreamer_send_create_pipeline(char *pipeline) {
 }
 
 void gstreamer_send_start_pipeline(GstElement *pipeline, int pipelineId) {
-  GMainLoop *loop = g_main_loop_new(NULL, FALSE);
-
   SampleHandlerUserData *s = calloc(1, sizeof(SampleHandlerUserData));
   s->pipelineId = pipelineId;
 
   GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline));
-  guint bus_watch_id = gst_bus_add_watch(bus, gstreamer_send_bus_call, loop);
+  guint bus_watch_id = gst_bus_add_watch(bus, gstreamer_send_bus_call, NULL);
   gst_object_unref(bus);
 
   GstElement *appsink = gst_bin_get_by_name(GST_BIN(pipeline), "appsink");

examples/gstreamer-send/gst/gst.go

@@ -16,7 +16,7 @@ import (
 )
 
 func init() {
-	go C.gstreamer_send_mainloop()
+	go C.gstreamer_send_start_mainloop()
 }
 
 // Pipeline is a wrapper for a GStreamer Pipeline

examples/gstreamer-send/gst/gst.h

@@ -11,6 +11,6 @@ extern void goHandlePipelineBuffer(void *buffer, int bufferLen, int samples, int
 GstElement *gstreamer_send_create_pipeline(char *pipeline);
 void gstreamer_send_start_pipeline(GstElement *pipeline, int pipelineId);
 void gstreamer_send_stop_pipeline(GstElement *pipeline);
-void gstreamer_send_mainloop(void);
+void gstreamer_send_start_mainloop(void);
 
 #endif