Oscplot: Associate a iio context to the oscplot object

Instead of using the iio context as an external global variable, store the context as a private member of the oscplot object. Otherwise whoever created a new oscplot object was forced to use the iio context created in the osc.c. Signed-off-by: Dan <[email protected]>
ahmedelbushra · Jun 16, 2015 · a968ff3 · a968ff3
1 parent b5bd82e
commit a968ff3
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 58 deletions.
diff --git a/osc.c b/osc.c
@@ -52,7 +52,7 @@ GtkWidget *versioncheck_en;
 GtkWidget *main_window;
 
 struct iio_context *ctx;
-unsigned int num_devices = 0;
+static unsigned int num_devices = 0;
 bool ctx_destroyed_by_do_quit;
 
 static void gfunc_save_plot_data_to_ini(gpointer data, gpointer user_data);
@@ -1328,7 +1328,7 @@ GtkWidget * new_plot_cb(GtkMenuItem *item, gpointer user_data)
 {
 	GtkWidget *new_plot;
 
-	new_plot = osc_plot_new();
+	new_plot = osc_plot_new(ctx);
 	osc_plot_set_visible(OSC_PLOT(new_plot), true);
 	plot_init(new_plot);