From 0d49253b107e67067b6143958fee3f8e4c0e0b6c Mon Sep 17 00:00:00 2001 From: Good Guy Date: Sun, 26 Jun 2016 09:58:17 -0600 Subject: [PATCH] bclistbox selection segv + other minor fixes --- cinelerra-5.1/cinelerra/mwindow.C | 2 +- cinelerra-5.1/configure.ac | 36 +++++++++--------- cinelerra-5.1/guicast/bclistbox.C | 17 ++++----- cinelerra-5.1/guicast/mutex.C | 4 ++ .../plugins/theme_blue_dot/bluedottheme.C | 4 ++ .../theme_blue_dot/data/tan_linear.png | Bin 0 -> 430 bytes .../theme_blue_dot/data/tan_smooth.png | Bin 0 -> 442 bytes cinelerra-5.1/thirdparty/Makefile | 2 +- 8 files changed, 35 insertions(+), 30 deletions(-) create mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/tan_linear.png create mode 100644 cinelerra-5.1/plugins/theme_blue_dot/data/tan_smooth.png diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index a9e813af..0d4421e9 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -2438,7 +2438,7 @@ void MWindow::hide_plugin(Plugin *plugin, int lock) ptr->hide_gui(); delete_plugin(ptr); //sleep(1); -// return; + return; } } if(lock) plugin_gui_lock->unlock(); diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index c1cbd888..e55a1b6c 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -94,19 +94,19 @@ PKG_3RD([a52dec],[yes], [ liba52/.libs/liba52.a ], [ include ]) -PKG_3RD([audiofile],[auto], +PKG_3RD([audiofile],[no], [audiofile-0.3.6], [ libaudiofile/.libs/libaudiofile.a \ libaudiofile/modules/.libs/libmodules.a \ libaudiofile/alac/.libs/libalac.a ], [ libaudiofile ]) -PKG_3RD([encore],[yes], +PKG_3RD([encore],[no], [encore-5.0], [ \$(OBJDIR)/libencore.a ], [ . ]) -PKG_3RD([esound],[auto], +PKG_3RD([esound],[no], [esound-0.2.41], [ .libs/libesd.a \ .libs/libesddsp.a ], @@ -456,11 +456,11 @@ CHECK_HEADERS([fdk], [fdk headers], [fdk-aac/genericStds.h]) AC_DEFUN([CHECK_WANT], [ RESULT=yes AC_ARG_WITH(m4_tolower([$1]), - AC_HELP_STRING([m4_join([-],[--with],m4_tolower([$1]))], [$2] (auto)), - [WANT_$1=$withval],[WANT_$1=auto]) + AC_HELP_STRING([m4_join([-],[--with],m4_tolower([$1]))], [$3] (auto)), + [WANT_$1=$withval],[WANT_$1=$2]) # WANT_$1 if test "x$WANT_$1" != "xno" ; then - m4_quote($3) + m4_quote($4) if test "x$RESULT" = "xno" -a "x$PKG_$1" = "x"; then echo "=== want $1 Failed." WANT_$1=no @@ -472,23 +472,23 @@ CFG_WANTS+=" $1" AC_SUBST([WANT_$1]) ]) -CHECK_WANT([GL], [use opengl], [ +CHECK_WANT([GL], [auto], [use opengl], [ CHECK_LIB([GL], [GL], [glUseProgram]) CHECK_LIB([GL], [GLU], [gluOrtho2D]) CHECK_HEADERS([GL], [opengl headers], [GL/gl.h GL/glext.h GL/glu.h GL/glx.h])]) -CHECK_WANT([OSS], [use OSS audio], [ +CHECK_WANT([OSS], [auto], [use OSS audio], [ CHECK_HEADERS([OSS], [oss headers], [sys/soundcard.h])]) -CHECK_WANT([XFT], [use libXft], [ +CHECK_WANT([XFT], [auto], [use libXft], [ CHECK_LIB([XFT], [Xft], [XftInit]) CHECK_HEADERS([XFT], [Xft/freetype headers], [X11/Xlib.h X11/Xft/Xft.h])]) -CHECK_WANT([ALSA], [use libasound/alsa], [ +CHECK_WANT([ALSA], [auto], [use libasound/alsa], [ CHECK_LIB([ALSA], [asound], [snd_pcm_open]) CHECK_HEADERS([ALSA], [asound headers], [alsa/asoundlib.h])]) -CHECK_WANT([FIREWIRE], [use firewire], [ +CHECK_WANT([FIREWIRE], [auto], [use firewire], [ CHECK_LIB([libavc1394], [avc1394], [avc1394_init_target]) CHECK_HEADERS([libavc1394], [libavc1394 headers], [libavc1394/avc1394.h]) CHECK_LIB([libavc1394], [rom1394], [rom1394_get_bus_id]) @@ -498,29 +498,29 @@ CHECK_WANT([FIREWIRE], [use firewire], [ CHECK_LIB([libraw1394], [raw1394], [raw1394_iso_recv_init]) CHECK_HEADERS([libraw1394], [libraw1394 headers], [libraw1394/raw1394.h])]) -CHECK_WANT([DV], [use dv], [ +CHECK_WANT([DV], [auto], [use dv], [ CHECK_LIB([libdv], [dv], [dv_init]) CHECK_HEADERS([libdv], [libdv headers], [libdv/dv.h])]) -CHECK_WANT([DVB], [use dvb], [ +CHECK_WANT([DVB], [auto], [use dvb], [ CHECK_HEADERS([DVB], [dvb device headers], [linux/dvb/dmx.h linux/dvb/frontend.h])]) -CHECK_WANT([VIDEO4LINUX2], [use v4l2], [ +CHECK_WANT([VIDEO4LINUX2], [auto], [use v4l2], [ CHECK_HEADERS([VIDEO4LINUX2], [v4l2 system headers], [linux/kernel.h linux/types.h linux/videodev2.h])]) -CHECK_WANT([XXF86VM], [use xf86vmode], [ +CHECK_WANT([XXF86VM], [auto], [use xf86vmode], [ CHECK_HEADERS([XXF86VM], [XF86VM headers], [X11/Xlib.h X11/extensions/xf86vmode.h])]) -CHECK_WANT([ESOUND], [use esd], [ +CHECK_WANT([ESOUND], [no], [use esd], [ CHECK_LIB([esound], [esd], [esd_open_sound]) CHECK_HEADERS([esound], [esound headers], [esd.h]) CHECK_LIB([audiofile], [audiofile], [afOpenFile]) CHECK_HEADERS([audiofile], [audiofile headers], [audiofile.h])]) -CHECK_WANT([DL], [system has libdl], [ +CHECK_WANT([DL], [auto], [system has libdl], [ CHECK_LIB([DL], [dl], [dlopen])]) -CHECK_WANT([NUMA], [system has libnuma], [ +CHECK_WANT([NUMA], [auto], [system has libnuma], [ CHECK_LIB([NUMA], [numa], [numa_alloc])]) diff --git a/cinelerra-5.1/guicast/bclistbox.C b/cinelerra-5.1/guicast/bclistbox.C index c78af1a6..6468b89f 100644 --- a/cinelerra-5.1/guicast/bclistbox.C +++ b/cinelerra-5.1/guicast/bclistbox.C @@ -3126,17 +3126,14 @@ int BC_ListBox::button_release_event() //printf("BC_ListBox::button_release_event 10\n"); unset_repeat(get_resources()->scroll_repeat); current_operation = NO_OPERATION; - translate_coordinates(top_level->event_win, - gui->win, - gui->get_cursor_x(), - gui->get_cursor_y(), - &cursor_x, - &cursor_y); - - selection_number1 = - selection_number = - get_cursor_item(data, cursor_x, cursor_y); + if( gui ) { + translate_coordinates(top_level->event_win, gui->win, + gui->get_cursor_x(), gui->get_cursor_y(), + &cursor_x, &cursor_y); + selection_number1 = selection_number = + get_cursor_item(data, cursor_x, cursor_y); //printf("BC_ListBox::button_release_event %d %d\n", selection_number2, selection_number1); + } if(is_popup) { diff --git a/cinelerra-5.1/guicast/mutex.C b/cinelerra-5.1/guicast/mutex.C index a4a6e21f..6bbf279e 100644 --- a/cinelerra-5.1/guicast/mutex.C +++ b/cinelerra-5.1/guicast/mutex.C @@ -96,6 +96,10 @@ int Mutex::lock(const char *location) int Mutex::unlock() { + if( count <= 0 ) { + printf("Mutex::unlock not locked: %s\n", title); + return 0; + } // Remove from recursive status if(recursive) { diff --git a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C index 4ab6a5a0..fb2d40b7 100644 --- a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C +++ b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C @@ -827,6 +827,10 @@ void BlueDotTheme::initialize() // new_toggle("toolwindow.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi,"tool"); // MIHA: Commented out in favor of default version M4<< + // toggle for tangent mode (compositor/tool window) + new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth"); + new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear"); + flush_images(); diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/tan_linear.png b/cinelerra-5.1/plugins/theme_blue_dot/data/tan_linear.png new file mode 100644 index 0000000000000000000000000000000000000000..eeed2ec22fa2db30529b50a6e62cb8d0bc5ba2f1 GIT binary patch literal 430 zcmV;f0a5;mP)N{377%|* z0VFkmO+P&}v$;%eY-X##K9B%Qk}kViYdC_Ane72=@ApKt$v;F3Pvz9oPqYzzT4Yb;mBSVFK!kNH5JIs=5k110k?1 zBHfAI!)WM681XArja2nAORC2?l^?O8bKny=Qq_ft36H3^Zw}flP|x+{N>S?r;O2+m koZNS8xV68K#qxjn0^~Aj`B<}zBme*a07*qoM6N<$f}DS^6951J literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 37275913..a94870ed 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -241,7 +241,7 @@ $(call rules,$(call std-build,giflib)) $(call rules,$(call std-build,ilmbase)) $(call rules,$(call std-build,ladspa)) $(call rules,$(call std-build,lame)) -$(call rules,$(call std-build,libavc1394)) +$(call rules,$(call std-build,libavc1394,libraw1394)) $(call rules,$(call std-build,libdv)) $(call rules,$(call std-build,libiec61883)) $(call rules,$(call std-build,libjpeg)) -- 2.26.2