Packman Build Service PMBS

libmp3splt.changes Changed

libmp3splt.spec Changed

libmp3splt-0.7.1.tar.gz/ChangeLog -> libmp3splt-0.7.3.tar.gz/ChangeLog Changed

libmp3splt-0.7.1.tar.gz/Makefile.in -> libmp3splt-0.7.3.tar.gz/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -70,6 +87,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -91,6 +113,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(m4datadir)"
 DATA = $(m4data_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
@@ -105,9 +133,11 @@
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^$^/*$/.*$$,\1,'; \
@@ -136,6 +166,8 @@
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -310,7 +342,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -346,10 +378,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -372,8 +402,11 @@
 	-rm -f libtool config.lt
 install-m4dataDATA: $(m4data_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(m4datadir)" || $(MKDIR_P) "$(DESTDIR)$(m4datadir)"
 	@list='$(m4data_DATA)'; test -n "$(m4datadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(m4datadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(m4datadir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -387,9 +420,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(m4data_DATA)'; test -n "$(m4datadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(m4datadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(m4datadir)" && rm -f $$files
+	dir='$(DESTDIR)$(m4datadir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -560,13 +591,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -598,7 +626,11 @@
 	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__remove_distdir)
 
 dist-lzma: distdir
@@ -606,7 +638,7 @@
 	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -637,6 +669,8 @@
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -646,7 +680,7 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
@@ -656,6 +690,7 @@
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -684,8 +719,16 @@
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \

libmp3splt-0.7.1.tar.gz/NEWS -> libmp3splt-0.7.3.tar.gz/NEWS Changed

libmp3splt-0.7.1.tar.gz/README -> libmp3splt-0.7.3.tar.gz/README Changed

libmp3splt-0.7.1.tar.gz/aclocal.m4 -> libmp3splt-0.7.3.tar.gz/aclocal.m4 Changed

@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,8 +14,8 @@
 
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.68,,
-m4_warning(this file was generated for autoconf 2.68.
+m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.69,,
+m4_warning(this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.))
@@ -2605,17 +2606,6 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@ -2732,7 +2722,7 @@
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
@@ -3348,10 +3338,6 @@
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3390,7 +3376,7 @@
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -4142,7 +4128,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4441,7 +4427,7 @@
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -6330,9 +6316,6 @@
         _LT_TAGVAR(ld_shlibs, $1)=yes
         ;;
 
-      gnu*)
-        ;;
-
       haiku*)
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
         _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6494,7 +6477,7 @@
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -9683,12 +9666,15 @@
 fidnl
 )# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -9698,7 +9684,7 @@
 am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if($1, 1.11.1, ,
+m4_if($1, 1.11.6, ,
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -9714,19 +9700,21 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION,
-AM_AUTOMAKE_VERSION(1.11.1)dnl
+AM_AUTOMAKE_VERSION(1.11.6)dnl
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
 _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # For projects using AC_CONFIG_AUX_DIR(foo), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -9808,14 +9796,14 @@
 Usually this means the macro was only invoked conditionally.)
 fi))
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
+# serial 12
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -9855,6 +9843,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -9919,7 +9908,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -9984,10 +9973,13 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL(AMDEP, test "x$enable_dependency_tracking" != xno)
 AC_SUBST(AMDEPBACKSLASH)dnl
 _AM_SUBST_NOTMAKE(AMDEPBACKSLASH)dnl

libmp3splt-0.7.1.tar.gz/autogen.sh -> libmp3splt-0.7.3.tar.gz/autogen.sh Changed

libmp3splt-0.7.1.tar.gz/configure -> libmp3splt-0.7.3.tar.gz/configure Changed

@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libmp3splt 0.7.1.
+# Generated by GNU Autoconf 2.69 for libmp3splt 0.7.3.
 #
 # Report bugs to <io_fx@yahoo.fr>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -169,7 +192,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -222,21 +246,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -339,6 +367,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -460,6 +496,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $0, causing all sort of problems
   # (the dirname of $0 is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -494,16 +534,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -515,28 +555,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???sx*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
@@ -574,8 +594,8 @@
 # Identity of this package.
 PACKAGE_NAME='libmp3splt'
 PACKAGE_TARNAME='libmp3splt'
-PACKAGE_VERSION='0.7.1'
-PACKAGE_STRING='libmp3splt 0.7.1'
+PACKAGE_VERSION='0.7.3'
+PACKAGE_STRING='libmp3splt 0.7.3'
 PACKAGE_BUGREPORT='io_fx@yahoo.fr'
 PACKAGE_URL=''
 
@@ -725,6 +745,7 @@
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -1323,8 +1344,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe

libmp3splt-0.7.1.tar.gz/configure.ac -> libmp3splt-0.7.3.tar.gz/configure.ac Changed

libmp3splt-0.7.1.tar.gz/debian/changelog -> libmp3splt-0.7.3.tar.gz/debian/changelog Changed

libmp3splt-0.7.1.tar.gz/debian/copyright -> libmp3splt-0.7.3.tar.gz/debian/copyright Changed

libmp3splt-0.7.1.tar.gz/doc/Makefile.in -> libmp3splt-0.7.3.tar.gz/doc/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,6 +69,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -311,10 +333,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:

libmp3splt-0.7.1.tar.gz/include/libmp3splt/mp3splt.h -> libmp3splt-0.7.3.tar.gz/include/libmp3splt/mp3splt.h Changed

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2011 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
  *
  * http://mp3splt.sourceforge.net
  *
@@ -255,6 +255,7 @@
 typedef struct {
   splt_tags tags;
   void *all_original_tags;
+  int last_plugin_used;
 } splt_original_tags;
 
 /**
@@ -334,7 +335,8 @@
   */
   int user_data;
   //! A pointer to the callback function
-  void (*progress)(struct splt_progres*);
+  void (*progress)(struct splt_progres*, void *);
+  void *progress_cb_data;
 } splt_progress;
 
 //!proxy information
@@ -383,6 +385,8 @@
   int splitnumber;
   //!how many splitpoints do we have?
   int real_splitnumber;
+  //!allocated space for the number of splitpoints
+  int allocated_splitnumber;
   /*! Pointer to the fallback function that is 
       called when the library starts to split
       a new file.
@@ -390,7 +394,9 @@
       the char* is the filename that is currently
       being split.
   */
-  void (*file_split)(const char *,int);
+  void (*file_split)(const char *,int, void *);
+  void *file_split_cb_data;
+
   //!All infos for the progress bar
   splt_progress *p_bar;
   //!callback for sending the silence level to the client
@@ -398,7 +404,8 @@
   //!user data set by the client for the 'get_silence_level' function
   void *silence_level_client_data;
   //!sends a message to the main program to tell what we are doing
-  void (*put_message)(const char *, splt_message_type );
+  void (*put_message)(const char *, splt_message_type, void *);
+  void *put_message_cb_data;
   //!structure in which we have all the splitpoints
   splt_point *points;
   //!how many tags do we have?
@@ -486,6 +493,10 @@
  */
 #define SPLT_DEFAULT_PARAM_MINIMUM_TRACK_LENGTH 0.0
 /**
+ * @brief Default value for the #SPLT_OPT_PARAM_MIN_TRACK_JOIN option
+ */
+#define SPLT_DEFAULT_PARAM_MIN_TRACK_JOIN 0.0
+/**
  * @brief Default value for the #SPLT_OPT_PARAM_GAP option
  */
 #define SPLT_DEFAULT_PARAM_GAP 30
@@ -493,6 +504,10 @@
  * @brief Default value for the #SPLT_OPT_PARAM_NUMBER_TRACKS option
  */
 #define SPLT_DEFAULT_PARAM_TRACKS 0
+/**
+ * @brief Default value for the #SPLT_OPT_PARAM_SHOTS option
+ */
+#define SPLT_DEFAULT_PARAM_SHOTS 25
 
 /**
  * @brief Values for the #SPLT_OPT_TAGS option
@@ -632,6 +647,13 @@
   tracks are split)
   */
   int parameter_number_tracks;
+  /*!
+     this option defines the number of shots to be found after the silence.
+     Decrease this value if you need to split files having closer silence points.
+
+     (positive integer number; default is #SPLT_DEFAULT_PARAM_SHOTS)
+  */
+  int parameter_shots;
   /*! The minimum silence length for option_silence_mode in seconds
     
     A positive float of the minimum number of seconds to be considered
@@ -645,6 +667,13 @@
   */
   float parameter_min_track_length;
 
+  /*! The minimum track length for option_silence_mode in seconds to be kept as a valid segment.
+  
+    A positive float of the minimum number of seconds to be left as output file. Smaller
+    segments will be joined among others.
+  */
+  float parameter_min_track_join;
+
   //!possible values are #splt_str_format
   int artist_tag_format;
   //!possible values are #splt_str_format
@@ -947,6 +976,7 @@
 
   SPLT_INVALID_REGEX = -800,
   SPLT_REGEX_NO_MATCH = -801,
+  SPLT_REGEX_UNAVAILABLE = -802,
 } splt_code;
 
 //internal
@@ -1084,6 +1114,18 @@
    */
   SPLT_OPT_PARAM_NUMBER_TRACKS,
   /**
+   * The desired number of shots when having a
+   * #SPLT_OPTION_SILENCE_MODE or #SPLT_OPTION_TRIM_SILENCE_MODE split
+   * or using the #SPLT_OPT_AUTO_ADJUST option
+   *
+   * The option can take positive integer values. It defines the number of shots to be
+   * found after the silence. Decrease this value if you need to split files having 
+   * closer silence points.
+   *
+   * Default is #SPLT_DEFAULT_PARAM_SHOTS
+   */
+  SPLT_OPT_PARAM_SHOTS,
+  /**
    * Allows you to remove the silence between the split tracks when
    * having a #SPLT_OPTION_SILENCE_MODE split
    *
@@ -1179,6 +1221,17 @@
    */
   SPLT_OPT_PARAM_MIN_TRACK_LENGTH,
   /**
+   * Minimum number of seconds to be considered a valid track\n
+   * All tracks shorter than this value are joined with others.
+   * The difference between #SPLT_OPT_PARAM_MIN_TRACK_LENGTH is that using this option,
+   * no part from the original file is lost.
+   *
+   * The option can take positive float values.
+   *
+   * Default is #SPLT_DEFAULT_PARAM_MIN_TRACK_JOIN
+   */
+  SPLT_OPT_PARAM_MIN_TRACK_JOIN,
+  /**
    * Format of the artist tag from filename.
    * Possible values are #splt_str_format
    */
@@ -1322,7 +1375,7 @@
 /**
  * @brief Package version
  */
