bclistbox selection segv + other minor fixes

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index a9e813af4131a8f9aaf61f1b23b190d3696ce967..0d4421e930c2acb9b83e084e93179aa7fca0c9ab 100644 (file)
--- 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 c1cbd8884b37da11ccef72a747576114d51e749e..e55a1b6cb241b4c498db70f9e51639203bb16b87 100644 (file)
--- 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 c78af1a68db7e489ea9cc9ecd1b838d68f97a251..6468b89fa4537bbfe9fb24ddbdc59252e62f3b2c 100644 (file)
--- 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 a4a6e21f99f605c1e30fe7a7ffb6092cad5ab40b..6bbf279e78396f033460a1a8cfd20a3f150e3561 100644 (file)
--- 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 4ab6a5a06c580cb39ad970f489562c3cb081f3e6..fb2d40b7539be31a0b0b1768423cc810c179658e 100644 (file)
--- 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 (file)
index 0000000..eeed2ec
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/tan_linear.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/tan_smooth.png b/cinelerra-5.1/plugins/theme_blue_dot/data/tan_smooth.png
new file mode 100644 (file)
index 0000000..e3c0eac
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/tan_smooth.png differ

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 372759133cf7c65b507d887df38eab98e1e9d528..a94870ed465881ad85ad0116e6f6c171f788c66d 100644 (file)
--- 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))