$OpenBSD: patch-app_sample_editor_c,v 1.3 2002/07/30 06:51:15 wcobb Exp $ --- app/sample-editor.c.orig Thu May 16 11:55:24 2002 +++ app/sample-editor.c Tue Jul 30 02:53:03 2002 @@ -186,7 +186,7 @@ static void sample_editor_reverse_clicke static void sample_editor_lock_sample (void) { - g_mutex_lock(current_sample->sample.lock); + pthread_mutex_lock(current_sample->sample.lock); } static void @@ -195,7 +195,7 @@ sample_editor_unlock_sample (void) if(gui_playing_mode) { mixer->updatesample(¤t_sample->sample); } - g_mutex_unlock(current_sample->sample.lock); + pthread_mutex_unlock(current_sample->sample.lock); } void @@ -465,7 +465,7 @@ sample_editor_page_create (GtkNotebook * #if !defined(NO_AUDIOFILE) && HAVE_DLFCN_H { // hack, hack void *handle, *function; - handle = dlopen(NULL, RTLD_NOW); + handle = dlopen(NULL, DL_LAZY); function = dlsym(handle, "afSetVirtualPCMMapping"); if(function == NULL) { libaf2 = FALSE; @@ -2038,7 +2038,7 @@ static void sample_editor_lrvol (GtkWidget *widget, gpointer data) { - int mode = (int)data; + int mode = GPOINTER_TO_INT(data); switch(mode) { @@ -2056,7 +2056,7 @@ static void sample_editor_open_volume_ramp_dialog (void) { GtkWidget *mainbox, *box1, *thing; - int i; + gint i; const char *labels1[] = { _("Normalize"), _("Execute"), @@ -2146,7 +2146,8 @@ sample_editor_open_volume_ramp_dialog (v gtk_widget_show(thing); gtk_box_pack_start(GTK_BOX(box1), thing, TRUE, TRUE, 0); gtk_signal_connect(GTK_OBJECT(thing), "clicked", - GTK_SIGNAL_FUNC(sample_editor_perform_ramp), (gpointer)i); + GTK_SIGNAL_FUNC(sample_editor_perform_ramp), + GINT_TO_POINTER(i)); } gtk_widget_show (volrampwindow); @@ -2166,7 +2167,7 @@ static void sample_editor_perform_ramp (GtkWidget *w, gpointer data) { - int action = (int)data; + int action = GPOINTER_TO_INT(data); double left, right; const int ss = sampledisplay->sel_start, se = sampledisplay->sel_end; int i;