Packman Build Service PMBS

libmp3splt.changes Changed

libmp3splt.spec Changed

libmp3splt-add_soname_to_gettext_domain.patch Changed

@@ -1,23 +1,23 @@
---- po/Makevars.orig	2011-04-27 18:13:47.000000000 +0200
-+++ po/Makevars	2011-04-27 18:14:01.000000000 +0200
+--- include/libmp3splt/mp3splt.h.orig	2011-07-21 12:11:09.402999984 +0200
++++ include/libmp3splt/mp3splt.h	2011-07-21 12:11:19.803999985 +0200
+@@ -1317,7 +1317,7 @@
+ 
+ /* other useful variables */
+ 
+-#define MP3SPLT_LIB_GETTEXT_DOMAIN "libmp3splt"
++#define MP3SPLT_LIB_GETTEXT_DOMAIN "libmp3splt@@SONAME@@"
+ 
+ //backslash character
+ #ifndef SPLT_DIRCHAR
+--- po/Makevars.orig	2011-07-21 12:10:40.213999985 +0200
++++ po/Makevars	2011-07-21 12:11:02.351999985 +0200
 @@ -1,7 +1,7 @@
  # Makefile variables for PO directory in any package using GNU gettext.
  
 -VERSION = 0.5.6
 -PACKAGE = libmp3splt
-+VERSION = 0.6.1a
++VERSION = 0.7
 +PACKAGE = libmp3splt$(SONAME)
  
  # Usually the message domain is the same as the package name.
  DOMAIN = $(PACKAGE)
---- include/libmp3splt/mp3splt.h.orig	2011-04-27 18:14:37.000000000 +0200
-+++ include/libmp3splt/mp3splt.h	2011-04-27 18:14:50.000000000 +0200
-@@ -1295,7 +1295,7 @@
- 
- /* other useful variables */
- 
--#define MP3SPLT_LIB_GETTEXT_DOMAIN "libmp3splt"
-+#define MP3SPLT_LIB_GETTEXT_DOMAIN "libmp3splt@@SONAME@@"
- 
- //backslash character
- #ifndef SPLT_DIRCHAR

libmp3splt-add_soname_to_plugin_dir.patch Changed

@@ -1,6 +1,28 @@
---- plugins/Makefile.in.orig	2011-04-27 18:15:37.000000000 +0200
-+++ plugins/Makefile.in	2011-04-27 18:16:03.000000000 +0200
-@@ -281,13 +281,13 @@
+--- src/Makefile.in.orig	2011-07-21 12:09:34.351999985 +0200
++++ src/Makefile.in	2011-07-21 12:10:01.071999985 +0200
+@@ -295,7 +295,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ include_HEADERS = $(top_srcdir)/include/libmp3splt/mp3splt.h
+-INCLUDES = -DSPLT_PLUGINS_DIR=\"$(libdir)/libmp3splt\" @INCLTDL@ \
++INCLUDES = -DSPLT_PLUGINS_DIR=\"$(libdir)/libmp3splt$(SONAME)\" @INCLTDL@ \
+ 	$(am__append_2) $(am__append_3)
+ lib_LTLIBRARIES = libmp3splt.la
+ libmp3splt_la_LDFLAGS = -no-undefined -version-info 0:5:0
+--- src/Makefile.am.orig	2011-07-21 12:10:03.439999985 +0200
++++ src/Makefile.am	2011-07-21 12:10:12.911999985 +0200
+@@ -2,7 +2,7 @@
+ 
+ include_HEADERS = $(top_srcdir)/include/libmp3splt/mp3splt.h
+ 
+-INCLUDES=-DSPLT_PLUGINS_DIR=\"$(libdir)/libmp3splt\" @INCLTDL@
++INCLUDES=-DSPLT_PLUGINS_DIR=\"$(libdir)/libmp3splt$(SONAME)\" @INCLTDL@
+ 
+ lib_LTLIBRARIES = libmp3splt.la
+ 
+--- plugins/Makefile.in.orig	2011-07-21 12:08:26.783999986 +0200
++++ plugins/Makefile.in	2011-07-21 12:09:12.569999984 +0200
+@@ -292,13 +292,13 @@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
@@ -13,11 +35,11 @@
  common_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs \
 -	-L/lib -no-undefined -lm -lmp3splt @LIBINTL@ $(am__append_1)
 +	-no-undefined -lm -lmp3splt @LIBINTL@ $(am__append_1)
- @MP3_PLUGIN_TRUE@libsplt_mp3_la_SOURCES = mp3.c mp3.h
- @MP3_PLUGIN_TRUE@libsplt_mp3_la_CPPFLAGS = $(common_CPPFLAGS) \
- @MP3_PLUGIN_TRUE@	@MAD_CFLAGS@ $(am__append_3) $(am__append_4)
---- plugins/Makefile.am.orig	2011-04-27 18:15:10.000000000 +0200
-+++ plugins/Makefile.am	2011-04-27 18:15:34.000000000 +0200
+ @MP3_PLUGIN_TRUE@libsplt_mp3_la_SOURCES = mp3.c mp3.h mp3_silence.c mp3_silence.h mp3_utils.c mp3_utils.h \
+ @MP3_PLUGIN_TRUE@silence_processors.c silence_processors.h
+ 
+--- plugins/Makefile.am.orig	2011-07-21 12:09:15.549999984 +0200
++++ plugins/Makefile.am	2011-07-21 12:09:29.767999985 +0200
 @@ -1,10 +1,10 @@
 -plugindir=$(libdir)/libmp3splt
 +plugindir=$(libdir)/libmp3splt$(SONAME)
@@ -31,25 +53,3 @@
     -no-undefined -lm -lmp3splt @LIBINTL@
  
  if WIN32
---- src/Makefile.in.orig	2011-04-27 18:16:28.000000000 +0200
-+++ src/Makefile.in	2011-04-27 18:16:49.000000000 +0200
-@@ -293,7 +293,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- include_HEADERS = $(top_srcdir)/include/libmp3splt/mp3splt.h
--INCLUDES = -DSPLT_PLUGINS_DIR=\"$(libdir)/libmp3splt\" @INCLTDL@ \
-+INCLUDES = -DSPLT_PLUGINS_DIR=\"$(libdir)/libmp3splt$(SONAME)\" @INCLTDL@ \
- 	$(am__append_2) $(am__append_3)
- lib_LTLIBRARIES = libmp3splt.la
- libmp3splt_la_LDFLAGS = -no-undefined -version-info 0:5:0
---- src/Makefile.am.orig	2011-04-27 18:16:06.000000000 +0200
-+++ src/Makefile.am	2011-04-27 18:16:20.000000000 +0200
-@@ -2,7 +2,7 @@
- 
- include_HEADERS = $(top_srcdir)/include/libmp3splt/mp3splt.h
- 
--INCLUDES=-DSPLT_PLUGINS_DIR=\"$(libdir)/libmp3splt\" @INCLTDL@
-+INCLUDES=-DSPLT_PLUGINS_DIR=\"$(libdir)/libmp3splt$(SONAME)\" @INCLTDL@
- 
- lib_LTLIBRARIES = libmp3splt.la
-

libmp3splt-0.6.1a.tar.bz2/ChangeLog -> libmp3splt-0.7.tar.bz2/ChangeLog Changed

libmp3splt-0.6.1a.tar.bz2/Makefile.in -> libmp3splt-0.7.tar.bz2/Makefile.in Changed

libmp3splt-0.6.1a.tar.bz2/NEWS -> libmp3splt-0.7.tar.bz2/NEWS Changed

libmp3splt-0.6.1a.tar.bz2/README -> libmp3splt-0.7.tar.bz2/README Changed

libmp3splt-0.6.1a.tar.bz2/aclocal.m4 -> libmp3splt-0.7.tar.bz2/aclocal.m4 Changed

@@ -13,8 +13,8 @@
 
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.67,,
-m4_warning(this file was generated for autoconf 2.67.
+m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.68,,
+m4_warning(this file was generated for autoconf 2.68.
 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'.))
@@ -87,7 +87,7 @@
 	   ;; #(
 	 *) lt_cv_sys_argz_works=yes ;;
 	 esac)
