Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 5

libmp3splt.changes Changed

@@ -1,4 +1,24 @@
 -------------------------------------------------------------------
+Tue Feb 21 10:41:33 UTC 2012 - pascal.bleser@opensuse.org
+
+- update to 0.7.1:
+  * added minimum track length option for silence scan - closes sf#2393766
+  * added option to set original tags when using 'replace tags in tags' -
+    closes sf#3407314
+  * added support for multiple ogg/vorbis logical streams
+  * fixed mp3 frame mode with skippoint when skippoint too small (on the same
+    frame as previous)
+  * fixed some regression regarding mp3splt v2.1c - removed some checks
+    relative to the total time - we cannot rely on the total time - for example
+    with concatenated mp3s
+  * fixed several audacity labels issues
+  * fixed inconsistency (extra 0 padding) between @n of custom tags and @n of
+    output filename
+
+- add Recommends for the mp3 and ogg plugins, as it is quite pointless to use
+  it without any of those
+
+-------------------------------------------------------------------
 Thu Jul 21 10:12:54 UTC 2011 - pascal.bleser@opensuse.org
 
 - update to 0.7:

libmp3splt.spec Changed

@@ -1,13 +1,24 @@
 # vim: set ts=4 sw=4 et:
+# Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 
 %define soname 0
 
 Name:           libmp3splt
-Version:        0.7
+Version:        0.7.1
 Release:        0.pm.1
 Summary:        Library to split MP3 and Ogg Files
-# http://prdownloads.sourceforge.net/mp3splt/libmp3splt-%{version}.tar.gz
-Source:         libmp3splt-%{version}.tar.bz2
+Source:         http://prdownloads.sourceforge.net/mp3splt/libmp3splt-%{version}.tar.gz
 Patch1:         libmp3splt-add_soname_to_plugin_dir.patch
 Patch2:         libmp3splt-add_soname_to_gettext_domain.patch
 Patch3:         libmp3splt-fix_swapped_memset_args.patch
@@ -15,26 +26,21 @@
 Source99:       libmp3splt-rpmlintrc
 URL:            http://mp3splt.sourceforge.net/mp3splt_page/home.php
 Group:          System/Libraries
-License:        GNU General Public License version 2 or later (GPLv2+)
+License:        GPL-2.0+
 BuildRoot:      %{_tmppath}/build-%{name}-%{version}
 BuildRequires:  libogg-devel libvorbis-devel
 BuildRequires:  mad-devel libid3tag-devel zlib-devel
 BuildRequires:  pcre-devel
 BuildRequires:  gcc make glibc-devel pkgconfig
 BuildRequires:  autoconf automake libtool
+Recommends:     %{name}%{soname}-mp3 = %{version}
+Recommends:     %{name}%{soname}-ogg = %{version}
 
 %description
 Library to split mp3 and ogg files selecting a begin and an end time position,
 without decoding. It's very useful to split large mp3/ogg to make smaller
 files or to split entire albums to obtain original tracks.
 
-
-
-
-Authors:
---------
-    Matteo Trotta <mtrotta@users.sourceforge.net>
-
 %package -n %{name}%{soname}
 Summary:        Library to split MP3 and Ogg Files
 Group:          System/Libraries
@@ -50,13 +56,6 @@
 without decoding. It's very useful to split large mp3/ogg to make smaller
 files or to split entire albums to obtain original tracks.
 
-
-
-
-Authors:
---------
-    Matteo Trotta <mtrotta@users.sourceforge.net>
-
 %package -n %{name}%{soname}-mp3
 Summary:        MP3 Support Plugin for %{name}
 Group:          System/Libraries
@@ -118,7 +117,11 @@
 
  -e ./configure  || NOCONFIGURE=1 ./autogen.sh
 
-{ %configure 2>&1 || exit 99; } | tee configure.stdout.log
+{
+    %configure \
+        --disable-doxygen_doc \
+    2>&1 || exit 99;
+} | tee configure.stdout.log
 for tag in \
 '\.mp3 format\)' \
 '\.ogg/vorbis format\)' \

libmp3splt-0.7.tar.bz2/ChangeLog -> libmp3splt-0.7.1.tar.gz/ChangeLog Changed

@@ -2,6 +2,23 @@
 
 - C library error messages not translated on windows : won't fix
 
+libmp3splt version 0.7.1
+-------------------------------------------------------------
+
+- added minimum track length option for silence scan - closes #2393766
+- added option to set original tags when using 'replace tags in tags' - closes #3407314
+- added support for multiple ogg/vorbis logical streams (mail)
+- fixed mp3 frame mode with skippoint when skippoint too small (on the same frame as previous)
+- fixed some regression regarding mp3splt v2.1c - removed some checks relative to the total
+time - we cannot rely on the total time - for example with concatenated mp3s
+- fixed several audacity labels issues
+- fixed inconsistency (extra 0 padding) between @n of custom tags and @n of output filename (mail)
+- fixed compilation error without libid3tag
+- fixed #3385833 - don't apply debugging flags or warnings flags by default:
+added --enable-c-debug --enable-optimise --enable-extra-warnings
+- fixed #3385827 - added --disable-doxygen_doc
+- fixed #3385829 - building doxygen documentation by itself + installing doxygen files
+
 libmp3splt version 0.7
 -------------------------------------------------------------

libmp3splt-0.7.tar.bz2/NEWS -> libmp3splt-0.7.1.tar.gz/NEWS Changed

libmp3splt-0.7.tar.bz2/README -> libmp3splt-0.7.1.tar.gz/README Changed

libmp3splt-0.7.tar.bz2/aclocal.m4 -> libmp3splt-0.7.1.tar.gz/aclocal.m4 Changed

@@ -102,8 +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, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -112,8 +112,8 @@
 
 m4_define(_LT_COPYING, dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -247,6 +247,8 @@
 AC_REQUIRE(_LT_PREPARE_SED_QUOTE_VARS)dnl
 AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl
 
+_LT_DECL(, PATH_SEPARATOR, 1, The PATH separator for the build system)dnl
+dnl
 _LT_DECL(, host_alias, 0, The host system)dnl
 _LT_DECL(, host, 0)dnl
 _LT_DECL(, host_os, 0)dnl
@@ -732,7 +734,7 @@
 m4_ifset(AC_PACKAGE_VERSION,  AC_PACKAGE_VERSION)
 configured by $0, generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -896,6 +898,7 @@
 m4_case($1,
   C,			_LT_LANG(C),
   C++,		_LT_LANG(CXX),
+  Go,			_LT_LANG(GO),
   Java,		_LT_LANG(GCJ),
   Fortran 77,		_LT_LANG(F77),
   Fortran,		_LT_LANG(FC),
@@ -917,6 +920,29 @@
 )# _LT_LANG
 
 
+m4_ifndef(AC_PROG_GO, 
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun(AC_PROG_GO,
+AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR(GOC,     Go compiler command)dnl
+AC_ARG_VAR(GOFLAGS, Go compiler flags)dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, ${ac_tool_prefix}gccgo, ${ac_tool_prefix}gccgo)
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+)#m4_defun
+)#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun(_LT_LANG_DEFAULT_CONFIG,
@@ -947,6 +973,10 @@
        m4_ifdef(LT_PROG_GCJ,
 	m4_define(LT_PROG_GCJ, defn(LT_PROG_GCJ)LT_LANG(GCJ))))))
 
+AC_PROVIDE_IFELSE(AC_PROG_GO,
+  LT_LANG(GO),
+  m4_define(AC_PROG_GO, defn(AC_PROG_GO)LT_LANG(GO)))
+
 AC_PROVIDE_IFELSE(LT_PROG_RC,
   LT_LANG(RC),
   m4_define(LT_PROG_RC, defn(LT_PROG_RC)LT_LANG(RC)))
@@ -1049,7 +1079,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1057,6 +1093,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi)
+
     AC_CACHE_CHECK(for -exported_symbols_list linker flag,
       lt_cv_ld_exported_symbols_list,
       lt_cv_ld_exported_symbols_list=no
@@ -1068,6 +1105,7 @@
 	lt_cv_ld_exported_symbols_list=no)
 	LDFLAGS="$save_LDFLAGS"
     )