-#define SPLT_PACKAGE_VERSION "0.7.1"
+#define SPLT_PACKAGE_VERSION "0.7.3"
 #endif
 /**
  * @brief Package authors
@@ -1442,7 +1495,7 @@
 @return The error code
  */
 int mp3splt_set_message_function(splt_state *state, 
-    void (*message_cb)(const char *, splt_message_type));
+    void (*message_cb)(const char *, splt_message_type, void *), void *cb_data);
 
 /** Register the function that is to be called on creation of a output file
 
@@ -1451,7 +1504,7 @@
 @return The error code
  */
 int mp3splt_set_split_filename_function(splt_state *state,
-    void (*file_cb)(const char *,int));
+    void (*file_cb)(const char *, int, void *), void *data);
 
 /** Register the progress bar callback
 
@@ -1460,7 +1513,7 @@
 @return The error code
  */
 int mp3splt_set_progress_function(splt_state *state,
-    void (*progress_cb)(splt_progress *p_bar));
+    void (*progress_cb)(splt_progress *p_bar, void *), void *cb_data);
 
 int mp3splt_set_silence_level_function(splt_state *state,
   void (*get_silence_cb)(long time, float level, void *user_data),
@@ -1627,6 +1680,8 @@
 void mp3splt_free_one_tag(splt_tags *tags);
 splt_tags *mp3splt_parse_filename_regex(splt_state *state, int *error);
 
+int mp3splt_library_is_locked(splt_state *state);
+
 #define MP3SPLT_MP3SPLT_H
 
 #endif

libmp3splt-0.7.1.tar.gz/libltdl/config/compile -> libmp3splt-0.7.3.tar.gz/libltdl/config/compile Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
+# Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2009-10-06.20; # UTC
+scriptversion=2012-03-05.13; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
+# Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -29,21 +29,219 @@
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /!/*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.oObBjJ)
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.cC++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.oO)
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;

libmp3splt-0.7.1.tar.gz/libltdl/config/config.guess -> libmp3splt-0.7.3.tar.gz/libltdl/config/config.guess Changed

@@ -2,9 +2,9 @@
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2011-05-11'
+timestamp='2012-02-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -57,8 +55,8 @@
 
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -145,7 +143,7 @@
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -792,13 +790,12 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
@@ -807,6 +804,9 @@
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
 	# uname -m includes "-pc" on this system.
 	echo ${UNAME_MACHINE}-mingw32
@@ -861,6 +861,13 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -895,13 +902,16 @@
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -943,7 +953,7 @@
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
@@ -978,13 +988,13 @@
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -1315,6 +1325,9 @@
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2

libmp3splt-0.7.1.tar.gz/libltdl/config/config.sub -> libmp3splt-0.7.3.tar.gz/libltdl/config/config.sub Changed

@@ -2,9 +2,9 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2011-03-23'
+timestamp='2012-04-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -76,8 +74,8 @@
 GNU config.sub ($timestamp)
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,6 +130,10 @@
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^$.*$-$^-*-^-*$$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^$.*$-$^-*-^-*$$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-^-*$//'`
     if  $basic_machine != $1 
@@ -223,6 +225,12 @@
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -247,17 +255,22 @@
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev4-8 | alphaev56 | alphaev678 | alphapca567 \
 	| alpha64 | alpha64ev4-8 | alpha64ev56 | alpha64ev678 | alpha64pca567 \
 	| am33_2.0 \
 	| arc | arm | armble | armelb | armv2345 | armv345lb | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.01 | hppa2.0 | hppa2.0nw | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| maxq | mb | microblaze | mcore | mep | metag \
@@ -291,7 +304,7 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh1234 | sh24a | sh24aeb | sh23e | sh34eb | sheb | shbe | shle | sh1234le | sh3ele \
 	| sh64 | sh64le \
@@ -300,7 +313,7 @@
 	| spu \
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -315,8 +328,7 @@
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -329,7 +341,10 @@
 	strongarm | thumb | xscale)
 		basic_machine=arm-unknown
 		;;
-
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
 	xscaleeb)
 		basic_machine=armeb-unknown
 		;;
@@ -352,11 +367,13 @@
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev4-8-* | alphaev56-* | alphaev678-* \
 	| alpha64-* | alpha64ev4-8-* | alpha64ev56-* | alpha64ev678-* \
 	| alphapca567-* | alpha64pca567-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c123* | c30-* | cjt90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -365,8 +382,10 @@
 	| f3001-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.01-* | hppa2.0-* | hppa2.0nw-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m6800123460-* | m68360-* | m683?2-* | m68k-* \
@@ -400,7 +419,7 @@
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh1234-* | sh24a-* | sh24aeb-* | sh23e-* | sh34eb-* | sheb-* | shbe-* \
 	| shle-* | sh1234le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -408,10 +427,11 @@
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -711,7 +731,6 @@
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -808,10 +827,18 @@
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -1120,13 +1147,8 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;

libmp3splt-0.7.1.tar.gz/libltdl/config/depcomp -> libmp3splt-0.7.3.tar.gz/libltdl/config/depcomp Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-03-27.16; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011, 2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -40,11 +40,11 @@
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -57,6 +57,12 @@
     ;;
 esac
 
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -90,10 +96,24 @@
    # This is just like msvisualcpp but w/o cygpath translation.
    # Just convert the backslash-escaped backslashes to single forward
    # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
+   cygpath_u='sed s,\\\\,/,g'
    depmode=msvisualcpp
 fi
 
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+   gccflag=-qmakedep=gcc,-MF
+   depmode=gcc
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -148,20 +168,21 @@
 ## The second -e expression handles DOS-style file names with drive letters.
   sed -e 's/^^:*: / /' \
       -e 's/^'$alpha':\/^:*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+  tr ' ' "$nl" < "$tmpdepfile" |
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -193,18 +214,15 @@
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
+    tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
    >> "$depfile"
   else
@@ -216,10 +234,17 @@
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
   dir=`echo "$object" | sed -e 's|/^/*$|/|'`
@@ -249,12 +274,11 @@
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
+    # Each line is of the form 'foo.o: dependent.h'.
     # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
+    # '$object: dependent.h' and one to simply 'dependent.h:'.
     sed -e "s,^.*\.a-z*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the .
-    sed -e 's,^.*\.a-z*:	 *,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+    sed -e 's,^.*\.a-z*:'"$tab"' *,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -265,23 +289,26 @@
   ;;
 
 icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
+  # However on
+  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
   # ICC 7.0 will fill foo.d with something like
   #    foo.o: sub/foo.c
   #    foo.o: sub/foo.h
-  # which is wrong.  We want:
+  # which is wrong.  We want
   #    sub/foo.o: sub/foo.c
   #    sub/foo.o: sub/foo.h
   #    sub/foo.c:
   #    sub/foo.h:
   # ICC 7.1 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\':
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-
+  # tcc 0.9.26 (FIXME still under development at the moment of writing)
+  # will emit a similar output, but also prepend the continuation lines
+  # with horizontal tabulation characters.
   "$@" -MD -MF "$tmpdepfile"
   stat=$?
   if test $stat -eq 0; then :
@@ -290,15 +317,21 @@
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',

libmp3splt-0.7.1.tar.gz/libltdl/config/install-sh -> libmp3splt-0.7.3.tar.gz/libltdl/config/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | =!) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | =!) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -200,7 +208,11 @@
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | =!) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	-=!*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then

libmp3splt-0.7.1.tar.gz/libltdl/config/ltmain.sh -> libmp3splt-0.7.3.tar.gz/libltdl/config/ltmain.sh Changed

libmp3splt-0.7.1.tar.gz/libltdl/config/missing -> libmp3splt-0.7.3.tar.gz/libltdl/config/missing Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@
   help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.ch', if possible, from existing .ch
 
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
@@ -226,7 +216,7 @@
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@
     touch $file
     ;;
 
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and is $msg.

libmp3splt-0.7.1.tar.gz/m4/Makefile.in -> libmp3splt-0.7.3.tar.gz/m4/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,6 +69,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -308,10 +330,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:

libmp3splt-0.7.1.tar.gz/plugins/Makefile.in -> libmp3splt-0.7.3.tar.gz/plugins/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -81,6 +98,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libsplt_mp3_la_DEPENDENCIES =
@@ -127,6 +150,11 @@
 SOURCES = $(libsplt_mp3_la_SOURCES) $(libsplt_ogg_la_SOURCES)
 DIST_SOURCES = $(am__libsplt_mp3_la_SOURCES_DIST) \
 	$(am__libsplt_ogg_la_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -349,7 +377,6 @@
 $(am__aclocal_m4_deps):
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -357,6 +384,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -378,9 +407,9 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libsplt_mp3.la: $(libsplt_mp3_la_OBJECTS) $(libsplt_mp3_la_DEPENDENCIES) 
+libsplt_mp3.la: $(libsplt_mp3_la_OBJECTS) $(libsplt_mp3_la_DEPENDENCIES) $(EXTRA_libsplt_mp3_la_DEPENDENCIES) 
 	$(libsplt_mp3_la_LINK) $(am_libsplt_mp3_la_rpath) $(libsplt_mp3_la_OBJECTS) $(libsplt_mp3_la_LIBADD) $(LIBS)
-libsplt_ogg.la: $(libsplt_ogg_la_OBJECTS) $(libsplt_ogg_la_DEPENDENCIES) 
+libsplt_ogg.la: $(libsplt_ogg_la_OBJECTS) $(libsplt_ogg_la_DEPENDENCIES) $(EXTRA_libsplt_ogg_la_DEPENDENCIES) 
 	$(libsplt_ogg_la_LINK) $(am_libsplt_ogg_la_rpath) $(libsplt_ogg_la_OBJECTS) $(libsplt_ogg_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -588,10 +617,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:

libmp3splt-0.7.1.tar.gz/plugins/mp3.c -> libmp3splt-0.7.3.tar.gz/plugins/mp3.c Changed

@@ -3,7 +3,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2011 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
  *
  *********************************************************/
 
@@ -143,8 +143,7 @@
 plugin should not have been detected
 \return NULL on error
 */
-static FILE *splt_mp3_open_file_read(splt_state *state, const char *filename,
-    int *error)
+static FILE *splt_mp3_open_file_read(splt_state *state, const char *filename, int *error)
 {
   FILE *file_input = NULL;
 
@@ -504,13 +503,13 @@
             char *genre = (char *)tag_value;
 
             int id3v1 = atoi(genre);
-            if ((id3v1 != 0) &&
+            if ((id3v1 > 0) &&
                 (id3v1 < SPLT_ID3V1_NUMBER_OF_GENRES) &&
                 (state->original_tags.tags.genre == NULL))
             {
               err = splt_tu_set_original_tags_field(state, SPLT_TAGS_GENRE, splt_id3v1_genresid3v1);
             }
-            else if (strcmp(genre, "0") == 0)
+            else if (strlen(genre) == 0)
             {
               err = splt_tu_set_original_tags_field(state, SPLT_TAGS_GENRE, SPLT_UNDEFINED_GENRE);
             }
@@ -720,6 +719,7 @@
   if (set_original_tags && bytes_and_size)
   {
     id = id3_tag_parse(bytes_and_size->tag_bytes, bytes_and_size->tag_length);
+    splt_mp3_delete_existing_frames(id, "TLEN");
   }
   else
   {
@@ -1090,8 +1090,7 @@
  - enables framemode if xing header is found 
  - xing header is often associated with VBR (variable bit rate)
 */
-static splt_mp3_state *splt_mp3_info(FILE *file_input, splt_state *state,
-    int framemode, int *error)
+static splt_mp3_state *splt_mp3_info(FILE *file_input, splt_state *state, int framemode, int *error)
 {
   splt_mp3_state *mp3state = state->codec;
 
@@ -1110,7 +1109,6 @@
   //always quiet
   mp3state->syncdetect = 0;
 
-  //we initialise default values
   mp3state->frames = 1;
   mp3state->end = 0;
   mp3state->end_non_zero = 0;
@@ -1147,6 +1145,21 @@
       goto function_end;
     }
 
+    if (mp3state->stream.error == MAD_ERROR_LOSTSYNC)
+    {
+#ifndef NO_ID3TAG
+      signed long tag_size = id3_tag_query(mp3state->stream.this_frame,
+          mp3state->stream.bufend - mp3state->stream.this_frame);
+      if (tag_size > 0)
+      {
+        mad_stream_skip(&mp3state->stream, tag_size);
+      }
+#else
+      splt_c_put_info_message_to_client(state,
+          _(" warning: lost sync and compiled without id3tag support - the split might be corrupt\n"));
+#endif
+    }
+
     if ((prev == 0) &&
         ((ret == 0) || (mp3state->stream.error == MAD_ERROR_BUFLEN)))
     {
@@ -1356,8 +1369,8 @@
   //checks if valid mp3 file
   //before last argument, if framemode or not
   //last argument if we put messages to clients or not
-  state->codec = splt_mp3_info(file_input, state,
-        splt_o_get_int_option(state,SPLT_OPT_FRAME_MODE), error);
+  state->codec = splt_mp3_info(file_input, state, 
+      splt_o_get_int_option(state, SPLT_OPT_FRAME_MODE), error);
   //if error
   if ((*error < 0) || (state->codec == NULL))
   {
@@ -1702,6 +1715,7 @@
   int adjustoption = splt_o_get_int_option(state, SPLT_OPT_PARAM_GAP);
   short seekable = ! splt_o_get_int_option(state, SPLT_OPT_INPUT_NOT_SEEKABLE);
   float threshold = splt_o_get_float_option(state, SPLT_OPT_PARAM_THRESHOLD);
+  int shots = splt_o_get_int_option(state, SPLT_OPT_PARAM_SHOTS);
 
   short fend_sec_is_not_eof =
     !splt_u_fend_sec_is_bigger_than_total_time(state, fend_sec);
@@ -2298,7 +2312,7 @@
         if ((adjust) && (mp3state->frames >= fend))
         {
           int silence_points_found =
-            splt_mp3_scan_silence(state, end, 2 * adjust, threshold, 0.f, 0, error,
+            splt_mp3_scan_silence(state, end, 2 * adjust, threshold, 0.f, shots, 0, error,
                 splt_scan_silence_processor);
           //if error, go out
           if (silence_points_found == -1)
@@ -3161,21 +3175,21 @@
 
   state->syncerrors = 0;
 
-  //if we can open the file
-  if ((file_input = splt_mp3_open_file_read(state, filename, error)) != NULL)
+  if ((file_input = splt_mp3_open_file_read(state, filename, error)) == NULL)
   {
-    splt_mp3_get_info(state, file_input, error);
+    return;
+  }
 
-    if (*error >= 0)
-    {
-      splt_mp3_state *mp3state = state->codec;
-      mp3state->off = splt_o_get_float_option(state,SPLT_OPT_PARAM_OFFSET);
+  splt_mp3_get_info(state, file_input, error);
 
-      //we initialise frames to 1
-      if (splt_t_get_total_time(state) > 0)
-      {
-        mp3state->frames = 1;
-      }
+  if (*error >= 0)
+  {
+    splt_mp3_state *mp3state = state->codec;
+    mp3state->off = splt_o_get_float_option(state, SPLT_OPT_PARAM_OFFSET);
+
+    if (splt_t_get_total_time(state) > 0)
+    {
+      mp3state->frames = 1;
     }
   }
 }
@@ -3346,12 +3360,13 @@
   float offset = splt_o_get_float_option(state,SPLT_OPT_PARAM_OFFSET);
   float threshold = splt_o_get_float_option(state, SPLT_OPT_PARAM_THRESHOLD);
   float min_length = splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_LENGTH);
+  int shots = splt_o_get_int_option(state, SPLT_OPT_PARAM_SHOTS);
 
   splt_mp3_state *mp3state = state->codec;
   mp3state->off = offset;
 
   int found = splt_mp3_scan_silence(state, mp3state->mp3file.firsthead.ptr, 0,
-      threshold, min_length, 1, error, splt_scan_silence_processor);
+      threshold, min_length, shots, 1, error, splt_scan_silence_processor);
   if (*error < 0) { return -1; }
 
   return found;
@@ -3361,11 +3376,12 @@
 int splt_pl_scan_trim_silence(splt_state *state, int *error)
 {
   float threshold = splt_o_get_float_option(state, SPLT_OPT_PARAM_THRESHOLD);
+  int shots = splt_o_get_int_option(state, SPLT_OPT_PARAM_SHOTS);
 
   splt_mp3_state *mp3state = state->codec;
 
   int found = splt_mp3_scan_silence(state, mp3state->mp3file.firsthead.ptr, 0,
-      threshold, 0, 1, error, splt_trim_silence_processor);
+      threshold, 0, shots, 1, error, splt_trim_silence_processor);
   if (*error < 0) { return -1; }
 
   return found;

libmp3splt-0.7.1.tar.gz/plugins/mp3.h -> libmp3splt-0.7.3.tar.gz/plugins/mp3.h Changed

libmp3splt-0.7.1.tar.gz/plugins/mp3_silence.c -> libmp3splt-0.7.3.tar.gz/plugins/mp3_silence.c Changed

@@ -3,7 +3,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2011 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
  *
  *********************************************************/
 
@@ -50,11 +50,11 @@
 \param threshold The threshold that tells noise from silence
 */
 int splt_mp3_scan_silence(splt_state *state, off_t begin, unsigned long length,
-    float threshold, float min, short output, int *error,
+    float threshold, float min, int shots, short output, int *error,
     short silence_processor(double time, int silence_was_found, short must_flush,
       splt_scan_silence_data *ssd, int *found, int *error))
 {
-  splt_scan_silence_data *ssd = splt_scan_silence_data_new(state, output, min, SPLT_TRUE); 
+  splt_scan_silence_data *ssd = splt_scan_silence_data_new(state, output, min, shots, SPLT_TRUE); 
   if (ssd == NULL)
   {
     *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;

libmp3splt-0.7.1.tar.gz/plugins/mp3_silence.h -> libmp3splt-0.7.3.tar.gz/plugins/mp3_silence.h Changed

libmp3splt-0.7.1.tar.gz/plugins/mp3_utils.c -> libmp3splt-0.7.3.tar.gz/plugins/mp3_utils.c Changed

libmp3splt-0.7.1.tar.gz/plugins/mp3_utils.h -> libmp3splt-0.7.3.tar.gz/plugins/mp3_utils.h Changed

libmp3splt-0.7.1.tar.gz/plugins/ogg.c -> libmp3splt-0.7.3.tar.gz/plugins/ogg.c Changed

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2012 Alexandru Munteanu - <io_fx@yahoo.fr>
  *
  * Large parts of this files have been copied from the 'vcut' 1.6
  * program provided with 'vorbis-tools' :
@@ -401,6 +401,7 @@
   }
 
   oggstate->serial = ogg_page_serialno(&page);
+  oggstate->saved_serial = ogg_page_serialno(&page);
   //how to handle alloc memory problem ?
   ogg_stream_init(oggstate->stream_in, oggstate->serial);
   if(ogg_stream_pagein(oggstate->stream_in, &page) < 0)
@@ -620,7 +621,8 @@
         //result==1 means that we have a good page
         if (result > 0)
         {
-          if (ogg_page_bos(&page))
+          if (ogg_page_bos(&page) &&
+              (oggstate->saved_serial != ogg_page_serialno(&page)))
           {
             splt_ogg_initialise_for_new_stream(ogg_new_stream_handler, 
                 &page, &cutpoint, prevgranpos);
@@ -792,7 +794,7 @@
 //Warning ! cutpoint is not the end cutpoint, but the length between the
 //begin and the end
 static int splt_ogg_find_end_cutpoint(splt_state *state, ogg_stream_state *stream,
-    FILE *in, FILE *f, ogg_int64_t cutpoint, int adjust, float threshold,
+    FILE *in, FILE *f, ogg_int64_t cutpoint, int adjust, float threshold, int shots,
     int *error, const char *output_fname, int save_end_point,
     double *sec_split_time_length)
 {
@@ -915,7 +917,8 @@
       {
         if (result != -1)
         {
-          if (ogg_page_bos(&page))
+          if (ogg_page_bos(&page) &&
+              (oggstate->saved_serial != ogg_page_serialno(&page)))
           {
             splt_ogg_initialise_for_new_stream(ogg_new_stream_handler, &page, &cutpoint, prev_granpos);
             oggstate->cutpoint_begin = 0;
@@ -1024,7 +1027,7 @@
             if (adjust)
             {
               if (splt_ogg_scan_silence(state,
-                    (2 * adjust), threshold, 0.f, 0, &page, current_granpos, error, first_cut_granpos,
+                    (2 * adjust), threshold, 0.f, shots, 0, &page, current_granpos, error, first_cut_granpos,
                     splt_scan_silence_processor) > 0)
               {
                 cutpoint = (splt_siu_silence_position(state->silence_list, 
@@ -1227,10 +1230,9 @@
   return -1;
 }
 
-//splits ogg
 double splt_ogg_split(const char *output_fname, splt_state *state,
     double sec_begin, double sec_end, short seekable, 
-    int adjust, float threshold, int *error, int save_end_point)
+    int adjust, float threshold, int shots, int *error, int save_end_point)
 {
   splt_ogg_state *oggstate = state->codec;
 
@@ -1320,7 +1322,7 @@
 
   double sec_split_time_length = sec_end - sec_begin;
   splt_ogg_find_end_cutpoint(state, &stream_out, oggstate->in, 
-      oggstate->out, cutpoint, adjust, threshold, error, output_fname,
+      oggstate->out, cutpoint, adjust, threshold, shots, error, output_fname,
       save_end_point, &sec_split_time_length);
   sec_end_time = sec_begin + sec_split_time_length;
 
@@ -1485,11 +1487,14 @@
 
   if (*error >= 0)
   {
-    return splt_ogg_split(final_fname, state,
-        begin_point, end_point,
-        !state->options.option_input_not_seekable,
-        state->options.parameter_gap,
-        state->options.parameter_threshold, error, save_end_point);
+    int gap = splt_o_get_int_option(state, SPLT_OPT_PARAM_GAP);
+    float threshold = splt_o_get_int_option(state, SPLT_OPT_PARAM_THRESHOLD);
+    int shots = splt_o_get_int_option(state, SPLT_OPT_PARAM_SHOTS);
+    
+    int input_not_seekable = splt_o_get_int_option(state, SPLT_OPT_INPUT_NOT_SEEKABLE);
+
+    return splt_ogg_split(final_fname, state, begin_point, end_point, 
+        input_not_seekable, gap, threshold, shots, error, save_end_point);
   }
 
   return end_point;
@@ -1501,12 +1506,13 @@
   float offset = splt_o_get_float_option(state,SPLT_OPT_PARAM_OFFSET);
   float threshold = splt_o_get_float_option(state, SPLT_OPT_PARAM_THRESHOLD);
   float min_length = splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_LENGTH);
+  int shots = splt_o_get_int_option(state, SPLT_OPT_PARAM_SHOTS);
 
   splt_ogg_state *oggstate = state->codec;
   oggstate->off = offset;
 
-  int found = splt_ogg_scan_silence(state, 0, threshold, min_length, 1, NULL, 0, error, 0,
-      splt_scan_silence_processor);
+  int found = splt_ogg_scan_silence(state, 0, threshold, min_length, shots, 1, NULL, 0, 
+      error, 0, splt_scan_silence_processor);
   if (*error < 0) { return -1; }
 
   return found;
@@ -1516,8 +1522,9 @@
 int splt_pl_scan_trim_silence(splt_state *state, int *error)
 {
   float threshold = splt_o_get_float_option(state, SPLT_OPT_PARAM_THRESHOLD);
+  int shots = splt_o_get_int_option(state, SPLT_OPT_PARAM_SHOTS);
 
-  int found = splt_ogg_scan_silence(state, 0, threshold, 0, 1, NULL, 0, error, 0,
+  int found = splt_ogg_scan_silence(state, 0, threshold, 0, shots, 1, NULL, 0, error, 0,
       splt_trim_silence_processor);
   if (*error < 0) { return -1; }

libmp3splt-0.7.1.tar.gz/plugins/ogg.h -> libmp3splt-0.7.3.tar.gz/plugins/ogg.h Changed

libmp3splt-0.7.1.tar.gz/plugins/ogg_new_stream_handler.c -> libmp3splt-0.7.3.tar.gz/plugins/ogg_new_stream_handler.c Changed

libmp3splt-0.7.1.tar.gz/plugins/ogg_new_stream_handler.h -> libmp3splt-0.7.3.tar.gz/plugins/ogg_new_stream_handler.h Changed

libmp3splt-0.7.1.tar.gz/plugins/ogg_silence.c -> libmp3splt-0.7.3.tar.gz/plugins/ogg_silence.c Changed

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2012 Alexandru Munteanu - <io_fx@yahoo.fr>
  *
  * Parts of this file have been copied from the 'vcut' 1.6
  * program provided with 'vorbis-tools' :
@@ -54,20 +54,19 @@
 static int splt_ogg_silence(splt_ogg_state *oggstate, vorbis_dsp_state *vd, float threshold);
 
 int splt_ogg_scan_silence(splt_state *state, short seconds, float threshold, 
-    float min, short output, ogg_page *page, ogg_int64_t granpos,
+    float min, int shots, short output, ogg_page *page, ogg_int64_t granpos,
     int *error, ogg_int64_t first_cut_granpos,
     short silence_processor(double time, int silence_was_found, short must_flush,
       splt_scan_silence_data *ssd, int *found, int *error))
 {
-  splt_scan_silence_data *ssd = splt_scan_silence_data_new(state, output, min, SPLT_FALSE);
+  splt_scan_silence_data *ssd = splt_scan_silence_data_new(state, output, min, shots, SPLT_FALSE);
   if (ssd == NULL)
   {
     *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
     return -1;
   }
 
-  splt_ogg_scan_silence_and_process(state, seconds, threshold, page, granpos, first_cut_granpos, 
-      silence_processor, ssd, error);
+  splt_ogg_scan_silence_and_process(state, seconds, threshold, page, granpos, first_cut_granpos, silence_processor, ssd, error);
 
   int found = ssd->found;
 
@@ -181,7 +180,8 @@
 
       if (result > 0)
       {
-        if (ogg_page_bos(&og))
+        if (ogg_page_bos(&og) &&
+            (oggstate->saved_serial != ogg_page_serialno(&og)))
         {
           splt_ogg_initialise_for_new_stream(ogg_new_stream_handler, &og, NULL, 0);
           oggstate->cutpoint_begin = 0;

libmp3splt-0.7.1.tar.gz/plugins/ogg_silence.h -> libmp3splt-0.7.3.tar.gz/plugins/ogg_silence.h Changed

libmp3splt-0.7.1.tar.gz/plugins/ogg_utils.c -> libmp3splt-0.7.3.tar.gz/plugins/ogg_utils.c Changed

libmp3splt-0.7.1.tar.gz/plugins/ogg_utils.h -> libmp3splt-0.7.3.tar.gz/plugins/ogg_utils.h Changed

libmp3splt-0.7.1.tar.gz/plugins/silence_processors.c -> libmp3splt-0.7.3.tar.gz/plugins/silence_processors.c Changed

@@ -3,7 +3,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2011 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
  *
  *********************************************************/
 
@@ -28,7 +28,7 @@
 #include "silence_processors.h"
 
 splt_scan_silence_data *splt_scan_silence_data_new(splt_state *state, short first, 
-    float min, short set_new_length)
+    float min, int shots, short set_new_length)
 {
   splt_scan_silence_data *ssd = malloc(sizeof(splt_scan_silence_data));
   if (!ssd)
@@ -39,6 +39,7 @@
   ssd->state = state;
   ssd->first = first;
   ssd->min = min;
+  ssd->number_of_shots = shots;
   ssd->set_new_length = set_new_length;
 
   ssd->flush = SPLT_FALSE;
@@ -46,7 +47,7 @@
   ssd->silence_end = 0;
   ssd->len = 0;
   ssd->found = 0;
-  ssd->shot = SPLT_DEFAULTSHOT;
+  ssd->shot = shots;
   ssd->silence_begin_was_found = SPLT_FALSE;
   ssd->continue_after_silence = SPLT_FALSE;
 
@@ -89,7 +90,7 @@
       ssd->len++;
     }
 
-    if (ssd->shot < SPLT_DEFAULTSHOT)
+    if (ssd->shot < ssd->number_of_shots)
     {
       ssd->shot += 2;
     }
@@ -126,7 +127,7 @@
       }
 
       ssd->len = 0;
-      ssd->shot = SPLT_DEFAULTSHOT;
+      ssd->shot = ssd->number_of_shots;
     }
   }
   else 
@@ -164,7 +165,7 @@
 {
   if (silence_was_found)
   {
-    if (ssd->shot < SPLT_DEFAULTSHOT)
+    if (ssd->shot < ssd->number_of_shots)
     {
       ssd->shot += 2;
     }
@@ -181,7 +182,7 @@
 
     ssd->found++;
     ssd->silence_begin_was_found = SPLT_TRUE;
-    ssd->shot = SPLT_DEFAULTSHOT;
+    ssd->shot = ssd->number_of_shots;
   }
 
   if (ssd->shot > 0)
@@ -220,7 +221,7 @@
       ssd->len++;
     }
 
-    if (ssd->shot < SPLT_DEFAULTSHOT)
+    if (ssd->shot < ssd->number_of_shots)
     {
       ssd->shot += 2;
     }
@@ -237,7 +238,7 @@
     if (ssd->shot <= 0)
     {
       ssd->len = 0;
-      ssd->shot = SPLT_DEFAULTSHOT;
+      ssd->shot = ssd->number_of_shots;
       ssd->continue_after_silence = SPLT_TRUE;
     }
   }

libmp3splt-0.7.1.tar.gz/plugins/silence_processors.h -> libmp3splt-0.7.3.tar.gz/plugins/silence_processors.h Changed

libmp3splt-0.7.1.tar.gz/po/LINGUAS -> libmp3splt-0.7.3.tar.gz/po/LINGUAS Changed

libmp3splt-0.7.1.tar.gz/po/cs.gmo -> libmp3splt-0.7.3.tar.gz/po/cs.gmo Changed

libmp3splt-0.7.1.tar.gz/po/cs.po -> libmp3splt-0.7.3.tar.gz/po/cs.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mp3splt-gtk\n"
 "Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
-"POT-Creation-Date: 2011-11-14 00:12+0100\n"
+"POT-Creation-Date: 2012-08-27 22:29+0200\n"
 "PO-Revision-Date: 2011-07-03 00:37+0000\n"
 "Last-Translator: fri <pavelfric@seznam.cz>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,22 +17,22 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: src/mp3splt.c:840
+#: src/mp3splt.c:845
 #, c-format
 msgid " info: resolving linked filename to '%s'\n"
 msgstr " Informace: Spojený název souboru je vyřešen do »%s«\n"
 
-#: src/mp3splt.c:905
+#: src/mp3splt.c:910
 #, c-format
 msgid " info: file matches the plugin '%s'\n"
 msgstr " Informace: Soubor odpovídá přídavnému modulu »%s«\n"
 
-#: src/mp3splt.c:913
+#: src/mp3splt.c:918
 #, c-format
 msgid " M3U file '%s' will be created.\n"
 msgstr " Soubor M3U »%s« bude vytvořen.\n"
 
-#: src/mp3splt.c:934
+#: src/mp3splt.c:939
 #, c-format
 msgid ""
 " Working with SILENCE AUTO-ADJUST (Threshold: %.1f dB Gap: %d sec Offset: "
@@ -40,6 +40,14 @@
 msgstr ""
 "Pracuje se s SILENCE AUTO-ADJUST (Práh: %.1f dB Mezera: %d s Posun: %.2f)\n"
 
+#: src/mp3splt.c:1739 src/tags_parser.c:108
+msgid ""
+" warning: cannot set tags from filename regular expression - compiled "
+"without pcre support\n"
+msgstr ""
+" Varování: Značky nelze naplnit z regulárního výrazu souboru  - sestaveno "
+"bez podpory pcre\n"
+
 #: src/checks.c:158
 msgid "directory does not exists"
 msgstr "Adresář neexistuje"
@@ -76,54 +84,54 @@
 msgid " info: starting normal split\n"
 msgstr " Informace: Spouští se dělení v obvyklém režimu\n"
 
-#: src/splt.c:242
+#: src/splt.c:251
 msgid " info: starting error mode split\n"
 msgstr " Informace: Spouští se dělení v chybovém režimu\n"
 
-#: src/splt.c:551
+#: src/splt.c:563
 msgid " info: starting time mode split\n"
 msgstr " Informace: Spouští se dělení v časovém režimu\n"
 
-#: src/splt.c:570
+#: src/splt.c:582
 msgid " info: starting 'split in equal tracks' mode\n"
 msgstr ""
 " Informace: Spouští se dělení v režimu »dělení na stejně dlouhé skladby«\n"
 
-#: src/splt.c:612
+#: src/splt.c:624
 #, c-format
 msgid " Trim silence split - Th: %.1f dB\n"
 msgstr ""
 
-#: src/splt.c:739
+#: src/splt.c:758
 #, c-format
 msgid "YES"
 msgstr "Ano"
 
-#: src/splt.c:743
+#: src/splt.c:762
 #, c-format
 msgid "NO"
 msgstr "Ne"
 
-#: src/splt.c:749
+#: src/splt.c:768
 #, c-format
 msgid "User"
 msgstr "Uživatel"
 
-#: src/splt.c:753
+#: src/splt.c:772
 #, c-format
 msgid "Auto"
 msgstr "Automaticky"
 
-#: src/splt.c:759
+#: src/splt.c:792
 #, fuzzy, c-format
 msgid ""
 " Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: %s, "
-"Min track: %.2f)\n"
+"Min track: %.2f, Shots: %d%s)\n"
 msgstr ""
 " Typ dělení pomocí zjištění ticha: Režim %s (Práh: %.1f dB, Posun: %.2f, "
 "Min: %.2f, Odstranění: %s)\n"
 
-#: src/splt.c:778
+#: src/splt.c:818
 #, c-format
 msgid ""
 " Found silence log file '%s' ! Reading silence points from file to save "
@@ -132,30 +140,30 @@
 " Byl nalezen soubor se zápisem pro ticho »%s«! Aby se ušetřil čas, jsou body "
 "rozdělení čteny z tohoto souboru ;)\n"
 
-#: src/splt.c:807
+#: src/splt.c:847
 #, c-format
 msgid " Total silence points found: %d."
 msgstr " Celkem nalezeno bodů ticha: %d."
 
-#: src/splt.c:819
+#: src/splt.c:859
 #, c-format
 msgid " (Selected %d tracks)\n"
 msgstr " (%d skladeb vybráno)\n"
 
-#: src/splt.c:929
+#: src/splt.c:972
 #, c-format
 msgid " Writing silence log file '%s' ...\n"
 msgstr " Zapisuje se soubor se zápisem o tichu »%s« …\n"
 
-#: src/splt.c:984
+#: src/splt.c:1028
 msgid " info: starting silence mode split\n"
 msgstr " Informace: Začíná se s dělením v režimu ticha\n"
 
-#: src/splt.c:1032
+#: src/splt.c:1076
 msgid " info: starting trim using silence mode split\n"
 msgstr ""
 
-#: src/splt.c:1079
+#: src/splt.c:1123
 msgid " info: starting wrap mode split\n"
 msgstr ""
 " Informace: Začíná se s dělením v režimu automatického zalomení (wrap)\n"
@@ -545,10 +553,15 @@
 msgstr " Chyba regulárního výrazu: %s"
 
 #: src/errors.c:435
+#, fuzzy
+msgid " regular expressions are not supported"
+msgstr " Chyba regulárního výrazu: %s"
+
+#: src/errors.c:437
 msgid " regular expression error: no match"
 msgstr " Chyba regulárního výrazu: žádná shoda"
 
-#: src/errors.c:437
+#: src/errors.c:439
 msgid " regular expression ok"
 msgstr " Regulární výraz OK"
 
@@ -560,76 +573,74 @@
 msgid "not enough memory"
 msgstr "Nedostatek paměti"
 
-#: src/tags_parser.c:108
+#: plugins/mp3.c:1159
 msgid ""
-" warning: cannot set tags from filename regular expression - compiled "
-"without pcre support\n"
+" warning: lost sync and compiled without id3tag support - the split might be "
+"corrupt\n"
 msgstr ""
-" Varování: Značky nelze naplnit z regulárního výrazu souboru  - sestaveno "
-"bez podpory pcre\n"
 
-#: plugins/mp3.c:1242
+#: plugins/mp3.c:1255
 msgid " info: found Xing or Info header. Switching to frame mode... \n"
 msgstr ""
 " Informace: Nalezena hlavička Xing nebo Info. Přepíná se do režimu snímků…\n"
 
-#: plugins/mp3.c:1381
+#: plugins/mp3.c:1394
 #, c-format
 msgid " info: MPEG %d Layer %d - %d Hz - %s"
 msgstr " Informace: MPEG %d Layer %d - %d Hz - %s"
 
-#: plugins/mp3.c:1389
+#: plugins/mp3.c:1402

libmp3splt-0.7.1.tar.gz/po/de_DE.gmo -> libmp3splt-0.7.3.tar.gz/po/de_DE.gmo Changed

libmp3splt-0.7.1.tar.gz/po/de_DE.po -> libmp3splt-0.7.3.tar.gz/po/de_DE.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libmp3splt\n"
 "Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
-"POT-Creation-Date: 2011-11-14 00:12+0100\n"
+"POT-Creation-Date: 2012-08-27 22:29+0200\n"
 "PO-Revision-Date: 2011-09-16 00:13+0100\n"
 "Last-Translator: Mario Blättermann <mariobl@freenet.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -17,22 +17,22 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/mp3splt.c:840
+#: src/mp3splt.c:845
 #, c-format
 msgid " info: resolving linked filename to '%s'\n"
 msgstr " Info: Verknüpfter Dateiname wird in »%s« aufgelöst\n"
 
-#: src/mp3splt.c:905
+#: src/mp3splt.c:910
 #, c-format
 msgid " info: file matches the plugin '%s'\n"
 msgstr " Info: Datei passt zum Plugin »%s«\n"
 
-#: src/mp3splt.c:913
+#: src/mp3splt.c:918
 #, c-format
 msgid " M3U file '%s' will be created.\n"
 msgstr " M3U-Datei »%s« wird erstellt.\n"
 
-#: src/mp3splt.c:934
+#: src/mp3splt.c:939
 #, c-format
 msgid ""
 " Working with SILENCE AUTO-ADJUST (Threshold: %.1f dB Gap: %d sec Offset: "
@@ -41,6 +41,14 @@
 "Mit SILENCE AUTO-ADJUST wird gearbeitet (Ansprechschwelle: %.1f dB Pause: %d "
 "s Versatz: %.2f)\n"
 
+#: src/mp3splt.c:1739 src/tags_parser.c:108
+msgid ""
+" warning: cannot set tags from filename regular expression - compiled "
+"without pcre support\n"
+msgstr ""
+" Warnung: Tags können nicht aus regulärem Ausdruck des Dateinamens gesetzt "
+"werden - ohne pcre-Unterstützung gesetzt\n"
+
 #: src/checks.c:158
 msgid "directory does not exists"
 msgstr "Ordner existiert nicht"
@@ -77,53 +85,53 @@
 msgid " info: starting normal split\n"
 msgstr " Info: Teilung im normalen Modus wird gestartet\n"
 
-#: src/splt.c:242
+#: src/splt.c:251
 msgid " info: starting error mode split\n"
 msgstr " Info: Teilung im Fehlermodus wird gestartet\n"
 
-#: src/splt.c:551
+#: src/splt.c:563
 msgid " info: starting time mode split\n"
 msgstr " Info: Teilung im Zeitmodus wird gestartet\n"
 
-#: src/splt.c:570
+#: src/splt.c:582
 msgid " info: starting 'split in equal tracks' mode\n"
 msgstr " Info: Teilung im Modus »Gleich große Teile« wird gestartet\n"
 
-#: src/splt.c:612
+#: src/splt.c:624
 #, c-format
 msgid " Trim silence split - Th: %.1f dB\n"
 msgstr "Trimmen nach Stille-Erkennung - Ansprechschwelle: %.1f dB\n"
 
-#: src/splt.c:739
+#: src/splt.c:758
 #, c-format
 msgid "YES"
 msgstr "JA"
 
-#: src/splt.c:743
+#: src/splt.c:762
 #, c-format
 msgid "NO"
 msgstr "NEIN"
 
-#: src/splt.c:749
+#: src/splt.c:768
 #, c-format
 msgid "User"
 msgstr "Benutzer"
 
-#: src/splt.c:753
+#: src/splt.c:772
 #, c-format
 msgid "Auto"
 msgstr "Automatisch"
 
-#: src/splt.c:759
-#, c-format
+#: src/splt.c:792
+#, fuzzy, c-format
 msgid ""
 " Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: %s, "
-"Min track: %.2f)\n"
+"Min track: %.2f, Shots: %d%s)\n"
 msgstr ""
 " Stille-Teilungstyp: Modus %s (Ansprechschwelle: %.1f dB, Aus: %.2f, Min: "
 "%.2f, Entfernen: %s, Min-Titel: %.2f)\n"
 
-#: src/splt.c:778
+#: src/splt.c:818
 #, c-format
 msgid ""
 " Found silence log file '%s' ! Reading silence points from file to save "
@@ -132,30 +140,30 @@
 " Stille-Protokolldatei »%s« wurde gefunden! Um Zeit zu sparen, werden die "
 "Teilungspunkte aus dieser Datei gelesen ;)\n"
 
-#: src/splt.c:807
+#: src/splt.c:847
 #, c-format
 msgid " Total silence points found: %d."
 msgstr " Insgesamt gefundene Teilungspunkte: %d."
 
-#: src/splt.c:819
+#: src/splt.c:859
 #, c-format
 msgid " (Selected %d tracks)\n"
 msgstr " (%d Titel ausgewählt)\n"
 
-#: src/splt.c:929
+#: src/splt.c:972
 #, c-format
 msgid " Writing silence log file '%s' ...\n"
 msgstr "Stille-Protokolldatei »%s« wird geschrieben …\n"
 
-#: src/splt.c:984
+#: src/splt.c:1028
 msgid " info: starting silence mode split\n"
 msgstr " Info: Teilung im Stille-Modus wird gestartet\n"
 
-#: src/splt.c:1032
+#: src/splt.c:1076
 msgid " info: starting trim using silence mode split\n"
 msgstr " Info: Trimmen im Stille-Modus wird gestartet\n"
 
-#: src/splt.c:1079
+#: src/splt.c:1123
 msgid " info: starting wrap mode split\n"
 msgstr " Info: Teilung im Wrap-Modus wird gestartet\n"
 
@@ -543,10 +551,15 @@
 msgstr " Fehler im regulären Ausdruck: %s"
 
 #: src/errors.c:435
+#, fuzzy
+msgid " regular expressions are not supported"
+msgstr " Fehler im regulären Ausdruck: %s"
+
+#: src/errors.c:437
 msgid " regular expression error: no match"
 msgstr "Fehler bei regulärem Ausdruck: kein Treffer"
 
-#: src/errors.c:437
+#: src/errors.c:439
 msgid " regular expression ok"
 msgstr " Regulärer Ausdruck OK"
 
@@ -558,76 +571,74 @@
 msgid "not enough memory"
 msgstr "nicht genug Speicher"
 
-#: src/tags_parser.c:108
+#: plugins/mp3.c:1159
 msgid ""
-" warning: cannot set tags from filename regular expression - compiled "
-"without pcre support\n"
+" warning: lost sync and compiled without id3tag support - the split might be "
+"corrupt\n"
 msgstr ""
-" Warnung: Tags können nicht aus regulärem Ausdruck des Dateinamens gesetzt "
-"werden - ohne pcre-Unterstützung gesetzt\n"
 
-#: plugins/mp3.c:1242
+#: plugins/mp3.c:1255
 msgid " info: found Xing or Info header. Switching to frame mode... \n"
 msgstr ""
 " Hinweis: Xing- oder Info-Header wurde gefunden. Wechsel zum Frame-Modus…\n"
 
-#: plugins/mp3.c:1381
+#: plugins/mp3.c:1394
 #, c-format
 msgid " info: MPEG %d Layer %d - %d Hz - %s"
 msgstr " Info: MPEG %d Layer %d - %d Hz - %s"
 
-#: plugins/mp3.c:1389
+#: plugins/mp3.c:1402

libmp3splt-0.7.1.tar.gz/po/es.gmo -> libmp3splt-0.7.3.tar.gz/po/es.gmo Changed

libmp3splt-0.7.1.tar.gz/po/es.po -> libmp3splt-0.7.3.tar.gz/po/es.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mp3splt-gtk\n"
 "Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
-"POT-Creation-Date: 2011-11-14 00:12+0100\n"
+"POT-Creation-Date: 2012-08-27 22:29+0200\n"
 "PO-Revision-Date: 2011-02-22 00:08+0000\n"
 "Last-Translator: nemecis1000 <nemecis000@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,28 +17,34 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/mp3splt.c:840
+#: src/mp3splt.c:845
 #, c-format
 msgid " info: resolving linked filename to '%s'\n"
 msgstr ""
 
-#: src/mp3splt.c:905
+#: src/mp3splt.c:910
 #, c-format
 msgid " info: file matches the plugin '%s'\n"
 msgstr ""
 
-#: src/mp3splt.c:913
+#: src/mp3splt.c:918
 #, c-format
 msgid " M3U file '%s' will be created.\n"
 msgstr ""
 
-#: src/mp3splt.c:934
+#: src/mp3splt.c:939
 #, c-format
 msgid ""
 " Working with SILENCE AUTO-ADJUST (Threshold: %.1f dB Gap: %d sec Offset: "
 "%.2f)\n"
 msgstr ""
 
+#: src/mp3splt.c:1739 src/tags_parser.c:108
+msgid ""
+" warning: cannot set tags from filename regular expression - compiled "
+"without pcre support\n"
+msgstr ""
+
 #: src/checks.c:158
 msgid "directory does not exists"
 msgstr ""
@@ -71,81 +77,81 @@
 msgid " info: starting normal split\n"
 msgstr ""
 
-#: src/splt.c:242
+#: src/splt.c:251
 msgid " info: starting error mode split\n"
 msgstr ""
 
-#: src/splt.c:551
+#: src/splt.c:563
 msgid " info: starting time mode split\n"
 msgstr ""
 
-#: src/splt.c:570
+#: src/splt.c:582
 msgid " info: starting 'split in equal tracks' mode\n"
 msgstr ""
 
-#: src/splt.c:612
+#: src/splt.c:624
 #, c-format
 msgid " Trim silence split - Th: %.1f dB\n"
 msgstr ""
 
-#: src/splt.c:739
+#: src/splt.c:758
 #, c-format
 msgid "YES"
 msgstr "SÍ"
 
-#: src/splt.c:743
+#: src/splt.c:762
 #, c-format
 msgid "NO"
 msgstr "NO"
 
-#: src/splt.c:749
+#: src/splt.c:768
 #, c-format
 msgid "User"
 msgstr "Usuario"
 
-#: src/splt.c:753
+#: src/splt.c:772
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: src/splt.c:759
+#: src/splt.c:792
 #, c-format
 msgid ""
 " Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: %s, "
-"Min track: %.2f)\n"
+"Min track: %.2f, Shots: %d%s)\n"
 msgstr ""
 
-#: src/splt.c:778
+#: src/splt.c:818
 #, c-format
 msgid ""
 " Found silence log file '%s' ! Reading silence points from file to save "
 "time ;)\n"
 msgstr ""
 
-#: src/splt.c:807
+#: src/splt.c:847
 #, c-format
 msgid " Total silence points found: %d."
 msgstr ""
 
-#: src/splt.c:819
+#: src/splt.c:859
 #, c-format
 msgid " (Selected %d tracks)\n"
 msgstr ""
 
-#: src/splt.c:929
+#: src/splt.c:972
 #, c-format
 msgid " Writing silence log file '%s' ...\n"
 msgstr ""
 
-#: src/splt.c:984
+#: src/splt.c:1028
 msgid " info: starting silence mode split\n"
 msgstr ""
 
-#: src/splt.c:1032
+#: src/splt.c:1076
 msgid " info: starting trim using silence mode split\n"
 msgstr ""
 
-#: src/splt.c:1079
+#: src/splt.c:1123
 msgid " info: starting wrap mode split\n"
 msgstr ""
 
@@ -529,10 +535,14 @@
 msgstr ""
 
 #: src/errors.c:435
-msgid " regular expression error: no match"
+msgid " regular expressions are not supported"
 msgstr ""
 
 #: src/errors.c:437
+msgid " regular expression error: no match"
+msgstr ""
+
+#: src/errors.c:439
 msgid " regular expression ok"
 msgstr ""
 
@@ -544,73 +554,73 @@
 msgid "not enough memory"
 msgstr ""
 
-#: src/tags_parser.c:108
+#: plugins/mp3.c:1159
 msgid ""
-" warning: cannot set tags from filename regular expression - compiled "
-"without pcre support\n"
+" warning: lost sync and compiled without id3tag support - the split might be "
+"corrupt\n"
 msgstr ""
 
-#: plugins/mp3.c:1242
+#: plugins/mp3.c:1255
 msgid " info: found Xing or Info header. Switching to frame mode... \n"
 msgstr ""
 
-#: plugins/mp3.c:1381
+#: plugins/mp3.c:1394
 #, c-format
 msgid " info: MPEG %d Layer %d - %d Hz - %s"
 msgstr ""
 
-#: plugins/mp3.c:1389
+#: plugins/mp3.c:1402
 #, c-format
 msgid " - FRAME MODE NS"
 msgstr ""
 
-#: plugins/mp3.c:1393
+#: plugins/mp3.c:1406
 #, c-format
 msgid " - FRAME MODE"
 msgstr ""
 
-#: plugins/mp3.c:1398

libmp3splt-0.7.1.tar.gz/po/fr_FR.gmo -> libmp3splt-0.7.3.tar.gz/po/fr_FR.gmo Changed

libmp3splt-0.7.1.tar.gz/po/fr_FR.po -> libmp3splt-0.7.3.tar.gz/po/fr_FR.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mp3splt-gtk\n"
 "Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
-"POT-Creation-Date: 2011-11-14 00:12+0100\n"
+"POT-Creation-Date: 2012-08-27 22:29+0200\n"
 "PO-Revision-Date: 2011-02-22 00:08+0000\n"
 "Last-Translator: Chris38 <ch.daudin@free.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,22 +17,22 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: src/mp3splt.c:840
+#: src/mp3splt.c:845
 #, c-format
 msgid " info: resolving linked filename to '%s'\n"
 msgstr " info: le fichier du lien symbolique est '%s'\n"
 
-#: src/mp3splt.c:905
+#: src/mp3splt.c:910
 #, c-format
 msgid " info: file matches the plugin '%s'\n"
 msgstr " info : le fichier correspond au module '%s'\n"
 
-#: src/mp3splt.c:913
+#: src/mp3splt.c:918
 #, c-format
 msgid " M3U file '%s' will be created.\n"
 msgstr " Le fichier M3U '%s' sera créé.\n"
 
-#: src/mp3splt.c:934
+#: src/mp3splt.c:939
 #, c-format
 msgid ""
 " Working with SILENCE AUTO-ADJUST (Threshold: %.1f dB Gap: %d sec Offset: "
@@ -41,6 +41,14 @@
 " Avec ajustement du silence (Seuil : %.1f dB Ecart : %d sec Compensation : "
 "%.2f)\n"
 
+#: src/mp3splt.c:1739 src/tags_parser.c:108
+msgid ""
+" warning: cannot set tags from filename regular expression - compiled "
+"without pcre support\n"
+msgstr ""
+"avertissement : impossible de remplir les tags avec l'expression régulière "
+"fichier - compilé sans support pcre\n"
+
 #: src/checks.c:158
 msgid "directory does not exists"
 msgstr "le dossier n'existe pas"
@@ -77,54 +85,54 @@
 msgid " info: starting normal split\n"
 msgstr " info : début de la division normale\n"
 
-#: src/splt.c:242
+#: src/splt.c:251
 msgid " info: starting error mode split\n"
 msgstr ""
 " info : début de la division avec recherche d'erreurs de synchronisation\n"
 
-#: src/splt.c:551
+#: src/splt.c:563
 msgid " info: starting time mode split\n"
 msgstr " info : début de la division en plusieurs pistes de même taille\n"
 
-#: src/splt.c:570
+#: src/splt.c:582
 msgid " info: starting 'split in equal tracks' mode\n"
 msgstr " info : début de la division en morceaux egaux\n"
 
-#: src/splt.c:612
+#: src/splt.c:624
 #, c-format
 msgid " Trim silence split - Th: %.1f dB\n"
 msgstr ""
 
-#: src/splt.c:739
+#: src/splt.c:758
 #, c-format
 msgid "YES"
 msgstr "OUI"
 
-#: src/splt.c:743
+#: src/splt.c:762
 #, c-format
 msgid "NO"
 msgstr "NON"
 
-#: src/splt.c:749
+#: src/splt.c:768
 #, c-format
 msgid "User"
 msgstr "Utilisateur"
 
-#: src/splt.c:753
+#: src/splt.c:772
 #, c-format
 msgid "Auto"
 msgstr "Automatique"
 
-#: src/splt.c:759
+#: src/splt.c:792
 #, fuzzy, c-format
 msgid ""
 " Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: %s, "
-"Min track: %.2f)\n"
+"Min track: %.2f, Shots: %d%s)\n"
 msgstr ""
 " Division avec recherche du silence : mode %s (Seuil : %.1f dB, Ecart : "
 "%.2f, Min : %.2f, Suppression : %s)\n"
 
-#: src/splt.c:778
+#: src/splt.c:818
 #, c-format
 msgid ""
 " Found silence log file '%s' ! Reading silence points from file to save "
@@ -133,31 +141,31 @@
 "Fichier journal silence trouvé '%s' ! Lecture des points silence points pour "
 "gagner du temps ;)\n"
 
-#: src/splt.c:807
+#: src/splt.c:847
 #, c-format
 msgid " Total silence points found: %d."
 msgstr "Total des points silence trouvés  : %d."
 
-#: src/splt.c:819
+#: src/splt.c:859
 #, c-format
 msgid " (Selected %d tracks)\n"
 msgstr " (%d pistes sélectionnées)\n"
 
-#: src/splt.c:929
+#: src/splt.c:972
 #, c-format
 msgid " Writing silence log file '%s' ...\n"
 msgstr " Ecriture du fichier de log avec les points de silence '%s' ...\n"
 
-#: src/splt.c:984
+#: src/splt.c:1028
 msgid " info: starting silence mode split\n"
 msgstr " info : début de la division avec recherche de silence\n"
 
-#: src/splt.c:1032
+#: src/splt.c:1076
 #, fuzzy
 msgid " info: starting trim using silence mode split\n"
 msgstr " info : début de la division avec recherche de silence\n"
 
-#: src/splt.c:1079
+#: src/splt.c:1123
 msgid " info: starting wrap mode split\n"
 msgstr " info : début de la division 'wrap'\n"
 
@@ -544,10 +552,15 @@
 msgstr "erreur expression régulière : %s"
 
 #: src/errors.c:435
+#, fuzzy
+msgid " regular expressions are not supported"
+msgstr "erreur expression régulière : %s"
+
+#: src/errors.c:437
 msgid " regular expression error: no match"
 msgstr "erreur expression régulière : aucune correspondance"
 
-#: src/errors.c:437
+#: src/errors.c:439
 msgid " regular expression ok"
 msgstr "expression régulière ok"
 
@@ -559,78 +572,76 @@
 msgid "not enough memory"
 msgstr "mémoire insuffisante"
 
-#: src/tags_parser.c:108
+#: plugins/mp3.c:1159
 msgid ""
-" warning: cannot set tags from filename regular expression - compiled "
-"without pcre support\n"
+" warning: lost sync and compiled without id3tag support - the split might be "
+"corrupt\n"
 msgstr ""
-"avertissement : impossible de remplir les tags avec l'expression régulière "
-"fichier - compilé sans support pcre\n"
 
-#: plugins/mp3.c:1242
+#: plugins/mp3.c:1255
 msgid " info: found Xing or Info header. Switching to frame mode... \n"
 msgstr " info: entête Xing ou Info trouvée. Activation du mode \"frame\"...\n"
 
-#: plugins/mp3.c:1381
+#: plugins/mp3.c:1394
 #, c-format
 msgid " info: MPEG %d Layer %d - %d Hz - %s"
 msgstr " info : MPEG %d couche %d - %d Hz - %s"
 
-#: plugins/mp3.c:1389
+#: plugins/mp3.c:1402

libmp3splt-0.7.3.tar.gz/po/hr.gmo Added

libmp3splt-0.7.3.tar.gz/po/hr.po Added

@@ -0,0 +1,645 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Munteanu Alexandru
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# gogo <trebelnik2@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: mp3splt-gtk\n"
+"Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
+"POT-Creation-Date: 2012-08-27 22:29+0200\n"
+"PO-Revision-Date: 2012-04-15 12:44+0000\n"
+"Last-Translator: gogo <trebelnik2@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: hr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+
+#: src/mp3splt.c:845
+#, c-format
+msgid " info: resolving linked filename to '%s'\n"
+msgstr " info: rješavanje povezanog naziva datoteke u '%s'\n"
+
+#: src/mp3splt.c:910
+#, c-format
+msgid " info: file matches the plugin '%s'\n"
+msgstr "info: datoteka se podudara s priključkom '%s'\n"
+
+#: src/mp3splt.c:918
+#, c-format
+msgid " M3U file '%s' will be created.\n"
+msgstr " M3U datoteka '%s' biti će  izrađena.\n"
+
+#: src/mp3splt.c:939
+#, c-format
+msgid ""
+" Working with SILENCE AUTO-ADJUST (Threshold: %.1f dB Gap: %d sec Offset: "
+"%.2f)\n"
+msgstr ""
+
+#: src/mp3splt.c:1739 src/tags_parser.c:108
+msgid ""
+" warning: cannot set tags from filename regular expression - compiled "
+"without pcre support\n"
+msgstr ""
+
+#: src/checks.c:158
+msgid "directory does not exists"
+msgstr "direktorij ne postoji"
+
+#: src/cddb.c:63
+#, c-format
+msgid " reading informations from CDDB file %s ...\n"
+msgstr " čitanje informacija iz CDDB datoteke %s ...\n"
+
+#: src/cddb.c:125 src/cue.c:539
+#, c-format
+msgid ""
+"  Tracks: %d\n"
+"\n"
+msgstr ""
+"  Pjesme: %d\n"
+"\n"
+
+#: src/cddb.c:259 src/cue.c:135
+#, c-format
+msgid ""
+"\n"
+"  Artist: %s\n"
+msgstr ""
+"\n"
+"  Izvođač: %s\n"
+
+#: src/cddb.c:262 src/cue.c:139
+#, c-format
+msgid "  Album: %s\n"
+msgstr "  Album: %s\n"
+
+#: src/splt.c:154
+msgid " info: starting normal split\n"
+msgstr " info: pokretanje normalne podjele\n"
+
+#: src/splt.c:251
+msgid " info: starting error mode split\n"
+msgstr " info: pokretanje načina greške\n"
+
+#: src/splt.c:563
+msgid " info: starting time mode split\n"
+msgstr " info: pokretanje načina vremena\n"
+
+#: src/splt.c:582
+msgid " info: starting 'split in equal tracks' mode\n"
+msgstr " info: pokretanje načina 'podijeli na jednake pjesme'\n"
+
+#: src/splt.c:624
+#, c-format
+msgid " Trim silence split - Th: %.1f dB\n"
+msgstr " Izreži podjelu tišine - Th: %.1f dB\n"
+
+#: src/splt.c:758
+#, c-format
+msgid "YES"
+msgstr "DA"
+
+#: src/splt.c:762
+#, c-format
+msgid "NO"
+msgstr "NE"
+
+#: src/splt.c:768
+#, c-format
+msgid "User"
+msgstr "Korisnik"
+
+#: src/splt.c:772
+#, c-format
+msgid "Auto"
+msgstr "Auto"
+
+#: src/splt.c:792
+#, fuzzy, c-format
+msgid ""
+" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: %s, "
+"Min track: %.2f, Shots: %d%s)\n"
+msgstr ""
+" Vrsta podjele tišine: %s način (Th: %.1f dB, Isključeno: %.2f, Min: %.2f, "
+"Ukloni: %s, Min pjesma: %.2f, Pogotci: %d)\n"
+
+#: src/splt.c:818
+#, c-format
+msgid ""
+" Found silence log file '%s' ! Reading silence points from file to save "
+"time ;)\n"
+msgstr ""
+" Peonađena datoteka popisa tišine '%s' ! Očitavnje točaka tišine iz "
+"datoteke, radi bržeg očitavanja ;)\n"
+
+#: src/splt.c:847
+#, c-format
+msgid " Total silence points found: %d."
+msgstr "Pronađeno ukupno točaka tišine: %d."
+
+#: src/splt.c:859
+#, c-format
+msgid " (Selected %d tracks)\n"
+msgstr " (Odabrano %d pjesama)\n"
+
+#: src/splt.c:972
+#, c-format
+msgid " Writing silence log file '%s' ...\n"
+msgstr " Zapisujem datoteku popisa tišine '%s' ...\n"
+
+#: src/splt.c:1028
+msgid " info: starting silence mode split\n"
+msgstr ""
+
+#: src/splt.c:1076
+msgid " info: starting trim using silence mode split\n"
+msgstr ""
+
+#: src/splt.c:1123
+msgid " info: starting wrap mode split\n"
+msgstr ""
+
+#: src/utils.c:71
+#, c-format
+msgid " info: overlapping split files with %ld.%ld.%ld\n"
+msgstr ""
+
+#: src/cue.c:435
+#, c-format
+msgid " reading informations from CUE file %s ...\n"
+msgstr ""
+
+#: src/cue.c:487
+msgid "description here"
+msgstr "opis ovdje"
+
+#: src/cue.c:700
+#, c-format
+msgid " CUE file '%s' created.\n"
+msgstr " CUE datoteka '%s' izrađena\n"
+
+#: src/audacity.c:237
+#, c-format
+msgid " reading informations from audacity labels file '%s' ...\n"
+msgstr ""
+
+#: src/errors.c:129
+msgid "Network error"
+msgstr "Greška mreže"
+
+#: src/errors.c:179
+msgid " warning: might be VBR, use frame mode"
+msgstr ""
+

libmp3splt-0.7.1.tar.gz/po/libmp3splt.pot -> libmp3splt-0.7.3.tar.gz/po/libmp3splt.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
-"POT-Creation-Date: 2011-11-14 00:12+0100\n"
+"POT-Creation-Date: 2012-08-27 22:29+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,28 +17,34 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/mp3splt.c:840
+#: src/mp3splt.c:845
 #, c-format
 msgid " info: resolving linked filename to '%s'\n"
 msgstr ""
 
-#: src/mp3splt.c:905
+#: src/mp3splt.c:910
 #, c-format
 msgid " info: file matches the plugin '%s'\n"
 msgstr ""
 
-#: src/mp3splt.c:913
+#: src/mp3splt.c:918
 #, c-format
 msgid " M3U file '%s' will be created.\n"
 msgstr ""
 
-#: src/mp3splt.c:934
+#: src/mp3splt.c:939
 #, c-format
 msgid ""
 " Working with SILENCE AUTO-ADJUST (Threshold: %.1f dB Gap: %d sec Offset: "
 "%.2f)\n"
 msgstr ""
 
+#: src/mp3splt.c:1739 src/tags_parser.c:108
+msgid ""
+" warning: cannot set tags from filename regular expression - compiled "
+"without pcre support\n"
+msgstr ""
+
 #: src/checks.c:158
 msgid "directory does not exists"
 msgstr ""
@@ -71,81 +77,81 @@
 msgid " info: starting normal split\n"
 msgstr ""
 
-#: src/splt.c:242
+#: src/splt.c:251
 msgid " info: starting error mode split\n"
 msgstr ""
 
-#: src/splt.c:551
+#: src/splt.c:563
 msgid " info: starting time mode split\n"
 msgstr ""
 
-#: src/splt.c:570
+#: src/splt.c:582
 msgid " info: starting 'split in equal tracks' mode\n"
 msgstr ""
 
-#: src/splt.c:612
+#: src/splt.c:624
 #, c-format
 msgid " Trim silence split - Th: %.1f dB\n"
 msgstr ""
 
-#: src/splt.c:739
+#: src/splt.c:758
 #, c-format
 msgid "YES"
 msgstr ""
 
-#: src/splt.c:743
+#: src/splt.c:762
 #, c-format
 msgid "NO"
 msgstr ""
 
-#: src/splt.c:749
+#: src/splt.c:768
 #, c-format
 msgid "User"
 msgstr ""
 
-#: src/splt.c:753
+#: src/splt.c:772
 #, c-format
 msgid "Auto"
 msgstr ""
 
-#: src/splt.c:759
+#: src/splt.c:792
 #, c-format
 msgid ""
 " Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: %s, "
-"Min track: %.2f)\n"
+"Min track: %.2f, Shots: %d%s)\n"
 msgstr ""
 
-#: src/splt.c:778
+#: src/splt.c:818
 #, c-format
 msgid ""
 " Found silence log file '%s' ! Reading silence points from file to save "
 "time ;)\n"
 msgstr ""
 
-#: src/splt.c:807
+#: src/splt.c:847
 #, c-format
 msgid " Total silence points found: %d."
 msgstr ""
 
-#: src/splt.c:819
+#: src/splt.c:859
 #, c-format
 msgid " (Selected %d tracks)\n"
 msgstr ""
 
-#: src/splt.c:929
+#: src/splt.c:972
 #, c-format
 msgid " Writing silence log file '%s' ...\n"
 msgstr ""
 
-#: src/splt.c:984
+#: src/splt.c:1028
 msgid " info: starting silence mode split\n"
 msgstr ""
 
-#: src/splt.c:1032
+#: src/splt.c:1076
 msgid " info: starting trim using silence mode split\n"
 msgstr ""
 
-#: src/splt.c:1079
+#: src/splt.c:1123
 msgid " info: starting wrap mode split\n"
 msgstr ""
 
@@ -529,10 +535,14 @@
 msgstr ""
 
 #: src/errors.c:435
-msgid " regular expression error: no match"
+msgid " regular expressions are not supported"
 msgstr ""
 
 #: src/errors.c:437
+msgid " regular expression error: no match"
+msgstr ""
+
+#: src/errors.c:439
 msgid " regular expression ok"
 msgstr ""
 
@@ -544,73 +554,73 @@
 msgid "not enough memory"
 msgstr ""
 
-#: src/tags_parser.c:108
+#: plugins/mp3.c:1159
 msgid ""
-" warning: cannot set tags from filename regular expression - compiled "
-"without pcre support\n"
+" warning: lost sync and compiled without id3tag support - the split might be "
+"corrupt\n"
 msgstr ""
 
-#: plugins/mp3.c:1242
+#: plugins/mp3.c:1255
 msgid " info: found Xing or Info header. Switching to frame mode... \n"
 msgstr ""
 
-#: plugins/mp3.c:1381
+#: plugins/mp3.c:1394
 #, c-format
 msgid " info: MPEG %d Layer %d - %d Hz - %s"
 msgstr ""
 
-#: plugins/mp3.c:1389
+#: plugins/mp3.c:1402
 #, c-format
 msgid " - FRAME MODE NS"
 msgstr ""
 
-#: plugins/mp3.c:1393
+#: plugins/mp3.c:1406
 #, c-format
 msgid " - FRAME MODE"
 msgstr ""
 
-#: plugins/mp3.c:1398

libmp3splt-0.7.1.tar.gz/src/Makefile.in -> libmp3splt-0.7.3.tar.gz/src/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +17,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -82,6 +99,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
@@ -124,6 +147,11 @@
 	$(LDFLAGS) -o $@
 SOURCES = $(libmp3splt_la_SOURCES)
 DIST_SOURCES = $(libmp3splt_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -373,7 +401,6 @@
 $(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -381,6 +408,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -402,7 +431,7 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libmp3splt.la: $(libmp3splt_la_OBJECTS) $(libmp3splt_la_DEPENDENCIES) 
+libmp3splt.la: $(libmp3splt_la_OBJECTS) $(libmp3splt_la_DEPENDENCIES) $(EXTRA_libmp3splt_la_DEPENDENCIES) 
 	$(libmp3splt_la_LINK) -rpath $(libdir) $(libmp3splt_la_OBJECTS) $(libmp3splt_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -696,8 +725,11 @@
 	-rm -rf .libs _libs
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -711,9 +743,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(includedir)" && rm -f $$files
+	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -814,10 +844,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:

libmp3splt-0.7.1.tar.gz/src/audacity.c -> libmp3splt-0.7.3.tar.gz/src/audacity.c Changed

libmp3splt-0.7.1.tar.gz/src/cddb.c -> libmp3splt-0.7.3.tar.gz/src/cddb.c Changed

libmp3splt-0.7.1.tar.gz/src/cddb.h -> libmp3splt-0.7.3.tar.gz/src/cddb.h Changed

libmp3splt-0.7.1.tar.gz/src/checks.c -> libmp3splt-0.7.3.tar.gz/src/checks.c Changed

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2011 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
  *
  * http://mp3splt.sourceforge.net
  *
@@ -229,11 +229,22 @@
       splt_o_set_int_option(state, SPLT_OPT_AUTO_ADJUST, SPLT_FALSE);
     }
 
+    if (splt_o_get_int_option(state, SPLT_OPT_PARAM_SHOTS) < 0)
+    {
+      splt_o_set_int_option(state, SPLT_OPT_PARAM_SHOTS, SPLT_DEFAULT_PARAM_SHOTS);
+    }
+
     if (splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_TRACK_LENGTH) < 0.f)
     {
       splt_o_set_float_option(state, SPLT_OPT_PARAM_MIN_TRACK_LENGTH,
           SPLT_DEFAULT_PARAM_MINIMUM_TRACK_LENGTH);
     }
+
+    if (splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_TRACK_JOIN) < 0.f)
+    {
+      splt_o_set_float_option(state, SPLT_OPT_PARAM_MIN_TRACK_JOIN,
+          SPLT_DEFAULT_PARAM_MIN_TRACK_JOIN);
+    }
   }
 
   if (!splt_o_get_int_option(state,SPLT_OPT_AUTO_ADJUST))

libmp3splt-0.7.1.tar.gz/src/checks.h -> libmp3splt-0.7.3.tar.gz/src/checks.h Changed

libmp3splt-0.7.1.tar.gz/src/client.c -> libmp3splt-0.7.3.tar.gz/src/client.c Changed

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2011 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
  *
  * http://mp3splt.sourceforge.net
  *
@@ -45,7 +45,7 @@
 
   if (state->split.file_split != NULL)
   {
-    state->split.file_split(filename, state->split.p_bar->user_data);
+    state->split.file_split(filename, state->split.p_bar->user_data, state->split.file_split_cb_data);
     error = splt_c_append_to_m3u_file(state, filename);
   }
   else
@@ -126,7 +126,7 @@
       p_bar->percent_progress = 1;
     }
 
-    p_bar->progress(p_bar);
+    p_bar->progress(p_bar, p_bar->progress_cb_data);
     splt_o_set_iopt(state, SPLT_INTERNAL_PROGRESS_RATE, 0);
   }
   else
@@ -143,7 +143,7 @@
   {
     if (state->split.put_message != NULL)
     {
-      state->split.put_message(message, mess_type);
+      state->split.put_message(message, mess_type, state->split.put_message_cb_data);
     }
     else
     {

libmp3splt-0.7.1.tar.gz/src/client.h -> libmp3splt-0.7.3.tar.gz/src/client.h Changed

libmp3splt-0.7.1.tar.gz/src/conversions.c -> libmp3splt-0.7.3.tar.gz/src/conversions.c Changed

libmp3splt-0.7.1.tar.gz/src/conversions.h -> libmp3splt-0.7.3.tar.gz/src/conversions.h Changed

libmp3splt-0.7.1.tar.gz/src/cue.c -> libmp3splt-0.7.3.tar.gz/src/cue.c Changed

libmp3splt-0.7.1.tar.gz/src/cue.h -> libmp3splt-0.7.3.tar.gz/src/cue.h Changed

libmp3splt-0.7.1.tar.gz/src/debug.c -> libmp3splt-0.7.3.tar.gz/src/debug.c Changed

libmp3splt-0.7.1.tar.gz/src/debug.h -> libmp3splt-0.7.3.tar.gz/src/debug.h Changed

libmp3splt-0.7.1.tar.gz/src/errors.c -> libmp3splt-0.7.3.tar.gz/src/errors.c Changed

libmp3splt-0.7.1.tar.gz/src/errors.h -> libmp3splt-0.7.3.tar.gz/src/errors.h Changed

libmp3splt-0.7.1.tar.gz/src/filename_regex.c -> libmp3splt-0.7.3.tar.gz/src/filename_regex.c Changed

libmp3splt-0.7.1.tar.gz/src/filename_regex.h -> libmp3splt-0.7.3.tar.gz/src/filename_regex.h Changed

libmp3splt-0.7.1.tar.gz/src/freedb.c -> libmp3splt-0.7.3.tar.gz/src/freedb.c Changed

libmp3splt-0.7.1.tar.gz/src/freedb.h -> libmp3splt-0.7.3.tar.gz/src/freedb.h Changed

libmp3splt-0.7.1.tar.gz/src/freedb_utils.c -> libmp3splt-0.7.3.tar.gz/src/freedb_utils.c Changed

libmp3splt-0.7.1.tar.gz/src/freedb_utils.h -> libmp3splt-0.7.3.tar.gz/src/freedb_utils.h Changed

libmp3splt-0.7.1.tar.gz/src/input_output.c -> libmp3splt-0.7.3.tar.gz/src/input_output.c Changed

libmp3splt-0.7.1.tar.gz/src/input_output.h -> libmp3splt-0.7.3.tar.gz/src/input_output.h Changed

libmp3splt-0.7.1.tar.gz/src/mp3splt.c -> libmp3splt-0.7.3.tar.gz/src/mp3splt.c Changed

@@ -392,13 +392,15 @@
 \return The error code if any error occours
 */
 int mp3splt_set_message_function(splt_state *state, 
-    void (*message_cb)(const char *, splt_message_type))
+    void (*message_cb)(const char *, splt_message_type, void *), 
+    void *cb_data)
 {
   int error = SPLT_OK;
 
   if (state != NULL)
   {
     state->split.put_message = message_cb;
+    state->split.put_message_cb_data = cb_data;
   }
   else
   {
@@ -415,13 +417,14 @@
 \return The error code if any error occours
 */
 int mp3splt_set_split_filename_function(splt_state *state,
-    void (*file_cb)(const char *,int b))
+    void (*file_cb)(const char *, int, void *), void *cb_data)
 {
   int error = SPLT_OK;
 
   if (state != NULL)
   {
     state->split.file_split = file_cb;
+    state->split.file_split_cb_data = cb_data;
   }
   else
   {
@@ -438,13 +441,14 @@
 \return The error code if any error occours
 */
 int mp3splt_set_progress_function(splt_state *state,
-    void (*progress_cb)(splt_progress *p_bar))
+    void (*progress_cb)(splt_progress *p_bar, void *), void *cb_data)
 {
   int error = SPLT_OK;
 
   if (state != NULL)
   {
     state->split.p_bar->progress = progress_cb;
+    state->split.p_bar->progress_cb_data = cb_data;
   }
   else
   {
@@ -460,9 +464,10 @@
 \param state The central structure this library keeps all its data in
 \param get_silence_cb The callback function
 \return The error code if any error occours
-*/int mp3splt_set_silence_level_function(splt_state *state,
-  void (*get_silence_cb)(long time, float level, void *user_data),
-  void *data)
+*/
+int mp3splt_set_silence_level_function(splt_state *state,
+    void (*get_silence_cb)(long time, float level, void *user_data),
+    void *data)
 {
   int error = SPLT_OK;
 
@@ -1727,7 +1732,13 @@
     {
       splt_o_lock_library(state);
 
+#ifndef NO_PCRE
       tags = splt_fr_parse_from_state(state, error);
+#else
+      splt_c_put_info_message_to_client(state,
+          _(" warning: cannot set tags from filename regular expression - compiled without pcre support\n"));
+      *error = SPLT_REGEX_UNAVAILABLE;
+#endif
 
       splt_o_unlock_library(state);
     }

libmp3splt-0.7.1.tar.gz/src/oformat_parser.c -> libmp3splt-0.7.3.tar.gz/src/oformat_parser.c Changed

libmp3splt-0.7.1.tar.gz/src/oformat_parser.h -> libmp3splt-0.7.3.tar.gz/src/oformat_parser.h Changed

libmp3splt-0.7.1.tar.gz/src/options.c -> libmp3splt-0.7.3.tar.gz/src/options.c Changed

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2011 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
  *
  * http://mp3splt.sourceforge.net
  *
@@ -51,8 +51,10 @@
   state->options.parameter_threshold = SPLT_DEFAULT_PARAM_THRESHOLD;
   state->options.parameter_offset = SPLT_DEFAULT_PARAM_OFFSET;
   state->options.parameter_number_tracks = SPLT_DEFAULT_PARAM_TRACKS;
+  state->options.parameter_shots = SPLT_DEFAULT_PARAM_SHOTS;
   state->options.parameter_minimum_length = SPLT_DEFAULT_PARAM_MINIMUM_LENGTH;
   state->options.parameter_min_track_length = SPLT_DEFAULT_PARAM_MINIMUM_TRACK_LENGTH;
+  state->options.parameter_min_track_join = SPLT_DEFAULT_PARAM_MIN_TRACK_JOIN;
 
   state->options.artist_tag_format = SPLT_NO_CONVERSION;
   state->options.album_tag_format = SPLT_NO_CONVERSION;
@@ -111,6 +113,9 @@
     case SPLT_OPT_PARAM_NUMBER_TRACKS:
       state->options.parameter_number_tracks = *((int *)data);
       break;
+    case SPLT_OPT_PARAM_SHOTS:
+      state->options.parameter_shots = *((int *)data);
+      break;
     case SPLT_OPT_PARAM_REMOVE_SILENCE:
       state->options.parameter_remove_silence = *((int *)data);
       break;
@@ -155,6 +160,9 @@
     case SPLT_OPT_PARAM_MIN_TRACK_LENGTH:
       state->options.parameter_min_track_length = *((float *)data);
       break;
+    case SPLT_OPT_PARAM_MIN_TRACK_JOIN:
+      state->options.parameter_min_track_join = *((float *)data);
+      break;
     case SPLT_OPT_ARTIST_TAG_FORMAT:
       state->options.artist_tag_format = *((int *)data);
       break;
@@ -220,6 +228,8 @@
       return &state->options.option_input_not_seekable;
     case SPLT_OPT_PARAM_NUMBER_TRACKS:
       return &state->options.parameter_number_tracks;
+    case SPLT_OPT_PARAM_SHOTS:
+      return &state->options.parameter_shots;
     case SPLT_OPT_PARAM_REMOVE_SILENCE:
       return &state->options.parameter_remove_silence;
     case SPLT_OPT_PARAM_GAP:
@@ -248,6 +258,8 @@
       return &state->options.parameter_minimum_length;
     case SPLT_OPT_PARAM_MIN_TRACK_LENGTH:
       return &state->options.parameter_min_track_length;
+    case SPLT_OPT_PARAM_MIN_TRACK_JOIN:
+      return &state->options.parameter_min_track_join;
     case SPLT_OPT_ARTIST_TAG_FORMAT:
       return &state->options.artist_tag_format;
     case SPLT_OPT_ALBUM_TAG_FORMAT:

libmp3splt-0.7.1.tar.gz/src/options.h -> libmp3splt-0.7.3.tar.gz/src/options.h Changed

libmp3splt-0.7.1.tar.gz/src/output_format.c -> libmp3splt-0.7.3.tar.gz/src/output_format.c Changed

libmp3splt-0.7.1.tar.gz/src/output_format.h -> libmp3splt-0.7.3.tar.gz/src/output_format.h Changed

libmp3splt-0.7.1.tar.gz/src/pair.c -> libmp3splt-0.7.3.tar.gz/src/pair.c Changed

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2011 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
  *
  * http://mp3splt.sourceforge.net
  *
@@ -36,9 +36,9 @@
 */
 #include "splt.h"
 
-splt_pair *splt_pair_new(void *first, void *second)
+splt_int_pair *splt_int_pair_new(int first, int second)
 {
-  splt_pair *pair = malloc(sizeof(splt_pair));
+  splt_int_pair *pair = malloc(sizeof(splt_int_pair));
   if (pair == NULL)
   {
     return NULL;
@@ -50,7 +50,7 @@
   return pair;
 }
 
-void splt_pair_free(splt_pair **pair)
+void splt_int_pair_free(splt_int_pair **pair)
 {
   if (!pair)
   {
@@ -66,12 +66,52 @@
   *pair = NULL;
 }
 
-void *splt_pair_first(splt_pair *pair)
+int splt_int_pair_first(splt_int_pair *pair)
 {
   return pair->first;
 }
 
-void *splt_pair_second(splt_pair *pair)
+int splt_int_pair_second(splt_int_pair *pair)
+{
+  return pair->second;
+}
+
+splt_il_pair *splt_il_pair_new(int first, long second)
+{
+  splt_il_pair *pair = malloc(sizeof(splt_il_pair));
+  if (pair == NULL)
+  {
+    return NULL;
+  }
+
+  pair->first = first;
+  pair->second = second;
+
+  return pair;
+}
+
+void splt_il_pair_free(splt_il_pair **pair)
+{
+  if (!pair)
+  {
+    return;
+  }
+
+  if (!*pair)
+  {
+    return;
+  }
+
+  free(*pair);
+  *pair = NULL;
+}
+
+int splt_il_pair_first(splt_il_pair *pair)
+{
+  return pair->first;
+}
+
+long splt_il_pair_second(splt_il_pair *pair)
 {
   return pair->second;
 }

libmp3splt-0.7.1.tar.gz/src/pair.h -> libmp3splt-0.7.3.tar.gz/src/pair.h Changed

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2011 Munteanu Alexandru - io_fx@yahoo.fr
+ * Copyright (c) 2005-2012 Munteanu Alexandru - io_fx@yahoo.fr
  *
  * http://mp3splt.sourceforge.net
  *
@@ -33,17 +33,24 @@
 #ifndef SPLT_PAIR_H
 
 typedef struct {
-  void *first;
-  void *second;
-} splt_pair;
+  int first;
+  int second;
+} splt_int_pair;
 
-splt_pair *splt_pair_new(void *first, void *second);
+splt_int_pair *splt_int_pair_new(int first, int second);
+void splt_int_pair_free(splt_int_pair **pair);
+int splt_int_pair_first(splt_int_pair *pair);
+int splt_int_pair_second(splt_int_pair *pair);
 
-void splt_pair_free(splt_pair **pair);
-
-void *splt_pair_first(splt_pair *pair);
-
-void *splt_pair_second(splt_pair *pair);
+typedef struct {
+  int first;
+  long second;
+} splt_il_pair;
+
+splt_il_pair *splt_il_pair_new(int first, long second);
+void splt_il_pair_free(splt_il_pair **pair);
+int splt_il_pair_first(splt_il_pair *pair);
+long splt_il_pair_second(splt_il_pair *pair);
 
 #define SPLT_PAIR_H

libmp3splt-0.7.1.tar.gz/src/plugins.c -> libmp3splt-0.7.3.tar.gz/src/plugins.c Changed

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2011 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
  *
  * http://mp3splt.sourceforge.net
  *
@@ -950,6 +950,8 @@
 
 void splt_p_set_original_tags(splt_state *state, int *error)
 {
+  splt_tu_set_original_tags_last_plugin_used(state, -100);
+
   splt_plugins *pl = state->plug;
   int current_plugin = splt_p_get_current_plugin(state);
   if ((current_plugin < 0) || (current_plugin >= pl->number_of_plugins_found))
@@ -961,6 +963,7 @@
   {
     if (pl->datacurrent_plugin.func->set_original_tags != NULL)
     {
+      splt_tu_set_original_tags_last_plugin_used(state, current_plugin);
       pl->datacurrent_plugin.func->set_original_tags(state, error);
     }
   }
@@ -969,7 +972,12 @@
 void splt_p_clear_original_tags(splt_state *state, int *error)
 {
   splt_plugins *pl = state->plug;
-  int current_plugin = splt_p_get_current_plugin(state);
+  int current_plugin = splt_tu_get_original_tags_last_plugin_used(state);
+  if (current_plugin == -100)
+  {
+    return;
+  }
+
   if ((current_plugin < 0) || (current_plugin >= pl->number_of_plugins_found))
   {
     *error = SPLT_ERROR_NO_PLUGIN_FOUND;

libmp3splt-0.7.1.tar.gz/src/plugins.h -> libmp3splt-0.7.3.tar.gz/src/plugins.h Changed

libmp3splt-0.7.1.tar.gz/src/silence_utils.c -> libmp3splt-0.7.3.tar.gz/src/silence_utils.c Changed

libmp3splt-0.7.1.tar.gz/src/silence_utils.h -> libmp3splt-0.7.3.tar.gz/src/silence_utils.h Changed

libmp3splt-0.7.1.tar.gz/src/socket_manager.c -> libmp3splt-0.7.3.tar.gz/src/socket_manager.c Changed

libmp3splt-0.7.1.tar.gz/src/split_points.c -> libmp3splt-0.7.3.tar.gz/src/split_points.c Changed

@@ -65,15 +65,17 @@
 
   if (!split->points)
   {
+    split->allocated_splitnumber = split->real_splitnumber;
     if ((split->points = malloc(sizeof(splt_point))) == NULL)
     {
       return SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
     }
   }
-  else
+  else if (split->real_splitnumber > split->allocated_splitnumber)
   {
-    if ((split->points = realloc(split->points,
-            split->real_splitnumber * sizeof(splt_point))) == NULL)
+    split->allocated_splitnumber = split->real_splitnumber;
+    if ((split->points = 
+          realloc(split->points, split->allocated_splitnumber * sizeof(splt_point))) == NULL)
     {
       return SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
     }
@@ -93,6 +95,37 @@
   return error;
 }
 
+//unoptimized
+int splt_sp_remove_splitpoint(splt_state *state, int index)
+{
+  splt_d_print_debug(state,"Removing splitpoint at _%d_ ...\n", index);
+
+  int error = SPLT_OK;
+
+  if ((index >= 0) && (index < state->split.real_splitnumber))
+  {
+    if (state->split.pointsindex.name)
+    {
+      free(state->split.pointsindex.name);
+      state->split.pointsindex.name = NULL;
+    }
+
+    int i;
+    for (i = index + 1; i < state->split.real_splitnumber;i++)
+    {
+      state->split.pointsi - 1 = state->split.pointsi;
+    }
+
+    state->split.real_splitnumber--;
+  }
+  else
+  {
+    splt_e_error(SPLT_IERROR_INT, __func__, index, NULL);
+  }
+
+  return error;
+}
+
 splt_point *splt_sp_get_splitpoints(splt_state *state, int *splitpoints_number)
 {
   splt_struct *split = &state->split;
@@ -324,6 +357,215 @@
   }
 }
 
+splt_array *splt_sp_find_intervals_between_two_consecutive_big_tracks(splt_state *state,
+    int min_track_join, int *error)
+{
+  splt_array *intervals = splt_array_new();
+  if (!intervals) { return NULL; }
+
+  int previous_was_big_track = SPLT_FALSE;
+  int start_interval = 0;
+  int fix_start_point = SPLT_FALSE;
+  int end_interval = 1;
+
+  if (state->split.real_splitnumber == 1)
+  {
+    return intervals;
+  }
+
+  int appended_last = SPLT_FALSE;
+
+  int i = 1;
+  for (i = 1;i < state->split.real_splitnumber; i++)
+  {
+    int begin_index = i-1;
+    int end_index = i;
+
+    long begin_track_point = splt_sp_get_splitpoint_value(state, begin_index, error);
+    if (*error < 0) { splt_array_free(&intervals); return NULL; }
+    long end_track_point = splt_sp_get_splitpoint_value(state, end_index, error);
+    if (*error < 0) { splt_array_free(&intervals); return NULL; }
+
+    long track_length = end_track_point - begin_track_point;
+    if (track_length >= min_track_join)
+    {
+      if (previous_was_big_track)
+      {
+        if (!fix_start_point)
+        {
+          start_interval = begin_index;
+        }
+        else
+        {
+          end_interval = begin_index;
+
+          splt_int_pair *pair = splt_int_pair_new(start_interval, end_interval);
+          splt_array_append(intervals, (void *) pair);
+
+          fix_start_point = SPLT_FALSE;
+          start_interval = end_interval;
+        }
+      }
+
+      previous_was_big_track = SPLT_TRUE;
+    }
+    else
+    {
+      fix_start_point = SPLT_TRUE;
+      previous_was_big_track = SPLT_FALSE;
+
+      if (!appended_last && 
+          (i == state->split.real_splitnumber - 1 || i == state->split.real_splitnumber - 2))
+      {
+        end_interval = state->split.real_splitnumber - 1;
+        splt_int_pair *pair = splt_int_pair_new(start_interval, end_interval);
+        splt_array_append(intervals, (void *) pair);
+        appended_last = SPLT_TRUE;
+      }
+    }
+  }
+
+  return intervals;
+}
+
+static void free_intervals(splt_array *intervals)
+{
+  long number_of_intervals = splt_array_length(intervals);
+  long i = 0;
+  for (i = 0; i < number_of_intervals; i++)
+  {
+    splt_int_pair *pair = (splt_int_pair *) splt_array_get(intervals, i);
+    splt_int_pair_free(&pair);
+  }
+  splt_array_free(&intervals);
+}
+
+static int backward_sort(const void *a, const void *b)
+{
+  const int *ia = (const int *)a;
+  const int *ib = (const int *)b;
+  return *ib - *ia;
+}
+
+void splt_sp_join_minimum_tracks_splitpoints(splt_state *state, int *error)
+{
+  if (state->split.real_splitnumber <= 0) { return; }
+
+  float min_track_join_f = splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_TRACK_JOIN);
+  long min_track_join = splt_co_time_to_long(min_track_join_f);
+
+  if (min_track_join <= 0) { return; }
+
+  splt_array *intervals = 
+    splt_sp_find_intervals_between_two_consecutive_big_tracks(state, min_track_join, error);
+  if (!intervals) { return; }
+
+  while (intervals && splt_array_length(intervals) > 0)
+  {
+    long number_of_intervals = splt_array_length(intervals);
+
+    int indexes_to_removestate->split.real_splitnumber;
+    int number_of_indexes_to_remove = 0;
+
+    long i = 0;
+    for (i = 0; i < number_of_intervals; i++)
+    {
+      splt_int_pair *pair = (splt_int_pair *) splt_array_get(intervals, i);
+      int begin_index = splt_int_pair_first(pair);
+      int end_index = splt_int_pair_second(pair);
+
+      //if the last segment is small
+      long end_time = splt_sp_get_splitpoint_value(state, end_index, error);
+      if (*error < 0) { goto end; }
+      int start_index = end_index - 1;
+      long before_end_time = splt_sp_get_splitpoint_value(state, start_index, error);
+      if (*error < 0) { goto end; }
+
+      long track_length = end_time - before_end_time;
+      while (track_length < min_track_join)
+      {
+        if (start_index == 0)
+        {
+          break;
+        }
+
+        start_index--;
+        track_length = end_time - splt_sp_get_splitpoint_value(state, start_index, error);
+        if (*error < 0) { goto end; }
+      }
+      //join last segments

libmp3splt-0.7.1.tar.gz/src/split_points.h -> libmp3splt-0.7.3.tar.gz/src/split_points.h Changed

libmp3splt-0.7.1.tar.gz/src/splt.c -> libmp3splt-0.7.3.tar.gz/src/splt.c Changed

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2011 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
  *
  * http://mp3splt.sourceforge.net
  *
@@ -163,6 +163,12 @@
   int i = 0;
   int number_of_splitpoints = splt_t_get_splitnumber(state);
 
+  int save_end_point = SPLT_TRUE;
+  if (splt_o_get_long_option(state, SPLT_OPT_OVERLAP_TIME) > 0)
+  {
+    save_end_point = SPLT_FALSE;
+  }
+
   while (i  < number_of_splitpoints - 1)
   {
     splt_t_set_current_split(state, i);
@@ -189,9 +195,12 @@
 
       int end_point_index = i+1;
       long new_end_point = splt_s_split(state, i, end_point_index, error);
-      splt_pair *index_end_point =
-        splt_pair_new((void *) &end_point_index, (void *) &new_end_point);
-      splt_array_append(new_end_points, (void *)index_end_point);
+
+      if (save_end_point)
+      {
+        splt_il_pair *index_end_point = splt_il_pair_new(end_point_index, new_end_point);
+        splt_array_append(new_end_points, (void *)index_end_point);
+      }
 
       splt_sp_set_splitpoint_value(state, i + 1, saved_end_point);
 
@@ -212,13 +221,13 @@
 end:
   for (i = 0;i < splt_array_length(new_end_points);i++)
   {
-    splt_pair *index_end_point = (splt_pair *) splt_array_get(new_end_points, i);
+    splt_il_pair *index_end_point = (splt_il_pair *) splt_array_get(new_end_points, i);
 
     splt_sp_set_splitpoint_value(state,
-        *((int*) splt_pair_first(index_end_point)),
-        *((long*) splt_pair_second(index_end_point)));
+        splt_il_pair_first(index_end_point),
+        splt_il_pair_second(index_end_point));
 
-    splt_pair_free(&index_end_point);
+    splt_il_pair_free(&index_end_point);
   }
 
   splt_array_free(&new_end_points);
@@ -435,20 +444,23 @@
 
           double new_sec_end_point = splt_p_split(state, final_fname,
               begin, overlapped_end, error, save_end_point);
-          long new_end_point = 0;
-          if (new_sec_end_point == -1.0)
-          {
-            new_end_point = LONG_MAX;
-          }
-          else
+
+          if (save_end_point)
           {
-            new_end_point = splt_co_time_to_long_ceil(new_sec_end_point);
-          }
+            long new_end_point = 0;
+            if (new_sec_end_point == -1.0)
+            {
+              new_end_point = LONG_MAX;
+            }
+            else
+            {
+              new_end_point = splt_co_time_to_long_ceil(new_sec_end_point);
+            }
 
-          int end_point_index = current_split + 1;
-          splt_pair *index_end_point =
-            splt_pair_new((void *) &end_point_index, (void *) &new_end_point);
-          splt_array_append(new_end_points, (void *) index_end_point);
+            int end_point_index = current_split + 1;
+            splt_il_pair *index_end_point = splt_il_pair_new(end_point_index, new_end_point);
+            splt_array_append(new_end_points, (void *) index_end_point);
+          }
 
           //if no error for the split, put the split file
           if (*error >= 0)
@@ -499,13 +511,13 @@
       int i = 0;
       for (i = 0;i < splt_array_length(new_end_points);i++)
       {
-        splt_pair *index_end_point = (splt_pair *) splt_array_get(new_end_points, i);
+        splt_il_pair *index_end_point = (splt_il_pair *) splt_array_get(new_end_points, i);
 
         splt_sp_set_splitpoint_value(state,
-            *((int*) splt_pair_first(index_end_point)),
-            *((long*) splt_pair_second(index_end_point)));
+            splt_il_pair_first(index_end_point),
+            splt_il_pair_second(index_end_point));
 
-        splt_pair_free(&index_end_point);
+        splt_il_pair_free(&index_end_point);
       }
 
       splt_array_free(&new_end_points);
@@ -707,10 +719,16 @@
           we_read_silence_from_logs = SPLT_TRUE;
           float threshold = SPLT_DEFAULT_PARAM_THRESHOLD;
           float min = SPLT_DEFAULT_PARAM_MINIMUM_LENGTH;
-          int i = fscanf(log_file, "%f\t%f", &threshold, &min);
+          int shots = SPLT_DEFAULT_PARAM_SHOTS;
+          int i = fscanf(log_file, "%f\t%f\t%d", &threshold, &min, &shots);
+
+          //compatibility with older versions; allow missing shots
+          if (i == 2) { shots = SPLT_DEFAULT_PARAM_SHOTS; }
 
-          if ((i < 2) || (threshold != splt_o_get_float_option(state, SPLT_OPT_PARAM_THRESHOLD))
-              || (splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_LENGTH) != min))
+          if ((i < 2) ||
+              (threshold != splt_o_get_float_option(state, SPLT_OPT_PARAM_THRESHOLD)) ||
+              (splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_LENGTH) != min) ||
+              (splt_o_get_int_option(state, SPLT_OPT_PARAM_SHOTS) != shots))
           {
             we_read_silence_from_logs = SPLT_FALSE;
           }
@@ -718,6 +736,7 @@
           {
             splt_o_set_float_option(state, SPLT_OPT_PARAM_THRESHOLD, threshold);
             splt_o_set_float_option(state, SPLT_OPT_PARAM_MIN_LENGTH, min);
+            splt_o_set_int_option(state, SPLT_OPT_PARAM_SHOTS, shots);
           }
         }
 
@@ -753,17 +772,38 @@
     snprintf(auto_user_str,128,_("Auto"));
   }
 
-  if (! splt_o_get_int_option(state,SPLT_OPT_QUIET_MODE))
+  if (! splt_o_get_int_option(state, SPLT_OPT_QUIET_MODE))
   {
-    splt_c_put_info_message_to_client(state, 
+    char *other_options = NULL;
+
+    if (splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_TRACK_JOIN) > 0)
+    {
+      char *min_track_join = 
+        splt_su_get_formatted_message(state, ", %s: %.2f", "Min track join",
+            splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_TRACK_JOIN));
+
+      int err = splt_su_append_str(&other_options, min_track_join, NULL);
+      if (err < 0) { *error = err; goto end; }
+
+      free(min_track_join);
+    }
+
+    splt_c_put_info_message_to_client(state,
         _(" Silence split type: %s mode (Th: %.1f dB,"
-          " Off: %.2f, Min: %.2f, Remove: %s, Min track: %.2f)\n"),
+          " Off: %.2f, Min: %.2f, Remove: %s, Min track: %.2f, Shots: %d%s)\n"),
         auto_user_str,
         splt_o_get_float_option(state, SPLT_OPT_PARAM_THRESHOLD),
         splt_o_get_float_option(state, SPLT_OPT_PARAM_OFFSET),
         splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_LENGTH),
         remove_str,
-        splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_TRACK_LENGTH));
+        splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_TRACK_LENGTH),
+        splt_o_get_int_option(state, SPLT_OPT_PARAM_SHOTS), 
+        other_options == NULL ? "" : other_options);
+
+    if (other_options)
+    {
+      free(other_options);
+    }
   }
  
   short read_silence_from_logs = SPLT_FALSE;
@@ -912,6 +952,9 @@
         if (append_error != SPLT_OK) { *error = append_error; }
       }
 
+      splt_sp_join_minimum_tracks_splitpoints(state, error);
+      if (*error < 0) { goto end; }
+
       splt_sp_skip_minimum_track_length_splitpoints(state, error);
     }
     else
@@ -943,9 +986,10 @@
             //do the effective write
             struct splt_ssplit *temp = state->silence_list;
             fprintf(log_file, "%s\n", splt_t_get_filename_to_split(state));
-            fprintf(log_file, "%.2f\t%.2f\n", 
+            fprintf(log_file, "%.2f\t%.2f\t%d\n", 
                 splt_o_get_float_option(state, SPLT_OPT_PARAM_THRESHOLD),
-                splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_LENGTH));
+                splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_LENGTH),

libmp3splt-0.7.1.tar.gz/src/splt.h -> libmp3splt-0.7.3.tar.gz/src/splt.h Changed

libmp3splt-0.7.1.tar.gz/src/splt_array.c -> libmp3splt-0.7.3.tar.gz/src/splt_array.c Changed

libmp3splt-0.7.1.tar.gz/src/splt_array.h -> libmp3splt-0.7.3.tar.gz/src/splt_array.h Changed

libmp3splt-0.7.1.tar.gz/src/string_utils.c -> libmp3splt-0.7.3.tar.gz/src/string_utils.c Changed

libmp3splt-0.7.1.tar.gz/src/string_utils.h -> libmp3splt-0.7.3.tar.gz/src/string_utils.h Changed

libmp3splt-0.7.1.tar.gz/src/sync_errors.c -> libmp3splt-0.7.3.tar.gz/src/sync_errors.c Changed

libmp3splt-0.7.1.tar.gz/src/sync_errors.h -> libmp3splt-0.7.3.tar.gz/src/sync_errors.h Changed

libmp3splt-0.7.1.tar.gz/src/tags_parser.c -> libmp3splt-0.7.3.tar.gz/src/tags_parser.c Changed

libmp3splt-0.7.1.tar.gz/src/tags_parser.h -> libmp3splt-0.7.3.tar.gz/src/tags_parser.h Changed

libmp3splt-0.7.1.tar.gz/src/tags_utils.c -> libmp3splt-0.7.3.tar.gz/src/tags_utils.c Changed

libmp3splt-0.7.1.tar.gz/src/tags_utils.h -> libmp3splt-0.7.3.tar.gz/src/tags_utils.h Changed

libmp3splt-0.7.1.tar.gz/src/types_func.c -> libmp3splt-0.7.3.tar.gz/src/types_func.c Changed

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2011 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
  *
  * http://mp3splt.sourceforge.net
  *
@@ -59,7 +59,9 @@
   state->split.current_split_file_number = 1;
   state->split.get_silence_level = NULL;
   state->split.put_message = NULL;
+  state->split.put_message_cb_data = NULL;
   state->split.file_split = NULL;
+  state->split.file_split_cb_data = NULL;
   state->split.p_bar->progress_text_max_char = 40;
   snprintf(state->split.p_bar->filename_shorted,512, "%s","");
   state->split.p_bar->percent_progress = 0;
@@ -70,11 +72,13 @@
   state->split.p_bar->silence_db_level = 0;
   state->split.p_bar->user_data = 0;
   state->split.p_bar->progress = NULL;
+  state->split.p_bar->progress_cb_data = NULL;
   state->cancel_split = SPLT_FALSE;
 
   splt_original_tags *original_tags = &state->original_tags;
   splt_tu_reset_tags(&original_tags->tags);
   original_tags->all_original_tags = NULL;
+  original_tags->last_plugin_used = -100;
 
   splt_w_set_wrap_default_values(state);
   splt_se_set_sync_errors_default_values(state);

libmp3splt-0.7.1.tar.gz/src/types_func.h -> libmp3splt-0.7.3.tar.gz/src/types_func.h Changed

libmp3splt-0.7.1.tar.gz/src/utils.c -> libmp3splt-0.7.3.tar.gz/src/utils.c Changed

libmp3splt-0.7.1.tar.gz/src/utils.h -> libmp3splt-0.7.3.tar.gz/src/utils.h Changed

libmp3splt-0.7.1.tar.gz/src/win32.c -> libmp3splt-0.7.3.tar.gz/src/win32.c Changed

libmp3splt-0.7.1.tar.gz/src/win32.h -> libmp3splt-0.7.3.tar.gz/src/win32.h Changed

libmp3splt-0.7.1.tar.gz/src/wrap.c -> libmp3splt-0.7.3.tar.gz/src/wrap.c Changed

libmp3splt-0.7.1.tar.gz/src/wrap.h -> libmp3splt-0.7.3.tar.gz/src/wrap.h Changed

libmp3splt-0.7.1.tar.gz/test/Makefile.am -> libmp3splt-0.7.3.tar.gz/test/Makefile.am Changed

libmp3splt-0.7.1.tar.gz/test/Makefile.in -> libmp3splt-0.7.3.tar.gz/test/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -59,6 +76,14 @@
 @HAS_CUTTER_TRUE@	test_filename_regex.lo tests.lo
 test_filename_regex_la_OBJECTS = $(am_test_filename_regex_la_OBJECTS)
 @HAS_CUTTER_TRUE@am_test_filename_regex_la_rpath =
+test_minimum_track_join_la_LIBADD =
+am__test_minimum_track_join_la_SOURCES_DIST =  \
+	test_minimum_track_join.c tests.h
+@HAS_CUTTER_TRUE@am_test_minimum_track_join_la_OBJECTS =  \
+@HAS_CUTTER_TRUE@	test_minimum_track_join.lo
+test_minimum_track_join_la_OBJECTS =  \
+	$(am_test_minimum_track_join_la_OBJECTS)
+@HAS_CUTTER_TRUE@am_test_minimum_track_join_la_rpath =
 test_pair_la_LIBADD =
 am__test_pair_la_SOURCES_DIST = test_pair.c tests.h
 @HAS_CUTTER_TRUE@am_test_pair_la_OBJECTS = test_pair.lo
@@ -95,14 +120,21 @@
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(test_filename_regex_la_SOURCES) $(test_pair_la_SOURCES) \
+SOURCES = $(test_filename_regex_la_SOURCES) \
+	$(test_minimum_track_join_la_SOURCES) $(test_pair_la_SOURCES) \
 	$(test_socket_manager_la_SOURCES) \
 	$(test_splt_array_la_SOURCES) $(test_string_utils_la_SOURCES)
 DIST_SOURCES = $(am__test_filename_regex_la_SOURCES_DIST) \
+	$(am__test_minimum_track_join_la_SOURCES_DIST) \
 	$(am__test_pair_la_SOURCES_DIST) \
 	$(am__test_socket_manager_la_SOURCES_DIST) \
 	$(am__test_splt_array_la_SOURCES_DIST) \
 	$(am__test_string_utils_la_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 am__tty_colors = \
@@ -278,13 +310,15 @@
 @HAS_CUTTER_TRUE@test_pair.la \
 @HAS_CUTTER_TRUE@test_string_utils.la \
 @HAS_CUTTER_TRUE@test_filename_regex.la \
-@HAS_CUTTER_TRUE@test_socket_manager.la
+@HAS_CUTTER_TRUE@test_socket_manager.la \
+@HAS_CUTTER_TRUE@test_minimum_track_join.la
 
 @HAS_CUTTER_TRUE@test_splt_array_la_SOURCES = test_splt_array.c tests.h
 @HAS_CUTTER_TRUE@test_pair_la_SOURCES = test_pair.c tests.h
 @HAS_CUTTER_TRUE@test_string_utils_la_SOURCES = test_string_utils.c
 @HAS_CUTTER_TRUE@test_filename_regex_la_SOURCES = test_filename_regex.c tests.c tests.h
 @HAS_CUTTER_TRUE@test_socket_manager_la_SOURCES = test_socket_manager.c tests.h
+@HAS_CUTTER_TRUE@test_minimum_track_join_la_SOURCES = test_minimum_track_join.c tests.h
 @HAS_CUTTER_TRUE@TESTS = run-tests.sh
 @HAS_CUTTER_TRUE@TESTS_ENVIRONMENT = NO_MAKE=yes CUTTER="$(CUTTER)"
 all: all-am
@@ -330,15 +364,17 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-test_filename_regex.la: $(test_filename_regex_la_OBJECTS) $(test_filename_regex_la_DEPENDENCIES) 
+test_filename_regex.la: $(test_filename_regex_la_OBJECTS) $(test_filename_regex_la_DEPENDENCIES) $(EXTRA_test_filename_regex_la_DEPENDENCIES) 
 	$(LINK) $(am_test_filename_regex_la_rpath) $(test_filename_regex_la_OBJECTS) $(test_filename_regex_la_LIBADD) $(LIBS)
-test_pair.la: $(test_pair_la_OBJECTS) $(test_pair_la_DEPENDENCIES) 
+test_minimum_track_join.la: $(test_minimum_track_join_la_OBJECTS) $(test_minimum_track_join_la_DEPENDENCIES) $(EXTRA_test_minimum_track_join_la_DEPENDENCIES) 
+	$(LINK) $(am_test_minimum_track_join_la_rpath) $(test_minimum_track_join_la_OBJECTS) $(test_minimum_track_join_la_LIBADD) $(LIBS)
+test_pair.la: $(test_pair_la_OBJECTS) $(test_pair_la_DEPENDENCIES) $(EXTRA_test_pair_la_DEPENDENCIES) 
 	$(LINK) $(am_test_pair_la_rpath) $(test_pair_la_OBJECTS) $(test_pair_la_LIBADD) $(LIBS)
-test_socket_manager.la: $(test_socket_manager_la_OBJECTS) $(test_socket_manager_la_DEPENDENCIES) 
+test_socket_manager.la: $(test_socket_manager_la_OBJECTS) $(test_socket_manager_la_DEPENDENCIES) $(EXTRA_test_socket_manager_la_DEPENDENCIES) 
 	$(LINK) $(am_test_socket_manager_la_rpath) $(test_socket_manager_la_OBJECTS) $(test_socket_manager_la_LIBADD) $(LIBS)
-test_splt_array.la: $(test_splt_array_la_OBJECTS) $(test_splt_array_la_DEPENDENCIES) 
+test_splt_array.la: $(test_splt_array_la_OBJECTS) $(test_splt_array_la_DEPENDENCIES) $(EXTRA_test_splt_array_la_DEPENDENCIES) 
 	$(LINK) $(am_test_splt_array_la_rpath) $(test_splt_array_la_OBJECTS) $(test_splt_array_la_LIBADD) $(LIBS)
-test_string_utils.la: $(test_string_utils_la_OBJECTS) $(test_string_utils_la_DEPENDENCIES) 
+test_string_utils.la: $(test_string_utils_la_OBJECTS) $(test_string_utils_la_DEPENDENCIES) $(EXTRA_test_string_utils_la_DEPENDENCIES) 
 	$(LINK) $(am_test_string_utils_la_rpath) $(test_string_utils_la_OBJECTS) $(test_string_utils_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -348,6 +384,7 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_filename_regex.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_minimum_track_join.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_pair.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_socket_manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_splt_array.Plo@am__quote@
@@ -514,14 +551,15 @@
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
 	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
+	    col="$$grn"; \
 	  else \
-	    echo "$$red$$dashes"; \
+	    col="$$red"; \
 	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
+	  echo "$${col}$$dashes$${std}"; \
+	  echo "$${col}$$banner$${std}"; \
+	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+	  test -z "$$report" || echo "$${col}$$report$${std}"; \
+	  echo "$${col}$$dashes$${std}"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
 
@@ -570,10 +608,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:

libmp3splt-0.7.3.tar.gz/test/test_minimum_track_join.c Added

@@ -0,0 +1,660 @@
+#include <cutter.h>
+
+#include "libmp3splt/mp3splt.h"
+#include "pair.h"
+#include "splt_array.h"
+#include "split_points.h"
+
+static int min_track_join = 5;
+
+static int error = SPLT_OK;
+static splt_state *state = NULL;
+
+void cut_setup()
+{
+  state = mp3splt_new_state(NULL);
+  error = SPLT_OK;
+}
+
+void cut_teardown()
+{
+  mp3splt_free_state(state, NULL);
+}
+
+void test_find_intervals_with_no_splitpoint()
+{
+  splt_array *intervals = 
+    splt_sp_find_intervals_between_two_consecutive_big_tracks(state, min_track_join, &error);
+
+  cut_assert_equal_int(SPLT_OK, error);
+
+  cut_assert_not_null(intervals);
+  cut_assert_equal_int(0, splt_array_length(intervals));
+
+  splt_array_free(&intervals);
+}
+
+void test_find_intervals_with_only_one_splitpoint_should_not_be_possible()
+{
+  splt_sp_append_splitpoint(state, 0, "", SPLT_SPLITPOINT);
+
+  splt_array *intervals = 
+    splt_sp_find_intervals_between_two_consecutive_big_tracks(state, min_track_join, &error);
+
+  cut_assert_equal_int(SPLT_OK, error);
+
+  cut_assert_not_null(intervals);
+  cut_assert_equal_int(0, splt_array_length(intervals));
+
+  splt_array_free(&intervals);
+}
+
+void test_find_intervals_with_one_segment_greater_than_minimum()
+{
+  splt_sp_append_splitpoint(state, 0, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 6, "", SPLT_SPLITPOINT);
+
+  splt_array *intervals = 
+    splt_sp_find_intervals_between_two_consecutive_big_tracks(state, min_track_join, &error);
+
+  cut_assert_equal_int(SPLT_OK, error);
+
+  cut_assert_not_null(intervals);
+  cut_assert_equal_int(0, splt_array_length(intervals));
+
+  splt_array_free(&intervals);
+}
+
+void test_find_intervals_with_one_segment_lesser_than_minimum()
+{
+  splt_sp_append_splitpoint(state, 0, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 4, "", SPLT_SPLITPOINT);
+
+  splt_array *intervals = 
+    splt_sp_find_intervals_between_two_consecutive_big_tracks(state, min_track_join, &error);
+
+  cut_assert_equal_int(SPLT_OK, error);
+
+  cut_assert_not_null(intervals);
+  cut_assert_equal_int(1, splt_array_length(intervals));
+
+  splt_int_pair *pair = (splt_int_pair *)splt_array_get(intervals, 0);
+  int start = splt_int_pair_first(pair);
+  int end = splt_int_pair_second(pair);
+
+  cut_assert_equal_int(0, start);
+  cut_assert_equal_int(1, end);
+
+  splt_int_pair_free(&pair);
+
+  splt_array_free(&intervals);
+}
+
+void test_find_intervals_with_no_segment_lesser_than_minimum()
+{
+  splt_sp_append_splitpoint(state, 0, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 6, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 12, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 18, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 24, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 30, "", SPLT_SPLITPOINT);
+
+  splt_array *intervals = 
+    splt_sp_find_intervals_between_two_consecutive_big_tracks(state, min_track_join, &error);
+
+  cut_assert_equal_int(SPLT_OK, error);
+
+  cut_assert_not_null(intervals);
+  cut_assert_equal_int(0, splt_array_length(intervals));
+
+  splt_array_free(&intervals);
+}
+
+void test_find_intervals_with_all_segments_lesser_than_minimum()
+{
+  splt_sp_append_splitpoint(state, 0, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 3, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 6, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 9, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 12, "", SPLT_SPLITPOINT);
+
+  splt_array *intervals = 
+    splt_sp_find_intervals_between_two_consecutive_big_tracks(state, min_track_join, &error);
+
+  cut_assert_equal_int(SPLT_OK, error);
+
+  cut_assert_not_null(intervals);
+  cut_assert_equal_int(1, splt_array_length(intervals));
+
+  splt_int_pair *pair = (splt_int_pair *)splt_array_get(intervals, 0);
+  int start = splt_int_pair_first(pair);
+  int end = splt_int_pair_second(pair);
+
+  cut_assert_equal_int(0, start);
+  cut_assert_equal_int(4, end);
+
+  splt_int_pair_free(&pair);
+
+  splt_array_free(&intervals);
+}
+
+void test_find_intervals_with_no_segment_lesser_than_minimum_at_beginning()
+{
+  splt_sp_append_splitpoint(state, 0, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 6, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 12, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 18, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 20, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 22, "", SPLT_SPLITPOINT);
+
+  splt_array *intervals = 
+    splt_sp_find_intervals_between_two_consecutive_big_tracks(state, min_track_join, &error);
+
+  cut_assert_equal_int(SPLT_OK, error);
+
+  cut_assert_not_null(intervals);
+  cut_assert_equal_int(1, splt_array_length(intervals));
+
+  splt_int_pair *pair = (splt_int_pair *)splt_array_get(intervals, 0);
+  int start = splt_int_pair_first(pair);
+  int end = splt_int_pair_second(pair);
+
+  cut_assert_equal_int(2, start);
+  cut_assert_equal_int(5, end);
+
+  splt_int_pair_free(&pair);
+
+  splt_array_free(&intervals);
+}
+
+void test_find_intervals_with_no_segment_lesser_than_minimum_at_end()
+{
+  splt_sp_append_splitpoint(state, 0, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 4, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 8, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 20, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 30, "", SPLT_SPLITPOINT);
+  splt_sp_append_splitpoint(state, 40, "", SPLT_SPLITPOINT);
+
+  splt_array *intervals = 
+    splt_sp_find_intervals_between_two_consecutive_big_tracks(state, min_track_join, &error);
+
+  cut_assert_equal_int(SPLT_OK, error);
+
+  cut_assert_not_null(intervals);
+  cut_assert_equal_int(1, splt_array_length(intervals));
+
+  splt_int_pair *pair = (splt_int_pair *)splt_array_get(intervals, 0);
+  int start = splt_int_pair_first(pair);
+  int end = splt_int_pair_second(pair);
+
+  cut_assert_equal_int(0, start);
+  cut_assert_equal_int(3, end);
+
+  splt_int_pair_free(&pair);
+
+  splt_array_free(&intervals);
+}
+
+void test_find_intervals_with_no_segment_lesser_than_minimum_in_the_middle()

libmp3splt-0.7.1.tar.gz/test/test_pair.c -> libmp3splt-0.7.3.tar.gz/test/test_pair.c Changed

@@ -4,7 +4,7 @@
 
 #include "tests.h"
 
-static splt_pair *pair = NULL;
+static splt_il_pair *pair = NULL;
 
 void cut_setup()
 {
@@ -14,33 +14,33 @@
 {
   if (pair)
   {
-    splt_pair_free(&pair);
+    splt_il_pair_free(&pair);
   }
 }
 
 void test_new()
 {
-  pair = splt_pair_new(NULL, NULL);
+  pair = splt_il_pair_new(0, 0);
   cut_assert_not_null(pair);
 }
 
 void test_get()
 {
   int x = 22;
-  double axis = 44.5;
-  pair = splt_pair_new(&x, &axis);
+  long axis = 44;
+  pair = splt_il_pair_new(x, axis);
 
-  int xx = *((int *)splt_pair_first(pair));
-  double axiss = *((double *)splt_pair_second(pair));
+  int xx = splt_il_pair_first(pair);
+  long axiss = splt_il_pair_second(pair);
 
   cut_assert_equal_int(22, xx);
-  cut_assert_equal_double(44.5, DOUBLE_PRECISION, axiss);
+  cut_assert_equal_int(44, axiss);
 }
 
 void test_free()
 {
-  pair = splt_pair_new(NULL, NULL);
-  splt_pair_free(&pair);
+  pair = splt_il_pair_new(0, 0);
+  splt_il_pair_free(&pair);
 
   cut_assert_null(pair);
 }

Changes of Revision 6