-     AS_IF(test $lt_cv_sys_argz_works = yes,
+     AS_IF(test "$lt_cv_sys_argz_works" = yes,
         AC_DEFINE(HAVE_WORKING_ARGZ, 1,
                    This value is set to 1 to indicate that the system argz facility works),
         ARGZ_H=argz.h
@@ -102,7 +102,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+#                 Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -111,7 +112,8 @@
 
 m4_define(_LT_COPYING, dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+#                 Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -138,7 +140,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 )
 
-# serial 56 LT_INIT
+# serial 57 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -167,6 +169,7 @@
 # ------------------
 AC_DEFUN(LT_INIT,
 AC_PREREQ(2.58)dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT)dnl
 AC_BEFORE($0, LT_LANG)dnl
 AC_BEFORE($0, LT_OUTPUT)dnl
 AC_BEFORE($0, LTDL_INIT)dnl
@@ -183,6 +186,8 @@
 AC_REQUIRE(LTOBSOLETE_VERSION)dnl
 m4_require(_LT_PROG_LTMAIN)dnl
 
+_LT_SHELL_INIT(SHELL=${CONFIG_SHELL-/bin/sh})
+
 dnl Parse OPTIONS
 _LT_SET_OPTIONS($0, $1)
 
@@ -219,7 +224,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 )
 
 
@@ -239,6 +244,9 @@
 m4_defun(_LT_SETUP,
 AC_REQUIRE(AC_CANONICAL_HOST)dnl
 AC_REQUIRE(AC_CANONICAL_BUILD)dnl
+AC_REQUIRE(_LT_PREPARE_SED_QUOTE_VARS)dnl
+AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl
+
 _LT_DECL(, host_alias, 0, The host system)dnl
 _LT_DECL(, host, 0)dnl
 _LT_DECL(, host_os, 0)dnl
@@ -261,10 +269,13 @@
 dnl
 m4_require(_LT_FILEUTILS_DEFAULTS)dnl
 m4_require(_LT_CHECK_SHELL_FEATURES)dnl
+m4_require(_LT_PATH_CONVERSION_FUNCTIONS)dnl
 m4_require(_LT_CMD_RELOAD)dnl
 m4_require(_LT_CHECK_MAGIC_METHOD)dnl
+m4_require(_LT_CHECK_SHAREDLIB_FROM_LINKLIB)dnl
 m4_require(_LT_CMD_OLD_ARCHIVE)dnl
 m4_require(_LT_CMD_GLOBAL_SYMBOLS)dnl
+m4_require(_LT_WITH_SYSROOT)dnl
 
 _LT_CONFIG_LIBTOOL_INIT(
 # See if we are running on zsh, and set the options which allow our
@@ -280,7 +291,6 @@
 _LT_CHECK_OBJDIR
 
 m4_require(_LT_TAG_COMPILER)dnl
-_LT_PROG_ECHO_BACKSLASH
 
 case $host_os in
 aix3*)
@@ -294,23 +304,6 @@
   ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/$"`$\\$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$"`\\$/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -351,6 +344,28 @@
 )# _LT_SETUP
 
 
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun(_LT_PREPARE_SED_QUOTE_VARS,
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/$"`$\\$/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/$"`\\$/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+)
+
 # _LT_PROG_LTMAIN
 # ---------------
 # Note that this code is called both from `configure', and `config.status'
@@ -503,7 +518,7 @@
 # declaration there will have the same value as in `configure'.  VARNAME
 # must have a single quote delimited value for this to work.
 m4_define(_LT_CONFIG_STATUS_DECLARE,
-$1='`$ECHO "X$$1" | $Xsed -e "$delay_single_quote_subst"`')
+$1='`$ECHO "$$1" | $SED "$delay_single_quote_subst"`')
 
 
 # _LT_CONFIG_STATUS_DECLARATIONS
@@ -513,7 +528,7 @@
 # embedded single quotes properly.  In configure, this macro expands
 # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
 #
-#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
 m4_defun(_LT_CONFIG_STATUS_DECLARATIONS,
 m4_foreach(_lt_var, m4_quote(lt_decl_all_varnames),
     m4_n(_LT_CONFIG_STATUS_DECLARE(_lt_var))))
@@ -612,12 +627,20 @@
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
 # Quote evaled strings.
 for var in lt_decl_all_varnames( \
 , lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *\\\\\\\`\\"\\\$*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)

libmp3splt-0.6.1a.tar.bz2/config.h.in -> libmp3splt-0.7.tar.bz2/config.h.in Changed

libmp3splt-0.6.1a.tar.bz2/configure -> libmp3splt-0.7.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for libmp3splt 0.6.1a.
+# Generated by GNU Autoconf 2.68 for libmp3splt 0.7.
 #
 # Report bugs to <io_fx@yahoo.fr>.
 #
@@ -91,6 +91,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *\\/* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -173,7 +174,15 @@
   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'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
+test \$(( 1 + 1 )) = 2 || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
 else
@@ -216,11 +225,18 @@
   # 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
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	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+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -528,160 +544,13 @@
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%^_$as_cr_alnum%_%g'"
 
-
 lt_ltdl_dir='libltdl'
 
-
-# Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-$*
-_LT_EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
-
-	  if test "$prev" != 'sed 50q "$0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from

libmp3splt-0.6.1a.tar.bz2/configure.ac -> libmp3splt-0.7.tar.bz2/configure.ac Changed

libmp3splt-0.6.1a.tar.bz2/debian/changelog -> libmp3splt-0.7.tar.bz2/debian/changelog Changed

libmp3splt-0.6.1a.tar.bz2/debian/control -> libmp3splt-0.7.tar.bz2/debian/control Changed

libmp3splt-0.6.1a.tar.bz2/debian/copyright -> libmp3splt-0.7.tar.bz2/debian/copyright Changed

libmp3splt-0.6.1a.tar.bz2/doc/Makefile.in -> libmp3splt-0.7.tar.bz2/doc/Makefile.in Changed

libmp3splt-0.6.1a.tar.bz2/include/libmp3splt/mp3splt.h -> libmp3splt-0.7.tar.bz2/include/libmp3splt/mp3splt.h Changed

@@ -248,8 +248,15 @@
    * @brief tags version (for mp3): 1 or 2 or 1 & 2
    */
   int tags_version;
+
+  int set_original_tags;
 } splt_tags;
 
+typedef struct {
+  splt_tags tags;
+  void *all_original_tags;
+} splt_original_tags;
+
 /**
  * @brief Definition of a splitpoint
  *
@@ -423,6 +430,10 @@
    */
   SPLT_OPTION_SILENCE_MODE,
   /**
+   * Split with trim silence detection
+   */
+  SPLT_OPTION_TRIM_SILENCE_MODE,
+  /**
    * Split with error mode 
    * It is useful to split large file derivated from a concatenation of
    * smaller files
@@ -524,6 +535,11 @@
  * See #mp3splt_set_oformat
  */
 #define SPLT_DEFAULT_SILENCE_OUTPUT "@f_silence_@n"
+/**
+ * @brief Default output for the trim silence split.
+ * See #mp3splt_set_oformat
+ */
+#define SPLT_DEFAULT_TRIM_SILENCE_OUTPUT "@f_trimmed"
 
 //!structure with all the options supplied to split the file
 typedef struct {
@@ -531,6 +547,7 @@
      - SPLT_OPTION_NORMAL_MODE
      - SPLT_OPTION_WRAP_MODE
      - SPLT_OPTION_SILENCE_MODE
+     - SPLT_OPTION_TRIM_SILENCE_MODE
      - SPLT_OPTION_ERROR_MODE
      - SPLT_OPTION_TIME_MODE
   */
@@ -714,7 +731,9 @@
   double (*split)(void *state, const char *final_fname, double begin_point,
       double end_point, int *error, int save_end_point);
   int (*scan_silence)(void *state, int *error);
+  int (*scan_trim_silence)(void *state, int *error);
   void (*set_original_tags)(void *state, int *error);
+  void (*clear_original_tags)(splt_original_tags *original_tags);
   void (*init)(void *state, int *error);
   void (*end)(void *state, int *error);
 } splt_plugin_func;
@@ -770,7 +789,7 @@
   char *default_genre_tag;
 
   //!tags of the original file to split
-  splt_tags original_tags;
+  splt_original_tags original_tags;
 
   //!options for the split
   splt_options options;
@@ -829,6 +848,7 @@
   SPLT_NO_SILENCE_SPLITPOINTS_FOUND = 7,
   SPLT_OK_SPLIT_EOF = 8,
   SPLT_LENGTH_SPLIT_OK = 9,
+  SPLT_TRIM_SILENCE_OK = 10,
 
   SPLT_FREEDB_OK = 100,
   SPLT_FREEDB_FILE_OK = 101,
@@ -881,6 +901,7 @@
   SPLT_ERROR_TIME_SPLIT_VALUE_INVALID = -34,
   SPLT_ERROR_LENGTH_SPLIT_VALUE_INVALID = -35,
   SPLT_ERROR_CANNOT_GET_TOTAL_TIME = -36,
+  SPLT_ERROR_LIBID3 = -37,
 
   SPLT_FREEDB_ERROR_INITIALISE_SOCKET = -101,
   SPLT_FREEDB_ERROR_CANNOT_GET_HOST = -102,
@@ -898,6 +919,7 @@
   SPLT_INVALID_CDDB_FILE = -116,
   SPLT_FREEDB_NO_SUCH_CD_IN_DATABASE = -118,
   SPLT_FREEDB_ERROR_SITE = -119,
+  SPLT_FREEDB_ERROR_CANNOT_DISCONNECT = -120,
 
   SPLT_DEWRAP_ERR_FILE_LENGTH = -200,
   SPLT_DEWRAP_ERR_VERSION_OLD = -201,
@@ -1109,8 +1131,8 @@
   /**
    * The threshold  level (dB) to be considered silence\n
    * It is a float number between -96 and 0. It is used when
-   * having a #SPLT_OPTION_SILENCE_MODE split or when having the
-   * #SPLT_OPT_AUTO_ADJUST option
+   * having a #SPLT_OPTION_SILENCE_MODE or a #SPLT_OPTION_TRIM_SILENCE_MODE split
+   * or when having the #SPLT_OPT_AUTO_ADJUST option
    *
    * The option can take float values between -96 and 0
    *
@@ -1119,8 +1141,8 @@
   SPLT_OPT_PARAM_THRESHOLD,
   /**
    * Allows you to adjust the offset of cutpoint in silence time when
-   * having a #SPLT_OPTION_SILENCE_MODE split or when having the
-   * #SPLT_OPT_AUTO_ADJUST option
+   * having a #SPLT_OPTION_SILENCE_MODE or a #SPLT_OPTION_TRIM_SILENCE_MODE split
+   * or when having the #SPLT_OPT_AUTO_ADJUST option
    *
    * The option can take float values between -2 and 2\n
    * 0  is  the begin of silence, and 1 the end
@@ -1281,7 +1303,7 @@
 /**
  * @brief Package version
  */
-#define SPLT_PACKAGE_VERSION "0.6.1a"
+#define SPLT_PACKAGE_VERSION "0.7"
 #endif
 /**
  * @brief Package authors

libmp3splt-0.6.1a.tar.bz2/libltdl/config/compile -> libmp3splt-0.7.tar.bz2/libltdl/config/compile Changed

libmp3splt-0.6.1a.tar.bz2/libltdl/config/config.guess -> libmp3splt-0.7.tar.bz2/libltdl/config/config.guess Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # 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
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2009-12-30'
+timestamp='2011-05-11'
 
 # 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
@@ -57,7 +57,7 @@
 
 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 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
 Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -181,7 +181,7 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -224,7 +224,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -270,7 +270,10 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^PVTX//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -296,7 +299,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.012*:*|arm:riscix:1.012*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -395,23 +398,23 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atariste:*MiNT:*:* | atariste:*mint:*:* | atariste:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atariste:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -481,8 +484,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if  $UNAME_PROCESSOR = mc88100  ||  $UNAME_PROCESSOR = mc88110 
 	then
 	    if  ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx  || \
@@ -495,7 +498,7 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -552,7 +555,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:456)
+    *:AIX:*:4567)
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -595,52 +598,52 @@
 	    9000/6780-90-9)
 		if  -x /usr/bin/getconf ; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if  "${HP_ARCH}" = "" ; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)

libmp3splt-0.6.1a.tar.bz2/libltdl/config/config.sub -> libmp3splt-0.7.tar.bz2/libltdl/config/config.sub Changed

libmp3splt-0.6.1a.tar.bz2/libltdl/config/ltmain.sh -> libmp3splt-0.7.tar.bz2/libltdl/config/ltmain.sh Changed

@@ -1,9 +1,9 @@
-# Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6b
+# libtool (GNU libtool) 2.4
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010 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.
 
@@ -32,50 +32,56 @@
 #
 # Provide generalized library-building support services.
 #
-#     --config             show all configuration variables
-#     --debug              enable verbose shell tracing
-# -n, --dry-run            display commands without modifying any files
-#     --features           display basic configuration information and exit
-#     --mode=MODE          use operation mode MODE
-#     --preserve-dup-deps  don't remove duplicate dependency libraries
-#     --quiet, --silent    don't print informational messages
-#     --tag=TAG            use configuration variables from tag TAG
-# -v, --verbose            print informational messages (default)
-#     --version            print version information
-# -h, --help               print short or long help message
+#       --config             show all configuration variables
+#       --debug              enable verbose shell tracing
+#   -n, --dry-run            display commands without modifying any files
+#       --features           display basic configuration information and exit
+#       --mode=MODE          use operation mode MODE
+#       --preserve-dup-deps  don't remove duplicate dependency libraries
+#       --quiet, --silent    don't print informational messages
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed help message
 #
 # MODE must be one of the following:
 #
-#       clean              remove files from the build directory
-#       compile            compile a source file into a libtool object
-#       execute            automatically set library path, then run a program
-#       finish             complete the installation of libtool libraries
-#       install            install libraries or executables
-#       link               create a library or an executable
-#       uninstall          remove libraries from an installed directory
+#         clean              remove files from the build directory
+#         compile            compile a source file into a libtool object
+#         execute            automatically set library path, then run a program
+#         finish             complete the installation of libtool libraries
+#         install            install libraries or executables
+#         link               create a library or an executable
+#         uninstall          remove libraries from an installed directory
 #
-# MODE-ARGS vary depending on the MODE.
+# MODE-ARGS vary depending on the MODE.  When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
 # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
 #
 # When reporting a bug, please describe a test case to reproduce it and
 # include the following information:
 #
-#       host-triplet:	$host
-#       shell:		$SHELL
-#       compiler:		$LTCC
-#       compiler flags:		$LTCFLAGS
-#       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2
-#       automake:		$automake_version
-#       autoconf:		$autoconf_version
+#         host-triplet:	$host
+#         shell:		$SHELL
+#         compiler:		$LTCC
+#         compiler flags:		$LTCFLAGS
+#         linker:		$LD (gnu? $with_gnu_ld)
+#         $progname:	(GNU libtool) 2.4 Debian-2.4-2
+#         automake:	$automake_version
+#         autoconf:	$autoconf_version
 #
 # Report bugs to <bug-libtool@gnu.org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
-PROGRAM=ltmain.sh
+PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2"
+VERSION="2.4 Debian-2.4-2"
 TIMESTAMP=""
-package_revision=1.3017
+package_revision=1.3293
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -91,10 +97,15 @@
 BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
 # NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
 lt_user_locale=
 lt_safe_locale=
 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -107,15 +118,24 @@
 	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
 	fi"
 done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
 
 $lt_unset CDPATH
 
 
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
 
 
 
 : ${CP="cp -f"}
-: ${ECHO="echo"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
 : ${EGREP="/bin/grep -E"}
 : ${FGREP="/bin/grep -F"}
 : ${GREP="/bin/grep"}
@@ -144,6 +164,27 @@
 dirname="s,/^/*$,,"
 basename="s,^.*/,,"
 
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
 # func_dirname_and_basename file append nondir_replacement
 # perform func_basename and func_dirname in a single function
 # call:
@@ -158,33 +199,183 @@
 # those functions but instead duplicate the functionality here.
 func_dirname_and_basename ()
 {
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by extended shell implementation
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading

libmp3splt-0.6.1a.tar.bz2/m4/Makefile.in -> libmp3splt-0.7.tar.bz2/m4/Makefile.in Changed

libmp3splt-0.6.1a.tar.bz2/plugins/Makefile.am -> libmp3splt-0.7.tar.bz2/plugins/Makefile.am Changed

libmp3splt-0.6.1a.tar.bz2/plugins/Makefile.in -> libmp3splt-0.7.tar.bz2/plugins/Makefile.in Changed

@@ -84,16 +84,26 @@
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libsplt_mp3_la_DEPENDENCIES =
-am__libsplt_mp3_la_SOURCES_DIST = mp3.c mp3.h
-@MP3_PLUGIN_TRUE@am_libsplt_mp3_la_OBJECTS = libsplt_mp3_la-mp3.lo
+am__libsplt_mp3_la_SOURCES_DIST = mp3.c mp3.h mp3_silence.c \
+	mp3_silence.h mp3_utils.c mp3_utils.h silence_processors.c \
+	silence_processors.h
+@MP3_PLUGIN_TRUE@am_libsplt_mp3_la_OBJECTS = libsplt_mp3_la-mp3.lo \
+@MP3_PLUGIN_TRUE@	libsplt_mp3_la-mp3_silence.lo \
+@MP3_PLUGIN_TRUE@	libsplt_mp3_la-mp3_utils.lo \
+@MP3_PLUGIN_TRUE@	libsplt_mp3_la-silence_processors.lo
 libsplt_mp3_la_OBJECTS = $(am_libsplt_mp3_la_OBJECTS)
 libsplt_mp3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libsplt_mp3_la_LDFLAGS) $(LDFLAGS) -o $@
 @MP3_PLUGIN_TRUE@am_libsplt_mp3_la_rpath = -rpath $(plugindir)
 libsplt_ogg_la_LIBADD =
-am__libsplt_ogg_la_SOURCES_DIST = ogg.c ogg.h
-@OGG_PLUGIN_TRUE@am_libsplt_ogg_la_OBJECTS = libsplt_ogg_la-ogg.lo
+am__libsplt_ogg_la_SOURCES_DIST = ogg.c ogg.h ogg_silence.c \
+	ogg_silence.h ogg_utils.c ogg_utils.h silence_processors.c \
+	silence_processors.h
+@OGG_PLUGIN_TRUE@am_libsplt_ogg_la_OBJECTS = libsplt_ogg_la-ogg.lo \
+@OGG_PLUGIN_TRUE@	libsplt_ogg_la-ogg_silence.lo \
+@OGG_PLUGIN_TRUE@	libsplt_ogg_la-ogg_utils.lo \
+@OGG_PLUGIN_TRUE@	libsplt_ogg_la-silence_processors.lo
 libsplt_ogg_la_OBJECTS = $(am_libsplt_ogg_la_OBJECTS)
 libsplt_ogg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -187,6 +197,7 @@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -229,6 +240,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -261,7 +273,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 ltdl_LIBOBJS = @ltdl_LIBOBJS@
 ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
 mandir = @mandir@
@@ -288,12 +299,16 @@
 common_CPPFLAGS = -I$(top_srcdir)/include/libmp3splt -I$(top_srcdir)/src
 common_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs \
 	-L/lib -no-undefined -lm -lmp3splt @LIBINTL@ $(am__append_1)
-@MP3_PLUGIN_TRUE@libsplt_mp3_la_SOURCES = mp3.c mp3.h
+@MP3_PLUGIN_TRUE@libsplt_mp3_la_SOURCES = mp3.c mp3.h mp3_silence.c mp3_silence.h mp3_utils.c mp3_utils.h \
+@MP3_PLUGIN_TRUE@silence_processors.c silence_processors.h
+
 @MP3_PLUGIN_TRUE@libsplt_mp3_la_CPPFLAGS = $(common_CPPFLAGS) \
 @MP3_PLUGIN_TRUE@	@MAD_CFLAGS@ $(am__append_3) $(am__append_4)
 @MP3_PLUGIN_TRUE@libsplt_mp3_la_LDFLAGS = $(common_LDFLAGS) @MAD_LIBS@
 @ID3TAG_TRUE@@MP3_PLUGIN_TRUE@libsplt_mp3_la_LIBADD = @ID3_LIBS@
-@OGG_PLUGIN_TRUE@libsplt_ogg_la_SOURCES = ogg.c ogg.h
+@OGG_PLUGIN_TRUE@libsplt_ogg_la_SOURCES = ogg.c ogg.h ogg_silence.c ogg_silence.h ogg_utils.c ogg_utils.h \
+@OGG_PLUGIN_TRUE@silence_processors.c silence_processors.h
+
 @OGG_PLUGIN_TRUE@libsplt_ogg_la_CPPFLAGS = $(common_CPPFLAGS) @OGG_CFLAGS@ @VORBIS_CFLAGS@
 @OGG_PLUGIN_TRUE@libsplt_ogg_la_LDFLAGS = $(common_LDFLAGS) @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ 
 all: all-am
@@ -373,7 +388,13 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsplt_mp3_la-mp3.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsplt_mp3_la-mp3_silence.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsplt_mp3_la-mp3_utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsplt_mp3_la-silence_processors.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsplt_ogg_la-ogg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsplt_ogg_la-ogg_silence.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsplt_ogg_la-ogg_utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsplt_ogg_la-silence_processors.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -403,6 +424,27 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_mp3_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsplt_mp3_la-mp3.lo `test -f 'mp3.c' || echo '$(srcdir)/'`mp3.c
 
+libsplt_mp3_la-mp3_silence.lo: mp3_silence.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_mp3_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsplt_mp3_la-mp3_silence.lo -MD -MP -MF $(DEPDIR)/libsplt_mp3_la-mp3_silence.Tpo -c -o libsplt_mp3_la-mp3_silence.lo `test -f 'mp3_silence.c' || echo '$(srcdir)/'`mp3_silence.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libsplt_mp3_la-mp3_silence.Tpo $(DEPDIR)/libsplt_mp3_la-mp3_silence.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp3_silence.c' object='libsplt_mp3_la-mp3_silence.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_mp3_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsplt_mp3_la-mp3_silence.lo `test -f 'mp3_silence.c' || echo '$(srcdir)/'`mp3_silence.c
+
+libsplt_mp3_la-mp3_utils.lo: mp3_utils.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_mp3_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsplt_mp3_la-mp3_utils.lo -MD -MP -MF $(DEPDIR)/libsplt_mp3_la-mp3_utils.Tpo -c -o libsplt_mp3_la-mp3_utils.lo `test -f 'mp3_utils.c' || echo '$(srcdir)/'`mp3_utils.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libsplt_mp3_la-mp3_utils.Tpo $(DEPDIR)/libsplt_mp3_la-mp3_utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp3_utils.c' object='libsplt_mp3_la-mp3_utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_mp3_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsplt_mp3_la-mp3_utils.lo `test -f 'mp3_utils.c' || echo '$(srcdir)/'`mp3_utils.c
+
+libsplt_mp3_la-silence_processors.lo: silence_processors.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_mp3_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsplt_mp3_la-silence_processors.lo -MD -MP -MF $(DEPDIR)/libsplt_mp3_la-silence_processors.Tpo -c -o libsplt_mp3_la-silence_processors.lo `test -f 'silence_processors.c' || echo '$(srcdir)/'`silence_processors.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libsplt_mp3_la-silence_processors.Tpo $(DEPDIR)/libsplt_mp3_la-silence_processors.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='silence_processors.c' object='libsplt_mp3_la-silence_processors.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_mp3_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsplt_mp3_la-silence_processors.lo `test -f 'silence_processors.c' || echo '$(srcdir)/'`silence_processors.c
+
 libsplt_ogg_la-ogg.lo: ogg.c
 @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_ogg_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsplt_ogg_la-ogg.lo -MD -MP -MF $(DEPDIR)/libsplt_ogg_la-ogg.Tpo -c -o libsplt_ogg_la-ogg.lo `test -f 'ogg.c' || echo '$(srcdir)/'`ogg.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libsplt_ogg_la-ogg.Tpo $(DEPDIR)/libsplt_ogg_la-ogg.Plo
@@ -410,6 +452,27 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_ogg_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsplt_ogg_la-ogg.lo `test -f 'ogg.c' || echo '$(srcdir)/'`ogg.c
 
+libsplt_ogg_la-ogg_silence.lo: ogg_silence.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_ogg_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsplt_ogg_la-ogg_silence.lo -MD -MP -MF $(DEPDIR)/libsplt_ogg_la-ogg_silence.Tpo -c -o libsplt_ogg_la-ogg_silence.lo `test -f 'ogg_silence.c' || echo '$(srcdir)/'`ogg_silence.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libsplt_ogg_la-ogg_silence.Tpo $(DEPDIR)/libsplt_ogg_la-ogg_silence.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ogg_silence.c' object='libsplt_ogg_la-ogg_silence.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_ogg_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsplt_ogg_la-ogg_silence.lo `test -f 'ogg_silence.c' || echo '$(srcdir)/'`ogg_silence.c
+
+libsplt_ogg_la-ogg_utils.lo: ogg_utils.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_ogg_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsplt_ogg_la-ogg_utils.lo -MD -MP -MF $(DEPDIR)/libsplt_ogg_la-ogg_utils.Tpo -c -o libsplt_ogg_la-ogg_utils.lo `test -f 'ogg_utils.c' || echo '$(srcdir)/'`ogg_utils.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libsplt_ogg_la-ogg_utils.Tpo $(DEPDIR)/libsplt_ogg_la-ogg_utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ogg_utils.c' object='libsplt_ogg_la-ogg_utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_ogg_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsplt_ogg_la-ogg_utils.lo `test -f 'ogg_utils.c' || echo '$(srcdir)/'`ogg_utils.c
+
+libsplt_ogg_la-silence_processors.lo: silence_processors.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_ogg_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsplt_ogg_la-silence_processors.lo -MD -MP -MF $(DEPDIR)/libsplt_ogg_la-silence_processors.Tpo -c -o libsplt_ogg_la-silence_processors.lo `test -f 'silence_processors.c' || echo '$(srcdir)/'`silence_processors.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libsplt_ogg_la-silence_processors.Tpo $(DEPDIR)/libsplt_ogg_la-silence_processors.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='silence_processors.c' object='libsplt_ogg_la-silence_processors.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_ogg_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsplt_ogg_la-silence_processors.lo `test -f 'silence_processors.c' || echo '$(srcdir)/'`silence_processors.c
+
 mostlyclean-libtool:
 	-rm -f *.lo

libmp3splt-0.6.1a.tar.bz2/plugins/mp3.c -> libmp3splt-0.7.tar.bz2/plugins/mp3.c Changed

@@ -29,20 +29,11 @@
 The Plug-in that handles mp3 files
 */
 
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <math.h>
-#include <ctype.h>
-
-#ifdef __WIN32__
-#include <io.h>
-#include <fcntl.h>
-#endif
-
 #include "splt.h"
+
 #include "mp3.h"
+#include "mp3_silence.h"
+#include "mp3_utils.h"
 
 /****************************/
 /* mp3 constants */
@@ -60,17 +51,6 @@
 	"?"
 };
 
-//! The layer- and-bitrate-table
-static const int splt_mp3_tabsel_1232316 = {
-  { {128,32,64,96,128,160,192,224,256,288,320,352,384,416,448,},
-    {128,32,48,56, 64, 80, 96,112,128,160,192,224,256,320,384,},
-    {128,32,40,48, 56, 64, 80, 96,112,128,160,192,224,256,320,} },
-
-  { {128,32,48,56,64,80,96,112,128,144,160,176,192,224,256,},
-    {128,8,16,24,32,40,48,56,64,80,96,112,128,144,160,},
-    {128,8,16,24,32,40,48,56,64,80,96,112,128,144,160,} }
-};
-
 /*! A table needed for fast crc32 computation
 
  */
@@ -214,7 +194,6 @@
   return file_output;
 }
 
-
 /****************************/
 /* CRC functions */
 
@@ -243,257 +222,30 @@
   return (crc ^ 0xFFFFFFFF);
 }
 
-/****************************/
-/* mp3 utils */
-
-//! Initializes a stream frame
-static void splt_mp3_init_stream_frame(splt_mp3_state *mp3state)
-{
-  mad_stream_init(&mp3state->stream);
-  mad_frame_init(&mp3state->frame);
-}
-
-//! Finishes a stream frame
-static void splt_mp3_finish_stream_frame(splt_mp3_state *mp3state)
-{
-  mad_stream_finish(&mp3state->stream);
-  mad_frame_finish(&mp3state->frame);
-}
-
-/*! does nothing important for libmp3splt
+/*! frees the splt_mp3_state structure
 
-\todo review this..
+used by the splt_t_state_free() function
 */
-static void splt_mp3_checksync (splt_mp3_state *mp3state)
-{
-  //char junk32;
-  //fprintf(stderr, "\nWarning: Too many sync errors! This may not be a mp3 file. Continue? (y/n) ");
-  //fgets(junk, 31, stdin);
-  //if (junk0=='y')
-
-  //we don't use user interactivity in a library
-  //always continue
-  mp3state->syncdetect = 0;
-
-  //else error("Aborted.",125);
-}
-
-//!calculates bitrate
-static int splt_mp3_c_bitrate (unsigned long head)
-{
-  if ((head & 0xffe00000) != 0xffe00000) return 0;
-  if (!((head>>17)&3)) return 0;
-  if (((head>>12)&0xf) == 0xf) return 0;
-  if (!((head >> 12) & 0xf)) return 0;
-  if (((head>>10)&0x3) == 0x3 ) return 0;
-  if (((head >> 19) & 1)==1 && ((head>>17)&3)==3 && 
-      ((head>>16)&1)==1) return 0;
-  if ((head & 0xffff0000) == 0xfffe0000) return 0;
-
-  return ((head>>12)&0xf);
-}
-
-//!make mp3 header bitrate, padding, offset, framesize
-static struct splt_header splt_mp3_makehead (unsigned long headword, 
-    struct splt_mp3 mp3f, struct splt_header head, off_t ptr)
-{
-  head.ptr = ptr;
-  head.bitrate = splt_mp3_tabsel_1231 - mp3f.mpgidmp3f.layer-1splt_mp3_c_bitrate(headword);
-  head.padding = ((headword>>9)&0x1);
-  head.framesize = (head.bitrate*144000)/
-    (mp3f.freq<<(1 - mp3f.mpgid)) + head.padding;
-
-  return head;
-}
-
-//!finds first header from start_pos. Returns -1 if no header is found
-static off_t splt_mp3_findhead (splt_mp3_state *mp3state, off_t start)
-{
-  if (splt_io_get_word(mp3state->file_input, 
-        start, SEEK_SET, &mp3state->headw) == -1)
-  {
-    return -1;
-  }
-  if (feof(mp3state->file_input)) 
-  {
-    return -1;
-  }
-  while (!(splt_mp3_c_bitrate(mp3state->headw)))
-  {
-    if (feof(mp3state->file_input)) 
-    {
-      return -1;
-    }
-    mp3state->headw <<= 8;
-    mp3state->headw |= fgetc(mp3state->file_input);
-    start++;
-  }
-
-  return start;
-}
-
-//! Finds first valid header from start. Will work with high probabilty, i hope :)
-static off_t splt_mp3_findvalidhead (splt_mp3_state *mp3state, off_t start)
-{
-  off_t begin;
-  struct splt_header h;
-
-  begin = splt_mp3_findhead(mp3state, start);
-
-  do {
-    start = begin;
-    if (start == -1) 
-    {
-      break;
-    }
-    h = splt_mp3_makehead (mp3state->headw, mp3state->mp3file, h, start);
-    begin = splt_mp3_findhead(mp3state, (start + 1));
-  } while (begin!=(start + h.framesize));
-
-  return start;
-}
-
-//!finds xing info offset and returns it?
-static int splt_mp3_xing_info_off(splt_mp3_state *mp3state)
+static void splt_mp3_state_free(splt_state *state)
 {
-  unsigned long headw = 0;
-  int i;
-
-  for (i=0; i<mp3state->mp3file.xing; i++)
-  {
-    if ((headw == SPLT_MP3_XING_MAGIC) || 
-        (headw == SPLT_MP3_INFO_MAGIC)) // "Xing" or "Info"
-    {
-      return i;
-    }
-    headw <<= 8;
-    headw |= mp3state->mp3file.xingbufferi;
-  }
-
-  return 0;
-}
-
-/*! Get a frame
+  splt_mp3_state *mp3state = state->codec;
 
-\return  negative value means: error
-*/
-static int splt_mp3_get_frame(splt_mp3_state *mp3state)
-{
-  if(mp3state->stream.buffer==NULL || 
-      mp3state->stream.error==MAD_ERROR_BUFLEN)
+  if (mp3state)
   {
-    size_t readSize, remaining;
-    unsigned char *readStart;

libmp3splt-0.6.1a.tar.bz2/plugins/mp3.h -> libmp3splt-0.7.tar.bz2/plugins/mp3.h Changed

@@ -32,6 +32,18 @@
 
 #ifndef MP3SPLT_MP3_H
 
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <math.h>
+#include <ctype.h>
+
+#ifdef __WIN32__
+#include <io.h>
+#include <fcntl.h>
+#endif
+
 #ifndef NO_ID3TAG
 #include <id3tag.h>
 #endif
@@ -43,6 +55,11 @@
 
 #define SPLT_MAD_BSIZE 4032
 
+typedef struct {
+  id3_byte_t *tag_bytes;
+  id3_length_t tag_length;
+} tag_bytes_and_size;
+
 // Struct that will contain header's useful infos
 struct splt_header {
   off_t ptr;    // Offset of header
@@ -153,6 +170,17 @@
 
 #define SPLT_MP3EXT ".mp3"
 
+//! The layer- and-bitrate-table
+static const int splt_mp3_tabsel_1232316 = {
+  { {128,32,64,96,128,160,192,224,256,288,320,352,384,416,448,},
+    {128,32,48,56, 64, 80, 96,112,128,160,192,224,256,320,384,},
+    {128,32,40,48, 56, 64, 80, 96,112,128,160,192,224,256,320,} },
+
+  { {128,32,48,56,64,80,96,112,128,144,160,176,192,224,256,},
+    {128,8,16,24,32,40,48,56,64,80,96,112,128,144,160,},
+    {128,8,16,24,32,40,48,56,64,80,96,112,128,144,160,} }
+};
+
 #define MP3SPLT_MP3_H
 
 #endif

libmp3splt-0.7.tar.bz2/plugins/mp3_silence.c Added

@@ -0,0 +1,232 @@
+/**********************************************************
+ * libmp3splt -- library based on mp3splt,
+ *               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
+ *
+ *********************************************************/
+
+/**********************************************************
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307,
+ * USA.
+ *********************************************************/
+
+#include <stdio.h>
+
+#include "mp3.h"
+#include "mp3_silence.h"
+#include "mp3_utils.h"
+#include "silence_processors.h"
+
+static void splt_mp3_scan_silence_and_process(splt_state *state, off_t begin_offset, 
+    float max_threshold, unsigned long length, 
+    short process_silence(double time, int silence_was_found, short must_flush,
+      splt_scan_silence_data *ssd, int *found, int *error),
+    splt_scan_silence_data *ssd, int *error);
+static int splt_mp3_silence(splt_mp3_state *mp3state, int channels, mad_fixed_t threshold);
+
+/*! scan for silence
+
+\return 
+ - the number of silence points found
+ - -1 on error
+\param state The central structure libmp3splt keeps all of its data in
+\param error Contains the error number if an error has occoured
+\param length The time length to scan in seconds
+\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,
+    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); 
+  if (ssd == NULL)
+  {
+    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
+    return -1;
+  }
+
+  splt_mp3_scan_silence_and_process(state, begin, threshold, length, silence_processor, ssd, error);
+
+  int found = ssd->found;
+
+  splt_free_scan_silence_data(&ssd);
+
+  if (*error < 0)
+  {
+    found = -1;
+  }
+
+  return found;
+}
+
+static void splt_mp3_scan_silence_and_process(splt_state *state, off_t begin_offset, 
+    float max_threshold, unsigned long length, 
+    short process_silence(double time, int silence_was_found, short must_flush,
+      splt_scan_silence_data *ssd, int *found, int *error),
+    splt_scan_silence_data *ssd, int *error)
+{
+  int found = 0;
+  short stop = SPLT_FALSE;
+
+  mad_fixed_t threshold = mad_f_tofixed(splt_co_convert_from_dB(max_threshold));
+  splt_mp3_state *mp3state = state->codec;
+
+  splt_c_put_progress_text(state, SPLT_PROGRESS_SCAN_SILENCE);
+
+  //seek to the begin
+  if (fseeko(mp3state->file_input, begin_offset, SEEK_SET) == -1)
+  {
+    splt_e_set_strerror_msg_with_data(state, splt_t_get_filename_to_split(state));
+    *error = SPLT_ERROR_SEEKING_FILE;
+    return;
+  }
+
+  //initialise mad stuff
+  splt_mp3_init_stream_frame(mp3state);
+  mad_synth_init(&mp3state->synth);
+
+  mad_timer_reset(&mp3state->timer);
+
+  mp3state->temp_level = 0.0;
+
+  do {
+    int mad_err = SPLT_OK;
+
+    switch (splt_mp3_get_valid_frame(state, &mad_err))
+    {
+      case 1:
+        //1 we have a valid frame
+        mad_timer_add(&mp3state->timer, mp3state->frame.header.duration);
+        mad_synth_frame(&mp3state->synth, &mp3state->frame);
+        unsigned long time = (unsigned long) mad_timer_count(mp3state->timer, MAD_UNITS_CENTISECONDS);
+
+        int silence_was_found =
+          splt_mp3_silence(mp3state, MAD_NCHANNELS(&mp3state->frame.header), threshold);
+ 
+        int err = SPLT_OK;
+        short must_flush = (length > 0 && time >= length);
+        double time_in_double = (double) time / 100.f;
+        stop = process_silence(time_in_double, silence_was_found, must_flush, ssd, &found, &err);
+        if (stop || stop == -1)
+        {
+          stop = SPLT_TRUE;
+          if (err < 0) { *error = err; goto end; }
+        }
+
+        if (mp3state->mp3file.len > 0)
+        {
+          off_t pos = ftello(mp3state->file_input);
+
+          float level = splt_co_convert_to_dB(mad_f_todouble(mp3state->temp_level));
+          if (state->split.get_silence_level)
+          {
+            state->split.get_silence_level(time, level, state->split.silence_level_client_data);
+          }
+          state->split.p_bar->silence_db_level = level;
+          state->split.p_bar->silence_found_tracks = found;
+
+          //if we don't have silence split,
+          //put the 1/4 of progress
+          if ((splt_o_get_int_option(state, SPLT_OPT_SPLIT_MODE) != SPLT_OPTION_SILENCE_MODE) &&
+              (splt_o_get_int_option(state, SPLT_OPT_SPLIT_MODE) != SPLT_OPTION_TRIM_SILENCE_MODE))
+          {
+            splt_c_update_progress(state,(double)(time),
+                (double)(length), 4,1/(float)4, SPLT_DEFAULT_PROGRESS_RATE);
+          }
+          else
+          {
+            if (splt_t_split_is_canceled(state))
+            {
+              //split cancelled
+              stop = SPLT_TRUE;
+            }
+            splt_c_update_progress(state,(double)pos,
+                (double)(mp3state->mp3file.len), 1,0,SPLT_DEFAULT_PROGRESS_RATE);
+          }
+        }
+        break;
+      case 0:
+        //0 do nothing
+        break;
+      case -1:
+        //-1 means eof
+        stop = SPLT_TRUE;
+        break;
+      case -3:
+        //error from libmad
+        stop = SPLT_TRUE;
+        *error = mad_err;
+        break;
+      default:
+        break;
+    }
+
+  } while (!stop);
+
+  int junk;
+  int err = SPLT_OK;
+  process_silence(-1, SPLT_FALSE, SPLT_FALSE, ssd, &junk, &err);
+  if (err < 0) { *error = err; }
+ 
+  //only if we have silence mode, we set progress to 100%
+  if ((splt_o_get_int_option(state, SPLT_OPT_SPLIT_MODE) == SPLT_OPTION_SILENCE_MODE) ||
+      (splt_o_get_int_option(state, SPLT_OPT_SPLIT_MODE) == SPLT_OPTION_TRIM_SILENCE_MODE))
+  {
+    splt_c_update_progress(state,1.0,1.0,1,1,1);
+  }
+
+end:
+  //finish with mad_*
+  splt_mp3_finish_stream_frame(mp3state);
+  mad_synth_finish(&mp3state->synth);
+}
+

libmp3splt-0.7.tar.bz2/plugins/mp3_silence.h Added

@@ -0,0 +1,40 @@
+/**********************************************************
+ *
+ * libmp3splt -- library based on mp3splt,
+ *               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
+ *
+ * http://mp3splt.sourceforge.net
+ *
+ *********************************************************/
+
+/**********************************************************
+ *
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307,
+ * USA.
+ *
+ *********************************************************/
+
+#include "silence_processors.h"
+#include "splt.h"
+
+int splt_mp3_scan_silence(splt_state *state, off_t begin, unsigned long length,
+    float threshold, float min, 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));
+

libmp3splt-0.7.tar.bz2/plugins/mp3_utils.c Added

@@ -0,0 +1,278 @@
+/**********************************************************
+ * libmp3splt -- library based on mp3splt,
+ *               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
+ *
+ *********************************************************/
+
+/**********************************************************
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307,
+ * USA.
+ *********************************************************/
+
+#include "mp3_utils.h"
+
+//! Initializes a stream frame
+void splt_mp3_init_stream_frame(splt_mp3_state *mp3state)
+{
+  mad_stream_init(&mp3state->stream);
+  mad_frame_init(&mp3state->frame);
+}
+
+//! Finishes a stream frame
+void splt_mp3_finish_stream_frame(splt_mp3_state *mp3state)
+{
+  mad_stream_finish(&mp3state->stream);
+  mad_frame_finish(&mp3state->frame);
+}
+
+/*! does nothing important for libmp3splt
+
+\todo review this..
+*/
+void splt_mp3_checksync(splt_mp3_state *mp3state)
+{
+  //char junk32;
+  //fprintf(stderr, "\nWarning: Too many sync errors! This may not be a mp3 file. Continue? (y/n) ");
+  //fgets(junk, 31, stdin);
+  //if (junk0=='y')
+
+  //we don't use user interactivity in a library
+  //always continue
+  mp3state->syncdetect = 0;
+
+  //else error("Aborted.",125);
+}
+
+//!calculates bitrate
+int splt_mp3_c_bitrate(unsigned long head)
+{
+  if ((head & 0xffe00000) != 0xffe00000) return 0;
+  if (!((head>>17)&3)) return 0;
+  if (((head>>12)&0xf) == 0xf) return 0;
+  if (!((head >> 12) & 0xf)) return 0;
+  if (((head>>10)&0x3) == 0x3 ) return 0;
+  if (((head >> 19) & 1)==1 && ((head>>17)&3)==3 && 
+      ((head>>16)&1)==1) return 0;
+  if ((head & 0xffff0000) == 0xfffe0000) return 0;
+
+  return ((head>>12)&0xf);
+}
+
+//!make mp3 header bitrate, padding, offset, framesize
+struct splt_header splt_mp3_makehead(unsigned long headword, 
+    struct splt_mp3 mp3f, struct splt_header head, off_t ptr)
+{
+  head.ptr = ptr;
+  head.bitrate = splt_mp3_tabsel_1231 - mp3f.mpgidmp3f.layer-1splt_mp3_c_bitrate(headword);
+  head.padding = ((headword>>9)&0x1);
+  head.framesize = (head.bitrate*144000)/
+    (mp3f.freq<<(1 - mp3f.mpgid)) + head.padding;
+
+  return head;
+}
+
+//!finds first header from start_pos. Returns -1 if no header is found
+off_t splt_mp3_findhead(splt_mp3_state *mp3state, off_t start)
+{
+  if (splt_io_get_word(mp3state->file_input, 
+        start, SEEK_SET, &mp3state->headw) == -1)
+  {
+    return -1;
+  }
+  if (feof(mp3state->file_input)) 
+  {
+    return -1;
+  }
+  while (!(splt_mp3_c_bitrate(mp3state->headw)))
+  {
+    if (feof(mp3state->file_input)) 
+    {
+      return -1;
+    }
+    mp3state->headw <<= 8;
+    mp3state->headw |= fgetc(mp3state->file_input);
+    start++;
+  }
+
+  return start;
+}
+
+//! Finds first valid header from start. Will work with high probabilty, i hope :)
+off_t splt_mp3_findvalidhead(splt_mp3_state *mp3state, off_t start)
+{
+  off_t begin;
+  struct splt_header h;
+
+  begin = splt_mp3_findhead(mp3state, start);
+
+  do {
+    start = begin;
+    if (start == -1) 
+    {
+      break;
+    }
+    h = splt_mp3_makehead (mp3state->headw, mp3state->mp3file, h, start);
+    begin = splt_mp3_findhead(mp3state, (start + 1));
+  } while (begin!=(start + h.framesize));
+
+  return start;
+}
+
+//!finds xing info offset and returns it?
+int splt_mp3_xing_info_off(splt_mp3_state *mp3state)
+{
+  unsigned long headw = 0;
+  int i;
+
+  for (i=0; i<mp3state->mp3file.xing; i++)
+  {
+    if ((headw == SPLT_MP3_XING_MAGIC) || 
+        (headw == SPLT_MP3_INFO_MAGIC)) // "Xing" or "Info"
+    {
+      return i;
+    }
+    headw <<= 8;
+    headw |= mp3state->mp3file.xingbufferi;
+  }
+
+  return 0;
+}
+
+/*! Get a frame
+
+\return  negative value means: error
+*/
+int splt_mp3_get_frame(splt_mp3_state *mp3state)
+{
+  if(mp3state->stream.buffer==NULL || 
+      mp3state->stream.error==MAD_ERROR_BUFLEN)
+  {
+    size_t readSize, remaining;
+    unsigned char *readStart;
+
+    if (feof(mp3state->file_input))
+    {
+      return -2;
+    }
+
+    if(mp3state->stream.next_frame!=NULL)
+    {
+      remaining = mp3state->stream.bufend - mp3state->stream.next_frame;
+      memmove(mp3state->inputBuffer, mp3state->stream.next_frame, remaining);
+      readStart = mp3state->inputBuffer + remaining;
+      readSize = SPLT_MAD_BSIZE - remaining;
+    }
+    else
+    {
+      readSize = SPLT_MAD_BSIZE;
+      readStart=mp3state->inputBuffer;
+      remaining=0;
+    }
+
+    readSize=fread(readStart, 1, readSize, mp3state->file_input);
+    if (readSize <= 0)
+    {
+      return -2;
+    }
+
+    mp3state->buf_len = readSize + remaining;
+    mp3state->bytes += readSize;
+    //does not set any error
+    mad_stream_buffer(&mp3state->stream, mp3state->inputBuffer, 
+        readSize+remaining);
+    mp3state->stream.error = MAD_ERROR_NONE;

libmp3splt-0.7.tar.bz2/plugins/mp3_utils.h Added

@@ -0,0 +1,43 @@
+/**********************************************************
+ * libmp3splt -- library based on mp3splt,
+ *               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
+ *
+ *********************************************************/
+
+/**********************************************************
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307,
+ * USA.
+ *********************************************************/
+
+#include "splt.h"
+
+#include "mp3.h"
+
+void splt_mp3_init_stream_frame(splt_mp3_state *mp3state);
+void splt_mp3_finish_stream_frame(splt_mp3_state *mp3state);
+void splt_mp3_checksync(splt_mp3_state *mp3state);
+int splt_mp3_c_bitrate(unsigned long head);
+struct splt_header splt_mp3_makehead(unsigned long headword, 
+    struct splt_mp3 mp3f, struct splt_header head, off_t ptr);
+off_t splt_mp3_findhead(splt_mp3_state *mp3state, off_t start);
+off_t splt_mp3_findvalidhead(splt_mp3_state *mp3state, off_t start);
+int splt_mp3_xing_info_off(splt_mp3_state *mp3state);
+int splt_mp3_get_frame(splt_mp3_state *mp3state);
+int splt_mp3_get_valid_frame(splt_state *state, int *error);
+

libmp3splt-0.6.1a.tar.bz2/plugins/ogg.c -> libmp3splt-0.7.tar.bz2/plugins/ogg.c Changed

@@ -54,6 +54,8 @@
 
 #include "splt.h"
 #include "ogg.h"
+#include "ogg_utils.h"
+#include "ogg_silence.h"
 
 #define FIRST_GRANPOS 1
 
@@ -70,9 +72,8 @@
 /* some function prototypes */
 
 splt_ogg_state *splt_ogg_info(FILE *in, splt_state *state, int *error);
-int splt_ogg_scan_silence(splt_state *state, short seconds, 
-    float threshold, float min, short output, ogg_page *page,
-    ogg_int64_t granpos, int *error, long first_cut_granpos);
+static vorbis_comment *clone_vorbis_comment(vorbis_comment *comment);
+static void free_vorbis_comment(vorbis_comment *vc, short cloned_vorbis_comment);
 
 /****************************/
 /* ogg utils */
@@ -207,39 +208,6 @@
   }
 }
 
-static long splt_ogg_get_blocksize(splt_ogg_state *oggstate, 
-    vorbis_info *vi, ogg_packet *op)
-{
-  //if this < 0, there is a problem
-  int this = vorbis_packet_blocksize(vi, op);
-  int ret = (this + oggstate->prevW)/4;
-
-  oggstate->prevW = this;
-
-  return ret;
-}
-
-static int splt_ogg_update_sync(splt_state *state, ogg_sync_state *sync_in,
-    FILE *f, int *error)
-{
-  char *buffer = ogg_sync_buffer(sync_in, SPLT_OGG_BUFSIZE);
-  if (!buffer)
-  {
-    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
-    return -1;
-  }
-  int bytes = fread(buffer,1,SPLT_OGG_BUFSIZE,f);
-
-  if (ogg_sync_wrote(sync_in, bytes) != 0)
-  {
-    splt_e_set_error_data(state, splt_t_get_filename_to_split(state));
-    *error = SPLT_ERROR_INVALID;
-    return -1;
-  }
-
-  return bytes;
-}
-
 /* Returns 0 for success, or -1 on failure. */
 static int splt_ogg_write_pages_to_file(splt_state *state, 
     ogg_stream_state *stream, FILE *file, int flush, int *error,
@@ -323,7 +291,10 @@
       free(oggstate->headers);
       oggstate->headers = NULL;
     }
-    vorbis_comment_clear(&oggstate->vc);
+
+    free_vorbis_comment(&oggstate->vc, oggstate->cloned_vorbis_comment);
+    oggstate->cloned_vorbis_comment = 2;
+
     if(oggstate->vb)
     {
       vorbis_block_clear(oggstate->vb);
@@ -400,6 +371,8 @@
   }
   memset(oggstate->packets, 0, sizeof(splt_v_packet)*2);
 
+  oggstate->cloned_vorbis_comment = 2;
+
   return oggstate;
 
 error:
@@ -424,50 +397,159 @@
 /****************************/
 /* ogg tags */
 
-//puts tags in vc
-//what happens if 'vorbis_comment_add_tag(..)' fails ?
-//- ask vorbis developers
-static void splt_ogg_v_comment(splt_state *state, vorbis_comment *vc, char *artist,
-    char *album, char *title, char *tracknum, char *date, char *genre, char *comment,
+static void add_tag_and_equal(const char *tag_name, const char *value, splt_array *to_delete, 
     int *error)
 {
-  if (splt_o_get_int_option(state, SPLT_OPT_TAGS) == SPLT_TAGS_ORIGINAL_FILE &&
-      state->original_tags.tags_version == 0)
+  if (value == NULL) { return; }
+
+  size_t size = strlen(tag_name) + 2;
+  char *tag_and_equal = malloc(size);
+  if (tag_and_equal == NULL)
   {
+    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
     return;
   }
+  snprintf(tag_and_equal, size, "%s=", tag_name);
 
-  if (title != NULL)
+  int err = splt_array_append(to_delete, tag_and_equal);
+  if (err == -1)
   {
-    vorbis_comment_add_tag(vc, "title", title);
+    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
   }
-  if (artist != NULL)
+}
+
+static splt_array *build_tag_and_equal_to_delete(const char *artist, 
+    const char *album, const char *title, const char *tracknum,
+    const char *date, const char *genre, const char *comment, int *error)
+{
+  splt_array *to_delete = splt_array_new();
+
+  add_tag_and_equal(SPLT_OGG_TITLE, title, to_delete, error);
+  if (*error < 0) { goto error; }
+  add_tag_and_equal(SPLT_OGG_ARTIST, artist, to_delete, error);
+  if (*error < 0) { goto error; }
+  add_tag_and_equal(SPLT_OGG_ALBUM, album, to_delete, error);
+  if (*error < 0) { goto error; }
+  if (date != NULL && strlen(date) > 0) { add_tag_and_equal(SPLT_OGG_DATE, date, to_delete, error); }
+  if (*error < 0) { goto error; }
+  add_tag_and_equal(SPLT_OGG_GENRE, genre, to_delete, error);
+  if (*error < 0) { goto error; }
+  add_tag_and_equal(SPLT_OGG_TRACKNUMBER, tracknum, to_delete, error);
+  if (*error < 0) { goto error; }
+  add_tag_and_equal(SPLT_OGG_COMMENT, comment, to_delete, error);
+  if (*error < 0) { goto error; }
+
+  return to_delete;
+
+error:
+  splt_array_free(&to_delete);
+  return NULL;
+}
+
+static void delete_all_non_null_tags(vorbis_comment *vc, 
+    const char *artist, const char *album, const char *title,
+    const char *tracknum, const char *date, const char *genre, 
+    const char *comment, int *error)
+{
+  char *vendor_backup = NULL;
+  splt_array *tag_and_equal_to_delete = NULL;
+  splt_array *comments = NULL;
+  long i = 0, j = 0;
+
+  tag_and_equal_to_delete = 
+    build_tag_and_equal_to_delete(artist, album, title, tracknum, date, genre, comment, error);
+  if (*error < 0) { return; }
+
+  comments = splt_array_new();
+  if (comments == NULL) { goto end; }
+
+  for (i = 0;i < vc->comments; i++)
   {
-    vorbis_comment_add_tag(vc, "artist", artist);
+    short keep_comment = SPLT_TRUE;
+
+    long number_of_tags_to_delete = splt_array_get_number_of_elements(tag_and_equal_to_delete);
+    for (j = 0;j < number_of_tags_to_delete; j++)
+    {
+      char *tag_and_equal = (char *) splt_array_get(tag_and_equal_to_delete, j);
+
+      if (strncasecmp(vc->user_commentsi, 
+            tag_and_equal, strlen(tag_and_equal)) == 0)
+      {
+        keep_comment = SPLT_FALSE;
+        break;
+      }
+    }
+
+    if (keep_comment)
+    {
+      char *user_comment = NULL;
+      int err = splt_su_append(&user_comment, 
+          vc->user_commentsi, vc->comment_lengthsi, NULL);
+      if (err <  0) { *error = err; goto end; }
+      err = splt_array_append(comments, user_comment);
+      if (err == -1) { *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY; goto end; }
+    }
   }
-  if (album != NULL)
+
+  int err = splt_su_copy(vc->vendor, &vendor_backup);
+  if (err < 0) { *error = err; goto end; }
+
+  vorbis_comment_clear(vc);
+
+  long tags_to_keep = splt_array_get_number_of_elements(comments);
+  for (i = 0;i < tags_to_keep; i++)
   {

libmp3splt-0.6.1a.tar.bz2/plugins/ogg.h -> libmp3splt-0.7.tar.bz2/plugins/ogg.h Changed

libmp3splt-0.7.tar.bz2/plugins/ogg_silence.c Added

@@ -0,0 +1,380 @@
+/**********************************************************
+ *
+ * libmp3splt -- library based on mp3splt,
+ *               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>
+ *
+ * Parts of this file have been copied from the 'vcut' 1.6
+ * program provided with 'vorbis-tools' :
+ *      vcut (c) 2000-2001 Michael Smith <msmith@xiph.org>
+ *
+ * Some parts from a more recent version of vcut :
+ *           (c) 2008 Michael Gold <mgold@ncf.ca>
+ *
+ * http://mp3splt.sourceforge.net
+ *
+ *********************************************************/
+
+/**********************************************************
+ *
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307,
+ * USA.
+ *
+ *********************************************************/
+
+#include <string.h>
+#include <math.h>
+
+#include "ogg.h"
+#include "ogg_silence.h"
+#include "ogg_utils.h"
+#include "silence_processors.h"
+
+static void splt_ogg_scan_silence_and_process(splt_state *state, short seconds,
+    float max_threshold, ogg_page *page,  ogg_int64_t granpos, ogg_int64_t first_cut_granpos,
+    short process_silence(double time, int silence_was_found, short must_flush,
+      splt_scan_silence_data *ssd, int *found, int *error),
+    splt_scan_silence_data *ssd, int *error);
+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,
+    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);
+  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);
+
+  int found = ssd->found;
+
+  splt_free_scan_silence_data(&ssd);
+
+  if (*error < 0)
+  {
+    found = -1;
+  }
+
+  return found;
+}
+
+static void splt_ogg_scan_silence_and_process(splt_state *state, short seconds,
+    float max_threshold, ogg_page *page,  ogg_int64_t granpos, ogg_int64_t first_cut_granpos,
+    short process_silence(double time, int silence_was_found, short must_flush,
+      splt_scan_silence_data *ssd, int *found, int *error),
+    splt_scan_silence_data *ssd, int *error)
+{
+  splt_c_put_progress_text(state,SPLT_PROGRESS_SCAN_SILENCE);
+
+  splt_ogg_state *oggstate = state->codec;
+
+  ogg_stream_state os;
+  ogg_stream_init(&os, oggstate->serial);
+
+  ogg_int64_t pos = granpos;
+
+  off_t initial_file_offset = ftello(oggstate->in);
+  int saveW = oggstate->prevW;
+
+  ogg_page og;
+
+  float threshold = splt_co_convert_from_dB(max_threshold);
+
+  int result = 0;
+
+  vorbis_dsp_state vd;
+  vorbis_synthesis_init(&vd, oggstate->vi);
+
+  vorbis_block vb;
+  vorbis_block_init(&vd, &vb);
+
+  ogg_sync_state oy;
+  ogg_sync_init(&oy);
+
+  int split_type = splt_o_get_int_option(state, SPLT_OPT_SPLIT_MODE);
+  short option_silence_mode =
+    (split_type == SPLT_OPTION_SILENCE_MODE || split_type == SPLT_OPTION_TRIM_SILENCE_MODE);
+
+  int found = 0;
+
+  //still have a page to process
+  if (page)
+  {
+    memcpy(&og, page, sizeof(ogg_page));
+    result = 1;
+  }
+
+  if (option_silence_mode)
+  {
+    memcpy(&oy, oggstate->sync_in, sizeof(*oggstate->sync_in));
+
+    size_t storage_to_copy = oggstate->sync_in->storage * sizeof(unsigned char);
+
+    oy.data = malloc(storage_to_copy);
+    if (oy.data == NULL)
+    {
+      *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
+      goto function_end;
+    }
+
+    memcpy(oy.data, oggstate->sync_in->data, storage_to_copy);
+  }
+
+  ogg_int64_t end = 0, begin = 0;
+
+  if (seconds > 0)
+  {
+    end = (ogg_int64_t) (seconds * oggstate->vi->rate);
+  }
+
+  oggstate->temp_level = 0.0;
+
+  short is_stream = SPLT_FALSE;
+  long stream_time0 = 0;
+
+  int eos = 0;
+  ogg_int64_t page_granpos;
+  ogg_packet op;
+
+  while (!eos)
+  {
+    while (!eos)
+    {
+      if (result == 0) 
+      {
+        break;
+      }
+
+      if (result > 0)
+      {
+        if (ogg_page_eos(&og)) 
+        {
+          eos = 1;
+        }
+
+        page_granpos = ogg_page_granulepos(&og) - oggstate->cutpoint_begin;
+
+        if (pos == 0) 
+        {
+          pos = page_granpos;
+        }
+        ogg_stream_pagein(&os, &og);
+
+        while (1)
+        {
+          result = ogg_stream_packetout(&os, &op);
+
+          //need more data
+          if (result == 0) 
+          {
+            break;
+          }
+
+          if (result > 0)
+          {
+            int bs = splt_ogg_get_blocksize(oggstate, oggstate->vi, &op);
+
+            //we currently loose the first packet when using the

libmp3splt-0.7.tar.bz2/plugins/ogg_silence.h Added

@@ -0,0 +1,48 @@
+/**********************************************************
+ *
+ * libmp3splt -- library based on mp3splt,
+ *               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>
+ *
+ * Parts of this file have been copied from the 'vcut' 1.6
+ * program provided with 'vorbis-tools' :
+ *      vcut (c) 2000-2001 Michael Smith <msmith@xiph.org>
+ *
+ * Some parts from a more recent version of vcut :
+ *           (c) 2008 Michael Gold <mgold@ncf.ca>
+ *
+ * http://mp3splt.sourceforge.net
+ *
+ *********************************************************/
+
+/**********************************************************
+ *
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307,
+ * USA.
+ *
+ *********************************************************/
+
+#include "silence_processors.h"
+#include "splt.h"
+
+int splt_ogg_scan_silence(splt_state *state, short seconds, float threshold, 
+    float min, 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));
+

libmp3splt-0.7.tar.bz2/plugins/ogg_utils.c Added

@@ -0,0 +1,110 @@
+/**********************************************************
+ *
+ * libmp3splt -- library based on mp3splt,
+ *               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>
+ *
+ * Parts of this file have been copied from the 'vcut' 1.6
+ * program provided with 'vorbis-tools' :
+ *      vcut (c) 2000-2001 Michael Smith <msmith@xiph.org>
+ *
+ * Some parts from a more recent version of vcut :
+ *           (c) 2008 Michael Gold <mgold@ncf.ca>
+ *
+ * http://mp3splt.sourceforge.net
+ *
+ *********************************************************/
+
+/**********************************************************
+ *
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307,
+ * USA.
+ *
+ *********************************************************/
+
+#include "ogg_utils.h"
+
+long splt_ogg_get_blocksize(splt_ogg_state *oggstate, vorbis_info *vi, ogg_packet *op)
+{
+  //if this < 0, there is a problem
+  int this = vorbis_packet_blocksize(vi, op);
+  int ret = (this + oggstate->prevW)/4;
+
+  oggstate->prevW = this;
+
+  return ret;
+}
+
+ogg_int64_t splt_ogg_compute_first_granulepos(splt_state *state, splt_ogg_state *oggstate, ogg_packet *packet, int bs)
+{
+  ogg_int64_t first_granpos = 0;
+
+  if (packet->granulepos >= 0)
+  {
+    /*fprintf(stdout,"oggstate->total_blocksize + bs = %ld\n",oggstate->total_blocksize + bs);
+    fprintf(stdout,"packet granulepos = %ld\n",packet->granulepos);
+    fflush(stdout);*/
+
+    if ((packet->granulepos > oggstate->total_blocksize + bs) &&
+        (oggstate->total_blocksize > 0) &&
+        !packet->e_o_s &&
+        (oggstate->first_granpos == 0))
+    {
+      first_granpos = packet->granulepos;
+      oggstate->first_granpos = first_granpos;
+      splt_c_put_info_message_to_client(state,
+          _(" warning: unexpected position in ogg vorbis stream - split from 0.0 to EOF to fix.\n"));
+    }
+
+    oggstate->total_blocksize = packet->granulepos;
+  }
+  else if (oggstate->total_blocksize == -1)
+  {
+    oggstate->total_blocksize = 0;
+  }
+  else {
+    oggstate->total_blocksize += bs;
+    /*fprintf(stdout,"blocksize = %d, total = %ld\n", bs, oggstate->total_blocksize);
+    fflush(stdout);*/
+  }
+
+  return first_granpos;
+}
+
+int splt_ogg_update_sync(splt_state *state, ogg_sync_state *sync_in, FILE *f, int *error)
+{
+  char *buffer = ogg_sync_buffer(sync_in, SPLT_OGG_BUFSIZE);
+  if (!buffer)
+  {
+    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
+    return -1;
+  }
+  int bytes = fread(buffer,1,SPLT_OGG_BUFSIZE,f);
+
+  if (ogg_sync_wrote(sync_in, bytes) != 0)
+  {
+    splt_e_set_error_data(state, splt_t_get_filename_to_split(state));
+    *error = SPLT_ERROR_INVALID;
+    return -1;
+  }
+
+  return bytes;
+}
+
+
+

libmp3splt-0.7.tar.bz2/plugins/ogg_utils.h Added

@@ -0,0 +1,48 @@
+/**********************************************************
+ *
+ * libmp3splt -- library based on mp3splt,
+ *               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>
+ *
+ * Parts of this file have been copied from the 'vcut' 1.6
+ * program provided with 'vorbis-tools' :
+ *      vcut (c) 2000-2001 Michael Smith <msmith@xiph.org>
+ *
+ * Some parts from a more recent version of vcut :
+ *           (c) 2008 Michael Gold <mgold@ncf.ca>
+ *
+ * http://mp3splt.sourceforge.net
+ *
+ *********************************************************/
+
+/**********************************************************
+ *
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307,
+ * USA.
+ *
+ *********************************************************/
+
+#include "splt.h"
+
+#include "ogg.h"
+
+long splt_ogg_get_blocksize(splt_ogg_state *oggstate, vorbis_info *vi, ogg_packet *op);
+ogg_int64_t splt_ogg_compute_first_granulepos(splt_state *state, splt_ogg_state *oggstate,
+    ogg_packet *packet, int bs);
+int splt_ogg_update_sync(splt_state *state, ogg_sync_state *sync_in, FILE *f, int *error);
+

libmp3splt-0.7.tar.bz2/plugins/silence_processors.c Added

@@ -0,0 +1,276 @@
+/**********************************************************
+ * libmp3splt -- library based on mp3splt,
+ *               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
+ *
+ *********************************************************/
+
+/**********************************************************
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307,
+ * USA.
+ *********************************************************/
+
+#include "silence_processors.h"
+
+splt_scan_silence_data *splt_scan_silence_data_new(splt_state *state, short first, 
+    float min, short set_new_length)
+{
+  splt_scan_silence_data *ssd = malloc(sizeof(splt_scan_silence_data));
+  if (!ssd)
+  {
+    return NULL;
+  }
+
+  ssd->state = state;
+  ssd->first = first;
+  ssd->min = min;
+  ssd->set_new_length = set_new_length;
+
+  ssd->flush = SPLT_FALSE;
+  ssd->silence_begin = 0;
+  ssd->silence_end = 0;
+  ssd->len = 0;
+  ssd->found = 0;
+  ssd->shot = SPLT_DEFAULTSHOT;
+  ssd->silence_begin_was_found = SPLT_FALSE;
+  ssd->continue_after_silence = SPLT_FALSE;
+
+  return ssd;
+}
+
+void splt_free_scan_silence_data(splt_scan_silence_data **ssd)
+{
+  if (!ssd || !*ssd)
+  {
+    return;
+  }
+
+  free(*ssd);
+  *ssd = NULL;
+}
+
+short splt_scan_silence_processor(double time, int silence_was_found,
+    short must_flush, splt_scan_silence_data *ssd, int *found_silence_points, int *error)
+{
+  if (time < 0) { return SPLT_TRUE; }
+
+  short stop = SPLT_FALSE;
+
+  if (must_flush)
+  {
+    ssd->flush = SPLT_TRUE;
+    stop = SPLT_TRUE;
+  }
+
+  if (!ssd->flush && silence_was_found)
+  {
+    if (ssd->len == 0)
+    {
+      ssd->silence_begin = time;
+    }
+
+    if (ssd->first == SPLT_FALSE) 
+    {
+      ssd->len++;
+    }
+
+    if (ssd->shot < SPLT_DEFAULTSHOT)
+    {
+      ssd->shot += 2;
+    }
+
+    ssd->silence_end = time;
+
+    *found_silence_points = ssd->found;
+    return stop;
+  }
+
+  if (ssd->len > SPLT_DEFAULTSILLEN)
+  {
+    if (ssd->flush || (ssd->shot <= 0))
+    {
+      double begin_position = ssd->silence_begin;
+      double end_position = ssd->silence_end;
+
+      if (ssd->set_new_length)
+      {
+        ssd->len = (int) (ssd->silence_end * 100.0 - ssd->silence_begin * 100.0);
+      }
+
+      if ((end_position - begin_position - ssd->min) >= 0.f)
+      {
+        if (splt_siu_ssplit_new(&ssd->state->silence_list,
+              begin_position, end_position, ssd->len, error) == -1)
+        {
+          ssd->found = -1;
+          *found_silence_points = ssd->found;
+          return SPLT_TRUE;
+        }
+
+        ssd->found++;
+      }
+
+      ssd->len = 0;
+      ssd->shot = SPLT_DEFAULTSHOT;
+    }
+  }
+  else 
+  {
+    ssd->len = 0;
+  }
+
+  if (ssd->flush)
+  {
+    return -1;
+  }
+
+  if (ssd->first && (ssd->shot <= 0))
+  {
+    ssd->first = SPLT_FALSE;
+  }
+
+  if (ssd->shot > 0) 
+  {
+    ssd->shot--;
+  }
+
+  if (ssd->found >= SPLT_MAXSILENCE) 
+  {
+    stop = SPLT_TRUE;
+  }
+
+  *found_silence_points = ssd->found;
+
+  return stop;
+}
+
+static short splt_detect_where_begin_silence_ends(double time, int silence_was_found,
+    short must_flush, splt_scan_silence_data *ssd, int *found_silence_points, int *error)
+{
+  if (silence_was_found)
+  {
+    if (ssd->shot < SPLT_DEFAULTSHOT)
+    {
+      ssd->shot += 2;
+    }
+
+    ssd->silence_end = time;
+  }
+
+  if (ssd->shot <= 0)
+  {
+    if (splt_siu_ssplit_new(&ssd->state->silence_list, ssd->silence_end, ssd->silence_end, 0, error) == -1)
+    {
+      return SPLT_TRUE;
+    }
+
+    ssd->found++;
+    ssd->silence_begin_was_found = SPLT_TRUE;
+    ssd->shot = SPLT_DEFAULTSHOT;
+  }
+
+  if (ssd->shot > 0)
+  {
+    ssd->shot--;
+  }
+
+  return SPLT_FALSE;
+}
+
+static short splt_detect_where_end_silence_begins(double time, int silence_was_found, 
+    short must_flush, splt_scan_silence_data *ssd, int *found_silence_points, int *error)
+{
+  if (time < 0)
+  {

libmp3splt-0.7.tar.bz2/plugins/silence_processors.h Added

@@ -0,0 +1,62 @@
+/**********************************************************
+ * libmp3splt -- library based on mp3splt,
+ *               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
+ *
+ *********************************************************/
+
+/**********************************************************
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307,
+ * USA.
+ *********************************************************/
+
+#include "splt.h"
+
+#ifndef SPLT_SILENCE_PROCESSORS_H
+
+typedef struct {
+  short first;
+  short flush;
+  double silence_begin;
+  double silence_end;
+  int len;
+  int found;
+  int shot;
+  float min;
+  splt_state *state;
+  short silence_begin_was_found;
+  short set_new_length;
+
+  short continue_after_silence;
+} splt_scan_silence_data;
+
+short splt_scan_silence_processor(double time, int silence_was_found, short must_flush, 
+    splt_scan_silence_data *data, int *found_silence_points, int *error);
+
+short splt_trim_silence_processor(double time, int silence_was_found, short must_flush,
+    splt_scan_silence_data *data, int *found_silence_points, int *error);
+
+splt_scan_silence_data *splt_scan_silence_data_new(splt_state *state, short first, 
+    float min, short set_new_length);
+
+void splt_free_scan_silence_data(splt_scan_silence_data **ssd);
+
+#define SPLT_SILENCE_PROCESSORS_H
+
+#endif
+

libmp3splt-0.6.1a.tar.bz2/po/LINGUAS -> libmp3splt-0.7.tar.bz2/po/LINGUAS Changed

libmp3splt-0.7.tar.bz2/po/cs.gmo Added

libmp3splt-0.7.tar.bz2/po/cs.po Added

@@ -0,0 +1,644 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Munteanu Alexandru
+# This file is distributed under the same license as the PACKAGE package.
+#
+# fri <pavelfric@seznam.cz>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: mp3splt-gtk\n"
+"Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
+"POT-Creation-Date: 2011-07-14 12:45+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"
+"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: src/mp3splt.c:840
+#, 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
+#, 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
+#, c-format
+msgid " M3U file '%s' will be created.\n"
+msgstr " Soubor M3U »%s« bude vytvořen.\n"
+
+#: src/mp3splt.c:934
+#, c-format
+msgid ""
+" Working with SILENCE AUTO-ADJUST (Threshold: %.1f dB Gap: %d sec Offset: "
+"%.2f)\n"
+msgstr ""
+"Pracuje se s SILENCE AUTO-ADJUST (Práh: %.1f dB Mezera: %d s Posun: %.2f)\n"
+
+#: src/checks.c:159
+msgid "directory does not exists"
+msgstr "Adresář neexistuje"
+
+#: src/cddb.c:63
+#, c-format
+msgid " reading informations from CDDB file %s ...\n"
+msgstr " Čtou se informace ze souboru CDDB %s …\n"
+
+#: src/cddb.c:125 src/cue.c:539
+#, c-format
+msgid ""
+"  Tracks: %d\n"
+"\n"
+msgstr ""
+"  Skladby: %d\n"
+"\n"
+
+#: src/cddb.c:259 src/cue.c:135
+#, c-format
+msgid ""
+"\n"
+"  Artist: %s\n"
+msgstr ""
+"\n"
+"  Umělec: %s\n"
+
+#: src/cddb.c:262 src/cue.c:139
+#, c-format
+msgid "  Album: %s\n"
+msgstr "  Album: %s\n"
+
+#: src/splt.c:147
+msgid " info: starting normal split\n"
+msgstr " Informace: Spouští se dělení v obvyklém režimu\n"
+
+#: src/splt.c:234
+msgid " info: starting error mode split\n"
+msgstr " Informace: Spouští se dělení v chybovém režimu\n"
+
+#: src/splt.c:544
+msgid " info: starting time mode split\n"
+msgstr " Informace: Spouští se dělení v časovém režimu\n"
+
+#: src/splt.c:563
+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:605
+#, c-format
+msgid " Trim silence split - Th: %.1f dB\n"
+msgstr ""
+
+#: src/splt.c:732
+#, c-format
+msgid "YES"
+msgstr "Ano"
+
+#: src/splt.c:736
+#, c-format
+msgid "NO"
+msgstr "Ne"
+
+#: src/splt.c:742
+#, c-format
+msgid "User"
+msgstr "Uživatel"
+
+#: src/splt.c:746
+#, c-format
+msgid "Auto"
+msgstr "Automaticky"
+
+#: src/splt.c:752
+#, c-format
+msgid ""
+" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: "
+"%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:770
+#, c-format
+msgid ""
+" Found silence log file '%s' ! Reading silence points from file to save "
+"time ;)\n"
+msgstr ""
+" 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:799
+#, c-format
+msgid " Total silence points found: %d."
+msgstr " Celkem nalezeno bodů ticha: %d."
+
+#: src/splt.c:811
+#, c-format
+msgid " (Selected %d tracks)\n"
+msgstr " (%d skladeb vybráno)\n"
+
+#: src/splt.c:906
+#, c-format
+msgid " Writing silence log file '%s' ...\n"
+msgstr " Zapisuje se soubor se zápisem o tichu »%s« …\n"
+
+#: src/splt.c:961
+msgid " info: starting silence mode split\n"
+msgstr " Informace: Začíná se s dělením v režimu ticha\n"
+
+#: src/splt.c:1009
+msgid " info: starting trim using silence mode split\n"
+msgstr ""
+
+#: src/splt.c:1056
+msgid " info: starting wrap mode split\n"
+msgstr ""
+" Informace: Začíná se s dělením v režimu automatického zalomení (wrap)\n"
+
+#: src/utils.c:71
+#, c-format
+msgid " info: overlapping split files with %ld.%ld.%ld\n"
+msgstr " Informace: Překrytí dělení souborů %ld.%ld.%ld\n"
+
+#: src/cue.c:435
+#, c-format
+msgid " reading informations from CUE file %s ...\n"
+msgstr " Čtou se informace ze souboru CUE %s …\n"
+
+#: src/cue.c:487
+msgid "description here"
+msgstr "Popis zde"
+
+#: src/cue.c:695
+#, c-format
+msgid " CUE file '%s' created.\n"
+msgstr " Byl vytvořen soubor CUE »%s«.\n"
+
+#: src/audacity.c:214
+#, c-format
+msgid " reading informations from audacity labels file '%s' ...\n"
+msgstr " Čtou se informace ze souboru se štítky Audacity '%s …\n"
+
+#: src/errors.c:129
+msgid "Network error"
+msgstr "Chyba sítě"
+
+#: src/errors.c:179
+msgid " warning: might be VBR, use frame mode"
+msgstr ""
+" Varování: může to být proměnlivý datový tok (VBR), použít režim snímků"
+
+#: src/errors.c:181
+msgid " error mode ok"
+msgstr " Chybový režim OK"
+

libmp3splt-0.6.1a.tar.bz2/po/de_DE.gmo -> libmp3splt-0.7.tar.bz2/po/de_DE.gmo Changed

libmp3splt-0.6.1a.tar.bz2/po/de_DE.po -> libmp3splt-0.7.tar.bz2/po/de_DE.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-03-05 21:56+0100\n"
+"POT-Creation-Date: 2011-07-14 12:45+0200\n"
 "PO-Revision-Date: 2011-02-22 00:08+0000\n"
 "Last-Translator: peterpall <gunter@peterpall.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,17 +22,17 @@
 msgid " info: resolving linked filename to '%s'\n"
 msgstr " Info: Verknüpfter Dateiname wird in »%s« aufgelöst\n"
 
-#: src/mp3splt.c:923
+#: src/mp3splt.c:905
 #, c-format
 msgid " info: file matches the plugin '%s'\n"
 msgstr " Info: Datei passt zum Plugin »%s«\n"
 
-#: src/mp3splt.c:931
+#: src/mp3splt.c:913
 #, c-format
 msgid " M3U file '%s' will be created.\n"
 msgstr " M3U-Datei »%s« wird erstellt.\n"
 
-#: src/mp3splt.c:951
+#: src/mp3splt.c:934
 #, c-format
 msgid ""
 " Working with SILENCE AUTO-ADJUST (Threshold: %.1f dB Gap: %d sec Offset: "
@@ -41,16 +41,16 @@
 "Mit SILENCE AUTO-ADJUST wird gearbeitet (Ansprechschwelle: %.1f dB Pause: %d "
 "s Versatz: %.2f)\n"
 
-#: src/checks.c:142
+#: src/checks.c:159
 msgid "directory does not exists"
 msgstr "Ordner existiert nicht"
 
-#: src/cddb.c:62
+#: src/cddb.c:63
 #, c-format
 msgid " reading informations from CDDB file %s ...\n"
 msgstr " Informationen aus CDDB-Datei %s werden gelesen …\n"
 
-#: src/cddb.c:123 src/cue.c:538
+#: src/cddb.c:125 src/cue.c:539
 #, c-format
 msgid ""
 "  Tracks: %d\n"
@@ -59,7 +59,7 @@
 "  Titel: %d\n"
 "\n"
 
-#: src/cddb.c:257 src/cue.c:135
+#: src/cddb.c:259 src/cue.c:135
 #, c-format
 msgid ""
 "\n"
@@ -68,7 +68,7 @@
 "\n"
 "  Künstler: %s\n"
 
-#: src/cddb.c:260 src/cue.c:139
+#: src/cddb.c:262 src/cue.c:139
 #, c-format
 msgid "  Album: %s\n"
 msgstr "  Album: %s\n"
@@ -89,27 +89,32 @@
 msgid " info: starting 'split in equal tracks' mode\n"
 msgstr " Info: Teilung im Modus »Gleich große Teile« wird gestartet\n"
 
-#: src/splt.c:671
+#: src/splt.c:605
+#, c-format
+msgid " Trim silence split - Th: %.1f dB\n"
+msgstr ""
+
+#: src/splt.c:732
 #, c-format
 msgid "YES"
 msgstr "JA"
 
-#: src/splt.c:675
+#: src/splt.c:736
 #, c-format
 msgid "NO"
 msgstr "NEIN"
 
-#: src/splt.c:681
+#: src/splt.c:742
 #, c-format
 msgid "User"
 msgstr "Benutzer"
 
-#: src/splt.c:685
+#: src/splt.c:746
 #, c-format
 msgid "Auto"
 msgstr "Automatisch"
 
-#: src/splt.c:691
+#: src/splt.c:752
 #, c-format
 msgid ""
 " Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: "
@@ -118,7 +123,7 @@
 " Stille-Teilungstyp: Modus %s (Ansprechschwelle: %.1f dB, Aus: %.2f, Min: "
 "%.2f, Entfernen: %s)\n"
 
-#: src/splt.c:709
+#: src/splt.c:770
 #, c-format
 msgid ""
 " Found silence log file '%s' ! Reading silence points from file to save "
@@ -127,26 +132,31 @@
 " Stille-Protokolldatei »%s« wurde gefunden! Um Zeit zu sparen, werden die "
 "Teilungspunkte aus dieser Datei gelesen ;)\n"
 
-#: src/splt.c:739
+#: src/splt.c:799
 #, c-format
 msgid " Total silence points found: %d."
 msgstr " Insgesamt gefundene Teilungspunkte: %d."
 
-#: src/splt.c:751
+#: src/splt.c:811
 #, c-format
 msgid " (Selected %d tracks)\n"
 msgstr " (%d Titel ausgewählt)\n"
 
-#: src/splt.c:847
+#: src/splt.c:906
 #, c-format
 msgid " Writing silence log file '%s' ...\n"
 msgstr "Stille-Protokolldatei »%s« wird geschrieben …\n"
 
-#: src/splt.c:902
+#: src/splt.c:961
 msgid " info: starting silence mode split\n"
 msgstr " Info: Teilung im Stille-Modus wird gestartet\n"
 
-#: src/splt.c:959
+#: src/splt.c:1009
+#, fuzzy
+msgid " info: starting trim using silence mode split\n"
+msgstr " Info: Teilung im Stille-Modus wird gestartet\n"
+
+#: src/splt.c:1056
 msgid " info: starting wrap mode split\n"
 msgstr " Info: Teilung im Wrap-Modus wird gestartet\n"
 
@@ -155,16 +165,16 @@
 msgid " info: overlapping split files with %ld.%ld.%ld\n"
 msgstr " Info: Überlappung der Dateiteilung mit %ld.%ld.%ld\n"
 
-#: src/cue.c:434
+#: src/cue.c:435
 #, c-format
 msgid " reading informations from CUE file %s ...\n"
 msgstr " Informationen aus CUE-Datei %s werden gelesen …\n"
 
-#: src/cue.c:486
+#: src/cue.c:487
 msgid "description here"
 msgstr "Beschreibung hier"
 
-#: src/cue.c:694
+#: src/cue.c:695
 #, c-format
 msgid " CUE file '%s' created.\n"
 msgstr " CUE-Datei »%s« wurde erstellt.\n"
@@ -229,7 +239,8 @@
 msgstr ""
 
 #: src/errors.c:212
-msgid " freedb error: cannot open socket"
+#, c-format
+msgid " freedb error: cannot open socket (%s)"
 msgstr ""
 
 #: src/errors.c:215
@@ -239,287 +250,301 @@
 
 #: src/errors.c:219
 #, c-format
-msgid " freedb error: cannot send message to host '%s' (%s)"
+msgid " freedb error: cannot disconnect from host (%s)"
 msgstr ""
 
 #: src/errors.c:223
+#, c-format
+msgid " freedb error: cannot send message to host '%s' (%s)"
+msgstr ""
+
+#: src/errors.c:227
 msgid " freedb error: invalid server answer"
 msgstr ""
 
-#: src/errors.c:226

libmp3splt-0.6.1a.tar.bz2/po/es.gmo -> libmp3splt-0.7.tar.bz2/po/es.gmo Changed

libmp3splt-0.6.1a.tar.bz2/po/es.po -> libmp3splt-0.7.tar.bz2/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-03-05 21:56+0100\n"
+"POT-Creation-Date: 2011-07-14 12:45+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"
@@ -22,47 +22,47 @@
 msgid " info: resolving linked filename to '%s'\n"
 msgstr ""
 
-#: src/mp3splt.c:923
+#: src/mp3splt.c:905
 #, c-format
 msgid " info: file matches the plugin '%s'\n"
 msgstr ""
 
-#: src/mp3splt.c:931
+#: src/mp3splt.c:913
 #, c-format
 msgid " M3U file '%s' will be created.\n"
 msgstr ""
 
-#: src/mp3splt.c:951
+#: src/mp3splt.c:934
 #, c-format
 msgid ""
 " Working with SILENCE AUTO-ADJUST (Threshold: %.1f dB Gap: %d sec Offset: "
 "%.2f)\n"
 msgstr ""
 
-#: src/checks.c:142
+#: src/checks.c:159
 msgid "directory does not exists"
 msgstr ""
 
-#: src/cddb.c:62
+#: src/cddb.c:63
 #, c-format
 msgid " reading informations from CDDB file %s ...\n"
 msgstr ""
 
-#: src/cddb.c:123 src/cue.c:538
+#: src/cddb.c:125 src/cue.c:539
 #, c-format
 msgid ""
 "  Tracks: %d\n"
 "\n"
 msgstr ""
 
-#: src/cddb.c:257 src/cue.c:135
+#: src/cddb.c:259 src/cue.c:135
 #, c-format
 msgid ""
 "\n"
 "  Artist: %s\n"
 msgstr ""
 
-#: src/cddb.c:260 src/cue.c:139
+#: src/cddb.c:262 src/cue.c:139
 #, c-format
 msgid "  Album: %s\n"
 msgstr ""
@@ -83,60 +83,69 @@
 msgid " info: starting 'split in equal tracks' mode\n"
 msgstr ""
 
-#: src/splt.c:671
+#: src/splt.c:605
+#, c-format
+msgid " Trim silence split - Th: %.1f dB\n"
+msgstr ""
+
+#: src/splt.c:732
 #, c-format
 msgid "YES"
 msgstr "SÍ"
 
-#: src/splt.c:675
+#: src/splt.c:736
 #, c-format
 msgid "NO"
 msgstr "NO"
 
-#: src/splt.c:681
+#: src/splt.c:742
 #, c-format
 msgid "User"
 msgstr "Usuario"
 
-#: src/splt.c:685
+#: src/splt.c:746
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: src/splt.c:691
+#: src/splt.c:752
 #, c-format
 msgid ""
 " Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: "
 "%s)\n"
 msgstr ""
 
-#: src/splt.c:709
+#: src/splt.c:770
 #, c-format
 msgid ""
 " Found silence log file '%s' ! Reading silence points from file to save "
 "time ;)\n"
 msgstr ""
 
-#: src/splt.c:739
+#: src/splt.c:799
 #, c-format
 msgid " Total silence points found: %d."
 msgstr ""
 
-#: src/splt.c:751
+#: src/splt.c:811
 #, c-format
 msgid " (Selected %d tracks)\n"
 msgstr ""
 
-#: src/splt.c:847
+#: src/splt.c:906
 #, c-format
 msgid " Writing silence log file '%s' ...\n"
 msgstr ""
 
-#: src/splt.c:902
+#: src/splt.c:961
 msgid " info: starting silence mode split\n"
 msgstr ""
 
-#: src/splt.c:959
+#: src/splt.c:1009
+msgid " info: starting trim using silence mode split\n"
+msgstr ""
+
+#: src/splt.c:1056
 msgid " info: starting wrap mode split\n"
 msgstr ""
 
@@ -145,16 +154,16 @@
 msgid " info: overlapping split files with %ld.%ld.%ld\n"
 msgstr ""
 
-#: src/cue.c:434
+#: src/cue.c:435
 #, c-format
 msgid " reading informations from CUE file %s ...\n"
 msgstr ""
 
-#: src/cue.c:486
+#: src/cue.c:487
 msgid "description here"
 msgstr ""
 
-#: src/cue.c:694
+#: src/cue.c:695
 #, c-format
 msgid " CUE file '%s' created.\n"
 msgstr ""
@@ -219,7 +228,8 @@
 msgstr ""
 
 #: src/errors.c:212
-msgid " freedb error: cannot open socket"
+#, c-format
+msgid " freedb error: cannot open socket (%s)"
 msgstr ""
 
 #: src/errors.c:215
@@ -229,287 +239,300 @@
 
 #: src/errors.c:219
 #, c-format
-msgid " freedb error: cannot send message to host '%s' (%s)"
+msgid " freedb error: cannot disconnect from host (%s)"
 msgstr ""
 
 #: src/errors.c:223
+#, c-format
+msgid " freedb error: cannot send message to host '%s' (%s)"
+msgstr ""
+
+#: src/errors.c:227
 msgid " freedb error: invalid server answer"
 msgstr ""
 
-#: src/errors.c:226
+#: src/errors.c:230
 msgid " freedb error: site returned code 201"
 msgstr ""
 
-#: src/errors.c:229
+#: src/errors.c:233

libmp3splt-0.6.1a.tar.bz2/po/fr_FR.gmo -> libmp3splt-0.7.tar.bz2/po/fr_FR.gmo Changed

libmp3splt-0.6.1a.tar.bz2/po/fr_FR.po -> libmp3splt-0.7.tar.bz2/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-03-05 21:56+0100\n"
+"POT-Creation-Date: 2011-07-14 12:45+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"
@@ -22,17 +22,17 @@
 msgid " info: resolving linked filename to '%s'\n"
 msgstr " info: le fichier du lien symbolique est '%s'\n"
 
-#: src/mp3splt.c:923
+#: src/mp3splt.c:905
 #, c-format
 msgid " info: file matches the plugin '%s'\n"
 msgstr " info : le fichier correspond au module '%s'\n"
 
-#: src/mp3splt.c:931
+#: src/mp3splt.c:913
 #, c-format
 msgid " M3U file '%s' will be created.\n"
 msgstr " Le fichier M3U '%s' sera créé.\n"
 
-#: src/mp3splt.c:951
+#: src/mp3splt.c:934
 #, c-format
 msgid ""
 " Working with SILENCE AUTO-ADJUST (Threshold: %.1f dB Gap: %d sec Offset: "
@@ -41,16 +41,16 @@
 " Avec ajustement du silence (Seuil : %.1f dB Ecart : %d sec Compensation : "
 "%.2f)\n"
 
-#: src/checks.c:142
+#: src/checks.c:159
 msgid "directory does not exists"
 msgstr "le dossier n'existe pas"
 
-#: src/cddb.c:62
+#: src/cddb.c:63
 #, c-format
 msgid " reading informations from CDDB file %s ...\n"
 msgstr " lecture des informations du fichier CDDB %s ...\n"
 
-#: src/cddb.c:123 src/cue.c:538
+#: src/cddb.c:125 src/cue.c:539
 #, c-format
 msgid ""
 "  Tracks: %d\n"
@@ -59,7 +59,7 @@
 "  Pistes : %d\n"
 "\n"
 
-#: src/cddb.c:257 src/cue.c:135
+#: src/cddb.c:259 src/cue.c:135
 #, c-format
 msgid ""
 "\n"
@@ -68,7 +68,7 @@
 "\n"
 "  Artiste : %s\n"
 
-#: src/cddb.c:260 src/cue.c:139
+#: src/cddb.c:262 src/cue.c:139
 #, c-format
 msgid "  Album: %s\n"
 msgstr "  Album : %s\n"
@@ -90,27 +90,32 @@
 msgid " info: starting 'split in equal tracks' mode\n"
 msgstr " info : début de la division en morceaux egaux\n"
 
-#: src/splt.c:671
+#: src/splt.c:605
+#, c-format
+msgid " Trim silence split - Th: %.1f dB\n"
+msgstr ""
+
+#: src/splt.c:732
 #, c-format
 msgid "YES"
 msgstr "OUI"
 
-#: src/splt.c:675
+#: src/splt.c:736
 #, c-format
 msgid "NO"
 msgstr "NON"
 
-#: src/splt.c:681
+#: src/splt.c:742
 #, c-format
 msgid "User"
 msgstr "Utilisateur"
 
-#: src/splt.c:685
+#: src/splt.c:746
 #, c-format
 msgid "Auto"
 msgstr "Automatique"
 
-#: src/splt.c:691
+#: src/splt.c:752
 #, c-format
 msgid ""
 " Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: "
@@ -119,7 +124,7 @@
 " Division avec recherche du silence : mode %s (Seuil : %.1f dB, Ecart : "
 "%.2f, Min : %.2f, Suppression : %s)\n"
 
-#: src/splt.c:709
+#: src/splt.c:770
 #, c-format
 msgid ""
 " Found silence log file '%s' ! Reading silence points from file to save "
@@ -128,26 +133,31 @@
 "Fichier journal silence trouvé '%s' ! Lecture des points silence points pour "
 "gagner du temps ;)\n"
 
-#: src/splt.c:739
+#: src/splt.c:799
 #, c-format
 msgid " Total silence points found: %d."
 msgstr "Total des points silence trouvés  : %d."
 
-#: src/splt.c:751
+#: src/splt.c:811
 #, c-format
 msgid " (Selected %d tracks)\n"
 msgstr " (%d pistes sélectionnées)\n"
 
-#: src/splt.c:847
+#: src/splt.c:906
 #, 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:902
+#: src/splt.c:961
 msgid " info: starting silence mode split\n"
 msgstr " info : début de la division avec recherche de silence\n"
 
-#: src/splt.c:959
+#: src/splt.c:1009
+#, 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:1056
 msgid " info: starting wrap mode split\n"
 msgstr " info : début de la division 'wrap'\n"
 
@@ -156,16 +166,16 @@
 msgid " info: overlapping split files with %ld.%ld.%ld\n"
 msgstr " info : chevauchement des fichiers obtenus avec %ld.%ld.%ld\n"
 
-#: src/cue.c:434
+#: src/cue.c:435
 #, c-format
 msgid " reading informations from CUE file %s ...\n"
 msgstr " lecture des informations du fichier CUE %s ...\n"
 
-#: src/cue.c:486
+#: src/cue.c:487
 msgid "description here"
 msgstr "description"
 
-#: src/cue.c:694
+#: src/cue.c:695
 #, c-format
 msgid " CUE file '%s' created.\n"
 msgstr " Fichier CUE '%s' créé.\n"
@@ -231,7 +241,8 @@
 msgstr "erreur freedb : accès hôte '%s ' impossible par le nom (%s)"
 
 #: src/errors.c:212
-msgid " freedb error: cannot open socket"
+#, fuzzy, c-format
+msgid " freedb error: cannot open socket (%s)"
 msgstr "erreur freedb : impossible d'ouvrir le 'socket'"
 
 #: src/errors.c:215
@@ -240,289 +251,303 @@
 msgstr "erreur freedb : impossible de se connecter à l'hôte '%s' (%s)"
 
 #: src/errors.c:219
+#, fuzzy, c-format
+msgid " freedb error: cannot disconnect from host (%s)"
+msgstr "erreur freedb : impossible de se connecter à l'hôte '%s' (%s)"
+
+#: src/errors.c:223
 #, c-format
 msgid " freedb error: cannot send message to host '%s' (%s)"
 msgstr "erreur freedb : impossible d'envoyer un message à l'hôte '%s' (%s)"
 
-#: src/errors.c:223
+#: src/errors.c:227
 msgid " freedb error: invalid server answer"
 msgstr "erreur freedb : réponse du serveur incorrecte"

libmp3splt-0.6.1a.tar.bz2/po/libmp3splt.pot -> libmp3splt-0.7.tar.bz2/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-03-05 21:56+0100\n"
+"POT-Creation-Date: 2011-07-14 12:45+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"
@@ -22,47 +22,47 @@
 msgid " info: resolving linked filename to '%s'\n"
 msgstr ""
 
-#: src/mp3splt.c:923
+#: src/mp3splt.c:905
 #, c-format
 msgid " info: file matches the plugin '%s'\n"
 msgstr ""
 
-#: src/mp3splt.c:931
+#: src/mp3splt.c:913
 #, c-format
 msgid " M3U file '%s' will be created.\n"
 msgstr ""
 
-#: src/mp3splt.c:951
+#: src/mp3splt.c:934
 #, c-format
 msgid ""
 " Working with SILENCE AUTO-ADJUST (Threshold: %.1f dB Gap: %d sec Offset: "
 "%.2f)\n"
 msgstr ""
 
-#: src/checks.c:142
+#: src/checks.c:159
 msgid "directory does not exists"
 msgstr ""
 
-#: src/cddb.c:62
+#: src/cddb.c:63
 #, c-format
 msgid " reading informations from CDDB file %s ...\n"
 msgstr ""
 
-#: src/cddb.c:123 src/cue.c:538
+#: src/cddb.c:125 src/cue.c:539
 #, c-format
 msgid ""
 "  Tracks: %d\n"
 "\n"
 msgstr ""
 
-#: src/cddb.c:257 src/cue.c:135
+#: src/cddb.c:259 src/cue.c:135
 #, c-format
 msgid ""
 "\n"
 "  Artist: %s\n"
 msgstr ""
 
-#: src/cddb.c:260 src/cue.c:139
+#: src/cddb.c:262 src/cue.c:139
 #, c-format
 msgid "  Album: %s\n"
 msgstr ""
@@ -83,60 +83,69 @@
 msgid " info: starting 'split in equal tracks' mode\n"
 msgstr ""
 
-#: src/splt.c:671
+#: src/splt.c:605
+#, c-format
+msgid " Trim silence split - Th: %.1f dB\n"
+msgstr ""
+
+#: src/splt.c:732
 #, c-format
 msgid "YES"
 msgstr ""
 
-#: src/splt.c:675
+#: src/splt.c:736
 #, c-format
 msgid "NO"
 msgstr ""
 
-#: src/splt.c:681
+#: src/splt.c:742
 #, c-format
 msgid "User"
 msgstr ""
 
-#: src/splt.c:685
+#: src/splt.c:746
 #, c-format
 msgid "Auto"
 msgstr ""
 
-#: src/splt.c:691
+#: src/splt.c:752
 #, c-format
 msgid ""
 " Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: "
 "%s)\n"
 msgstr ""
 
-#: src/splt.c:709
+#: src/splt.c:770
 #, c-format
 msgid ""
 " Found silence log file '%s' ! Reading silence points from file to save "
 "time ;)\n"
 msgstr ""
 
-#: src/splt.c:739
+#: src/splt.c:799
 #, c-format
 msgid " Total silence points found: %d."
 msgstr ""
 
-#: src/splt.c:751
+#: src/splt.c:811
 #, c-format
 msgid " (Selected %d tracks)\n"
 msgstr ""
 
-#: src/splt.c:847
+#: src/splt.c:906
 #, c-format
 msgid " Writing silence log file '%s' ...\n"
 msgstr ""
 
-#: src/splt.c:902
+#: src/splt.c:961
 msgid " info: starting silence mode split\n"
 msgstr ""
 
-#: src/splt.c:959
+#: src/splt.c:1009
+msgid " info: starting trim using silence mode split\n"
+msgstr ""
+
+#: src/splt.c:1056
 msgid " info: starting wrap mode split\n"
 msgstr ""
 
@@ -145,16 +154,16 @@
 msgid " info: overlapping split files with %ld.%ld.%ld\n"
 msgstr ""
 
-#: src/cue.c:434
+#: src/cue.c:435
 #, c-format
 msgid " reading informations from CUE file %s ...\n"
 msgstr ""
 
-#: src/cue.c:486
+#: src/cue.c:487
 msgid "description here"
 msgstr ""
 
-#: src/cue.c:694
+#: src/cue.c:695
 #, c-format
 msgid " CUE file '%s' created.\n"
 msgstr ""
@@ -219,7 +228,8 @@
 msgstr ""
 
 #: src/errors.c:212
-msgid " freedb error: cannot open socket"
+#, c-format
+msgid " freedb error: cannot open socket (%s)"
 msgstr ""
 
 #: src/errors.c:215
@@ -229,287 +239,300 @@
 
 #: src/errors.c:219
 #, c-format
-msgid " freedb error: cannot send message to host '%s' (%s)"
+msgid " freedb error: cannot disconnect from host (%s)"
 msgstr ""
 
 #: src/errors.c:223
+#, c-format
+msgid " freedb error: cannot send message to host '%s' (%s)"
+msgstr ""
+
+#: src/errors.c:227
 msgid " freedb error: invalid server answer"
 msgstr ""
 
-#: src/errors.c:226
+#: src/errors.c:230
 msgid " freedb error: site returned code 201"
 msgstr ""
 
-#: src/errors.c:229
+#: src/errors.c:233

libmp3splt-0.6.1a.tar.bz2/src/Makefile.am -> libmp3splt-0.7.tar.bz2/src/Makefile.am Changed

libmp3splt-0.6.1a.tar.bz2/src/Makefile.in -> libmp3splt-0.7.tar.bz2/src/Makefile.in Changed

@@ -103,7 +103,8 @@
 	libmp3splt_la-wrap.lo libmp3splt_la-client.lo \
 	libmp3splt_la-conversions.lo libmp3splt_la-tags_parser.lo \
 	libmp3splt_la-oformat_parser.lo libmp3splt_la-pair.lo \
-	libmp3splt_la-debug.lo libmp3splt_la-filename_regex.lo
+	libmp3splt_la-debug.lo libmp3splt_la-filename_regex.lo \
+	libmp3splt_la-socket_manager.lo
 libmp3splt_la_OBJECTS = $(am_libmp3splt_la_OBJECTS)
 libmp3splt_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -196,6 +197,7 @@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -238,6 +240,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -272,7 +275,6 @@
 # Define a C macro LOCALEDIR indicating where catalogs will be installed.
 localedir = $(datadir)/locale
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 ltdl_LIBOBJS = @ltdl_LIBOBJS@
 ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
 mandir = @mandir@
@@ -332,7 +334,8 @@
   oformat_parser.c oformat_parser.h \
   pair.c pair.h \
   debug.c debug.h \
-  filename_regex.c filename_regex.h
+  filename_regex.c filename_regex.h \
+  socket_manager.c socket_manager.h
 
 all: all-am
 
@@ -428,6 +431,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmp3splt_la-pair.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmp3splt_la-plugins.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmp3splt_la-silence_utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmp3splt_la-socket_manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmp3splt_la-split_points.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmp3splt_la-splt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmp3splt_la-splt_array.Plo@am__quote@
@@ -678,6 +682,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmp3splt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmp3splt_la-filename_regex.lo `test -f 'filename_regex.c' || echo '$(srcdir)/'`filename_regex.c
 
+libmp3splt_la-socket_manager.lo: socket_manager.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmp3splt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmp3splt_la-socket_manager.lo -MD -MP -MF $(DEPDIR)/libmp3splt_la-socket_manager.Tpo -c -o libmp3splt_la-socket_manager.lo `test -f 'socket_manager.c' || echo '$(srcdir)/'`socket_manager.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmp3splt_la-socket_manager.Tpo $(DEPDIR)/libmp3splt_la-socket_manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='socket_manager.c' object='libmp3splt_la-socket_manager.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmp3splt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmp3splt_la-socket_manager.lo `test -f 'socket_manager.c' || echo '$(srcdir)/'`socket_manager.c
+
 mostlyclean-libtool:
 	-rm -f *.lo

libmp3splt-0.6.1a.tar.bz2/src/cddb.c -> libmp3splt-0.7.tar.bz2/src/cddb.c Changed

libmp3splt-0.6.1a.tar.bz2/src/checks.c -> libmp3splt-0.7.tar.bz2/src/checks.c Changed

@@ -42,7 +42,7 @@
 static void close_files(splt_state *state, const char *file1, FILE **f1,
     const char *file2, FILE **f2, int *error);
 
-void splt_check_points_inf_song_length(splt_state *state, int *error)
+void splt_check_points_inf_song_length_and_convert_negatives(splt_state *state, int *error)
 {
   if (splt_io_input_is_stdin(state))
   {
@@ -56,18 +56,34 @@
   }
 
   int err = SPLT_OK;
-  int found_max_splitpoint = SPLT_FALSE;
   long total_time = splt_t_get_total_time(state);
 
+  if (total_time == 0)
+  {
+    return;
+  }
+
   int i = 0;
-  for (i = 0; i < splitnumber - 1; i++)
+  for (i = 0; i < splitnumber; i++)
   {
     long splitpoint_value = splt_sp_get_splitpoint_value(state, i, &err);
     if (err < SPLT_OK) { *error = err; return; }
 
+    if (splitpoint_value < 0)
+    {
+      splitpoint_value = total_time + splitpoint_value;
+      splt_sp_set_splitpoint_value(state, i, splitpoint_value);
+    }
+
+    if (splitpoint_value == LONG_MAX)
+    {
+      splitpoint_value = total_time;
+      splt_sp_set_splitpoint_value(state, i, total_time);
+      continue;
+    }
+
     if (splitpoint_value > total_time)
     {
-      found_max_splitpoint = SPLT_TRUE;
       splt_t_set_splitnumber(state, i+1);
 
       *error = SPLT_SPLITPOINT_BIGGER_THAN_LENGTH;
@@ -103,15 +119,16 @@
       return;
     }
 
-    if (splitpoint_value == LONG_MAX)
+    if (next_splitpoint_value < 0)
     {
-      splt_sp_set_splitpoint_value(state, i, splt_t_get_total_time(state));
+      splt_e_set_error_data_from_splitpoint(state, next_splitpoint_value);
+      *error = SPLT_ERROR_NEGATIVE_SPLITPOINT;
+      return;
     }
 
     if (splitpoint_value > next_splitpoint_value) 
     {
-      splt_e_set_error_data_from_splitpoints(state,
-          splitpoint_value, next_splitpoint_value);
+      splt_e_set_error_data_from_splitpoints(state, splitpoint_value, next_splitpoint_value);
       *error = SPLT_ERROR_SPLITPOINTS_NOT_IN_ORDER;
       return;
     }
@@ -184,7 +201,8 @@
 
   int split_mode = splt_o_get_int_option(state,SPLT_OPT_SPLIT_MODE);
 
-  if (( split_mode == SPLT_OPTION_SILENCE_MODE)
+  if ((split_mode == SPLT_OPTION_SILENCE_MODE)
+      || (split_mode == SPLT_OPTION_TRIM_SILENCE_MODE)
       || splt_o_get_int_option(state,SPLT_OPT_AUTO_ADJUST))
   {
     splt_o_set_int_option(state, SPLT_OPT_FRAME_MODE, SPLT_OPT_FRAME_MODE);
@@ -221,6 +239,7 @@
   if ((splt_o_get_int_option(state,SPLT_OPT_INPUT_NOT_SEEKABLE)) &&
       (splt_o_get_int_option(state,SPLT_OPT_AUTO_ADJUST) ||
        (split_mode == SPLT_OPTION_SILENCE_MODE) ||
+       (split_mode == SPLT_OPTION_TRIM_SILENCE_MODE) ||
        (split_mode == SPLT_OPTION_ERROR_MODE) ||
        (split_mode == SPLT_OPTION_WRAP_MODE)))
   {

libmp3splt-0.6.1a.tar.bz2/src/checks.h -> libmp3splt-0.7.tar.bz2/src/checks.h Changed

libmp3splt-0.6.1a.tar.bz2/src/cue.c -> libmp3splt-0.7.tar.bz2/src/cue.c Changed

libmp3splt-0.6.1a.tar.bz2/src/errors.c -> libmp3splt-0.7.tar.bz2/src/errors.c Changed

@@ -209,11 +209,15 @@
           state->err.error_data, state->err.strerror_msg);
     case SPLT_FREEDB_ERROR_CANNOT_OPEN_SOCKET:
       return splt_su_get_formatted_message(state,
-          _(" freedb error: cannot open socket"));
+          _(" freedb error: cannot open socket (%s)"));
     case SPLT_FREEDB_ERROR_CANNOT_CONNECT:
       return splt_su_get_formatted_message(state,
           _(" freedb error: cannot connect to host '%s' (%s)"),
           state->err.error_data, state->err.strerror_msg);
+    case SPLT_FREEDB_ERROR_CANNOT_DISCONNECT:
+      return splt_su_get_formatted_message(state,
+          _(" freedb error: cannot disconnect from host (%s)"),
+          state->err.strerror_msg);
     case SPLT_FREEDB_ERROR_CANNOT_SEND_MESSAGE:
       return splt_su_get_formatted_message(state,
           _(" freedb error: cannot send message to host '%s' (%s)"),
@@ -282,6 +286,8 @@
       return splt_su_get_formatted_message(state, _(" split in equal tracks ok"));
     case SPLT_SILENCE_OK:
       return splt_su_get_formatted_message(state, _(" silence split ok"));
+    case SPLT_TRIM_SILENCE_OK:
+      return splt_su_get_formatted_message(state, _(" trim using silence split ok"));
     case SPLT_SPLITPOINT_BIGGER_THAN_LENGTH:
       return splt_su_get_formatted_message(state,
           _(" file split, splitpoints bigger than length"));
@@ -318,6 +324,9 @@
     case SPLT_ERROR_CANNOT_GET_TOTAL_TIME:
       return splt_su_get_formatted_message(state,
           _(" error: cannot get total audio length"));
+    case SPLT_ERROR_LIBID3:
+      return splt_su_get_formatted_message(state,
+          _(" error: unknown error while setting tags with libid3"));
     case SPLT_ERROR_SPLITPOINTS_NOT_IN_ORDER:
       return splt_su_get_formatted_message(state,
           _(" error: the splitpoints are not in order (%s)"),

libmp3splt-0.6.1a.tar.bz2/src/freedb.c -> libmp3splt-0.7.tar.bz2/src/freedb.c Changed

@@ -45,9 +45,12 @@
 #endif
 
 #include "splt.h"
-
+#include "socket_manager.h"
 #include "freedb.h"
 
+#define DONT_SKIP_LINES 0
+#define SKIP_ONE_LINE 1
+
 #if defined(__BEOS__) && !defined (HAS_GETPASS)
 //used for proxy (proxy not implemented)
 //#warning Faking getpass() !!!
@@ -62,11 +65,6 @@
 //      return ret;
 //}
 #endif
-#if defined(__BEOS__) && (IPPROTO_UDP==1)
-// net_server has a weird order for IPPROTO_
-#else
-#define closesocket close
-#endif
 
 // The alphabet fpr the base64 algorithm - for proxy (proxy not implemented)
 //
@@ -124,104 +122,6 @@
 //}
 // End of Base64 Algorithm
 
-//! we analyse the freedb2 buffer for the CDs results
-static int splt_freedb2_analyse_cd_buffer (char *buf, int size,
-    splt_state *state, int *error)
-{
-  //temporary pointer
-  char *temp = buf, *temp2 = NULL;
-
-  //we replace the \r with \n
-  while ((temp = strchr(temp,'\r')) != NULL)
-  {
-    *temp = '\n';
-  }
-
-  temp = NULL;
-  do
-  {
-    //genre
-    buf = strchr(buf, '\n');
-
-    if (buf != NULL)
-    {
-      buf += 1;
-      buf++;
-
-      //disc id
-      temp = strchr(buf, ' ');
-      if (temp != NULL)
-      {
-        temp++;
-
-        //artist / album
-        //temp2 is the end of the line
-        temp2 = strchr(temp+8,'\n');
-        if (temp2 != NULL)
-        {
-          temp2++;
-
-          splt_fu_freedb_set_disc(state, splt_fu_freedb_get_found_cds(state), 
-              temp, buf, temp-buf);
-
-          char *full_artist_album = malloc(temp2-(temp+8)-1);
-          if (full_artist_album)
-          {
-            int max_chars = temp2-(temp+8)-1;
-            snprintf(full_artist_album,max_chars,"%s",temp+9);
-            //snprintf seems buggy
-#ifdef __WIN32__					
-            full_artist_albummax_chars-1 = '\0';
-#endif
-            splt_d_print_debug(state,"Setting the full artist album name _%s_\n", full_artist_album);
-
-            //i!=-1 means that it's not a revision
-            int i=0;
-            int err = SPLT_OK;
-            //here we have in album_name the name of the current album
-            err = splt_fu_freedb_append_result(state, full_artist_album, i);
-            if (err < 0)
-            {
-              if (full_artist_album)
-              {
-                free(full_artist_album);
-                full_artist_album = NULL;
-              }
-              *error = err;
-              return -2;
-            }
-
-            //free memory
-            free(full_artist_album);
-            full_artist_album = NULL;
-          }
-          else
-          {
-            *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
-            return -2;
-          }
-
-          //next cd
-          splt_fu_freedb_found_cds_next(state);
-        }
-        else
-        {
-          return -1;
-        }
-      }
-    }
-    else
-    {
-      return 0;
-    }
-
-  } while (((strstr(buf,"/"))!= NULL) &&
-      ((strchr(buf,'\n'))!= NULL) &&
-      (splt_fu_freedb_get_found_cds(state) < SPLT_MAXCD));
-
-  return splt_fu_freedb_get_found_cds(state);
-}
-
 //char *login (char *s)
 //{
 //      char *pass, junk130;
@@ -235,7 +135,7 @@
 //      return s;
 //}
 
-static splt_addr splt_freedb_useproxy(splt_proxy *proxy, splt_addr dest,
+/*static splt_addr splt_freedb_useproxy(splt_proxy *proxy, splt_addr dest,
     const char search_server256, int port)
 {
   dest.proxy=0;
@@ -245,7 +145,6 @@
   //if (proxy->use_proxy)
   if (proxy)
   {
-    /*
     //TODO
     strncpy(dest.hostname, proxy->hostname, 255);
     dest.port = proxy->port;
@@ -261,15 +160,13 @@
     }
     memset(dest.auth, 0x0, strlen(line)+1);
     strncpy(dest.auth, line, strlen(line));
-    //dest.auth = b64(line, strlen(line));*/
+    //dest.auth = b64(line, strlen(line));
   }
 
   if (!dest.proxy) 
   {
-    //we put the hostname
     if (strlen(search_server) == 0)
     {
-      //by default we use freedb2.org
       strncpy(dest.hostname, SPLT_FREEDB2_SITE, 255);
     }
     else
@@ -277,11 +174,8 @@
       strncpy(dest.hostname, search_server, 255);
     }
 
-    //we put the port
     if (port == -1)
     {
-      //by default we put the port 80
-      //to use it with cddb.cgi
       dest.port = SPLT_FREEDB_CDDB_CGI_PORT;
     }
     else
@@ -291,6 +185,97 @@
   }
 
   return dest;
+}*/
+
+char *get_cgi_path_and_cut_server(int type, const char *search_server)
+{
+  char *cgi_path = NULL;
+
+  if (strlen(search_server) == 0)
+  {
+    splt_su_copy("/~cddb/cddb.cgi", &cgi_path);
+    return cgi_path;
+  }
+
+  if (type == SPLT_FREEDB_SEARCH_TYPE_CDDB_CGI ||
+      type == SPLT_FREEDB_GET_FILE_TYPE_CDDB_CGI)
+  {
+    char *path = strchr(search_server,'/');
+    if (path)
+    {
+      splt_su_copy(path, &cgi_path);

libmp3splt-0.6.1a.tar.bz2/src/freedb.h -> libmp3splt-0.7.tar.bz2/src/freedb.h Changed

libmp3splt-0.6.1a.tar.bz2/src/input_output.c -> libmp3splt-0.7.tar.bz2/src/input_output.c Changed

libmp3splt-0.6.1a.tar.bz2/src/mp3splt.c -> libmp3splt-0.7.tar.bz2/src/mp3splt.c Changed

@@ -595,7 +595,7 @@
       splt_o_lock_library(state);
 
       error = splt_tu_append_tags(state, title, artist,
-          album, performer, year, comment, track, genre);
+          album, performer, year, comment, track, genre, SPLT_FALSE);
 
       splt_o_unlock_library(state);
     }
@@ -870,24 +870,6 @@
 
       int split_type = splt_o_get_int_option(state, SPLT_OPT_SPLIT_MODE);
 
-      //normal split checks
-      if (split_type == SPLT_OPTION_NORMAL_MODE)
-      {
-        if (! splt_o_get_int_option(state, SPLT_OPT_PRETEND_TO_SPLIT))
-        {
-          //check if we have at least 2 splitpoints
-          if (splt_t_get_splitnumber(state) < 2)
-          {
-            error = SPLT_ERROR_SPLITPOINTS;
-            goto function_end;
-          }
-        }
-
-        //we check if the splitpoints are in order
-        splt_check_if_points_in_order(state, &error);
-        if (error < 0) { goto function_end; }
-      }
-
       splt_t_set_new_filename_path(state, new_filename_path, &error);
       if (error < 0) { goto function_end; }
 
@@ -945,6 +927,7 @@
       {
         if ((split_type != SPLT_OPTION_WRAP_MODE)
             && (split_type != SPLT_OPTION_SILENCE_MODE)
+            && (split_type != SPLT_OPTION_TRIM_SILENCE_MODE)
             && (split_type != SPLT_OPTION_ERROR_MODE))
         {
           splt_c_put_info_message_to_client(state, 
@@ -964,6 +947,9 @@
         case SPLT_OPTION_SILENCE_MODE:
           splt_s_silence_split(state, &error);
           break; 
+        case SPLT_OPTION_TRIM_SILENCE_MODE:
+          splt_s_trim_silence_split(state, &error);
+          break;
         case SPLT_OPTION_TIME_MODE:
           splt_s_time_split(state, &error);
           break;
@@ -976,7 +962,20 @@
         default:
           if (split_type == SPLT_OPTION_NORMAL_MODE)
           {
-            splt_check_points_inf_song_length(state, &error);
+            if (! splt_o_get_int_option(state, SPLT_OPT_PRETEND_TO_SPLIT))
+            {
+              //check if we have at least 2 splitpoints
+              if (splt_t_get_splitnumber(state) < 2)
+              {
+                error = SPLT_ERROR_SPLITPOINTS;
+                goto function_end;
+              }
+            }
+
+            splt_check_points_inf_song_length_and_convert_negatives(state, &error);
+            if (error < 0) { goto function_end; }
+
+            splt_check_if_points_in_order(state, &error);
             if (error < 0) { goto function_end; }
           }

libmp3splt-0.6.1a.tar.bz2/src/oformat_parser.c -> libmp3splt-0.7.tar.bz2/src/oformat_parser.c Changed

libmp3splt-0.6.1a.tar.bz2/src/plugins.c -> libmp3splt-0.7.tar.bz2/src/plugins.c Changed

@@ -84,55 +84,98 @@
   return SPLT_OK;
 }
 
-//function to filter the plugin files
+#ifdef __WIN32__
+static int splt_p_filter_plugin_files(const struct _wdirent *de)
+{
+  wchar_t *file = (wchar_t *) de->d_name;
+  const wchar_t *p_end = NULL;
+  const wchar_t *p_start = NULL;
+
+  if (!file)
+  {
+    return 0;
+  }
+
+  if (wcslen(file) < 8)
+  {
+    return 0;
+  }
+
+  if (wcsncmp(file, L"libsplt_", 8) != 0)
+  {
+    return 0;
+  }
+
+  splt_d_print_debug(NULL, "Looking at the file _%s_\n", splt_w32_utf16_to_utf8(file));
+
+  p_start = wcschr(file,'.');
+  p_end = wcsrchr(file,'.');
+  if ((p_end != NULL) && (p_start == p_end))
+  {
+    if (wcscmp(p_end, L".dll") == 0)
+    {
+      return 1;
+    }
+  }
+
+  return 0;
+}
+#else
 static int splt_p_filter_plugin_files(const struct dirent *de)
 {
   char *file = (char *) de->d_name;
   const char *p_end = NULL;
   const char *p_start = NULL;
-  if (file)
+
+  if (!file)
   {
-    if (strlen(file) >= 8)
-    {
-      //if the name starts with splt_and contains .so or .sl or .dll or .dylib
-      if (strncmp(file,"libsplt_",8) == 0)
-      {
-        splt_d_print_debug(NULL, "Looking at the file _%s_\n", file);
+    return 0;
+  }
 
-        p_start = strchr(file,'.');
+  if (strlen(file) < 8)
+  {
+    return 0;
+  }
+
+  if (strncmp(file,"libsplt_", 8) != 0)
+  {
+    return 0;
+  }
+
+  splt_d_print_debug(NULL, "Looking at the file _%s_\n", file);
+
+  p_start = strchr(file,'.');
 
 #ifndef __WIN32__
-        //gnu/linux .so.0
-        p_end = strstr(file, ".so.0");
-        if (p_end != NULL && (p_start == p_end) && (*(p_end+5) == '\0'))
-        {
-          return 1;
-        }
+  //gnu/linux .so.0
+  p_end = strstr(file, ".so.0");
+  if (p_end != NULL && (p_start == p_end) && (*(p_end+5) == '\0'))
+  {
+    return 1;
+  }
 #endif
 
-        p_end = strrchr(file,'.');
-        if ((p_end != NULL) && (p_start == p_end))
-        {
-          //windows .dll
+  p_end = strrchr(file,'.');
+  if ((p_end != NULL) && (p_start == p_end))
+  {
+    //windows .dll
 #ifdef __WIN32__
-          if (strcmp(p_end,".dll") == 0)
-          {
-            return 1;
-          }
+    if (strcmp(p_end,".dll") == 0)
+    {
+      return 1;
+    }
 #else
-          //bsd .sl & darwin .dylib
-          if ((strcmp(p_end,".sl") == 0) || (strcmp(p_end,".dylib") == 0))
-          {
-            return 1;
-          }
-#endif
-        }
-      }
+    //bsd .sl & darwin .dylib
+    if ((strcmp(p_end,".sl") == 0) || (strcmp(p_end,".dylib") == 0))
+    {
+      return 1;
     }
+#endif
   }
 
   return 0;
 }
+#endif
 
 static int splt_p_alloc_init_new_plugin(splt_plugins *pl)
 {
@@ -177,12 +220,19 @@
 {
   int return_value = SPLT_OK;
 
+#ifdef __WIN32__
+  struct _wdirent **files = NULL;
+#else
   struct dirent **files = NULL;
+#endif
 
   int number_of_files = 0;
   errno = 0;
+#ifdef __WIN32__
+  number_of_files = wscandir(directory, &files, splt_p_filter_plugin_files, walphasort);
+#else
   number_of_files = scandir(directory, &files, splt_p_filter_plugin_files, alphasort);
-  int directory_len = strlen(directory);
+#endif
   int new_number_of_files = number_of_files;
 
   if (number_of_files == -1)
@@ -194,35 +244,32 @@
   }
   else if (new_number_of_files >= 0)
   {
-    char *fname = NULL;
+    char *dir_and_fname = NULL;
 
     //for all the filtered found plugins,
     //copy their name
     while (new_number_of_files--)
     {
-      fname = filesnew_number_of_files->d_name;
-      int fname_len = strlen(fname);
+#ifdef __WIN32__
+      char *fname = splt_w32_utf16_to_utf8(filesnew_number_of_files->d_name);
+#else
+      char *fname = filesnew_number_of_files->d_name;
+#endif
 
-      //get the full directory + filename
-      int dir_and_fname_len = fname_len + directory_len + 3;
-      char *dir_and_fname = malloc(sizeof(char) * dir_and_fname_len);
-      if (dir_and_fname == NULL)
-      {
-        return_value = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
-        goto end;
-      }
-      snprintf(dir_and_fname, dir_and_fname_len - 1, "%s%c%s",directory,SPLT_DIRCHAR,fname);
+#ifdef __WIN32__
+      splt_su_copy(fname, &dir_and_fname);
+#else
+      splt_su_copy(directory, &dir_and_fname);
+      splt_su_append_str(&dir_and_fname, SPLT_DIRSTR, fname, NULL);
+#endif
 
-      //check if we already have a plugin with the same file
-      int we_already_have_this_plugin_file = SPLT_FALSE;
       int i = 0;
       int err = SPLT_OK;
       for (i = 0;i < pl->number_of_plugins_found;i++)
       {
         if (splt_check_is_the_same_file(state, dir_and_fname, pl->datai.plugin_filename, &err))
         {
-          we_already_have_this_plugin_file = SPLT_TRUE;
-          break;
+          goto loop_end;
         }
 
         if (err != SPLT_OK)

libmp3splt-0.6.1a.tar.bz2/src/plugins.h -> libmp3splt-0.7.tar.bz2/src/plugins.h Changed

libmp3splt-0.7.tar.bz2/src/socket_manager.c Added

@@ -0,0 +1,360 @@
+/**********************************************************
+ *
+ * audacity.c -- Audacity label file parser portion of the Mp3Splt utility
+ *                    Utility for mp3/ogg splitting without decoding
+ *
+ * Copyright (c) 2002-2004 M. Trotta - <matteo.trotta@lib.unimib.it>
+ * Copyright (c) 2007 Federico Grau - <donfede@casagrau.org>
+ * Copyright (c) 2010-2011 Alexandru Munteanu <io_fx@yahoo.fr>
+ *
+ * http://mp3splt.sourceforge.net
+ * http://audacity.sourceforge.net/
+ */
+
+/**********************************************************
+ *
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307,
+ * USA.
+ *
+ *********************************************************/
+
+/*!\file 
+
+Manages a socket connection
+*/
+
+#include <unistd.h>
+
+#ifdef __WIN32__
+#include <conio.h>
+#include <winsock.h>
+#else
+#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#endif
+
+#include <string.h>
+
+#include "splt.h"
+#include "socket_manager.h"
+
+#define SPLT_BUFFER_SIZE 1024
+#define SPLT_MAXIMUM_NUMBER_OF_LINES_READ 1000
+
+
+void splt_sm_connect(splt_socket_handler *sh, const char *hostname, int port,
+    splt_state *state)
+{
+  struct hostent *host_entity = NULL;
+  
+  int err = splt_su_copy(hostname, &sh->hostname);
+  if (err < 0) { sh->error = err; return; }
+
+#ifdef __WIN32__
+  WSADATA winsock;
+  long winsockinit = WSAStartup(0x0101,&winsock);
+  if (winsockinit != 0)
+  {
+    splt_e_set_strerror_msg(state);
+    sh->error = SPLT_FREEDB_ERROR_INITIALISE_SOCKET;
+    return;
+  }
+#endif
+
+  host_entity = gethostbyname(hostname);
+
+  if (host_entity == NULL)
+  {
+    splt_e_set_strherror_msg(state);
+    splt_e_set_error_data(state, hostname);
+    sh->error = SPLT_FREEDB_ERROR_CANNOT_GET_HOST;
+    return;
+  }
+
+  struct sockaddr_in my_socket;
+  memset(&my_socket, 0x0, sizeof(my_socket));
+  my_socket.sin_family = AF_INET;
+  my_socket.sin_addr.s_addr = ((struct in_addr *) (host_entity->h_addr)) ->s_addr;
+  my_socket.sin_port = htons(port);
+
+  sh->fd = socket(AF_INET, SOCK_STREAM, 0);
+  if (sh->fd == -1)
+  {
+    splt_e_set_strerror_msg(state);
+    sh->error = SPLT_FREEDB_ERROR_CANNOT_OPEN_SOCKET;
+    return;
+  }
+
+  if (connect(sh->fd, (void *)&my_socket, sizeof(my_socket)) < 0)
+  {
+    splt_e_set_strerror_msg(state);
+    splt_e_set_error_data(state, hostname);
+    sh->error = SPLT_FREEDB_ERROR_CANNOT_CONNECT;
+    return;
+  }
+}
+
+void splt_sm_send(splt_socket_handler *sh, const char *message, 
+    splt_state *state)
+{
+  if (send(sh->fd, message, strlen(message), 0) == -1)
+  {
+    splt_e_set_strerror_msg(state);
+    splt_e_set_error_data(state, sh->hostname);
+    sh->error = SPLT_FREEDB_ERROR_CANNOT_SEND_MESSAGE;
+  }
+}
+
+void splt_sm_send_http_message(splt_socket_handler *sh, const char *message,
+    splt_state *state)
+{
+  char *message_with_http = NULL;
+  int err = splt_su_append_str(&message_with_http, 
+      message, " HTTP/1.0\r\nHost: ", sh->hostname, "\r\n\r\n", NULL);
+  if (err < 0) { sh->error = err; return; }
+
+  splt_sm_send(sh, message_with_http, state);
+
+  if (message_with_http)
+  {
+    free(message_with_http);
+    message_with_http = NULL;
+  }
+}
+
+int splt_sm_process_without_headers_functor(const char *received_line, 
+    int line_number, void *user_data)
+{
+  splt_sm_functor_decorator *sm_fd = (splt_sm_functor_decorator *) user_data;
+ 
+  if (!sm_fd->processing_headers)
+  {
+    int real_line_number = 
+      sm_fd->line_number_after_headers - sm_fd->num_lines_to_skip;
+
+    if (real_line_number > 0)
+    {
+      int we_continue = sm_fd->functor(received_line, real_line_number, sm_fd->user_data);
+      if (!we_continue)
+      {
+        return SPLT_FALSE;
+      }
+    }
+    sm_fd->line_number_after_headers++;
+  }
+
+  if (strlen(received_line) == 0)
+  {
+    sm_fd->processing_headers = SPLT_FALSE;
+  }
+
+  return SPLT_TRUE;
+}
+
+void splt_sm_receive_and_process_without_headers_with_recv(splt_socket_handler *sh, 
+    splt_state *state,
+    ssize_t (*recv_func)(int fd, void *buf, size_t len, int flags),
+    int (*process_functor)(const char *received_line, int line_number, void *user_data),
+    void *user_data, int number_of_lines_to_skip_after_headers)
+{
+  splt_sm_functor_decorator *sm_fd = malloc(sizeof(splt_sm_functor_decorator));
+  if (!sm_fd)
+  {
+    sh->error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
+    return;
+  }
+
+  sm_fd->functor = process_functor;
+  sm_fd->user_data = user_data;
+  sm_fd->processing_headers = SPLT_TRUE;
+  sm_fd->num_lines_to_skip = number_of_lines_to_skip_after_headers;
+  sm_fd->line_number_after_headers = 1;
+  sm_fd->line_number = 1;
+
+  splt_sm_receive_and_process_with_recv(sh, state, 
+      recv_func, splt_sm_process_without_headers_functor, sm_fd);
+
+  free(sm_fd);
+  sm_fd = NULL;
+}
+
+void splt_sm_receive_and_process_without_headers(splt_socket_handler *sh, 
+    splt_state *state, 
+    int (*process_functor)(const char *received_line, int line_number, void *user_data),
+    void *user_data, int number_of_lines_to_skip_after_headers)
+{

libmp3splt-0.7.tar.bz2/src/socket_manager.h Added

@@ -0,0 +1,89 @@
+/*
+ * audacity.h -- Audacity label file parser portion of the Mp3Splt utility
+ *                    Utility for mp3/ogg splitting without decoding
+ *
+ * Copyright (c) 2002-2004 M. Trotta - <matteo.trotta@lib.unimib.it>
+ * Copyright (c) 2007 Federico Grau - <donfede@casagrau.org>
+ *
+ * http://mp3splt.sourceforge.net
+ * http://audacity.sourceforge.net/
+ */
+
+/**********************************************************
+ *
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307,
+ * USA.
+ *
+ *********************************************************/
+
+#ifndef _MP3SPLT_SOCKET_MANAGER_H
+
+#if defined(__BEOS__) && (IPPROTO_UDP==1)
+// net_server has a weird order for IPPROTO_
+#else
+ #ifndef __WIN32__
+  #define closesocket close
+ #endif
+#endif
+
+typedef struct {
+  int error;
+#ifdef __WIN32__
+  SOCKET fd;
+#else
+  int fd;
+#endif
+  char *hostname;
+} splt_socket_handler;
+
+typedef struct {
+  int (*functor)(const char *received_line, int line_number, void *user_data);
+  void *user_data;
+  int processing_headers;
+  int num_lines_to_skip;
+  int line_number_after_headers;
+  int line_number;
+} splt_sm_functor_decorator;
+
+splt_socket_handler *splt_sm_socket_handler_new(int *error);
+void splt_sm_socket_handler_free(splt_socket_handler **sh);
+
+void splt_sm_connect(splt_socket_handler *sh, const char *hostname, int port,
+    splt_state *state);
+void splt_sm_send_http_message(splt_socket_handler *sh, const char *message,
+    splt_state *state);
+
+void splt_sm_receive_and_process_without_headers(splt_socket_handler *sh, splt_state *state,
+    int (*process_functor)(const char *received_line, int line_number, void *user_data),
+    void *user_data, int number_of_lines_to_skip_after_headers);
+void splt_sm_receive_and_process_without_headers_with_recv(splt_socket_handler *sh, 
+    splt_state *state,
+    ssize_t (*recv_func)(int fd, void *buf, size_t len, int flags),
+    int (*process_functor)(const char *received_line, int line_number, void *user_data),
+    void *user_data, int number_of_lines_to_skip_after_headers);
+void splt_sm_receive_and_process(splt_socket_handler *sh, splt_state *state,
+    int (*process_functor)(const char *received_line, int line_number, void *user_data),
+    void *user_data);
+void splt_sm_receive_and_process_with_recv(splt_socket_handler *sh, splt_state *state,
+    ssize_t (*recv_func)(int fd, void *buf, size_t len, int flags),
+    int (*process_functor)(const char *received_line, int line_number, void *user_data),
+    void *user_data);
+
+void splt_sm_close(splt_socket_handler *sh, splt_state *state);
+
+#define _MP3SPLT_SOCKET_MANAGER_H
+#endif
+

libmp3splt-0.6.1a.tar.bz2/src/split_points.c -> libmp3splt-0.7.tar.bz2/src/split_points.c Changed

@@ -61,41 +61,34 @@
   splt_d_print_debug(state,"Appending splitpoint _%s_ with value _%ld_\n",
       name, split_value);
 
-  if (split_value >= 0)
-  {
-    split->real_splitnumber++;
+  split->real_splitnumber++;
 
-    if (!split->points)
+  if (!split->points)
+  {
+    if ((split->points = malloc(sizeof(splt_point))) == NULL)
     {
-      if ((split->points = malloc(sizeof(splt_point))) == NULL)
-      {
-        return SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
-      }
+      return SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
     }
-    else
+  }
+  else
+  {
+    if ((split->points = realloc(split->points,
+            split->real_splitnumber * sizeof(splt_point))) == NULL)
     {
-      if ((split->points = realloc(split->points,
-              split->real_splitnumber * sizeof(splt_point))) == NULL)
-      {
-        return SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
-      }
+      return SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
     }
+  }
 
-    int index = split->real_splitnumber - 1;
-    split->pointsindex.name = NULL;
+  int index = split->real_splitnumber - 1;
+  split->pointsindex.name = NULL;
 
-    error = splt_sp_set_splitpoint_value(state, index, split_value);
-    if (error != SPLT_OK) { return error; }
+  error = splt_sp_set_splitpoint_value(state, index, split_value);
+  if (error != SPLT_OK) { return error; }
 
-    error = splt_sp_set_splitpoint_name(state, index, name);
-    if (error < 0) { return error; }
+  error = splt_sp_set_splitpoint_name(state, index, name);
+  if (error < 0) { return error; }
 
-    splt_sp_set_splitpoint_type(state, index, type);
-  }
-  else
-  {
-    return SPLT_ERROR_NEGATIVE_SPLITPOINT;
-  }
+  splt_sp_set_splitpoint_type(state, index, type);
 
   return error;
 }

libmp3splt-0.6.1a.tar.bz2/src/splt.c -> libmp3splt-0.7.tar.bz2/src/splt.c Changed

@@ -591,6 +591,67 @@
   }
 }
 
+int splt_s_set_trim_silence_splitpoints(splt_state *state, int *error)
+{
+  splt_d_print_debug(state, "Search and set trim silence splitpoints...\n");
+
+  int found = 0;
+  struct splt_ssplit *temp = NULL;
+  int append_error = SPLT_OK;
+
+  if (! splt_o_get_int_option(state,SPLT_OPT_QUIET_MODE))
+  {
+    splt_c_put_info_message_to_client(state, 
+        _(" Trim silence split - Th: %.1f dB\n"),
+        splt_o_get_float_option(state, SPLT_OPT_PARAM_THRESHOLD));
+  }
+
+  if (state->split.get_silence_level)
+  {
+    state->split.get_silence_level(0, INT_MAX, state->split.silence_level_client_data);
+  }
+  found = splt_p_scan_trim_silence(state, error);
+  if (*error < 0) { goto end; }
+
+  if (splt_t_split_is_canceled(state))
+  {
+    *error = SPLT_SPLIT_CANCELLED;
+    goto end;
+  }
+
+  temp = state->silence_list;
+  int i;
+  long previous = 0;
+  for (i = 1; i < found + 1; i++)
+  {
+    if (temp == NULL)
+    {
+      found = i;
+      break;
+    }
+
+    long temp_silence_pos = splt_siu_silence_position(temp, 0) * 100;
+
+    if (i > 1 && temp_silence_pos < previous)
+    {
+      temp_silence_pos = LONG_MAX;
+    }
+
+    append_error = splt_sp_append_splitpoint(state, temp_silence_pos, NULL, SPLT_SPLITPOINT);
+    if (append_error != SPLT_OK) { *error = append_error; found = i; break; }
+
+    temp = temp->next;
+
+    previous = temp_silence_pos;
+  }
+
+end:
+  splt_siu_ssplit_free(&state->silence_list);
+  splt_t_set_splitnumber(state, found);
+
+  return found;
+}
+
 /************************************/
 /*! Split with split points setermined by silence detection
 
@@ -722,7 +783,6 @@
   {
     if (state->split.get_silence_level)
     {
-      //TODO
       state->split.get_silence_level(0, INT_MAX, state->split.silence_level_client_data);
     }
     found = splt_p_scan_silence(state, error);
@@ -795,12 +855,11 @@
             if (append_error < 0) { *error = append_error; found = i; break;}
             append_error = splt_sp_append_splitpoint(state, 0, NULL, SPLT_SPLITPOINT);
             if (append_error < 0) { *error = append_error; found = i; break;}
-            splt_sp_set_splitpoint_value(state, 2*i-1,splt_co_time_to_long(temp->begin_position));
+            splt_sp_set_splitpoint_value(state, 2*i-1, splt_co_time_to_long(temp->begin_position));
             splt_sp_set_splitpoint_value(state, 2*i, splt_co_time_to_long(temp->end_position));
           }
           else
           {
-            //TODO
             long temp_silence_pos = splt_siu_silence_position(temp, offset) * 100;
             append_error = splt_sp_append_splitpoint(state, temp_silence_pos, NULL, SPLT_SPLITPOINT);
             if (append_error != SPLT_OK) { *error = append_error; found = i; break; }
@@ -924,9 +983,6 @@
       //we put the silence split errors
       switch (*error)
       {
-/*        case SPLT_MIGHT_BE_VBR:
-          *error = SPLT_SILENCE_OK;
-          break;*/
         case SPLT_OK_SPLIT:
           *error = SPLT_SILENCE_OK;
           break;
@@ -944,6 +1000,47 @@
   }
 }
 
+/*! Do the trim silence split
+
+\param error The code of a eventual error that has occoured
+*/ 
+void splt_s_trim_silence_split(splt_state *state, int *error)
+{
+  splt_c_put_info_message_to_client(state, _(" info: starting trim using silence mode split\n"));
+
+  int found = splt_s_set_trim_silence_splitpoints(state, error);
+  if (*error < 0) { return; }
+
+  if (found < 1)
+  {
+    *error = SPLT_NO_SILENCE_SPLITPOINTS_FOUND;
+    return;
+  }
+
+  splt_d_print_debug(state,"Writing tracks...\n");
+
+  int output_filenames = splt_o_get_int_option(state,SPLT_OPT_OUTPUT_FILENAMES);
+  if (output_filenames == SPLT_OUTPUT_DEFAULT)
+  {
+    splt_of_set_oformat(state, SPLT_DEFAULT_TRIM_SILENCE_OUTPUT, error, SPLT_TRUE);
+    if (*error < 0) { return; }
+  }
+
+  splt_s_multiple_split(state, error);
+
+  switch (*error)
+  {
+    case SPLT_OK_SPLIT:
+      *error = SPLT_TRIM_SILENCE_OK;
+      break;
+    case SPLT_OK_SPLIT_EOF:
+      *error = SPLT_TRIM_SILENCE_OK;
+      break;
+    default:
+      break;
+  }
+}
+
 /****************************/
 /*! Automatically split a file that has been created by mp3wrap

libmp3splt-0.6.1a.tar.bz2/src/splt.h -> libmp3splt-0.7.tar.bz2/src/splt.h Changed

libmp3splt-0.6.1a.tar.bz2/src/splt_array.c -> libmp3splt-0.7.tar.bz2/src/splt_array.c Changed

libmp3splt-0.6.1a.tar.bz2/src/splt_array.h -> libmp3splt-0.7.tar.bz2/src/splt_array.h Changed

libmp3splt-0.6.1a.tar.bz2/src/string_utils.c -> libmp3splt-0.7.tar.bz2/src/string_utils.c Changed

libmp3splt-0.6.1a.tar.bz2/src/string_utils.h -> libmp3splt-0.7.tar.bz2/src/string_utils.h Changed

libmp3splt-0.6.1a.tar.bz2/src/tags_parser.c -> libmp3splt-0.7.tar.bz2/src/tags_parser.c Changed

libmp3splt-0.6.1a.tar.bz2/src/tags_utils.c -> libmp3splt-0.7.tar.bz2/src/tags_utils.c Changed

@@ -32,37 +32,42 @@
 
 void splt_tu_free_original_tags(splt_state *state)
 {
-  if (state->original_tags.year)
+  splt_tags *tags = &state->original_tags.tags;
+
+  if (tags->year)
   {
-    free(state->original_tags.year);
-    state->original_tags.year = NULL;
+    free(tags->year);
+    tags->year = NULL;
   }
-  if (state->original_tags.artist)
+  if (tags->artist)
   {
-    free(state->original_tags.artist);
-    state->original_tags.artist = NULL;
+    free(tags->artist);
+    tags->artist = NULL;
   }
-  if (state->original_tags.album)
+  if (tags->album)
   {
-    free(state->original_tags.album);
-    state->original_tags.album = NULL;
+    free(tags->album);
+    tags->album = NULL;
   }
-  if (state->original_tags.title)
+  if (tags->title)
   {
-    free(state->original_tags.title);
-    state->original_tags.title = NULL;
+    free(tags->title);
+    tags->title = NULL;
   }
-  if (state->original_tags.comment)
+  if (tags->comment)
   {
-    free(state->original_tags.comment);
-    state->original_tags.comment = NULL;
+    free(tags->comment);
+    tags->comment = NULL;
   }
-  if (state->original_tags.genre)
+  if (tags->genre)
   {
-    free(state->original_tags.genre);
-    state->original_tags.genre = NULL;
+    free(tags->genre);
+    tags->genre = NULL;
   }
-  state->original_tags.track = -1;
+  tags->track = -1;
+
+  int err = SPLT_OK;
+  splt_p_clear_original_tags(state, &err);
 }
 
 //! Get all tags for split point number x
@@ -135,7 +140,7 @@
     const char *title, const char *artist,
     const char *album, const char *performer,
     const char *year, const char *comment,
-    int track, const char *genre)
+    int track, const char *genre, int set_original_tags)
 {
   int error = SPLT_OK;
   int old_tagsnumber = state->split.real_tagsnumber;
@@ -168,6 +173,10 @@
   if (error != SPLT_OK)
     return error;
 
+  error = splt_tu_set_tags_field(state, old_tagsnumber, SPLT_TAGS_ORIGINAL, &set_original_tags);
+  if (error != SPLT_OK)
+    return error;
+
   error = splt_tu_set_tags_field(state, old_tagsnumber, SPLT_TAGS_GENRE, genre);
   return error;
 }
@@ -183,26 +192,28 @@
   char *new_comment = NULL;
   char *new_genre = NULL;
 
-  new_title = splt_su_replace_all(state->original_tags.title, "@", "@@", &err);
+  splt_tags *tags = &state->original_tags.tags;
+
+  new_title = splt_su_replace_all(tags->title, "@", "@@", &err);
   if (err != SPLT_OK) { goto end; }
 
-  new_artist = splt_su_replace_all(state->original_tags.artist, "@", "@@", &err);
+  new_artist = splt_su_replace_all(tags->artist, "@", "@@", &err);
   if (err != SPLT_OK) { goto end; }
 
-  new_album = splt_su_replace_all(state->original_tags.album, "@", "@@", &err);
+  new_album = splt_su_replace_all(tags->album, "@", "@@", &err);
   if (err != SPLT_OK) { goto end; }
 
-  new_year = splt_su_replace_all(state->original_tags.year, "@", "@@", &err);
+  new_year = splt_su_replace_all(tags->year, "@", "@@", &err);
   if (err != SPLT_OK) { goto end; }
 
-  new_comment = splt_su_replace_all(state->original_tags.comment, "@", "@@", &err);
+  new_comment = splt_su_replace_all(tags->comment, "@", "@@", &err);
   if (err != SPLT_OK) { goto end; }
 
-  new_genre = splt_su_replace_all(state->original_tags.genre, "@", "@@", &err);
+  new_genre = splt_su_replace_all(tags->genre, "@", "@@", &err);
   if (err != SPLT_OK) { goto end; }
 
   err = splt_tu_append_tags(state, new_title, new_artist, new_album, NULL,
-      new_year, new_comment, state->original_tags.track, new_genre);
+      new_year, new_comment, tags->track, new_genre, SPLT_TRUE);
 
 end:
   if (new_title) { free(new_title); }
@@ -219,7 +230,7 @@
     const char *title, const char *artist,
     const char *album, const char *performer,
     const char *year, const char *comment,
-    int track, const char *genre)
+    int track, const char *genre, int set_original_tags)
 {
   int error = SPLT_OK;
   int old_tagsnumber = state->split.real_tagsnumber-1;
@@ -275,6 +286,13 @@
     if (error != SPLT_OK)
       return error;
 
+    if (set_original_tags != -1)
+    {
+      error = splt_tu_set_tags_field(state, old_tagsnumber, SPLT_TAGS_ORIGINAL, &set_original_tags);
+    }
+    if (error != SPLT_OK)
+      return error;
+
     if (genre != NULL)
     {
       error = splt_tu_set_tags_field(state, old_tagsnumber, SPLT_TAGS_GENRE, genre);
@@ -295,6 +313,7 @@
   tags->track = -1;
   tags->genre = NULL;
   tags->tags_version = 0;
+  tags->set_original_tags = SPLT_FALSE;
 }
 
 splt_tags *splt_tu_new_tags(splt_state *state, int *error)
@@ -417,7 +436,17 @@
 
 int splt_tu_set_original_tags_field(splt_state *state, int tags_field, const void *data)
 {
-  return splt_tu_set_field_on_tags(&state->original_tags, tags_field, data);
+  return splt_tu_set_field_on_tags(&state->original_tags.tags, tags_field, data);
+}
+
+void splt_tu_set_original_tags_data(splt_state *state, void *data)
+{
+  state->original_tags.all_original_tags = data;
+}
+
+void *splt_tu_get_original_tags_data(splt_state *state)
+{
+  return state->original_tags.all_original_tags;
 }
 
 static char *splt_tu_get_replaced_with_tags(const char *word,
@@ -620,13 +649,15 @@
   if (append_new_tags)
   {
     err = splt_tu_append_tags(state, tags->title, tags->artist, tags->album,
-        tags->performer, tags->year, tags->comment, tags->track, tags->genre);
+        tags->performer, tags->year, tags->comment, tags->track, tags->genre,
+        SPLT_FALSE);
   }
   else
   {
     err = splt_tu_append_only_non_null_previous_tags(state, tags->title,
         tags->artist, tags->album, tags->performer, tags->year, 
-        tags->comment, tags->track, tags->genre);
+        tags->comment, tags->track, tags->genre,
+        SPLT_TRUE);
   }
 
   if (err < 0)
@@ -636,7 +667,7 @@
 }
 
 void splt_tu_set_new_tags_where_current_tags_are_null(splt_state *state,
-    splt_tags *current_tags, splt_tags *new_tags, 
+    splt_tags *current_tags, splt_tags *new_tags,
     int index, int *error)
 {
   if (!current_tags->title)
@@ -672,6 +703,7 @@
   {
     splt_tu_set_tags_field(state, index, SPLT_TAGS_GENRE, new_tags->genre);
   }
+  splt_tu_set_tags_field(state, index, SPLT_TAGS_ORIGINAL, &new_tags->set_original_tags);

libmp3splt-0.6.1a.tar.bz2/src/tags_utils.h -> libmp3splt-0.7.tar.bz2/src/tags_utils.h Changed

@@ -49,6 +49,8 @@
     int tags_field, const void *data);
 int splt_tu_set_original_tags_field(splt_state *state,
     int tags_field, const void *data);
+void splt_tu_set_original_tags_data(splt_state *state, void *data);
+void *splt_tu_get_original_tags_data(splt_state *state);
 splt_tags *splt_tu_get_tags(splt_state *state, int *tags_number);
 
 int splt_tu_set_tags_in_tags(splt_state *state, int current_tags);
@@ -70,7 +72,7 @@
     const char *title, const char *artist,
     const char *album, const char *performer,
     const char *year, const char *comment,
-    int track, const char *genre);
+    int track, const char *genre, int set_original_tags);
 
 void splt_tu_append_tags_to_state(splt_state *state, splt_tags *tags, 
     int append_null_tags, int *error);
@@ -83,7 +85,7 @@
     const char *title, const char *artist,
     const char *album, const char *performer,
     const char *year, const char *comment,
-    int track, const char *genre);
+    int track, const char *genre, int set_original_tags);
 
 #define MP3SPLT_TAGS_UTILS_H

libmp3splt-0.6.1a.tar.bz2/src/types_func.c -> libmp3splt-0.7.tar.bz2/src/types_func.c Changed

libmp3splt-0.6.1a.tar.bz2/test/Makefile.am -> libmp3splt-0.7.tar.bz2/test/Makefile.am Changed

libmp3splt-0.6.1a.tar.bz2/test/Makefile.in -> libmp3splt-0.7.tar.bz2/test/Makefile.in Changed

@@ -64,6 +64,13 @@
 @HAS_CUTTER_TRUE@am_test_pair_la_OBJECTS = test_pair.lo
 test_pair_la_OBJECTS = $(am_test_pair_la_OBJECTS)
 @HAS_CUTTER_TRUE@am_test_pair_la_rpath =
+test_socket_manager_la_LIBADD =
+am__test_socket_manager_la_SOURCES_DIST = test_socket_manager.c \
+	tests.h
+@HAS_CUTTER_TRUE@am_test_socket_manager_la_OBJECTS =  \
+@HAS_CUTTER_TRUE@	test_socket_manager.lo
+test_socket_manager_la_OBJECTS = $(am_test_socket_manager_la_OBJECTS)
+@HAS_CUTTER_TRUE@am_test_socket_manager_la_rpath =
 test_splt_array_la_LIBADD =
 am__test_splt_array_la_SOURCES_DIST = test_splt_array.c tests.h
 @HAS_CUTTER_TRUE@am_test_splt_array_la_OBJECTS = test_splt_array.lo
@@ -89,9 +96,11 @@
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(test_filename_regex_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_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)
 ETAGS = etags
@@ -168,6 +177,7 @@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -210,6 +220,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -242,7 +253,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 ltdl_LIBOBJS = @ltdl_LIBOBJS@
 ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
 mandir = @mandir@
@@ -267,12 +277,14 @@
 @HAS_CUTTER_TRUE@noinst_LTLIBRARIES = test_splt_array.la \
 @HAS_CUTTER_TRUE@test_pair.la \
 @HAS_CUTTER_TRUE@test_string_utils.la \
-@HAS_CUTTER_TRUE@test_filename_regex.la
+@HAS_CUTTER_TRUE@test_filename_regex.la \
+@HAS_CUTTER_TRUE@test_socket_manager.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@TESTS = run-tests.sh
 @HAS_CUTTER_TRUE@TESTS_ENVIRONMENT = NO_MAKE=yes CUTTER="$(CUTTER)"
 all: all-am
@@ -322,6 +334,8 @@
 	$(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) 
 	$(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) 
+	$(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) 
 	$(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) 
@@ -335,6 +349,7 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_filename_regex.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@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_string_utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tests.Plo@am__quote@

libmp3splt-0.7.tar.bz2/test/test_socket_manager.c Added

@@ -0,0 +1,175 @@
+#include <cutter.h>
+
+#include "libmp3splt/mp3splt.h"
+#include "socket_manager.h"
+
+static int error = SPLT_OK;
+static splt_state *state = NULL;
+
+int process_functor(const char *received_line, int line_number, void *user_data);
+int process_functor_with_skip_line(const char *received_line, int line_number, void *user_data);
+int processor_with_continue_false(const char *received_line, int line_number, void *user_data);
+ssize_t recv_without_headers(int descriptor, void *buffer, size_t buffer_size, int flags);
+ssize_t recv_with_headers(int descriptor, void *buffer, size_t buffer_size, int flags);
+
+static int counter = 10;
+
+void cut_setup()
+{
+  state = mp3splt_new_state(NULL);
+  error = SPLT_OK;
+}
+
+void cut_teardown()
+{
+  mp3splt_free_state(state, NULL);
+}
+
+void test_sm_receive_and_process()
+{
+  counter = 10;
+
+  splt_socket_handler *sh = splt_sm_socket_handler_new(&error);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  splt_sm_receive_and_process_with_recv(sh, state, &recv_without_headers, &process_functor, NULL);
+
+  splt_sm_socket_handler_free(&sh);
+}
+
+void test_sm_receive_and_process_with_headers_skipped()
+{
+  counter = 10;
+
+  splt_socket_handler *sh = splt_sm_socket_handler_new(&error);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  splt_sm_receive_and_process_without_headers_with_recv(sh, state, &recv_with_headers,
+      &process_functor_with_skip_line, NULL, 1); 
+
+  splt_sm_socket_handler_free(&sh);
+}
+
+void test_sm_receive_and_process_with_continue_processor_false()
+{
+  splt_socket_handler *sh = splt_sm_socket_handler_new(&error);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  splt_sm_receive_and_process_without_headers_with_recv(sh, state, &recv_with_headers,
+      &processor_with_continue_false, NULL, 1); 
+
+  splt_sm_socket_handler_free(&sh);
+}
+
+int processor_with_continue_false(const char *received_line, int line_number, void *user_data)
+{
+  cut_assert_not_equal_int(41, counter);
+
+  if (counter == 31)
+  {
+    cut_assert_equal_int(1, line_number);
+    cut_assert_equal_string("212223242526272829", received_line);
+    return SPLT_FALSE;
+  }
+
+  return SPLT_TRUE;
+}
+
+int process_functor_with_skip_line(const char *received_line, int line_number, void *user_data)
+{
+  cut_assert_not_equal_int(21, counter);
+
+  if (counter == 31)
+  {
+    cut_assert_equal_int(1, line_number);
+    cut_assert_equal_string("212223242526272829", received_line);
+  }
+  else if (counter == 41)
+  {
+    cut_assert_equal_int(2, line_number);
+    cut_assert_equal_string("313233343536373839", received_line);
+  }
+
+  return SPLT_TRUE;
+}
+
+int process_functor(const char *received_line, int line_number, void *user_data)
+{
+  if (counter == 11)
+  {
+    cut_assert_equal_int(1, line_number);
+    cut_assert_equal_string("", received_line);
+  }
+  if (counter == 21)
+  {
+    cut_assert_equal_int(2, line_number);
+    cut_assert_equal_string("111213141516171819", received_line);
+  }
+  else if (counter == 31)
+  {
+    cut_assert_equal_int(3, line_number);
+    cut_assert_equal_string("212223242526272829", received_line);
+  }
+  else if (counter == 41)
+  {
+    cut_assert_equal_int(4, line_number);
+    cut_assert_equal_string("313233343536373839", received_line);
+  }
+
+  return SPLT_TRUE;
+}
+
+ssize_t recv_with_headers(int descriptor, void *buffer, size_t buffer_size, int flags)
+{
+  if (counter == 41) {
+    return 0;
+  }
+
+  if (counter < 10)
+  {
+    snprintf(buffer, buffer_size, "AA");
+    counter++;
+    return 2;
+  }
+
+  if (counter == 10)
+  {
+    snprintf(buffer, buffer_size, "\r\n");
+    counter++;
+    return 2;
+  }
+
+  if (counter % 10 != 0)
+  {
+    snprintf(buffer, buffer_size, "%d", counter);
+  }
+  else
+  {
+    snprintf(buffer, buffer_size, "\n");
+  }
+
+  counter++;
+
+  return 2;
+}
+
+ssize_t recv_without_headers(int descriptor, void *buffer, size_t buffer_size, int flags)
+{
+  if (counter == 41) {
+    return 0;
+  }
+
+  if (counter % 10 != 0)
+  {
+    snprintf(buffer, buffer_size, "%d", counter);
+  }
+  else
+  {
+    snprintf(buffer, buffer_size, "\n");
+  }
+
+  counter++;
+
+  return 2;
+}
+

libmp3splt-0.6.1a.tar.bz2/test/test_splt_array.c -> libmp3splt-0.7.tar.bz2/test/test_splt_array.c Changed

libmp3splt-0.6.1a.tar.bz2/test/test_string_utils.c -> libmp3splt-0.7.tar.bz2/test/test_string_utils.c Changed

Changes of Revision 4