+
     AC_CACHE_CHECK(for -force_load linker flag,lt_cv_ld_force_load,
       lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -1085,7 +1123,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1130,8 +1170,8 @@
 )
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES(TAG)
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun(_LT_DARWIN_LINKER_FEATURES,
 
@@ -1142,6 +1182,8 @@
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case($1, F77, _LT_TAGVAR(compiler_needs_object, $1)=yes,
+                  FC,  _LT_TAGVAR(compiler_needs_object, $1)=yes)
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -1425,14 +1467,27 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1509,13 +1564,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -1695,6 +1750,11 @@
     lt_cv_sys_max_cmd_len=196608

libmp3splt-0.7.tar.bz2/config.h.in -> libmp3splt-0.7.1.tar.gz/config.h.in Changed

libmp3splt-0.7.tar.bz2/configure -> libmp3splt-0.7.1.tar.gz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libmp3splt 0.7.
+# Generated by GNU Autoconf 2.68 for libmp3splt 0.7.1.
 #
 # Report bugs to <io_fx@yahoo.fr>.
 #
@@ -574,8 +574,8 @@
 # Identity of this package.
 PACKAGE_NAME='libmp3splt'
 PACKAGE_TARNAME='libmp3splt'
-PACKAGE_VERSION='0.7'
-PACKAGE_STRING='libmp3splt 0.7'
+PACKAGE_VERSION='0.7.1'
+PACKAGE_STRING='libmp3splt 0.7.1'
 PACKAGE_BUGREPORT='io_fx@yahoo.fr'
 PACKAGE_URL=''
 
@@ -622,12 +622,12 @@
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+GRAPHVIZ
+DOXYGEN
 HAVE_GRAPHVIZ_FALSE
 HAVE_GRAPHVIZ_TRUE
-GRAPHVIZ
 HAVE_DOXYGEN_FALSE
 HAVE_DOXYGEN_TRUE
-DOXYGEN
 PCRE_LIBS
 PCRE_CFLAGS
 PCRE_FALSE
@@ -822,6 +822,9 @@
 with_ltdl_include
 with_ltdl_lib
 enable_ltdl_install
+enable_c_debug
+enable_optimise
+enable_extra_warnings
 enable_win
 enable_mp3
 with_mad
@@ -845,6 +848,7 @@
 enable_cutter
 with_cutter
 enable_pcre
+enable_doxygen_doc
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1406,7 +1410,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libmp3splt 0.7 to adapt to many kinds of systems.
+\`configure' configures libmp3splt 0.7.1 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1476,7 +1480,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libmp3splt 0.7:";;
+     short | recursive ) echo "Configuration of libmp3splt 0.7.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1496,6 +1500,9 @@
                           optimize for fast installation default=yes
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-ltdl-install   install libltdl
+  --enable-c-debug        Enable debugging symbols.
+  --enable-optimise       Enable O2 optimise.
+  --enable-extra-warnings Enable extra warnings.
   --enable-win            Enable if compiling on windows with mingw.
   --disable-mp3           Disable mp3 plugin.
   --disable-madtest       Do not try to compile and run a test mad program.
@@ -1507,6 +1514,7 @@
   --disable-cutter        Disable Cutter unit testing.
   --disable-pcre          Disable pcre support to set tags from input
                           filename.
+  --disable-doxygen_doc   Disable doxygen code documentation.
 
 Optional Packages:
   --with-PACKAGE=ARG    use PACKAGE ARG=yes
@@ -1516,7 +1524,7 @@
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-libintl-prefix=DIR  search for libintl in DIR/include and DIR/lib
   --without-libintl-prefix     don't search for libintl in includedir and libdir
-  --with-pic              try to use only PIC/non-PIC objects default=use
+  --with-pic=PKGS       try to use only PIC/non-PIC objects default=use
                           both
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1635,7 +1643,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libmp3splt configure 0.7
+libmp3splt configure 0.7.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2104,7 +2112,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libmp3splt $as_me 0.7, which was
+It was created by libmp3splt $as_me 0.7.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2919,7 +2927,7 @@
 
 # Define the identity of the package.
  PACKAGE=libmp3splt
- VERSION=0.7
+ VERSION=0.7.1
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2985,12 +2993,6 @@
 
 
 
-DEBUG_FLAGS="-g"
-#OPTIMISE_FLAGS="-O2"
-#WARNING_FLAGS="-Wall -Wextra -Wswitch-enum -Wswitch-default -Wfloat-equal -Wbad-function-cast -Wcast-qual -Wunreachable-code"
-WARNING_FLAGS="-Wall"
-CFLAGS="$DEBUG_FLAGS $WARNING_FLAGS $OPTIMISE_FLAGS $CFLAGS"
-
 #################################################
 # Check for programs
 #################################################
@@ -6373,8 +6375,8 @@
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -7007,6 +7009,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -7046,7 +7053,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -7472,7 +7479,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -8109,13 +8116,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -8262,6 +8269,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hidei};"\

libmp3splt-0.7.tar.bz2/configure.ac -> libmp3splt-0.7.1.tar.gz/configure.ac Changed

@@ -32,19 +32,13 @@
 # Basic initialisations 
 #################################################
 
-AC_PREREQ(2.56)
-AC_INIT(libmp3splt,0.7,io_fx@yahoo.fr)
+AC_PREREQ(2.62)
+AC_INIT(libmp3splt,0.7.1,io_fx@yahoo.fr)
 AC_CONFIG_AUX_DIR(libltdl/config)
-AM_INIT_AUTOMAKE(libmp3splt, 0.7)
+AM_INIT_AUTOMAKE(libmp3splt, 0.7.1)
 AC_CONFIG_HEADERS(config.h)
 AM_MAINTAINER_MODE(enable)
 
-DEBUG_FLAGS="-g"
-#OPTIMISE_FLAGS="-O2"
-#WARNING_FLAGS="-Wall -Wextra -Wswitch-enum -Wswitch-default -Wfloat-equal -Wbad-function-cast -Wcast-qual -Wunreachable-code"
-WARNING_FLAGS="-Wall"
-CFLAGS="$DEBUG_FLAGS $WARNING_FLAGS $OPTIMISE_FLAGS $CFLAGS"
-
 #################################################
 # Check for programs
 #################################################
@@ -111,6 +105,27 @@
 esac
 AC_MSG_RESULT($HOST)
 
+#################################################################
+# Check for some debugging, warnings and optimise options
+#################################################################
+
+AC_ARG_ENABLE(c-debug, AC_HELP_STRING(--enable-c-debug, Enable debugging symbols. ) ,
+    enable_c_debug=$enableval,enable_c_debug="no")
+if test "x$enable_c_debug" = xyes;then
+  CFLAGS="$CFLAGS -g"
+fi
+
+AC_ARG_ENABLE(optimise, AC_HELP_STRING(--enable-optimise, Enable O2 optimise. ) ,
+    enable_optimise=$enableval,enable_optimise="no")
+if test "x$enable_optimise" = xyes;then
+  CFLAGS="$CFLAGS -O2"
+fi
+
+AC_ARG_ENABLE(extra-warnings, AC_HELP_STRING(--enable-extra-warnings, Enable extra warnings. ) ,
+    enable_extra_warnings=$enableval,enable_extra_warnings="no")
+if test "x$enable_extra_warnings" = xyes;then
+  CFLAGS="$CFLAGS -Wall -Wextra -Wswitch-enum -Wswitch-default -Wfloat-equal -Wbad-function-cast -Wcast-qual -Wunreachable-code"
+fi
 
 #################################################################
 # Check for some functions
@@ -228,6 +243,39 @@
     Install it or configure with "--disable-pcre".))
 fi
 
+#################################################
+# Documentation of the code
+# (but only if doxygen is installed)
+#################################################
+
+doxygen_doc="no" 
+with_graphviz="no"
+AC_ARG_ENABLE(doxygen_doc, AC_HELP_STRING(--disable-doxygen_doc, Disable doxygen code documentation. ) , 
+    enable_doxygen_doc=$enableval,enable_doxygen_doc="yes")
+
+AM_CONDITIONAL(HAVE_DOXYGEN, false)
+AM_CONDITIONAL(HAVE_GRAPHVIZ, false)
+if test "x$enable_doxygen_doc" = xyes;then
+  AC_PATH_PROG(DOXYGEN,doxygen)
+  AC_ARG_VAR(DOXYGEN,
+             Location of the 'doxygen' program; if found we can generate documentation for the C code)
+  
+  if test "x$DOXYGEN" != "x"; then
+   AM_CONDITIONAL(HAVE_DOXYGEN, true)
+   doxygen_doc="yes"
+
+   AC_PATH_PROG(GRAPHVIZ,dot)
+   AC_ARG_VAR(GRAPHVIZ,
+              Location of the 'dot' program from the graphviz suite; if found we can generate caller graphs for the documentation of the C code)
+   if test "x$GRAPHVIZ" = "x"; then
+     AC_MSG_WARN(*** dot from the graphviz package not found, inheritance diagrams will not be generated in code documentation)
+   else
+     AM_CONDITIONAL(HAVE_GRAPHVIZ, true)
+     with_graphviz="yes"
+   fi
+
+  fi
+fi
 
 #################################################
 # Print the configuration to the screen
@@ -245,7 +293,6 @@
 echo "    libogg, libvorbis (.ogg/vorbis format)                  $ogg"
 echo
 echo " Other :"
-
 echo
 echo "    pcre (for setting tags from the input filename)         $pcre"
 
@@ -259,32 +306,12 @@
   echo
 fi
 
+echo "    doxygen documentation                                   $doxygen_doc"
+echo "        with graphviz                                       $with_graphviz"
 echo "---------------------------------------------------------"
 echo
 
 #################################################
-# Documentation of the code using 'make doxygen'
-# (but only if doxygen is installed)
-#################################################
-
-# Check for doxygen, so we can decide if we add it to the "doc" 
-# make target.
-AC_PATH_PROG(DOXYGEN,doxygen)
-AC_ARG_VAR(DOXYGEN,
-           Location of the 'doxygen' program; if found we can generate documentation for the C code)
-AM_CONDITIONAL(HAVE_DOXYGEN,  test "x$DOXYGEN" != "x" )
-
-# Check for dot, the tool that makes the nice little caller graphs for the
-# doxygen documentation.
-AC_PATH_PROG(GRAPHVIZ,dot)
-AC_ARG_VAR(GRAPHVIZ,
-           Location of the 'dot' program from the graphviz suite; if found we can generate caller graphs for the documentation of the C code)
-AM_CONDITIONAL(HAVE_GRAPHVIZ,  test "x$GRAPHVIZ" != "x" )
-if test x$HAVE_DOT = "xfalse"; then
-   AC_MSG_WARN(*** dot from the graphviz package not found, inheritance diagrams will not be generated in code documentation)
-fi
-
-#################################################
 # Generate Makefile
 #################################################

libmp3splt-0.7.tar.bz2/debian/changelog -> libmp3splt-0.7.1.tar.gz/debian/changelog Changed

libmp3splt-0.7.tar.bz2/doc/Doxyfile.in -> libmp3splt-0.7.1.tar.gz/doc/Doxyfile.in Changed

libmp3splt-0.7.tar.bz2/doc/Makefile.am -> libmp3splt-0.7.1.tar.gz/doc/Makefile.am Changed

@@ -1,22 +1,54 @@
 EXTRA_DIST = Doxyfile.in
 
-DOC_DIR=$(HTML_DIR)
-
 if HAVE_DOXYGEN
 html: doc
 
-doc:
+doc: doxyfile.temp
+
+doxyfile.temp:
 	cat Doxyfile.in >Doxyfile
 if HAVE_GRAPHVIZ
 	echo "HAVE_DOT = YES" >> Doxyfile
 else
 	echo "HAVE_DOT = NO" >> Doxyfile
 endif
-
 	echo "STRIP_FROM_PATH = $(top_builddir)" >> Doxyfile
-
 	@echo "Running doxygen to generate the code documentation"
 	doxygen
+	echo temporary > doxyfile.temp
+
+CLEANFILES=doxyfile.temp
+
+all-local: html 
+
+clean-local:
+	-rm -f $(top_srcdir)/doc/doxygen/*.html
+	-rm -f $(top_srcdir)/doc/doxygen/*.png
+	-rm -f $(top_srcdir)/doc/doxygen/*.md5
+	-rm -f $(top_srcdir)/doc/doxygen/*.map
+	-rm -f $(top_srcdir)/doc/doxygen/*.js
+	-rm -f $(top_srcdir)/doc/doxygen/*.css
+
+doxygen_target_dir=$(DESTDIR)$(docdir)/doxygen
+
+install-data-local:
+	-$(MKDIR_P) $(doxygen_target_dir)
+	-$(INSTALL_DATA) doxygen/*.html $(doxygen_target_dir)
+	-$(INSTALL_DATA) doxygen/*.png $(doxygen_target_dir)
+	-$(INSTALL_DATA) doxygen/*.md5 $(doxygen_target_dir)
+	-$(INSTALL_DATA) doxygen/*.map $(doxygen_target_dir)
+	-$(INSTALL_DATA) doxygen/*.js $(doxygen_target_dir)
+	-$(INSTALL_DATA) doxygen/*.css $(doxygen_target_dir)
+
+uninstall-local:
+	-rm -f $(doxygen_target_dir)/*.html
+	-rm -f $(doxygen_target_dir)/*.png
+	-rm -f $(doxygen_target_dir)/*.md5
+	-rm -f $(doxygen_target_dir)/*.map
+	-rm -f $(doxygen_target_dir)/*.js
+	-rm -f $(doxygen_target_dir)/*.css
+	-rmdir $(doxygen_target_dir)
+
 else
 doc:
 	@echo "You must have 'doxygen' installed on your system to generate"
@@ -24,6 +56,6 @@
 	@echo "'configure' again."
 endif
 
-# A FORCE target that always has to be remade
 FORCE:
-.PHONY: FORCE
\ No newline at end of file
+.PHONY: FORCE
+

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

@@ -218,7 +218,8 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = Doxyfile.in
-DOC_DIR = $(HTML_DIR)
+@HAVE_DOXYGEN_TRUE@CLEANFILES = doxyfile.temp
+@HAVE_DOXYGEN_TRUE@doxygen_target_dir = $(DESTDIR)$(docdir)/doxygen
 all: all-am
 
 .SUFFIXES:
@@ -297,7 +298,8 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+@HAVE_DOXYGEN_FALSE@all-local:
+all-am: Makefile all-local
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -316,6 +318,7 @@
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -324,9 +327,12 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+@HAVE_DOXYGEN_FALSE@uninstall-local:
+@HAVE_DOXYGEN_FALSE@install-data-local:
+@HAVE_DOXYGEN_FALSE@clean-local:
 clean: clean-am
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
@@ -344,7 +350,7 @@
 
 info-am:
 
-install-data-am:
+install-data-am: install-data-local
 
 install-dvi: install-dvi-am
 
@@ -388,39 +394,70 @@
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-local
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+.PHONY: all all-am all-local check check-am clean clean-generic \
+	clean-libtool clean-local distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-local
 
 
 @HAVE_DOXYGEN_TRUE@html: doc
 
-@HAVE_DOXYGEN_TRUE@doc:
+@HAVE_DOXYGEN_TRUE@doc: doxyfile.temp
+
+@HAVE_DOXYGEN_TRUE@doxyfile.temp:
 @HAVE_DOXYGEN_TRUE@	cat Doxyfile.in >Doxyfile
 @HAVE_DOXYGEN_TRUE@@HAVE_GRAPHVIZ_TRUE@	echo "HAVE_DOT = YES" >> Doxyfile
 @HAVE_DOXYGEN_TRUE@@HAVE_GRAPHVIZ_FALSE@	echo "HAVE_DOT = NO" >> Doxyfile
-
 @HAVE_DOXYGEN_TRUE@	echo "STRIP_FROM_PATH = $(top_builddir)" >> Doxyfile
-
 @HAVE_DOXYGEN_TRUE@	@echo "Running doxygen to generate the code documentation"
 @HAVE_DOXYGEN_TRUE@	doxygen
+@HAVE_DOXYGEN_TRUE@	echo temporary > doxyfile.temp
+
+@HAVE_DOXYGEN_TRUE@all-local: html 
+
+@HAVE_DOXYGEN_TRUE@clean-local:
+@HAVE_DOXYGEN_TRUE@	-rm -f $(top_srcdir)/doc/doxygen/*.html
+@HAVE_DOXYGEN_TRUE@	-rm -f $(top_srcdir)/doc/doxygen/*.png
+@HAVE_DOXYGEN_TRUE@	-rm -f $(top_srcdir)/doc/doxygen/*.md5
+@HAVE_DOXYGEN_TRUE@	-rm -f $(top_srcdir)/doc/doxygen/*.map
+@HAVE_DOXYGEN_TRUE@	-rm -f $(top_srcdir)/doc/doxygen/*.js
+@HAVE_DOXYGEN_TRUE@	-rm -f $(top_srcdir)/doc/doxygen/*.css
+
+@HAVE_DOXYGEN_TRUE@install-data-local:
+@HAVE_DOXYGEN_TRUE@	-$(MKDIR_P) $(doxygen_target_dir)
+@HAVE_DOXYGEN_TRUE@	-$(INSTALL_DATA) doxygen/*.html $(doxygen_target_dir)
+@HAVE_DOXYGEN_TRUE@	-$(INSTALL_DATA) doxygen/*.png $(doxygen_target_dir)
+@HAVE_DOXYGEN_TRUE@	-$(INSTALL_DATA) doxygen/*.md5 $(doxygen_target_dir)
+@HAVE_DOXYGEN_TRUE@	-$(INSTALL_DATA) doxygen/*.map $(doxygen_target_dir)
+@HAVE_DOXYGEN_TRUE@	-$(INSTALL_DATA) doxygen/*.js $(doxygen_target_dir)
+@HAVE_DOXYGEN_TRUE@	-$(INSTALL_DATA) doxygen/*.css $(doxygen_target_dir)
+
+@HAVE_DOXYGEN_TRUE@uninstall-local:
+@HAVE_DOXYGEN_TRUE@	-rm -f $(doxygen_target_dir)/*.html
+@HAVE_DOXYGEN_TRUE@	-rm -f $(doxygen_target_dir)/*.png
+@HAVE_DOXYGEN_TRUE@	-rm -f $(doxygen_target_dir)/*.md5
+@HAVE_DOXYGEN_TRUE@	-rm -f $(doxygen_target_dir)/*.map
+@HAVE_DOXYGEN_TRUE@	-rm -f $(doxygen_target_dir)/*.js
+@HAVE_DOXYGEN_TRUE@	-rm -f $(doxygen_target_dir)/*.css
+@HAVE_DOXYGEN_TRUE@	-rmdir $(doxygen_target_dir)
+
 @HAVE_DOXYGEN_FALSE@doc:
 @HAVE_DOXYGEN_FALSE@	@echo "You must have 'doxygen' installed on your system to generate"
 @HAVE_DOXYGEN_FALSE@	@echo "the documentation.  Try installing it, and running"
 @HAVE_DOXYGEN_FALSE@	@echo "'configure' again."
 
-# A FORCE target that always has to be remade
 FORCE:
 .PHONY: FORCE

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

@@ -482,6 +482,10 @@
  */
 #define SPLT_DEFAULT_PARAM_MINIMUM_LENGTH 0.0
 /**
+ * @brief Default value for the #SPLT_OPT_PARAM_MIN_TRACK_LENGTH option
+ */
+#define SPLT_DEFAULT_PARAM_MINIMUM_TRACK_LENGTH 0.0
+/**
  * @brief Default value for the #SPLT_OPT_PARAM_GAP option
  */
 #define SPLT_DEFAULT_PARAM_GAP 30
@@ -634,6 +638,12 @@
     a valid splitpoint
   */
   float parameter_minimum_length;
+  /*! The minimum track length for option_silence_mode in seconds
+ 
+    A positive float of the minimum number of seconds to be considered
+    a valid splitpoint
+  */
+  float parameter_min_track_length;
 
   //!possible values are #splt_str_format
   int artist_tag_format;
@@ -1160,6 +1170,15 @@
    */
   SPLT_OPT_PARAM_MIN_LENGTH,
   /**
+   * Minimum number of seconds to be considered a valid track\n
+   * All tracks shorter than this value are discarded.
+   *
+   * The option can take positive float values.
+   *
+   * Default is #SPLT_DEFAULT_PARAM_MINIMUM_TRACK_LENGTH
+   */
+  SPLT_OPT_PARAM_MIN_TRACK_LENGTH,
+  /**
    * Format of the artist tag from filename.
    * Possible values are #splt_str_format
    */
@@ -1303,7 +1322,7 @@
 /**
  * @brief Package version
  */
-#define SPLT_PACKAGE_VERSION "0.7"
+#define SPLT_PACKAGE_VERSION "0.7.1"
 #endif
 /**
  * @brief Package authors
@@ -1578,6 +1597,7 @@
 int mp3splt_count_silence_points(splt_state *state, int *error);
 
 int mp3splt_set_silence_points(splt_state *state, int *error);
+void mp3splt_set_trim_silence_points(splt_state *state, int *error);
 
 //returns the version of libmp3splt
 void mp3splt_get_version(char *version);

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

@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 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.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --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
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4 Debian-2.4-2
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4 Debian-2.4-2"
+VERSION="2.4.2 Debian-2.4.2-1"
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@
     *.cCFSifmso | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.fF09? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.fF09? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/$\\"$/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^$.\{79\}$$..*$/\1\
+\2/
+h
+s/$\\"$/\\\1/g
+s/$/\\n/
+s/$^\n*$.*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6150,7 +6163,8 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6834,7 +6848,7 @@
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"

libmp3splt-0.7.tar.bz2/plugins/Makefile.am -> libmp3splt-0.7.1.tar.gz/plugins/Makefile.am Changed

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

@@ -99,11 +99,13 @@
 libsplt_ogg_la_LIBADD =
 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
+	silence_processors.h ogg_new_stream_handler.c \
+	ogg_new_stream_handler.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
+@OGG_PLUGIN_TRUE@	libsplt_ogg_la-silence_processors.lo \
+@OGG_PLUGIN_TRUE@	libsplt_ogg_la-ogg_new_stream_handler.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) \
@@ -307,7 +309,7 @@
 @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_silence.c ogg_silence.h ogg_utils.c ogg_utils.h \
-@OGG_PLUGIN_TRUE@silence_processors.c silence_processors.h
+@OGG_PLUGIN_TRUE@silence_processors.c silence_processors.h ogg_new_stream_handler.c ogg_new_stream_handler.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@ 
@@ -392,6 +394,7 @@
 @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_new_stream_handler.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@
@@ -473,6 +476,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) $(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
 
+libsplt_ogg_la-ogg_new_stream_handler.lo: ogg_new_stream_handler.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_new_stream_handler.lo -MD -MP -MF $(DEPDIR)/libsplt_ogg_la-ogg_new_stream_handler.Tpo -c -o libsplt_ogg_la-ogg_new_stream_handler.lo `test -f 'ogg_new_stream_handler.c' || echo '$(srcdir)/'`ogg_new_stream_handler.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libsplt_ogg_la-ogg_new_stream_handler.Tpo $(DEPDIR)/libsplt_ogg_la-ogg_new_stream_handler.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ogg_new_stream_handler.c' object='libsplt_ogg_la-ogg_new_stream_handler.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_new_stream_handler.lo `test -f 'ogg_new_stream_handler.c' || echo '$(srcdir)/'`ogg_new_stream_handler.c
+
 mostlyclean-libtool:
 	-rm -f *.lo

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

@@ -124,6 +124,8 @@
 static void splt_mp3_save_end_point(splt_state *state, splt_mp3_state *mp3state,
     int save_end_point, off_t end)
 {
+  mp3state->end_non_zero = end;
+
   if (save_end_point)
   {
     mp3state->end = end;
@@ -1111,6 +1113,7 @@
   //we initialise default values
   mp3state->frames = 1;
   mp3state->end = 0;
+  mp3state->end_non_zero = 0;
   mp3state->first = 1;
   mp3state->file_input = file_input;
   mp3state->framemode = framemode;
@@ -1260,6 +1263,8 @@
 
   //we put useful infos in the state
   mp3state->mp3file.firsth = (off_t) (mp3state->bytes - len);
+  splt_d_print_debug(state, "mp3 firsth bytes = %ld\n", mp3state->bytes);
+  splt_d_print_debug(state, "mp3 firsth len = %ld\n", len);
   mp3state->bytes = mp3state->mp3file.firsth;
   mp3state->headw = 
     (unsigned long) ((mp3state->data_ptr0 << 24) | 
@@ -2159,6 +2164,12 @@
 
         splt_c_put_progress_text(state,SPLT_PROGRESS_PREPARE);
 
+        //this happens when we end and start on the same frame
+        if (mp3state->frames >= fbegin && mp3state->end_non_zero != 0)
+        {
+          begin = mp3state->end_non_zero;
+        }
+
         // Finds begin by counting frames
         while (mp3state->frames < fbegin)
         {
@@ -3375,8 +3386,8 @@
 
 void splt_pl_clear_original_tags(splt_original_tags *original_tags)
 {
-  tag_bytes_and_size *bytes_and_size = 
-    (tag_bytes_and_size *) original_tags->all_original_tags;
+#ifndef NO_ID3TAG
+  tag_bytes_and_size *bytes_and_size = (tag_bytes_and_size *) original_tags->all_original_tags;
 
   if (!bytes_and_size) {
     return;
@@ -3392,6 +3403,7 @@
 
   free(original_tags->all_original_tags);
   original_tags->all_original_tags = NULL;
+#endif
 }
 
 //@}

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

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

@@ -44,7 +44,6 @@
 
 #include <time.h>
 #include <string.h>
-#include <math.h>
 #include <locale.h>
 
 #ifdef __WIN32__
@@ -56,6 +55,7 @@
 #include "ogg.h"
 #include "ogg_utils.h"
 #include "ogg_silence.h"
+#include "ogg_new_stream_handler.h"
 
 #define FIRST_GRANPOS 1
 
@@ -72,8 +72,8 @@
 /* some function prototypes */
 
 splt_ogg_state *splt_ogg_info(FILE *in, splt_state *state, int *error);
-static vorbis_comment *clone_vorbis_comment(vorbis_comment *comment);
-static void free_vorbis_comment(vorbis_comment *vc, short cloned_vorbis_comment);
+static void splt_ogg_clear_sync_in(splt_ogg_state *oggstate);
+static void splt_ogg_clear_sync_in_and_free(splt_ogg_state *oggstate);
 
 /****************************/
 /* ogg utils */
@@ -138,196 +138,70 @@
   }
 }
 
-static char *splt_ogg_trackstring(int number, int *error)
+/* Full cleanup of internal state and vorbis/ogg structures */
+static void splt_ogg_v_free(splt_ogg_state *oggstate)
 {
-  char *track = NULL;
-
-  if (number > 0)
+  if (!oggstate)
   {
-    int len = 0, i;
-    len = ((int) (log10((double) (number)))) + 1;
-
-    if ((track = malloc(len + 1))==NULL)
-    {
-      *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
-      return NULL;
-    }
-    memset(track, 0, len + 1);
-    for (i=len-1; i >= 0; i--)
-    {
-      tracki = ((number%10) | 0x30);
-      number /= 10;
-    }
+    return;
   }
 
-  return track;
-}
-
-//saves a packet
-static splt_v_packet *splt_ogg_save_packet(ogg_packet *packet, int *error)
-{
-  splt_v_packet *p = NULL;
-
-  //if we have no header, we will have bytes < 0
-  p = malloc(sizeof(splt_v_packet));
-  if (!p)
+  if(oggstate->packets)
   {
-    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
-    return p;
+    splt_ogg_free_packet(&oggstate->packets0);
+    splt_ogg_free_packet(&oggstate->packets1);
+    free(oggstate->packets);
+    oggstate->packets = NULL;
   }
 
-  p->length = packet->bytes;
-  p->packet = malloc(p->length);
-  if (! p->packet)
-  {
-    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
-    free(p);
-    p = NULL;
-    return p;
-  }
-  memcpy(p->packet, packet->packet, p->length);
+  splt_ogg_free_oggstate_headers(oggstate);
 
-  return p;
-}
+  splt_ogg_free_vorbis_comment(&oggstate->vc, oggstate->cloned_vorbis_comment);
+  oggstate->cloned_vorbis_comment = 2;
 
-//frees a packet
-static void splt_ogg_free_packet(splt_v_packet **p)
-{
-  if (p)
+  if(oggstate->vb)
   {
-    if (*p)
-    {
-      if((*p)->packet)
-      {
-        free((*p)->packet);
-        (*p)->packet = NULL;
-      }
-      free(*p);
-      *p = NULL;
-    }
+    vorbis_block_clear(oggstate->vb);
+    free(oggstate->vb);
+    oggstate->vb = NULL;
   }
-}
 
-/* 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,
-    const char *output_fname)
-{
-  ogg_page page;
-
-  if (flush)
+  if(oggstate->vd)
   {
-    while (ogg_stream_flush(stream, &page))
-    {
-      if (splt_io_fwrite(state, page.header, 1, page.header_len, file) < page.header_len)
-      {
-        goto write_error;
-      }
-      if (splt_io_fwrite(state, page.body, 1, page.body_len, file) < page.body_len)
-      {
-        goto write_error;
-      }
-    }
+    vorbis_dsp_clear(oggstate->vd);
+    free(oggstate->vd);
+    oggstate->vd = NULL;
   }
-  else
+
+  //only free the input if different from stdin
+  if(oggstate->stream_in && oggstate->in != stdin)
   {
-    while (ogg_stream_pageout(stream, &page))
-    {
-      if (splt_io_fwrite(state, page.header,1,page.header_len, file) < page.header_len)
-      {
-        goto write_error;
-      }
-      if (splt_io_fwrite(state, page.body,1,page.body_len, file) < page.body_len)
-      {
-        goto write_error;
-      }
-    }
+    ogg_stream_clear(oggstate->stream_in);
+    free(oggstate->stream_in);
+    oggstate->stream_in = NULL;
   }
 
-  return 0;
+  splt_ogg_clear_sync_in_and_free(oggstate);
 
-write_error:
-  splt_e_set_error_data(state, output_fname);
-  *error = SPLT_ERROR_CANT_WRITE_TO_OUTPUT_FILE;
-  return -1;
-}
-
-static void splt_ogg_submit_headers_to_stream(ogg_stream_state *stream, 
-    splt_ogg_state *oggstate)
-{
-  int i;
-  for(i=0;i<3;i++)
+  if (oggstate->vi)
   {
-    ogg_packet p;
-    p.bytes = oggstate->headersi->length;
-    p.packet = oggstate->headersi->packet;
-    p.b_o_s = ((i==0)?1:0);
-    p.e_o_s = 0;
-    p.granulepos=0;
-
-    ogg_stream_packetin(stream, &p);
+    vorbis_info_clear(oggstate->vi);
+    free(oggstate->vi);
+    oggstate->vi = NULL;
   }
+
+  free(oggstate);
+  oggstate = NULL;
 }
 
-/* Full cleanup of internal state and vorbis/ogg structures */
-static void splt_ogg_v_free(splt_ogg_state *oggstate)
+static void splt_ogg_clear_sync_in_and_free(splt_ogg_state *oggstate)
 {

libmp3splt-0.7.1.tar.gz/plugins/ogg_new_stream_handler.c Added

@@ -0,0 +1,167 @@
+/**********************************************************
+ *
+ * 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_new_stream_handler.h"
+
+#include <string.h>
+
+splt_ogg_new_stream_handler *splt_ogg_nsh_new(splt_state *state, splt_ogg_state *oggstate, 
+    ogg_stream_state *stream_out, const char *output_fname, int write_header_packets,
+    ogg_stream_state *optional_stream_in)
+{
+  splt_ogg_new_stream_handler *nsh = malloc(sizeof(*nsh));
+
+  if (nsh == NULL)
+  {
+    return NULL;
+  }
+
+  memset(nsh, 0x0, sizeof(*nsh));
+
+  nsh->header_packet_counter = TOTAL_HEADER_PACKETS;
+  nsh->state = state;
+  nsh->oggstate = oggstate;
+  nsh->stream_out = stream_out;
+  nsh->output_fname = output_fname;
+  nsh->write_header_packets = write_header_packets;
+  nsh->optional_stream_in = optional_stream_in;
+
+  return nsh;
+}
+
+void splt_ogg_nsh_free(splt_ogg_new_stream_handler **nsh)
+{
+  if (!nsh || !*nsh)
+  {
+    return;
+  }
+
+  free(*nsh);
+  *nsh = NULL;
+}
+
+void splt_ogg_initialise_for_new_stream(splt_ogg_new_stream_handler *nsh, 
+    ogg_page *page, long *cutpoint, long previous_granulepos)
+{
+  splt_ogg_state *oggstate = nsh->oggstate;
+
+  ogg_stream_state *stream_in = nsh->optional_stream_in;
+  if (nsh->optional_stream_in == NULL)
+  {
+    stream_in = oggstate->stream_in;
+  }
+
+  ogg_stream_clear(stream_in);
+  ogg_stream_init(stream_in, ogg_page_serialno(page));
+
+  if (cutpoint != NULL && *cutpoint != 0)
+  {
+    *cutpoint -= previous_granulepos;
+  }
+
+  nsh->header_packet_counter = 0;
+}
+
+int splt_ogg_new_stream_needs_header_packet(splt_ogg_new_stream_handler *nsh)
+{
+  return nsh->header_packet_counter < TOTAL_HEADER_PACKETS;
+}
+
+void splt_ogg_new_stream_handle_header_packet(splt_ogg_new_stream_handler *nsh, ogg_packet *packet, int *error)
+{
+  splt_ogg_state *oggstate = nsh->oggstate;
+
+  if (!nsh->write_header_packets)
+  {
+    nsh->header_packet_counter++;
+    return;
+  }
+
+  splt_state *state = nsh->state;
+
+  if (nsh->header_packet_counter == 0)
+  {
+    splt_ogg_free_oggstate_headers(oggstate);
+
+    oggstate->headers = malloc(sizeof(splt_v_packet) * TOTAL_HEADER_PACKETS);
+    if (oggstate->headers == NULL)
+    {
+      *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
+      return;
+    }
+    memset(oggstate->headers, 0, sizeof(splt_v_packet) * TOTAL_HEADER_PACKETS);
+
+    splt_ogg_free_vorbis_comment(&oggstate->vc, oggstate->cloned_vorbis_comment); 
+    vorbis_info_clear(oggstate->vi);
+    vorbis_info_init(oggstate->vi);
+  }
+
+  oggstate->headersnsh->header_packet_counter = splt_ogg_clone_packet(packet, error);
+  if (*error < 0)
+  {
+    return;
+  }
+
+  if (vorbis_synthesis_headerin(oggstate->vi, &oggstate->vc, packet) < 0)
+  {
+    *error = SPLT_ERROR_INVALID;
+    splt_e_set_error_data(state, splt_t_get_filename_to_split(state));
+    return;
+  }
+  oggstate->cloned_vorbis_comment = SPLT_FALSE;
+
+  nsh->header_packet_counter++;
+
+  if (nsh->write_header_packets && nsh->header_packet_counter == TOTAL_HEADER_PACKETS)
+  {
+    oggstate->serial++;
+
+    ogg_stream_clear(nsh->stream_out);
+    ogg_stream_init(nsh->stream_out, oggstate->serial);
+
+    splt_ogg_put_tags(state, error);
+    if (*error < 0) { return; }
+
+    splt_ogg_set_tags_in_headers(oggstate, error);
+    if (*error < 0) { return; }
+
+    splt_ogg_write_header_packets(state, oggstate, nsh->stream_out, nsh->output_fname, error);
+  }
+}
+

libmp3splt-0.7.1.tar.gz/plugins/ogg_new_stream_handler.h Added

@@ -0,0 +1,69 @@
+/**********************************************************
+ *
+ * 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.
+ *
+ *********************************************************/
+
+#ifndef MP3SPLT_OGG_NEW_STREAM_HANDLER_H
+
+#include "splt.h"
+
+#include "ogg.h"
+#include "ogg_utils.h"
+
+typedef struct {
+  int header_packet_counter;
+  splt_state *state;
+  splt_ogg_state *oggstate;
+  ogg_stream_state *stream_out;
+  const char *output_fname;
+  int write_header_packets;
+  ogg_stream_state *optional_stream_in;
+} splt_ogg_new_stream_handler;
+
+splt_ogg_new_stream_handler *splt_ogg_nsh_new(splt_state *state, 
+    splt_ogg_state *oggstate, ogg_stream_state *stream_out, const char *output_fname,
+    int write_header_packets, ogg_stream_state *optional_stream_in);
+
+void splt_ogg_initialise_for_new_stream(splt_ogg_new_stream_handler *nsh, 
+    ogg_page *page, long *cutpoint, long previous_granulepos);
+int splt_ogg_new_stream_needs_header_packet();
+void splt_ogg_new_stream_handle_header_packet(splt_ogg_new_stream_handler *nsh, ogg_packet *packet, int *error);
+
+#define MP3SPLT_OGG_NEW_STREAM_HANDLER_H
+
+#endif
+

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

@@ -44,6 +44,7 @@
 #include "ogg_silence.h"
 #include "ogg_utils.h"
 #include "silence_processors.h"
+#include "ogg_new_stream_handler.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,
@@ -86,13 +87,21 @@
       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_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);
 
+  splt_ogg_new_stream_handler *ogg_new_stream_handler = 
+    splt_ogg_nsh_new(state, oggstate, NULL, NULL, SPLT_FALSE, &os);
+  if (ogg_new_stream_handler == NULL)
+  {
+    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
+    return;
+  }
+
   ogg_int64_t pos = granpos;
 
   off_t initial_file_offset = ftello(oggstate->in);
@@ -158,6 +167,9 @@
   ogg_int64_t page_granpos;
   ogg_packet op;
 
+  double previous_streams_time_in_double = 0;
+  double time_in_double = 0;
+
   while (!eos)
   {
     while (!eos)
@@ -169,9 +181,11 @@
 
       if (result > 0)
       {
-        if (ogg_page_eos(&og)) 
+        if (ogg_page_bos(&og))
         {
-          eos = 1;
+          splt_ogg_initialise_for_new_stream(ogg_new_stream_handler, &og, NULL, 0);
+          oggstate->cutpoint_begin = 0;
+          previous_streams_time_in_double = time_in_double;
         }
 
         page_granpos = ogg_page_granulepos(&og) - oggstate->cutpoint_begin;
@@ -194,12 +208,19 @@
 
           if (result > 0)
           {
+            if (splt_ogg_new_stream_needs_header_packet(ogg_new_stream_handler))
+            {
+              splt_ogg_new_stream_handle_header_packet(ogg_new_stream_handler, &op, error);
+              if (*error < 0) { goto function_end; }
+              continue;
+            }
+
             int bs = splt_ogg_get_blocksize(oggstate, oggstate->vi, &op);
 
             //we currently loose the first packet when using the
             //auto adjust option because we are out of sync,
             //so we disable the continuity check
-            if (!splt_o_get_int_option(state,SPLT_OPT_AUTO_ADJUST))
+            if (!splt_o_get_int_option(state, SPLT_OPT_AUTO_ADJUST))
             {
               ogg_int64_t first_granpos = splt_ogg_compute_first_granulepos(state, oggstate, &op, bs);
               if (first_cut_granpos == 0 && first_granpos != 0)
@@ -219,8 +240,8 @@
 
             if (vorbis_synthesis(&vb, &op) != 0)
             {
-              *error = SPLT_ERROR_INVALID;
               splt_e_set_error_data(state, splt_t_get_filename_to_split(state));
+              *error = SPLT_ERROR_INVALID;
               goto function_end;
             }
 
@@ -229,8 +250,9 @@
 
             int err = SPLT_OK;
             short must_flush = (end && begin > end);
-            double time_in_double = (double) (pos - first_cut_granpos);
+            time_in_double = (double) (pos - first_cut_granpos);
             time_in_double /= oggstate->vi->rate;
+            time_in_double += previous_streams_time_in_double;
             int stop = process_silence(time_in_double, silence_was_found, must_flush, ssd, &found, &err);
             if (stop || stop == -1)
             {
@@ -245,8 +267,6 @@
       }
 
       result = ogg_sync_pageout(&oy, &og);
-      //result == -1 is NOT a fatal error
-
 //      long page_number = ogg_page_pageno(&og);
 //      fprintf(stdout,"X page number = %ld\n", page_number);
 //      fflush(stdout);
@@ -265,7 +285,6 @@
       }
 
       result = ogg_sync_pageout(&oy, &og);
-      //result == -1 is NOT a fatal error
 
 //      if (result != -1)
 //      {
@@ -339,6 +358,8 @@
     splt_e_set_strerror_msg_with_data(state, splt_t_get_filename_to_split(state));
     *error = SPLT_ERROR_SEEKING_FILE;
   }
+
+  splt_ogg_nsh_free(&ogg_new_stream_handler);
 }
 
 static int splt_ogg_silence(splt_ogg_state *oggstate, vorbis_dsp_state *vd, float threshold)
@@ -353,7 +374,7 @@
       int i, j;
       for (i = 0; i < oggstate->vi->channels; i++)
       {
-        float  *mono=pcmi;
+        float *mono=pcmi;
         if (!silence) 
         {
           break;

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

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

@@ -37,8 +37,21 @@
  *
  *********************************************************/
 
+#include <string.h>
+#include <math.h>
+
 #include "ogg_utils.h"
 
+static void splt_ogg_submit_headers_to_stream(ogg_stream_state *stream, splt_ogg_state *oggstate);
+static char *splt_ogg_trackstring(int number, int *error);
+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,
+    int *error);
+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);
+
 long splt_ogg_get_blocksize(splt_ogg_state *oggstate, vorbis_info *vi, ogg_packet *op)
 {
   //if this < 0, there is a problem
@@ -106,5 +119,483 @@
   return bytes;
 }
 
+splt_v_packet *splt_ogg_clone_packet(ogg_packet *packet, int *error)
+{
+  splt_v_packet *p = NULL;
+
+  p = malloc(sizeof(splt_v_packet));
+  if (!p)
+  {
+    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
+    return p;
+  }
+
+  p->length = packet->bytes;
+  p->packet = malloc(p->length);
+  if (! p->packet)
+  {
+    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
+    free(p);
+    p = NULL;
+    return p;
+  }
+  memcpy(p->packet, packet->packet, p->length);
+
+  return p;
+}
+
+void splt_ogg_free_packet(splt_v_packet **p)
+{
+  if (!p || !*p)
+  {
+    return;
+  }
+
+  if ((*p)->packet)
+  {
+    free((*p)->packet);
+    (*p)->packet = NULL;
+  }
+
+  free(*p);
+  *p = NULL;
+}
+
+void splt_ogg_free_oggstate_headers(splt_ogg_state *oggstate)
+{
+  if (!oggstate->headers)
+  {
+    return;
+  }
+
+  int i = 0;
+  for (i = 0;i < TOTAL_HEADER_PACKETS; i++)
+  {
+    splt_ogg_free_packet(&oggstate->headersi);
+  }
+
+  free(oggstate->headers);
+  oggstate->headers = NULL;
+}
+
+/* Returns 0 for success, or -1 on failure. */
+int splt_ogg_write_pages_to_file(splt_state *state, ogg_stream_state *stream,
+    FILE *file, int flush, int *error, const char *output_fname)
+{
+  ogg_page page;
+
+  if (flush)
+  {
+    while (ogg_stream_flush(stream, &page))
+    {
+      if (splt_io_fwrite(state, page.header, 1, page.header_len, file) < page.header_len)
+      {
+        goto write_error;
+      }
+      if (splt_io_fwrite(state, page.body, 1, page.body_len, file) < page.body_len)
+      {
+        goto write_error;
+      }
+    }
+  }
+  else
+  {
+    while (ogg_stream_pageout(stream, &page))
+    {
+      if (splt_io_fwrite(state, page.header,1,page.header_len, file) < page.header_len)
+      {
+        goto write_error;
+      }
+      if (splt_io_fwrite(state, page.body,1,page.body_len, file) < page.body_len)
+      {
+        goto write_error;
+      }
+    }
+  }
+
+  return 0;
+
+write_error:
+  splt_e_set_error_data(state, output_fname);
+  *error = SPLT_ERROR_CANT_WRITE_TO_OUTPUT_FILE;
+  return -1;
+}
+
+int splt_ogg_write_header_packets(splt_state *state, splt_ogg_state *oggstate,
+    ogg_stream_state *stream_out, const char *output_fname, int *error)
+{
+  splt_ogg_submit_headers_to_stream(stream_out, oggstate);
+  return splt_ogg_write_pages_to_file(state, stream_out, oggstate->out, 1,
+      error, output_fname);
+}
+
+void splt_ogg_set_tags_in_headers(splt_ogg_state *oggstate, int *error)
+{
+  ogg_packet header_comm;
+  vorbis_commentheader_out(&oggstate->vc, &header_comm);
+  splt_ogg_free_packet(&oggstate->headers1);
+  oggstate->headers1 = splt_ogg_clone_packet(&header_comm, error);
+  ogg_packet_clear(&header_comm);
+
+  splt_ogg_free_vorbis_comment(&oggstate->vc, oggstate->cloned_vorbis_comment);
+  oggstate->cloned_vorbis_comment = 2;
+}
+
+vorbis_comment *splt_ogg_clone_vorbis_comment(vorbis_comment *comment)
+{
+  vorbis_comment *cloned_comment = malloc(sizeof(vorbis_comment));
+  if (cloned_comment == NULL)
+  {
+    return NULL;
+  }
+  memset(cloned_comment, 0x0, sizeof(vorbis_comment));
+
+  vorbis_comment_init(cloned_comment);
+
+  int err = splt_su_copy(comment->vendor, &cloned_comment->vendor);
+  if (err < 0)
+  {
+    free(cloned_comment);
+    return NULL;
+  }
+
+  long number_of_comments = comment->comments; 
+  cloned_comment->comments = number_of_comments;
+
+  if (number_of_comments <= 0)
+  {
+    cloned_comment->comment_lengths = NULL;
+    cloned_comment->user_comments = NULL;
+    return cloned_comment;
+  }
+
+  cloned_comment->comment_lengths = malloc(sizeof(int) * number_of_comments);
+  if (cloned_comment->comment_lengths == NULL)
+  {
+    splt_ogg_free_vorbis_comment(cloned_comment, SPLT_TRUE);
+    free(cloned_comment);
+    return NULL;
+  }
+  memset(cloned_comment->comment_lengths, 0x0, sizeof(int) * number_of_comments);
+
+  cloned_comment->user_comments = malloc(sizeof(char *) * number_of_comments);
+  if (cloned_comment->user_comments == NULL)
+  {
+    splt_ogg_free_vorbis_comment(cloned_comment, SPLT_TRUE);
+    free(cloned_comment);
+    return NULL;
+  }
+  memset(cloned_comment->user_comments, 0x0, sizeof(char *) * number_of_comments);
+
+  int i = 0;
+  for (i = 0;i < number_of_comments; i++)
+  {
+    int err = splt_su_copy(comment->user_commentsi, &cloned_comment->user_commentsi);
+    if (err < 0)
+    {

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

@@ -37,12 +37,29 @@
  *
  *********************************************************/
 
-#include "splt.h"
+#ifndef MP3SPLT_OGG_UTILS_H
 
+#include "splt.h"
 #include "ogg.h"
 
+#define TOTAL_HEADER_PACKETS 3
+
 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);
+splt_v_packet *splt_ogg_clone_packet(ogg_packet *packet, int *error);
+void splt_ogg_free_packet(splt_v_packet **p);
+void splt_ogg_free_oggstate_headers(splt_ogg_state *oggstate);
+int splt_ogg_write_pages_to_file(splt_state *state, ogg_stream_state *stream,
+    FILE *file, int flush, int *error, const char *output_fname);
+int splt_ogg_write_header_packets(splt_state *state, splt_ogg_state *oggstate,
+    ogg_stream_state *stream_out, const char *output_fname, int *error);
+void splt_ogg_put_tags(splt_state *state, int *error);
+void splt_ogg_set_tags_in_headers(splt_ogg_state *oggstate, int *error);
+vorbis_comment *splt_ogg_clone_vorbis_comment(vorbis_comment *comment);
+void splt_ogg_free_vorbis_comment(vorbis_comment *vc, short cloned_vorbis_comment);
+
+#define MP3SPLT_OGG_UTILS_H
 
+#endif

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

libmp3splt-0.7.tar.bz2/po/cs.po -> libmp3splt-0.7.1.tar.gz/po/cs.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mp3splt-gtk\n"
 "Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
-"POT-Creation-Date: 2011-07-14 12:45+0200\n"
+"POT-Creation-Date: 2011-11-14 00:12+0100\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"
@@ -40,7 +40,7 @@
 msgstr ""
 "Pracuje se s SILENCE AUTO-ADJUST (Práh: %.1f dB Mezera: %d s Posun: %.2f)\n"
 
-#: src/checks.c:159
+#: src/checks.c:158
 msgid "directory does not exists"
 msgstr "Adresář neexistuje"
 
@@ -72,58 +72,58 @@
 msgid "  Album: %s\n"
 msgstr "  Album: %s\n"
 
-#: src/splt.c:147
+#: src/splt.c:154
 msgid " info: starting normal split\n"
 msgstr " Informace: Spouští se dělení v obvyklém režimu\n"
 
-#: src/splt.c:234
+#: src/splt.c:242
 msgid " info: starting error mode split\n"
 msgstr " Informace: Spouští se dělení v chybovém režimu\n"
 
-#: src/splt.c:544
+#: src/splt.c:551
 msgid " info: starting time mode split\n"
 msgstr " Informace: Spouští se dělení v časovém režimu\n"
 
-#: src/splt.c:563
+#: src/splt.c:570
 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
+#: src/splt.c:612
 #, c-format
 msgid " Trim silence split - Th: %.1f dB\n"
 msgstr ""
 
-#: src/splt.c:732
+#: src/splt.c:739
 #, c-format
 msgid "YES"
 msgstr "Ano"
 
-#: src/splt.c:736
+#: src/splt.c:743
 #, c-format
 msgid "NO"
 msgstr "Ne"
 
-#: src/splt.c:742
+#: src/splt.c:749
 #, c-format
 msgid "User"
 msgstr "Uživatel"
 
-#: src/splt.c:746
+#: src/splt.c:753
 #, c-format
 msgid "Auto"
 msgstr "Automaticky"
 
-#: src/splt.c:752
-#, c-format
+#: src/splt.c:759
+#, fuzzy, c-format
 msgid ""
-" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: "
-"%s)\n"
+" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: %s, "
+"Min track: %.2f)\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
+#: src/splt.c:778
 #, c-format
 msgid ""
 " Found silence log file '%s' ! Reading silence points from file to save "
@@ -132,30 +132,30 @@
 " Byl nalezen soubor se zápisem pro ticho »%s«! Aby se ušetřil čas, jsou body "
 "rozdělení čteny z tohoto souboru ;)\n"
 
-#: src/splt.c:799
+#: src/splt.c:807
 #, c-format
 msgid " Total silence points found: %d."
 msgstr " Celkem nalezeno bodů ticha: %d."
 
-#: src/splt.c:811
+#: src/splt.c:819
 #, c-format
 msgid " (Selected %d tracks)\n"
 msgstr " (%d skladeb vybráno)\n"
 
-#: src/splt.c:906
+#: src/splt.c:929
 #, c-format
 msgid " Writing silence log file '%s' ...\n"
 msgstr " Zapisuje se soubor se zápisem o tichu »%s« …\n"
 
-#: src/splt.c:961
+#: src/splt.c:984
 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
+#: src/splt.c:1032
 msgid " info: starting trim using silence mode split\n"
 msgstr ""
 
-#: src/splt.c:1056
+#: src/splt.c:1079
 msgid " info: starting wrap mode split\n"
 msgstr ""
 " Informace: Začíná se s dělením v režimu automatického zalomení (wrap)\n"
@@ -174,12 +174,12 @@
 msgid "description here"
 msgstr "Popis zde"
 
-#: src/cue.c:695
+#: src/cue.c:700
 #, c-format
 msgid " CUE file '%s' created.\n"
 msgstr " Byl vytvořen soubor CUE »%s«.\n"
 
-#: src/audacity.c:214
+#: src/audacity.c:237
 #, c-format
 msgid " reading informations from audacity labels file '%s' ...\n"
 msgstr " Čtou se informace ze souboru se štítky Audacity '%s …\n"
@@ -568,68 +568,68 @@
 " Varování: Značky nelze naplnit z regulárního výrazu souboru  - sestaveno "
 "bez podpory pcre\n"
 
-#: plugins/mp3.c:1239
+#: plugins/mp3.c:1242
 msgid " info: found Xing or Info header. Switching to frame mode... \n"
 msgstr ""
 " Informace: Nalezena hlavička Xing nebo Info. Přepíná se do režimu snímků…\n"
 
-#: plugins/mp3.c:1376
+#: plugins/mp3.c:1381
 #, c-format
 msgid " info: MPEG %d Layer %d - %d Hz - %s"
 msgstr " Informace: MPEG %d Layer %d - %d Hz - %s"
 
-#: plugins/mp3.c:1384
+#: plugins/mp3.c:1389
 #, c-format
 msgid " - FRAME MODE NS"
 msgstr " - REŽIM SNÍMKŮ NS"
 
-#: plugins/mp3.c:1388
+#: plugins/mp3.c:1393
 #, c-format
 msgid " - FRAME MODE"
 msgstr " - REŽIM SNÍMKŮ"
 
-#: plugins/mp3.c:1393
+#: plugins/mp3.c:1398
 #, c-format
 msgid " - NS - %d Kb/s"
 msgstr " - NS - %d kB/s"
 
-#: plugins/mp3.c:1398
+#: plugins/mp3.c:1403
 #, c-format
 msgid " - %d Kb/s"
 msgstr " - %d kB/s"
 
-#: plugins/mp3.c:1406 plugins/ogg.c:134
+#: plugins/mp3.c:1411 plugins/ogg.c:134
 #, c-format
 msgid " - Total time: %dm.%02ds"
 msgstr " - Celkový čas: %dm.%02ds"
 
-#: plugins/mp3.c:2713
+#: plugins/mp3.c:2724
 #, c-format
 msgid " Detected file created with: Mp3Wrap v. %c.%c\n"
 msgstr " Zjištěný soubor vytvořen: Mp3Wrap v. %c.%c\n"
 
-#: plugins/mp3.c:2751
+#: plugins/mp3.c:2762
 msgid " Check for file integrity: calculating CRC please wait... "
 msgstr " Ověření celistvosti souboru: Počítá se CRC, prosím, počkejte …"

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

libmp3splt-0.7.tar.bz2/po/de_DE.po -> libmp3splt-0.7.1.tar.gz/po/de_DE.po Changed

@@ -1,16 +1,16 @@
-# SOME DESCRIPTIVE TITLE.
+# German translation for libmp3splt.
 # Copyright (C) YEAR Munteanu Alexandru
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Mario Blättermann <mariobl@freenet.de>, 2010, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mp3splt-gtk\n"
+"Project-Id-Version: libmp3splt\n"
 "Report-Msgid-Bugs-To: io_fx@yahoo.fr\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"
+"POT-Creation-Date: 2011-11-14 00:12+0100\n"
+"PO-Revision-Date: 2011-09-16 00:13+0100\n"
+"Last-Translator: Mario Blättermann <mariobl@freenet.de>\n"
+"Language-Team: German <gnome-de@gnome.org>\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +41,7 @@
 "Mit SILENCE AUTO-ADJUST wird gearbeitet (Ansprechschwelle: %.1f dB Pause: %d "
 "s Versatz: %.2f)\n"
 
-#: src/checks.c:159
+#: src/checks.c:158
 msgid "directory does not exists"
 msgstr "Ordner existiert nicht"
 
@@ -73,57 +73,57 @@
 msgid "  Album: %s\n"
 msgstr "  Album: %s\n"
 
-#: src/splt.c:147
+#: src/splt.c:154
 msgid " info: starting normal split\n"
 msgstr " Info: Teilung im normalen Modus wird gestartet\n"
 
-#: src/splt.c:234
+#: src/splt.c:242
 msgid " info: starting error mode split\n"
 msgstr " Info: Teilung im Fehlermodus wird gestartet\n"
 
-#: src/splt.c:544
+#: src/splt.c:551
 msgid " info: starting time mode split\n"
 msgstr " Info: Teilung im Zeitmodus wird gestartet\n"
 
-#: src/splt.c:563
+#: src/splt.c:570
 msgid " info: starting 'split in equal tracks' mode\n"
 msgstr " Info: Teilung im Modus »Gleich große Teile« wird gestartet\n"
 
-#: src/splt.c:605
+#: src/splt.c:612
 #, c-format
 msgid " Trim silence split - Th: %.1f dB\n"
-msgstr ""
+msgstr "Trimmen nach Stille-Erkennung - Ansprechschwelle: %.1f dB\n"
 
-#: src/splt.c:732
+#: src/splt.c:739
 #, c-format
 msgid "YES"
 msgstr "JA"
 
-#: src/splt.c:736
+#: src/splt.c:743
 #, c-format
 msgid "NO"
 msgstr "NEIN"
 
-#: src/splt.c:742
+#: src/splt.c:749
 #, c-format
 msgid "User"
 msgstr "Benutzer"
 
-#: src/splt.c:746
+#: src/splt.c:753
 #, c-format
 msgid "Auto"
 msgstr "Automatisch"
 
-#: src/splt.c:752
+#: src/splt.c:759
 #, c-format
 msgid ""
-" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: "
-"%s)\n"
+" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: %s, "
+"Min track: %.2f)\n"
 msgstr ""
 " Stille-Teilungstyp: Modus %s (Ansprechschwelle: %.1f dB, Aus: %.2f, Min: "
-"%.2f, Entfernen: %s)\n"
+"%.2f, Entfernen: %s, Min-Titel: %.2f)\n"
 
-#: src/splt.c:770
+#: src/splt.c:778
 #, c-format
 msgid ""
 " Found silence log file '%s' ! Reading silence points from file to save "
@@ -132,31 +132,30 @@
 " Stille-Protokolldatei »%s« wurde gefunden! Um Zeit zu sparen, werden die "
 "Teilungspunkte aus dieser Datei gelesen ;)\n"
 
-#: src/splt.c:799
+#: src/splt.c:807
 #, c-format
 msgid " Total silence points found: %d."
 msgstr " Insgesamt gefundene Teilungspunkte: %d."
 
-#: src/splt.c:811
+#: src/splt.c:819
 #, c-format
 msgid " (Selected %d tracks)\n"
 msgstr " (%d Titel ausgewählt)\n"
 
-#: src/splt.c:906
+#: src/splt.c:929
 #, c-format
 msgid " Writing silence log file '%s' ...\n"
 msgstr "Stille-Protokolldatei »%s« wird geschrieben …\n"
 
-#: src/splt.c:961
+#: src/splt.c:984
 msgid " info: starting silence mode split\n"
 msgstr " Info: Teilung im Stille-Modus wird gestartet\n"
 
-#: src/splt.c:1009
-#, fuzzy
+#: src/splt.c:1032
 msgid " info: starting trim using silence mode split\n"
-msgstr " Info: Teilung im Stille-Modus wird gestartet\n"
+msgstr " Info: Trimmen im Stille-Modus wird gestartet\n"
 
-#: src/splt.c:1056
+#: src/splt.c:1079
 msgid " info: starting wrap mode split\n"
 msgstr " Info: Teilung im Wrap-Modus wird gestartet\n"
 
@@ -174,456 +173,461 @@
 msgid "description here"
 msgstr "Beschreibung hier"
 
-#: src/cue.c:695
+#: src/cue.c:700
 #, c-format
 msgid " CUE file '%s' created.\n"
 msgstr " CUE-Datei »%s« wurde erstellt.\n"
 
-#: src/audacity.c:214
+#: src/audacity.c:237
 #, c-format
 msgid " reading informations from audacity labels file '%s' ...\n"
-msgstr ""
+msgstr " Informationen aus Audacity-Labels-Datei »%s« werden gelesen …\n"
 
 #: src/errors.c:129
 msgid "Network error"
-msgstr ""
+msgstr "Netzwerkfehler"
 
 #: src/errors.c:179
 msgid " warning: might be VBR, use frame mode"
-msgstr ""
+msgstr " Warnung: könnte VBR sein, Frame-Modus wird verwendet"
 
 #: src/errors.c:181
 msgid " error mode ok"
-msgstr ""
+msgstr "Fehlermodus OK"
 
 #: src/errors.c:183
 msgid " error: unknown sync error"
-msgstr ""
+msgstr " Fehler: Unbekannter Abgleichfehler"
 
 #: src/errors.c:185
 msgid " no sync errors found"
-msgstr ""
+msgstr " Keine Abgleichfehler gefunden"
 
 #: src/errors.c:188
 msgid " sync error: too many sync errors"
-msgstr ""
+msgstr " Abgleichfehler: Zu viele Abgleichfehler"
 
 #: src/errors.c:192
 msgid " maximum number of found CD reached"
-msgstr ""
+msgstr "Maximale Anzahl der gefundenen CDs erreicht"
 
 #: src/errors.c:194
 msgid " cue file processed"
-msgstr ""

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

libmp3splt-0.7.tar.bz2/po/es.po -> libmp3splt-0.7.1.tar.gz/po/es.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mp3splt-gtk\n"
 "Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
-"POT-Creation-Date: 2011-07-14 12:45+0200\n"
+"POT-Creation-Date: 2011-11-14 00:12+0100\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"
@@ -39,7 +39,7 @@
 "%.2f)\n"
 msgstr ""
 
-#: src/checks.c:159
+#: src/checks.c:158
 msgid "directory does not exists"
 msgstr ""
 
@@ -67,85 +67,85 @@
 msgid "  Album: %s\n"
 msgstr ""
 
-#: src/splt.c:147
+#: src/splt.c:154
 msgid " info: starting normal split\n"
 msgstr ""
 
-#: src/splt.c:234
+#: src/splt.c:242
 msgid " info: starting error mode split\n"
 msgstr ""
 
-#: src/splt.c:544
+#: src/splt.c:551
 msgid " info: starting time mode split\n"
 msgstr ""
 
-#: src/splt.c:563
+#: src/splt.c:570
 msgid " info: starting 'split in equal tracks' mode\n"
 msgstr ""
 
-#: src/splt.c:605
+#: src/splt.c:612
 #, c-format
 msgid " Trim silence split - Th: %.1f dB\n"
 msgstr ""
 
-#: src/splt.c:732
+#: src/splt.c:739
 #, c-format
 msgid "YES"
 msgstr "SÍ"
 
-#: src/splt.c:736
+#: src/splt.c:743
 #, c-format
 msgid "NO"
 msgstr "NO"
 
-#: src/splt.c:742
+#: src/splt.c:749
 #, c-format
 msgid "User"
 msgstr "Usuario"
 
-#: src/splt.c:746
+#: src/splt.c:753
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: src/splt.c:752
+#: src/splt.c:759
 #, c-format
 msgid ""
-" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: "
-"%s)\n"
+" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: %s, "
+"Min track: %.2f)\n"
 msgstr ""
 
-#: src/splt.c:770
+#: src/splt.c:778
 #, c-format
 msgid ""
 " Found silence log file '%s' ! Reading silence points from file to save "
 "time ;)\n"
 msgstr ""
 
-#: src/splt.c:799
+#: src/splt.c:807
 #, c-format
 msgid " Total silence points found: %d."
 msgstr ""
 
-#: src/splt.c:811
+#: src/splt.c:819
 #, c-format
 msgid " (Selected %d tracks)\n"
 msgstr ""
 
-#: src/splt.c:906
+#: src/splt.c:929
 #, c-format
 msgid " Writing silence log file '%s' ...\n"
 msgstr ""
 
-#: src/splt.c:961
+#: src/splt.c:984
 msgid " info: starting silence mode split\n"
 msgstr ""
 
-#: src/splt.c:1009
+#: src/splt.c:1032
 msgid " info: starting trim using silence mode split\n"
 msgstr ""
 
-#: src/splt.c:1056
+#: src/splt.c:1079
 msgid " info: starting wrap mode split\n"
 msgstr ""
 
@@ -163,12 +163,12 @@
 msgid "description here"
 msgstr ""
 
-#: src/cue.c:695
+#: src/cue.c:700
 #, c-format
 msgid " CUE file '%s' created.\n"
 msgstr ""
 
-#: src/audacity.c:214
+#: src/audacity.c:237
 #, c-format
 msgid " reading informations from audacity labels file '%s' ...\n"
 msgstr ""
@@ -550,67 +550,67 @@
 "without pcre support\n"
 msgstr ""
 
-#: plugins/mp3.c:1239
+#: plugins/mp3.c:1242
 msgid " info: found Xing or Info header. Switching to frame mode... \n"
 msgstr ""
 
-#: plugins/mp3.c:1376
+#: plugins/mp3.c:1381
 #, c-format
 msgid " info: MPEG %d Layer %d - %d Hz - %s"
 msgstr ""
 
-#: plugins/mp3.c:1384
+#: plugins/mp3.c:1389
 #, c-format
 msgid " - FRAME MODE NS"
 msgstr ""
 
-#: plugins/mp3.c:1388
+#: plugins/mp3.c:1393
 #, c-format
 msgid " - FRAME MODE"
 msgstr ""
 
-#: plugins/mp3.c:1393
+#: plugins/mp3.c:1398
 #, c-format
 msgid " - NS - %d Kb/s"
 msgstr ""
 
-#: plugins/mp3.c:1398
+#: plugins/mp3.c:1403
 #, c-format
 msgid " - %d Kb/s"
 msgstr ""
 
-#: plugins/mp3.c:1406 plugins/ogg.c:134
+#: plugins/mp3.c:1411 plugins/ogg.c:134
 #, c-format
 msgid " - Total time: %dm.%02ds"
 msgstr ""
 
-#: plugins/mp3.c:2713
+#: plugins/mp3.c:2724
 #, c-format
 msgid " Detected file created with: Mp3Wrap v. %c.%c\n"
 msgstr ""
 
-#: plugins/mp3.c:2751
+#: plugins/mp3.c:2762
 msgid " Check for file integrity: calculating CRC please wait... "
 msgstr ""
 
-#: plugins/mp3.c:2770
+#: plugins/mp3.c:2781
 msgid " OK\n"
 msgstr ""
 
-#: plugins/mp3.c:2789

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

libmp3splt-0.7.tar.bz2/po/fr_FR.po -> libmp3splt-0.7.1.tar.gz/po/fr_FR.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mp3splt-gtk\n"
 "Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
-"POT-Creation-Date: 2011-07-14 12:45+0200\n"
+"POT-Creation-Date: 2011-11-14 00:12+0100\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"
@@ -41,7 +41,7 @@
 " Avec ajustement du silence (Seuil : %.1f dB Ecart : %d sec Compensation : "
 "%.2f)\n"
 
-#: src/checks.c:159
+#: src/checks.c:158
 msgid "directory does not exists"
 msgstr "le dossier n'existe pas"
 
@@ -73,58 +73,58 @@
 msgid "  Album: %s\n"
 msgstr "  Album : %s\n"
 
-#: src/splt.c:147
+#: src/splt.c:154
 msgid " info: starting normal split\n"
 msgstr " info : début de la division normale\n"
 
-#: src/splt.c:234
+#: src/splt.c:242
 msgid " info: starting error mode split\n"
 msgstr ""
 " info : début de la division avec recherche d'erreurs de synchronisation\n"
 
-#: src/splt.c:544
+#: src/splt.c:551
 msgid " info: starting time mode split\n"
 msgstr " info : début de la division en plusieurs pistes de même taille\n"
 
-#: src/splt.c:563
+#: src/splt.c:570
 msgid " info: starting 'split in equal tracks' mode\n"
 msgstr " info : début de la division en morceaux egaux\n"
 
-#: src/splt.c:605
+#: src/splt.c:612
 #, c-format
 msgid " Trim silence split - Th: %.1f dB\n"
 msgstr ""
 
-#: src/splt.c:732
+#: src/splt.c:739
 #, c-format
 msgid "YES"
 msgstr "OUI"
 
-#: src/splt.c:736
+#: src/splt.c:743
 #, c-format
 msgid "NO"
 msgstr "NON"
 
-#: src/splt.c:742
+#: src/splt.c:749
 #, c-format
 msgid "User"
 msgstr "Utilisateur"
 
-#: src/splt.c:746
+#: src/splt.c:753
 #, c-format
 msgid "Auto"
 msgstr "Automatique"
 
-#: src/splt.c:752
-#, c-format
+#: src/splt.c:759
+#, fuzzy, c-format
 msgid ""
-" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: "
-"%s)\n"
+" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: %s, "
+"Min track: %.2f)\n"
 msgstr ""
 " Division avec recherche du silence : mode %s (Seuil : %.1f dB, Ecart : "
 "%.2f, Min : %.2f, Suppression : %s)\n"
 
-#: src/splt.c:770
+#: src/splt.c:778
 #, c-format
 msgid ""
 " Found silence log file '%s' ! Reading silence points from file to save "
@@ -133,31 +133,31 @@
 "Fichier journal silence trouvé '%s' ! Lecture des points silence points pour "
 "gagner du temps ;)\n"
 
-#: src/splt.c:799
+#: src/splt.c:807
 #, c-format
 msgid " Total silence points found: %d."
 msgstr "Total des points silence trouvés  : %d."
 
-#: src/splt.c:811
+#: src/splt.c:819
 #, c-format
 msgid " (Selected %d tracks)\n"
 msgstr " (%d pistes sélectionnées)\n"
 
-#: src/splt.c:906
+#: src/splt.c:929
 #, 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:961
+#: src/splt.c:984
 msgid " info: starting silence mode split\n"
 msgstr " info : début de la division avec recherche de silence\n"
 
-#: src/splt.c:1009
+#: src/splt.c:1032
 #, 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
+#: src/splt.c:1079
 msgid " info: starting wrap mode split\n"
 msgstr " info : début de la division 'wrap'\n"
 
@@ -175,12 +175,12 @@
 msgid "description here"
 msgstr "description"
 
-#: src/cue.c:695
+#: src/cue.c:700
 #, c-format
 msgid " CUE file '%s' created.\n"
 msgstr " Fichier CUE '%s' créé.\n"
 
-#: src/audacity.c:214
+#: src/audacity.c:237
 #, c-format
 msgid " reading informations from audacity labels file '%s' ...\n"
 msgstr ""
@@ -567,70 +567,70 @@
 "avertissement : impossible de remplir les tags avec l'expression régulière "
 "fichier - compilé sans support pcre\n"
 
-#: plugins/mp3.c:1239
+#: plugins/mp3.c:1242
 msgid " info: found Xing or Info header. Switching to frame mode... \n"
 msgstr " info: entête Xing ou Info trouvée. Activation du mode \"frame\"...\n"
 
-#: plugins/mp3.c:1376
+#: plugins/mp3.c:1381
 #, c-format
 msgid " info: MPEG %d Layer %d - %d Hz - %s"
 msgstr " info : MPEG %d couche %d - %d Hz - %s"
 
-#: plugins/mp3.c:1384
+#: plugins/mp3.c:1389
 #, c-format
 msgid " - FRAME MODE NS"
 msgstr " - MODE 'FRAME' NS (sans changement de position)"
 
-#: plugins/mp3.c:1388
+#: plugins/mp3.c:1393
 #, c-format
 msgid " - FRAME MODE"
 msgstr " - MODE 'FRAME'"
 
-#: plugins/mp3.c:1393
+#: plugins/mp3.c:1398
 #, c-format
 msgid " - NS - %d Kb/s"
 msgstr " - NS - %d Kb/s"
 
-#: plugins/mp3.c:1398
+#: plugins/mp3.c:1403
 #, c-format
 msgid " - %d Kb/s"
 msgstr " - %d Kb/s"
 
-#: plugins/mp3.c:1406 plugins/ogg.c:134
+#: plugins/mp3.c:1411 plugins/ogg.c:134
 #, c-format
 msgid " - Total time: %dm.%02ds"
 msgstr " - Temps total : %dm.%02ds"
 
-#: plugins/mp3.c:2713
+#: plugins/mp3.c:2724
 #, c-format
 msgid " Detected file created with: Mp3Wrap v. %c.%c\n"
 msgstr " Le fichier reconnu a le format Mp3Wrap v. %c.%c\n"
 
-#: plugins/mp3.c:2751
+#: plugins/mp3.c:2762
 msgid " Check for file integrity: calculating CRC please wait... "
 msgstr ""
 " Vérification de l'intégrité du fichier : calcul du CRC (contrôle de "

libmp3splt-0.7.tar.bz2/po/libmp3splt.pot -> libmp3splt-0.7.1.tar.gz/po/libmp3splt.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
-"POT-Creation-Date: 2011-07-14 12:45+0200\n"
+"POT-Creation-Date: 2011-11-14 00:12+0100\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"
@@ -39,7 +39,7 @@
 "%.2f)\n"
 msgstr ""
 
-#: src/checks.c:159
+#: src/checks.c:158
 msgid "directory does not exists"
 msgstr ""
 
@@ -67,85 +67,85 @@
 msgid "  Album: %s\n"
 msgstr ""
 
-#: src/splt.c:147
+#: src/splt.c:154
 msgid " info: starting normal split\n"
 msgstr ""
 
-#: src/splt.c:234
+#: src/splt.c:242
 msgid " info: starting error mode split\n"
 msgstr ""
 
-#: src/splt.c:544
+#: src/splt.c:551
 msgid " info: starting time mode split\n"
 msgstr ""
 
-#: src/splt.c:563
+#: src/splt.c:570
 msgid " info: starting 'split in equal tracks' mode\n"
 msgstr ""
 
-#: src/splt.c:605
+#: src/splt.c:612
 #, c-format
 msgid " Trim silence split - Th: %.1f dB\n"
 msgstr ""
 
-#: src/splt.c:732
+#: src/splt.c:739
 #, c-format
 msgid "YES"
 msgstr ""
 
-#: src/splt.c:736
+#: src/splt.c:743
 #, c-format
 msgid "NO"
 msgstr ""
 
-#: src/splt.c:742
+#: src/splt.c:749
 #, c-format
 msgid "User"
 msgstr ""
 
-#: src/splt.c:746
+#: src/splt.c:753
 #, c-format
 msgid "Auto"
 msgstr ""
 
-#: src/splt.c:752
+#: src/splt.c:759
 #, c-format
 msgid ""
-" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: "
-"%s)\n"
+" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: %s, "
+"Min track: %.2f)\n"
 msgstr ""
 
-#: src/splt.c:770
+#: src/splt.c:778
 #, c-format
 msgid ""
 " Found silence log file '%s' ! Reading silence points from file to save "
 "time ;)\n"
 msgstr ""
 
-#: src/splt.c:799
+#: src/splt.c:807
 #, c-format
 msgid " Total silence points found: %d."
 msgstr ""
 
-#: src/splt.c:811
+#: src/splt.c:819
 #, c-format
 msgid " (Selected %d tracks)\n"
 msgstr ""
 
-#: src/splt.c:906
+#: src/splt.c:929
 #, c-format
 msgid " Writing silence log file '%s' ...\n"
 msgstr ""
 
-#: src/splt.c:961
+#: src/splt.c:984
 msgid " info: starting silence mode split\n"
 msgstr ""
 
-#: src/splt.c:1009
+#: src/splt.c:1032
 msgid " info: starting trim using silence mode split\n"
 msgstr ""
 
-#: src/splt.c:1056
+#: src/splt.c:1079
 msgid " info: starting wrap mode split\n"
 msgstr ""
 
@@ -163,12 +163,12 @@
 msgid "description here"
 msgstr ""
 
-#: src/cue.c:695
+#: src/cue.c:700
 #, c-format
 msgid " CUE file '%s' created.\n"
 msgstr ""
 
-#: src/audacity.c:214
+#: src/audacity.c:237
 #, c-format
 msgid " reading informations from audacity labels file '%s' ...\n"
 msgstr ""
@@ -550,67 +550,67 @@
 "without pcre support\n"
 msgstr ""
 
-#: plugins/mp3.c:1239
+#: plugins/mp3.c:1242
 msgid " info: found Xing or Info header. Switching to frame mode... \n"
 msgstr ""
 
-#: plugins/mp3.c:1376
+#: plugins/mp3.c:1381
 #, c-format
 msgid " info: MPEG %d Layer %d - %d Hz - %s"
 msgstr ""
 
-#: plugins/mp3.c:1384
+#: plugins/mp3.c:1389
 #, c-format
 msgid " - FRAME MODE NS"
 msgstr ""
 
-#: plugins/mp3.c:1388
+#: plugins/mp3.c:1393
 #, c-format
 msgid " - FRAME MODE"
 msgstr ""
 
-#: plugins/mp3.c:1393
+#: plugins/mp3.c:1398
 #, c-format
 msgid " - NS - %d Kb/s"
 msgstr ""
 
-#: plugins/mp3.c:1398
+#: plugins/mp3.c:1403
 #, c-format
 msgid " - %d Kb/s"
 msgstr ""
 
-#: plugins/mp3.c:1406 plugins/ogg.c:134
+#: plugins/mp3.c:1411 plugins/ogg.c:134
 #, c-format
 msgid " - Total time: %dm.%02ds"
 msgstr ""
 
-#: plugins/mp3.c:2713
+#: plugins/mp3.c:2724
 #, c-format
 msgid " Detected file created with: Mp3Wrap v. %c.%c\n"
 msgstr ""
 
-#: plugins/mp3.c:2751
+#: plugins/mp3.c:2762
 msgid " Check for file integrity: calculating CRC please wait... "
 msgstr ""
 
-#: plugins/mp3.c:2770
+#: plugins/mp3.c:2781
 msgid " OK\n"
 msgstr ""
 
-#: plugins/mp3.c:2789

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

@@ -144,14 +144,35 @@
   return splt_su_copy(name, &sa->name);
 }
 
-static void splt_audacity_set_begin(splt_audacity *sa, double begin)
+static long to_hundreths(char *str)
 {
-  sa->begin = (long) (floorf(begin) * 100.0);
+  long hun = 0;
+  long seconds = 0, hundreths = 0;
+  sscanf(str, "%ld.%4ld", &seconds, &hundreths);
+
+  if (hundreths >= 100)
+  {
+    double hun_in_double = (double)hundreths;
+    hundreths = round(hun_in_double / 100.0);
+  }
+
+  return seconds * 100 + hundreths;
+}
+
+static char *splt_audacity_set_begin(splt_audacity *sa, char *str)
+{
+  int hun = to_hundreths(str);
+  if (hun == -1) { return NULL; }
+  sa->begin = hun;
+  return strchr(str, '\t');
 }
 
-static void splt_audacity_set_end(splt_audacity *sa, double end)
+static char *splt_audacity_set_end(splt_audacity *sa, char *str)
 {
-  sa->end = (long) (floorf(end) * 100.0);
+  int hun = to_hundreths(str);
+  if (hun == -1) { return NULL; }
+  sa->end  = hun;
+  return strchr(str, '\t');
 }
 
 static splt_audacity *splt_audacity_process_line(splt_state *state, char *line,
@@ -167,19 +188,21 @@
   char *ptr = line;
 
   errno = 0;
-  splt_audacity_set_begin(aud, strtod(ptr, &ptr));
-  if (errno != 0) {
+  ptr = splt_audacity_set_begin(aud, ptr);
+  if (ptr == NULL || *ptr == '\0') {
     *error = SPLT_INVALID_AUDACITY_FILE;
     goto error;
   }
+  ptr++;
 
   errno = 0;
-  splt_audacity_set_end(aud, strtod(ptr, &ptr));
-  if (errno != 0)
+  ptr = splt_audacity_set_end(aud, ptr);
+  if (ptr == NULL || *ptr == '\0')
   {
     *error = SPLT_INVALID_AUDACITY_FILE;
     goto error;
   }
+  ptr++;
 
   ptr = splt_su_trim_spaces(ptr);

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

@@ -57,7 +57,6 @@
 
   int err = SPLT_OK;
   long total_time = splt_t_get_total_time(state);
-
   if (total_time == 0)
   {
     return;
@@ -75,7 +74,7 @@
       splt_sp_set_splitpoint_value(state, i, splitpoint_value);
     }
 
-    if (splitpoint_value == LONG_MAX)
+    /*if (splitpoint_value == LONG_MAX)
     {
       splitpoint_value = total_time;
       splt_sp_set_splitpoint_value(state, i, total_time);
@@ -91,7 +90,7 @@
       splt_sp_set_splitpoint_value(state, i, total_time);
 
       break;
-    }
+    }*/
   }
 }
 
@@ -229,6 +228,12 @@
       splt_o_set_float_option(state, SPLT_OPT_PARAM_MIN_LENGTH, SPLT_DEFAULT_PARAM_MINIMUM_LENGTH);
       splt_o_set_int_option(state, SPLT_OPT_AUTO_ADJUST, SPLT_FALSE);
     }
+
+    if (splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_TRACK_LENGTH) < 0.f)
+    {
+      splt_o_set_float_option(state, SPLT_OPT_PARAM_MIN_TRACK_LENGTH,
+          SPLT_DEFAULT_PARAM_MINIMUM_TRACK_LENGTH);
+    }
   }
 
   if (!splt_o_get_int_option(state,SPLT_OPT_AUTO_ADJUST))

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

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

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

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

@@ -1511,6 +1511,49 @@
   return found_splitpoints;
 }
 
+//!set the trim silence splitpoints without actually splitting
+void mp3splt_set_trim_silence_points(splt_state *state, int *error)
+{
+  int erro = SPLT_OK;
+  int *err = &erro;
+  if (error != NULL) { err = error; }
+
+  int silence_mode = SPLT_OPTION_TRIM_SILENCE_MODE;
+  mp3splt_set_option(state, SPLT_OPT_SPLIT_MODE, &silence_mode);
+
+  if (state != NULL)
+  {
+    if (!splt_o_library_locked(state))
+    {
+      splt_o_lock_library(state);
+
+      splt_t_set_stop_split(state, SPLT_FALSE);
+
+      splt_check_file_type(state, err);
+
+      if (*err >= 0)
+      {
+        splt_p_init(state, err);
+        if (*err >= 0)
+        {
+          splt_s_set_trim_silence_splitpoints(state, err);
+          splt_p_end(state, err);
+        }
+      }
+
+      splt_o_unlock_library(state);
+    }
+    else
+    {
+      *err = SPLT_ERROR_LIBRARY_LOCKED;
+    }
+  }
+  else
+  {
+    *err = SPLT_ERROR_STATE_NULL;
+  }
+}
+
 //!count how many silence splitpoints silence detection results in
 int mp3splt_count_silence_points(splt_state *state, int *error)
 {

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

@@ -292,23 +292,23 @@
       "%s", format + 2 + offset);
 }
 
-static char splt_of_get_number_of_digits_from_total_time(splt_state *state)
+char splt_of_get_number_of_digits_from_total_time(splt_state *state)
 {
   long total_time = splt_t_get_total_time(state);
-  if (total_time > 0)
+  if (total_time <= 0)
   {
-    long minutes = total_time / 100 / 60;
-    int i = (int) (log10l((long double) minutes));
-    char number_of_digits = (char) (i + '1');
-    if (number_of_digits == '1')
-    {
-      return '2';
-    }
+    return '2';
+  }
 
-    return number_of_digits;
+  long minutes = total_time / 100 / 60;
+  int i = (int) (log10l((long double) minutes));
+  char number_of_digits = (char) (i + '1');
+  if (number_of_digits == '1')
+  {
+    return '2';
   }
 
-  return '2';
+  return number_of_digits;
 }
 
 /*! \brief Automagically set the filename for a split point
@@ -352,14 +352,10 @@
     current_split = splt_t_get_current_split_file_number(state) - 1;
   }
 
-  long mins = -1;
-  long secs = -1;
-  long hundr = -1;
+  long mins = -1; long secs = -1; long hundr = -1;
   long point_value = splt_sp_get_splitpoint_value(state, current_split, &error);
   splt_co_get_mins_secs_hundr(point_value, &mins, &secs, &hundr);
-  long next_mins = -1;
-  long next_secs = -1;
-  long next_hundr = -1;
+  long next_mins = -1; long next_secs = -1; long next_hundr = -1;
   long next_point_value = -1;
   if (splt_sp_splitpoint_exists(state, current_split + 1))
   {

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

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

@@ -52,6 +52,7 @@
   state->options.parameter_offset = SPLT_DEFAULT_PARAM_OFFSET;
   state->options.parameter_number_tracks = SPLT_DEFAULT_PARAM_TRACKS;
   state->options.parameter_minimum_length = SPLT_DEFAULT_PARAM_MINIMUM_LENGTH;
+  state->options.parameter_min_track_length = SPLT_DEFAULT_PARAM_MINIMUM_TRACK_LENGTH;
 
   state->options.artist_tag_format = SPLT_NO_CONVERSION;
   state->options.album_tag_format = SPLT_NO_CONVERSION;
@@ -151,6 +152,9 @@
     case SPLT_OPT_PARAM_MIN_LENGTH:
       state->options.parameter_minimum_length = *((float *)data);
       break;
+    case SPLT_OPT_PARAM_MIN_TRACK_LENGTH:
+      state->options.parameter_min_track_length = *((float *)data);
+      break;
     case SPLT_OPT_ARTIST_TAG_FORMAT:
       state->options.artist_tag_format = *((int *)data);
       break;
@@ -242,6 +246,8 @@
       return &state->options.parameter_offset;
     case SPLT_OPT_PARAM_MIN_LENGTH:
       return &state->options.parameter_minimum_length;
+    case SPLT_OPT_PARAM_MIN_TRACK_LENGTH:
+      return &state->options.parameter_min_track_length;
     case SPLT_OPT_ARTIST_TAG_FORMAT:
       return &state->options.artist_tag_format;
     case SPLT_OPT_ALBUM_TAG_FORMAT:

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

@@ -265,37 +265,63 @@
   return error;
 }
 
-int splt_sp_order_splitpoints(splt_state *state, int len)
+static int splt_point_value_sort(const void *p1, const void *p2)
 {
-  //TODO: use quicksort ?
+  splt_point *point1 = (splt_point *)p1;
+  splt_point *point2 = (splt_point *)p2;
 
-  int error = SPLT_OK;
+  return point1->value - point2->value;
+}
+
+void splt_sp_order_splitpoints(splt_state *state, int len)
+{
+  qsort(state->split.points, state->split.real_splitnumber, 
+      sizeof *state->split.points, splt_point_value_sort);
+}
 
-  int i = 0, j = 1;
-  float key;
-  for (j = 1; j < len; j++)
+void splt_sp_skip_minimum_track_length_splitpoints(splt_state *state, int *error)
+{
+  if (state->split.real_splitnumber <= 0) { return; }
+
+  long min_track_length = 
+    splt_co_time_to_long(splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_TRACK_LENGTH));
+
+  int i = 1;
+  for (i = 1;i < state->split.real_splitnumber; i++)
   {
-    key = splt_sp_get_splitpoint_value(state, j, &error);
+    int begin_index = i-1;
+    int end_index = i;
 
-    if (error < 0) { return error; }
+    int begin_point_type = splt_sp_get_splitpoint_type(state, begin_index, error);
+    if (*error < 0) { return; }
 
-    i = j - 1;
-    while ((i >= 0) && 
-        (splt_sp_get_splitpoint_value(state,i, &error) > key))
+    if (begin_point_type == SPLT_SKIPPOINT)
     {
-      if (error < 0) { return error; }
+      continue;
+    }
 
-      long temp = splt_sp_get_splitpoint_value(state, i, &error);
-      if (error < 0) { return error; }
+    long begin_track_point = splt_sp_get_splitpoint_value(state, begin_index, error);
+    if (*error < 0) { return; }
+    long end_track_point = splt_sp_get_splitpoint_value(state, end_index, error);
+    if (*error < 0) { return; }
 
-      splt_sp_set_splitpoint_value(state, i+1, temp);
-      i--;
+    long track_length = end_track_point - begin_track_point;
+    if (track_length >= min_track_length)
+    {
+      continue;
     }
 
-    splt_sp_set_splitpoint_value(state, i+1, key);
-  }
+    long mins1, secs1, hundr1;
+    splt_co_get_mins_secs_hundr(track_length, &mins1, &secs1, &hundr1);
+    long mins2, secs2, hundr2;
+    splt_co_get_mins_secs_hundr(min_track_length, &mins2, &secs2, &hundr2);
 
-  return error;
+    splt_c_put_info_message_to_client(state, 
+        _(" info: track too short (%ld.%ld.%ld < %ld.%ld.%ld); skipped.\n"),
+        mins1, secs1, hundr1, mins2, secs2, hundr2);
+
+    splt_sp_set_splitpoint_type(state, begin_index, SPLT_SKIPPOINT);
+  }
 }
 
 long splt_sp_overlap_time(splt_state *state, int splitpoint_index)

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

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

@@ -53,7 +53,15 @@
   {
     double new_sec_end_point = 
       splt_p_split(state, final_fname, splt_beg, splt_end, error, save_end_point);
-    new_end_point = splt_co_time_to_long_ceil(new_sec_end_point);
+
+    if (new_sec_end_point == -1.0)
+    {
+      new_end_point = LONG_MAX;
+    }
+    else
+    {
+      new_end_point = splt_co_time_to_long_ceil(new_sec_end_point);
+    }
 
     if (*error >= 0)
     {
@@ -108,8 +116,7 @@
         //LONG_MAX == EOF
         if (split_end == LONG_MAX)
         {
-          //Warning : we might not always have total time with input not seekable
-          splt_end = splt_t_get_total_time_as_double_secs(state);
+          splt_end = -1;
         }
         else
         {
@@ -155,6 +162,7 @@
 
   int i = 0;
   int number_of_splitpoints = splt_t_get_splitnumber(state);
+
   while (i  < number_of_splitpoints - 1)
   {
     splt_t_set_current_split(state, i);
@@ -367,7 +375,7 @@
     int err = SPLT_OK;
 
     int temp_int = number_of_files + 1;
-    if (number_of_files == -1)
+    if (total_time > 0 && number_of_files == -1)
     {
       temp_int = (int)floor(((total_time / 100.0) / (split_time_length))+1) + 1;
     }
@@ -393,8 +401,6 @@
         save_end_point = SPLT_FALSE;
       }
 
-      int last_file = SPLT_FALSE;
-
       splt_array *new_end_points = splt_array_new();
 
       do {
@@ -412,16 +418,14 @@
           splt_sp_set_splitpoint_value(state, current_split,
               splt_co_time_to_long_ceil(begin));
           long end_splitpoint = splt_co_time_to_long_ceil(end);
-          if (total_time > 0 && end_splitpoint >= total_time)
-          {
-            end_splitpoint = total_time;
-            //avoid worst scenarios where floor & SPLT_OK_SPLIT_EOF do not work
-            last_file = SPLT_TRUE;
-          }
           splt_sp_set_splitpoint_value(state, current_split+1, end_splitpoint);
 
-          double overlapped_end = (double)
-            ((double)splt_sp_overlap_time(state, current_split+1) / 100.0);
+          long overlapped_time = splt_sp_overlap_time(state, current_split+1);
+          double overlapped_end = -1;
+          if (overlapped_time != LONG_MAX)
+          {
+            overlapped_end = (double) ((double) overlapped_time / 100.0);
+          }
 
           err = splt_u_finish_tags_and_put_output_format_filename(state, -1);
           if (err < 0) { *error = err; break; }
@@ -431,7 +435,15 @@
 
           double new_sec_end_point = splt_p_split(state, final_fname,
               begin, overlapped_end, error, save_end_point);
-          long new_end_point = splt_co_time_to_long_ceil(new_sec_end_point);
+          long new_end_point = 0;
+          if (new_sec_end_point == -1.0)
+          {
+            new_end_point = LONG_MAX;
+          }
+          else
+          {
+            new_end_point = splt_co_time_to_long_ceil(new_sec_end_point);
+          }
 
           int end_point_index = current_split + 1;
           splt_pair *index_end_point =
@@ -469,11 +481,6 @@
             free(final_fname);
             final_fname = NULL;
           }
-
-          if (last_file)
-          {
-            break;
-          }
         }
         else
         {
@@ -750,12 +757,13 @@
   {
     splt_c_put_info_message_to_client(state, 
         _(" Silence split type: %s mode (Th: %.1f dB,"
-          " Off: %.2f, Min: %.2f, Remove: %s)\n"),
+          " Off: %.2f, Min: %.2f, Remove: %s, Min track: %.2f)\n"),
         auto_user_str,
         splt_o_get_float_option(state, SPLT_OPT_PARAM_THRESHOLD),
         splt_o_get_float_option(state, SPLT_OPT_PARAM_OFFSET),
         splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_LENGTH),
-        remove_str);
+        remove_str,
+        splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_TRACK_LENGTH));
   }
  
   short read_silence_from_logs = SPLT_FALSE;
@@ -828,68 +836,83 @@
         }
       }
 
-      //put first splitpoint
-      append_error = splt_sp_append_splitpoint(state, 0, NULL, SPLT_SPLITPOINT);
-      if (append_error != SPLT_OK)
-      {
-        *error = append_error;
-      }
-      else
-      {
-        temp = state->silence_list;
-        int i;
+      temp = state->silence_list;
 
-        //we take all splitpoints found and we remove silence 
-        //if needed
-        for (i = 1; i < found; i++)
-        {
-          if (temp == NULL)
-          {
-            found = i;
-            break;
-          }
+      int i;
 
-          if (splt_o_get_int_option(state, SPLT_OPT_PARAM_REMOVE_SILENCE))
-          {
-            append_error = splt_sp_append_splitpoint(state, 0, NULL, SPLT_SKIPPOINT);
-            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, splt_co_time_to_long(temp->end_position));
-          }
-          else
-          {
-            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; }
-          }
-          temp = temp->next;
+      //we take all splitpoints found and we remove silence 
+      //if needed
+      for (i = 1; i < found; i++)
+      {
+        if (temp == NULL)
+        {
+          found = i;
+          break;
         }
 
-        //we order the splitpoints
+        long end_track_point = 0;
+        long end_track_point_after_silence = 0;
         if (splt_o_get_int_option(state, SPLT_OPT_PARAM_REMOVE_SILENCE))
         {
-          splitpoints_appended = (found-1)*2+1;
+          end_track_point = splt_co_time_to_long(temp->begin_position);
+          end_track_point_after_silence = splt_co_time_to_long(temp->end_position);
         }
         else 
         {
-          splitpoints_appended = found;
+          end_track_point = splt_co_time_to_long(splt_siu_silence_position(temp, offset));
         }
 
-        splt_d_print_debug(state,"Order splitpoints...\n");
-        int err = splt_sp_order_splitpoints(state, splitpoints_appended);
-        if (err < 0) { *error = err; }
+        if (i == 1)
+        {
+          append_error = splt_sp_append_splitpoint(state, 0, NULL, SPLT_SPLITPOINT);
+          if (append_error < 0) { *error = append_error; found = i; break;}
+        }
 
-        if (*error >= 0)
+        if (splt_o_get_int_option(state, SPLT_OPT_PARAM_REMOVE_SILENCE))

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

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

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

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

@@ -82,7 +82,7 @@
   int current_split = splt_t_get_current_split_file_number(state) - 1;
   int old_current_split = current_split;
 
-  int remaining_tags_like_x = splt_o_get_int_option(state, SPLT_OPT_ALL_REMAINING_TAGS_LIKE_X); 
+  int remaining_tags_like_x = splt_o_get_int_option(state, SPLT_OPT_ALL_REMAINING_TAGS_LIKE_X);
   if (remaining_tags_like_x != -1)
   {
     if (current_split >= state->split.real_tagsnumber)
@@ -449,11 +449,47 @@
   return state->original_tags.all_original_tags;
 }
 
+splt_tags *splt_tu_get_original_tags_tags(splt_state *state)
+{
+  return &state->original_tags.tags;
+}
+
 static char *splt_tu_get_replaced_with_tags(const char *word,
-    const splt_tags *tags, int track, int *error, int replace_tags_in_tags)
+    const splt_tags *tags, const splt_tags *original_tags,
+    int track, int *error, int replace_tags_in_tags, 
+    int current_split, splt_state *state)
 {
   int err = SPLT_OK;
 
+  if (current_split == -1)
+  {
+    current_split = splt_t_get_current_split_file_number(state) - 1;
+  }
+
+  long mins = -1; long secs = -1; long hundr = -1;
+  long point_value = splt_sp_get_splitpoint_value(state, current_split, &err);
+  splt_co_get_mins_secs_hundr(point_value, &mins, &secs, &hundr);
+  long next_mins = -1; long next_secs = -1; long next_hundr = -1;
+  long next_point_value = -1;
+  if (splt_sp_splitpoint_exists(state, current_split + 1))
+  {
+    next_point_value = splt_sp_get_splitpoint_value(state, current_split + 1, &err);
+    long total_time = splt_t_get_total_time(state);
+    if (total_time > 0 && next_point_value > total_time)
+    {
+      next_point_value = total_time;
+    }
+    splt_co_get_mins_secs_hundr(next_point_value, &next_mins, &next_secs, &next_hundr);
+  }
+  short write_eof = SPLT_FALSE;
+  if (next_point_value == LONG_MAX)
+  {
+    write_eof = SPLT_TRUE;
+  }
+
+  long mMsShH_value = 1;
+  short eof_written = SPLT_FALSE;
+
   char *word_with_tags = NULL;
 
   if (!replace_tags_in_tags)
@@ -470,12 +506,7 @@
     return NULL;
   }
 
-  const char *title = tags->title;
-  const char *artist = tags->artist;
-  const char *album= tags->album;
-  const char *performer = tags->performer;
-  const char *year = tags->year;
-  const char *comment = tags->comment;
+  const splt_tags *tags_to_replace = tags;
 
   int counter = 0;
   const char *ptr = NULL;
@@ -483,6 +514,24 @@
   {
     if (*ptr == '@')
     {
+      tags_to_replace = tags;
+    }
+    else if (*ptr == '#')
+    {
+      tags_to_replace = original_tags;
+    }
+
+    const char *title = tags_to_replace->title;
+    const char *artist = tags_to_replace->artist;
+    const char *album= tags_to_replace->album;
+    const char *performer = tags_to_replace->performer;
+    const char *year = tags_to_replace->year;
+    const char *comment = tags_to_replace->comment;
+    const char *genre = tags_to_replace->genre;
+    int real_track = tags_to_replace->track;
+
+    if (*ptr == '@' || *ptr == '#')
+    {
       err = splt_su_append(&word_with_tags, buffer, counter, NULL);
       if (err != SPLT_OK) { goto error; }
 
@@ -493,6 +542,57 @@
 
       switch (*ptr)
       {
+        case 's':
+          mMsShH_value = secs;
+          goto put_value;
+        case 'S':
+          mMsShH_value = next_secs;
+          goto put_value;
+        case 'm':
+          mMsShH_value = mins;
+          goto put_value;
+        case 'M':
+          mMsShH_value = next_mins;
+          goto put_value;
+        case 'h':
+          mMsShH_value = hundr;
+          goto put_value;
+        case 'H':
+          mMsShH_value = next_hundr;
+put_value:
+          if (!eof_written)
+          {
+            if (write_eof &&
+                (*ptr == 'S' || *ptr == 'M' || *ptr == 'H'))
+            {
+              write_eof = SPLT_FALSE;
+              eof_written = SPLT_TRUE;
+
+              err = splt_su_append_str(&word_with_tags, "EOF", NULL);
+              if (err != SPLT_OK) { goto error; }
+            }
+            else if (mMsShH_value != -1)
+            {
+              char temp6 = { '\0' };
+              temp0 = '%';
+              temp1 = '0';
+              char number_of_digits = '2';
+              if (*ptr == 'M' || *ptr == 'm')
+              {
+                number_of_digits = splt_of_get_number_of_digits_from_total_time(state);
+              }
+              temp2 = number_of_digits;
+              temp3 = 'l';
+              temp4 = 'd';
+
+              char mMsShH_str100 = { '\0' };
+              snprintf(mMsShH_str, 100, temp, mMsShH_value);
+
+              err = splt_su_append_str(&word_with_tags, mMsShH_str, NULL);
+              if (err != SPLT_OK) { goto error; }
+            }
+          }
+          break;
         case 'a':
           if (artist != NULL)
           {
@@ -528,6 +628,13 @@
             if (err != SPLT_OK) { goto error; }
           }
           break;
+        case 'g':
+          if (genre != NULL)
+          {
+            err = splt_su_append_str(&word_with_tags, genre, NULL);
+            if (err != SPLT_OK) { goto error; }
+          }
+          break;
         case 'y':
           if (year != NULL)
           {
@@ -538,8 +645,22 @@
         case 'N':
         case 'n':
           ;
+          int track_to_set = track;
+
+          if (*ptr == 'n')
+          {
+            track_to_set = real_track;
+          }
+
+          char temp5 = { '\0' };
+          temp0 = '%';
+          temp1 = '0';
+          temp2 = splt_of_get_oformat_number_of_digits_as_char(state);
+          temp3 = 'd';
+
           char track_str10 = { '\0' };
-          snprintf(track_str, 10, "%d",track);
+          snprintf(track_str, 10, temp, track_to_set);
+
           err = splt_su_append_str(&word_with_tags, track_str, NULL);
           if (err != SPLT_OK) { goto error; }
           break;
@@ -812,17 +933,25 @@
 
   int replace_tags_in_tags = splt_o_get_int_option(state, SPLT_OPT_REPLACE_TAGS_IN_TAGS);
 
-  char *t = splt_tu_get_replaced_with_tags(tags->title, tags, track, &err, replace_tags_in_tags);
+  splt_tags *original_tags = splt_tu_get_original_tags_tags(state);
+

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

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

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