Commit 7d8cba7ce43c161c7f0750297dfa0a8941ee8305
2020-05-21T17:29:27
only show buffers created from the interface
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92
diff --git a/gtk/rtbuf_gtk.c b/gtk/rtbuf_gtk.c
index 44b7dd5..4c15384 100644
--- a/gtk/rtbuf_gtk.c
+++ b/gtk/rtbuf_gtk.c
@@ -476,27 +476,22 @@ void rtbuf_gtk_unlock ()
void rtbuf_gtk_new_cb (s_rtbuf *rtbuf)
{
- rtbuf_gtk_lock();
- if (!rtbuf->user_ptr) {
- s_rtbuf_gtk_rtbuf_info *info = rtbuf_gtk_rtbuf_info_new();
- assert(info);
- info->x = 0;
- info->y = 0;
- rtbuf->user_ptr = info;
+ if (rtbuf->user_ptr) {
+ rtbuf_gtk_lock();
+ rtbuf_gtk_modular_layout_new(rtbuf);
+ rtbuf_gtk_unlock();
}
- rtbuf_gtk_modular_layout_new(rtbuf);
- rtbuf_gtk_unlock();
}
void rtbuf_gtk_delete_cb (s_rtbuf *rtbuf)
{
- rtbuf_gtk_lock();
if (rtbuf->user_ptr) {
s_rtbuf_gtk_rtbuf_info *info;
info = (s_rtbuf_gtk_rtbuf_info*) rtbuf->user_ptr;
+ rtbuf_gtk_lock();
gtk_widget_destroy(GTK_WIDGET(info->widget));
+ rtbuf_gtk_unlock();
}
- rtbuf_gtk_unlock();
}
void rtbuf_gtk_bind_cb (s_rtbuf *src, unsigned int out,
@@ -507,7 +502,6 @@ void rtbuf_gtk_bind_cb (s_rtbuf *src, unsigned int out,
RtbufOutputWidget *output_widget;
RtbufInputWidget *input_widget;
s_rtbuf_gtk_connection *connection;
- rtbuf_gtk_lock();
assert(src);
assert(src->proc);
assert(out < src->proc->out_n);
@@ -515,13 +509,16 @@ void rtbuf_gtk_bind_cb (s_rtbuf *src, unsigned int out,
assert(dest->proc);
assert(in < dest->proc->in_n);
src_info = (s_rtbuf_gtk_rtbuf_info*) src->user_ptr;
- assert(src_info);
+ if (!src_info)
+ return;
output_widget = src_info->out[out];
assert(output_widget);
dest_info = (s_rtbuf_gtk_rtbuf_info*) dest->user_ptr;
- assert(dest_info);
+ if (!dest_info)
+ return;
input_widget = dest_info->in[in];
assert(input_widget);
+ rtbuf_gtk_lock();
if (rtbuf_gtk_connection_find(modular_connections,
output_widget, input_widget))
return;
@@ -545,7 +542,6 @@ void rtbuf_gtk_unbind_cb (s_rtbuf *src, unsigned int out,
RtbufOutputWidget *output_widget;
RtbufInputWidget *input_widget;
s_rtbuf_gtk_connection *connection;
- rtbuf_gtk_lock();
assert(src);
assert(src->proc);
assert(out < src->proc->out_n);
@@ -553,13 +549,16 @@ void rtbuf_gtk_unbind_cb (s_rtbuf *src, unsigned int out,
assert(dest->proc);
assert(in < dest->proc->in_n);
src_info = (s_rtbuf_gtk_rtbuf_info*) src->user_ptr;
- assert(src_info);
+ if (!src_info)
+ return;
output_widget = src_info->out[out];
assert(output_widget);
dest_info = (s_rtbuf_gtk_rtbuf_info*) dest->user_ptr;
- assert(dest_info);
+ if (!dest_info)
+ return;
input_widget = dest_info->in[in];
assert(input_widget);
+ rtbuf_gtk_lock();
connection = rtbuf_gtk_connection_find(modular_connections,
output_widget, input_widget);
if (connection)