Packman Build Service PMBS

mp3splt.changes Changed

mp3splt.spec Changed

mp3splt-2.4.3.tar.gz/m4/Makefile.am Deleted

mp3splt-2.4.3.tar.gz/m4/Makefile.in Deleted

@@ -1,372 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\\ \	*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = m4
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/mp3splt.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MP3SPLT_CFLAGS = @MP3SPLT_CFLAGS@
-MP3SPLT_LIBS = @MP3SPLT_LIBS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = mp3splt.m4
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \

mp3splt-2.4.3.tar.gz/m4/mp3splt.m4 Deleted

@@ -1,108 +0,0 @@
-# Alexandru Munteanu <io_fx@yahoo.fr>
-# Slightly modified 'ogg.m4'
-
-AC_DEFUN(MP3SPLT_CHECK,
-
-
-AC_ARG_WITH(mp3splt, AC_HELP_STRING(--with-mp3splt=PFX,
- Prefix where libmp3splt is installed (optional). ) ,
- mp3splt_prefix="$withval", mp3splt_prefix="")
-AC_ARG_WITH(mp3splt-libraries, AC_HELP_STRING(--with-mp3splt-libraries=DIR,
- Directory where libmp3splt library is installed (optional). ) ,
- mp3splt_libraries="$withval", mp3splt_libraries="")
-AC_ARG_WITH(mp3splt-includes, AC_HELP_STRING(--with-mp3splt-includes=DIR,
- Directory where libmp3splt header files are installed (optional). ) ,
- mp3splt_includes="$withval", mp3splt_includes="")
-AC_ARG_ENABLE(mp3splttest, AC_HELP_STRING(--disable-mp3splttest,
- Do not try to compile and run a test mp3splt program. ) ,
- , enable_mp3splttest=yes)
-
-if test "x$mp3splt_libraries" != "x"; then
- MP3SPLT_LIBS="-L$mp3splt_libraries"
-elif test "x$mp3splt_prefix" != "x"; then
- MP3SPLT_LIBS="-L$mp3splt_prefix/lib"
-elif test "x$prefix" != "xNONE"; then
- MP3SPLT_LIBS="-L$prefix/lib"
-fi
-
-MP3SPLT_LIBS="$MP3SPLT_LIBS -lmp3splt"
-
-if test "x$mp3splt_includes" != "x"; then
- MP3SPLT_CFLAGS="-I$mp3splt_includes"
-elif test "x$mp3splt_prefix" != "x"; then
- MP3SPLT_CFLAGS="-I$mp3splt_prefix/include"
-elif test "x$prefix" != "xNONE"; then
- mp3splt_CFLAGS="-I$prefix/include"
-fi
-
-
-AC_MSG_CHECKING(for libmp3splt)
-no_mp3splt=""
-
-if test "x$enable_mp3splttest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $MP3SPLT_CFLAGS"
- LIBS="$LIBS $MP3SPLT_LIBS"
-
- rm -f conf.mp3splttest
-
- AC_TRY_RUN(
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <libmp3splt/mp3splt.h>
-
-int main ()
-{
- system("touch conf.mp3splttest");
- return 0;
-}
-
-,, no_mp3splt=yes,echo $ac_n "cross compiling; assumed OK... $ac_c")
-
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
-fi
-
-
-if test "x$no_mp3splt" = "x" ; then
- AC_MSG_RESULT(yes)
- ifelse($1, , :, $1) 
-else
- AC_MSG_RESULT(no)
- if test -f conf.mp3splttest ; then
- :
- else
- echo "*** Could not run libmp3splt test program, checking why..."
- CFLAGS="$CFLAGS $MP3SPLT_CFLAGS"
- LIBS="$LIBS $MP3SPLT_LIBS"
- AC_TRY_LINK(
-#include <stdio.h>
-#include <libmp3splt/mp3splt.h>
-, return 0; ,
- echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding libmp3splt or finding the wrong"
- echo "*** version of libmp3splt. If it is not finding libmp3splt, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH",
- echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means libmp3splt was incorrectly installed"
- echo "*** or that you have moved libmp3splt since it was installed." )
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- MP3SPLT_CFLAGS=""
- MP3SPLT_LIBS=""
- ifelse($2, , :, $2)
-fi
-
-AC_SUBST(MP3SPLT_CFLAGS)
-AC_SUBST(MP3SPLT_LIBS)
-rm -f conf.mp3splttest
-)
-

mp3splt-2.4.3.tar.gz/AUTHORS -> mp3splt-2.5.2.tar.gz/AUTHORS Changed

mp3splt-2.4.3.tar.gz/COPYING -> mp3splt-2.5.2.tar.gz/COPYING Changed

@@ -1,12 +1,12 @@
-		 GNU GENERAL PUBLIC LICENSE
-		 Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
 
-			 Preamble
+ Preamble
 
 The licenses for most software are designed to take away your
 freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
 your programs, too.
 
 When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@
 
 The precise terms and conditions for copying, distribution and
 modification follow.
-&#xc;
-		 GNU GENERAL PUBLIC LICENSE
+
+ GNU GENERAL PUBLIC LICENSE
 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
 0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@
 License. (Exception: if the Program itself is interactive but
 does not normally print such an announcement, your work based on
 the Program is not required to print an announcement.)
-&#xc;
+
 These requirements apply to the modified work as a whole. If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-&#xc;
+
 4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License. Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-&#xc;
+
 8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			 NO WARRANTY
+ NO WARRANTY
 
 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		 END OF TERMS AND CONDITIONS
-&#xc;
-	Appendix: How to Apply These Terms to Your New Programs
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
 
 If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@
 the "copyright" line and a pointer to where the full notice is found.
 
 <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
+ Copyright (C) <year> <name of author>
 
 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
@@ -303,16 +303,16 @@
 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, USA.
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
- Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision version 69, Copyright (C) year name of author
 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
 This is free software, and you are welcome to redistribute it
 under certain conditions; type `show c' for details.
@@ -335,5 +335,6 @@
 This General Public License does not permit incorporating your program into
 proprietary programs. If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
+

mp3splt-2.4.3.tar.gz/ChangeLog -> mp3splt-2.5.2.tar.gz/ChangeLog Changed

@@ -7,6 +7,45 @@
 
 - translated 'mp3splt -h' doesn't show complete message on utf8 on windows: won't fix ?
 
+#mp3splt version 2.5.2
+
+- added option -I to specify the input tags encoding for when writing ID3v2 tags (ISO-8859-1, UTF-8
+or UTF-16)
+- added option -K to keep the original tags and just replace them when importing a CUE or CDDB file
+(feature request #95)
+- fixed bug #149 - use of getline() on mac
+- libmp3splt check is now more correct and checks for the exact version of libmp3splt with = instead
+of >=; will be changed to >= when final version of libmp3splt will be released
+- now using pkg-config instead of mp3splt.m4 (bug #145)
+- corrected build files (configure.ac, Makefile.am, ...) and check using 'make distcheck' (bug #147)
+
+#mp3splt version 2.5.1
+
+- fixed a bug when removing the tags from skippoints (libmp3splt)
+- added option to set output ID3v2 tags encoded in latin1, UTF-8 or UTF16
+
+#mp3splt version 2.5
+
+- done issues #40 and #85 - added minimum silence length parameter for auto adjust (mainly libmp3splt)
+- added minimum silence length for trim silence mode (minimum silence to trigger a trimming)
+(mainly libmp3splt)
+- done issue #12 - added option to output the full silence log useful to plot a graph
+(mainly libmp3splt)
+- implemented back the proxy feature with basic authentification - feature #50 (mainly libmp3splt)
+- added option to generate exactly the same input tags bytes using @O (mainly libmp3splt)
+- enhanced the CUE export to export the tags as REM comments and also the splitpoint names (libmp3splt)
+- fixed bug when detecting the input tags version - output had no tags when the input only had ID3v1
+(libmp3splt)
+- fixed bug: output tags versions was not equal to the input file tags versions when the user was
+setting custom tags without any @o to get the original tags (libmp3splt)
+- done issue #79 - added 0 to the number of digits to output in order to be able to support
+the old mp3splt output format (libmp3splt)
+- fixed bug #141 - when input file is a symlink and output directory is the one of the input file
+(libmp3splt)
+- fixed bug on mp3 trim silence scan: last frame was skipped (libmp3splt)
+- fixed bug #133 - updated GPLv2 COPYING file
+- fixed bug #142 - skipped splitpoints were handled wrong by '-c'
+
 #mp3splt version 2.4.3
 
 - added the trackjoin parameter for silence detection split: tracks shorter than trackjoin will be joined with others

mp3splt-2.4.3.tar.gz/INSTALL -> mp3splt-2.5.2.tar.gz/INSTALL Changed

mp3splt-2.4.3.tar.gz/Makefile.am -> mp3splt-2.5.2.tar.gz/Makefile.am Changed

mp3splt-2.4.3.tar.gz/Makefile.in -> mp3splt-2.5.2.tar.gz/Makefile.in Changed

@@ -60,9 +60,8 @@
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/mp3splt.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -165,6 +164,8 @@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMP3SPLT_CFLAGS = @LIBMP3SPLT_CFLAGS@
+LIBMP3SPLT_LIBS = @LIBMP3SPLT_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
@@ -175,8 +176,6 @@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MP3SPLT_CFLAGS = @MP3SPLT_CFLAGS@
-MP3SPLT_LIBS = @MP3SPLT_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
@@ -188,6 +187,9 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -249,7 +251,7 @@
 # General automake options.
 AUTOMAKE_OPTIONS = foreign no-dependencies
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src doc m4 po
+SUBDIRS = src doc po
 EXTRA_DIST = autogen.sh debian/changelog debian/compat debian/control debian/copyright debian/dirs debian/docs debian/rules
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

mp3splt-2.4.3.tar.gz/NEWS -> mp3splt-2.5.2.tar.gz/NEWS Changed

mp3splt-2.4.3.tar.gz/README -> mp3splt-2.5.2.tar.gz/README Changed

mp3splt-2.4.3.tar.gz/TODO -> mp3splt-2.5.2.tar.gz/TODO Changed

mp3splt-2.4.3.tar.gz/aclocal.m4 -> mp3splt-2.5.2.tar.gz/aclocal.m4 Changed

@@ -20,6 +20,166 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.))
 
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# 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.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG(MIN-VERSION)
+# ----------------------------------
+AC_DEFUN(PKG_PROG_PKG_CONFIG,
+m4_pattern_forbid(^_?PKG_A-Z_+$)
+m4_pattern_allow(^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$)
+m4_pattern_allow(^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$)
+AC_ARG_VAR(PKG_CONFIG, path to pkg-config utility)
+AC_ARG_VAR(PKG_CONFIG_PATH, directories to add to pkg-config's search path)
+AC_ARG_VAR(PKG_CONFIG_LIBDIR, path overriding pkg-config's built-in search path)
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL(PKG_CONFIG, pkg-config)
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default($1, 0.9.0)
+	AC_MSG_CHECKING(pkg-config is at least version $_pkg_min_version)
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT(yes)
+	else
+		AC_MSG_RESULT(no)
+		PKG_CONFIG=""
+	fi
+fidnl
+)# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE(PKG_PROG_PKG_CONFIG)
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN(PKG_CHECK_EXISTS,
+AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG($PKG_CONFIG --exists --print-errors "$1"); then
+ m4_default($2, :)
+m4_ifvaln($3, else
+ $3)dnl
+fi)
+
+# _PKG_CONFIG(VARIABLE, COMMAND, MODULES)
+# ---------------------------------------------
+m4_define(_PKG_CONFIG,
+if test -n "$$1"; then
+ pkg_cv_$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS($3,
+ pkg_cv_$1=`$PKG_CONFIG --$2 "$3" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes ,
+		 pkg_failed=yes)
+ else
+ pkg_failed=untried
+fidnl
+)# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN(_PKG_SHORT_ERRORS_SUPPORTED,
+AC_REQUIRE(PKG_PROG_PKG_CONFIG)
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fidnl
+)# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, ACTION-IF-FOUND,
+# ACTION-IF-NOT-FOUND)
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN(PKG_CHECK_MODULES,
+AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
+AC_ARG_VAR($1_CFLAGS, C compiler flags for $1, overriding pkg-config)dnl
+AC_ARG_VAR($1_LIBS, linker flags for $1, overriding pkg-config)dnl
+
+pkg_failed=no
+AC_MSG_CHECKING(for $1)
+
+_PKG_CONFIG($1_CFLAGS, cflags, $2)
+_PKG_CONFIG($1_LIBS, libs, $2)
+
+m4_define(_PKG_TEXT, Alternatively, you may set the environment variables $1_CFLAGS
+and $1_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.)
+
+if test $pkg_failed = yes; then
+ 	AC_MSG_RESULT(no)
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+	 $1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+ else 
+	 $1_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default($4, AC_MSG_ERROR(
+Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT)dnl
+ )
+elif test $pkg_failed = untried; then
+ 	AC_MSG_RESULT(no)
+	m4_default($4, AC_MSG_FAILURE(
+The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.)dnl
+ )
+else
+	$1_CFLAGS=$pkg_cv_$1_CFLAGS
+	$1_LIBS=$pkg_cv_$1_LIBS
+ AC_MSG_RESULT(yes)
+	$3
+fidnl
+)# PKG_CHECK_MODULES
+
 # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
 # Foundation, Inc.
 #
@@ -1026,7 +1186,6 @@
 m4_include(m4/lib-ld.m4)
 m4_include(m4/lib-link.m4)
 m4_include(m4/lib-prefix.m4)
-m4_include(m4/mp3splt.m4)
 m4_include(m4/nls.m4)
 m4_include(m4/po.m4)
 m4_include(m4/progtest.m4)

mp3splt-2.4.3.tar.gz/config.guess -> mp3splt-2.5.2.tar.gz/config.guess Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2009-12-30'
+timestamp='2012-02-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -57,8 +55,8 @@
 
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -145,7 +143,7 @@
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format. This provides both forward
@@ -181,7 +179,7 @@
 		fi
 		;;
 	 *)
-	 os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -224,7 +222,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -270,7 +268,10 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^PVTX//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
 Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -296,7 +297,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
 *:OS400:*:*)
- echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
 arm:RISC*:1.012*:*|arm:riscix:1.012*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -395,23 +396,23 @@
 # MiNT. But MiNT is downward compatible to TOS, so this should
 # be no problem.
 atariste:*MiNT:*:* | atariste:*mint:*:* | atariste:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
 atari*:*MiNT:*:* | atari*:*mint:*:* | atariste:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+	exit ;;
 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
 m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -481,8 +482,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
 AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if $UNAME_PROCESSOR = mc88100 || $UNAME_PROCESSOR = mc88110 
 	then
 	 if ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx || \
@@ -495,7 +496,7 @@
 	else
 	 echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
 M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -552,7 +553,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
- *:AIX:*:456)
+ *:AIX:*:4567)
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -595,52 +596,52 @@
 	 9000/6780-90-9)
 		if -x /usr/bin/getconf ; then
 		 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
+		 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		 case "${sc_cpu_version}" in
+		 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		 532) # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			 32) HP_ARCH="hppa2.0n" ;;
+			 64) HP_ARCH="hppa2.0w" ;;
 			 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
+			esac ;;
+		 esac
 		fi
 		if "${HP_ARCH}" = "" ; then
 		 eval $set_cc_for_build
-		 sed 's/^ //' << EOF >$dummy.c
+		 sed 's/^		//' << EOF >$dummy.c
 
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		 long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		 long cpu = sysconf (_SC_CPU_VERSION);
 
- switch (cpu)
- 	{
- 	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;

mp3splt-2.4.3.tar.gz/config.h.in -> mp3splt-2.5.2.tar.gz/config.h.in Changed

mp3splt-2.4.3.tar.gz/config.sub -> mp3splt-2.5.2.tar.gz/config.sub Changed

mp3splt-2.4.3.tar.gz/configure -> mp3splt-2.5.2.tar.gz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mp3splt 2.4.3.
+# Generated by GNU Autoconf 2.69 for mp3splt 2.5.2.
 #
 # Report bugs to <mtrotta@users.sourceforge.net>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='mp3splt'
 PACKAGE_TARNAME='mp3splt'
-PACKAGE_VERSION='2.4.3'
-PACKAGE_STRING='mp3splt 2.4.3'
+PACKAGE_VERSION='2.5.2'
+PACKAGE_STRING='mp3splt 2.5.2'
 PACKAGE_BUGREPORT='mtrotta@users.sourceforge.net'
 PACKAGE_URL=''
 
@@ -628,8 +628,11 @@
 LIBOBJS
 DO_SYMLINK_FALSE
 DO_SYMLINK_TRUE
-MP3SPLT_LIBS
-MP3SPLT_CFLAGS
+LIBMP3SPLT_LIBS
+LIBMP3SPLT_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
 WIN32_FALSE
 WIN32_TRUE
 POSUB
@@ -747,10 +750,6 @@
 enable_rpath
 with_libiconv_prefix
 with_libintl_prefix
-with_mp3splt
-with_mp3splt_libraries
-with_mp3splt_includes
-enable_mp3splttest
 enable_oggsplt_symlink
 enable_c_debug
 enable_optimise
@@ -764,7 +763,12 @@
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP'
+CPP
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+LIBMP3SPLT_CFLAGS
+LIBMP3SPLT_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1305,7 +1309,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 mp3splt 2.4.3 to adapt to many kinds of systems.
+\`configure' configures mp3splt 2.5.2 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1375,7 +1379,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of mp3splt 2.4.3:";;
+ short | recursive ) echo "Configuration of mp3splt 2.5.2:";;
 esac
 cat <<\_ACEOF
 
@@ -1389,12 +1393,10 @@
 --enable-dependency-tracking do not reject slow dependency extractors
 --disable-nls do not use Native Language Support
 --disable-rpath do not hardcode runtime library paths
- --disable-mp3splttest Do not try to compile and run a test mp3splt
- program.
 --enable-oggsplt_symlink
 Enable symlink of oggsplt to mp3splt.
 --enable-c-debug Enable debugging symbols.
- --enable-optimise Enable O2 optimise.
+ --enable-optimise Enable O3 optimise.
 --enable-extra-warnings Enable extra warnings.
 
 Optional Packages:
@@ -1405,13 +1407,6 @@
 --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-mp3splt=PFX Prefix where libmp3splt is installed (optional).
- --with-mp3splt-libraries=DIR
- Directory where libmp3splt library is installed
- (optional).
- --with-mp3splt-includes=DIR
- Directory where libmp3splt header files are
- installed (optional).
 
 Some influential environment variables:
 CC C compiler command
@@ -1422,6 +1417,15 @@
 CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
 you have headers in a nonstandard directory <include dir>
 CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
+ PKG_CONFIG_PATH
+ directories to add to pkg-config's search path
+ PKG_CONFIG_LIBDIR
+ path overriding pkg-config's built-in search path
+ LIBMP3SPLT_CFLAGS
+ C compiler flags for LIBMP3SPLT, overriding pkg-config
+ LIBMP3SPLT_LIBS
+ linker flags for LIBMP3SPLT, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1489,7 +1493,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-mp3splt configure 2.4.3
+mp3splt configure 2.5.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1787,11 +1791,78 @@
 as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $2 (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func

mp3splt-2.4.3.tar.gz/configure.ac -> mp3splt-2.5.2.tar.gz/configure.ac Changed

@@ -4,7 +4,7 @@
 # * for mp3/ogg splitting without decoding
 # *
 # * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
-# * Copyright (c) 2005-2012 Munteanu Alexandru - io_fx@yahoo.fr
+# * Copyright (c) 2005-2013 Munteanu Alexandru - m@ioalex.net
 # *
 # * http://mp3splt.sourceforge.net
 # *
@@ -24,7 +24,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # *********************************************************/
 
@@ -32,11 +32,13 @@
 # Basic initialisations 
 #################################################
 
+m4_define(minimum_libmp3splt_version,0.8.2)
+
 AC_PREREQ(2.56)
-AC_INIT(mp3splt, 2.4.3, mtrotta@users.sourceforge.net)
+AC_INIT(mp3splt, 2.5.2, mtrotta@users.sourceforge.net)
 
 AC_CONFIG_SRCDIR(src/mp3splt.c)
-AM_INIT_AUTOMAKE(mp3splt, 2.4.3)
+AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE(enable)
 
@@ -52,6 +54,14 @@
 AM_GNU_GETTEXT(external)
 AM_GNU_GETTEXT_VERSION(0.13.1)
 
+AC_DEFINE_UNQUOTED(LIBMP3SPLT_WITH_SONAME, "libmp3splt0", libmp3splt library with soname)
+
+#################################################################
+# Check for functions
+#################################################################
+
+AC_CHECK_FUNCS(getline)
+
 #################################################################
 # Check for the type of the host
 #################################################################
@@ -89,7 +99,9 @@
 #################################################
 #Check for libmp3splt
 
-MP3SPLT_CHECK(, AC_MSG_ERROR(libmp3splt version 0.7.3 needed :
+PKG_CHECK_MODULES(LIBMP3SPLT, libmp3splt = minimum_libmp3splt_version,
+,
+ AC_MSG_ERROR(libmp3splt version minimum_libmp3splt_version needed :
 
 Download the latest version of libmp3splt at http://mp3splt.sourceforge.net/
 ) )
@@ -114,13 +126,13 @@
 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"
+ CFLAGS="$CFLAGS -g -Wall"
 fi
 
-AC_ARG_ENABLE(optimise, AC_HELP_STRING(--enable-optimise, Enable O2 optimise. ) ,
+AC_ARG_ENABLE(optimise, AC_HELP_STRING(--enable-optimise, Enable O3 optimise. ) ,
 enable_optimise=$enableval,enable_optimise="no")
 if test "x$enable_optimise" = xyes;then
- CFLAGS="$CFLAGS -O2"
+ CFLAGS="$CFLAGS -O3"
 fi
 
 AC_ARG_ENABLE(extra-warnings, AC_HELP_STRING(--enable-extra-warnings, Enable extra warnings. ) ,
@@ -133,7 +145,7 @@
 # Generate Makefiles
 #################################################
 
-AC_OUTPUT(Makefile src/Makefile po/Makefile.in doc/Makefile m4/Makefile)
+AC_OUTPUT(Makefile src/Makefile po/Makefile.in doc/Makefile)
 
 #################################################
 # Output configuration

mp3splt-2.4.3.tar.gz/debian/changelog -> mp3splt-2.5.2.tar.gz/debian/changelog Changed

mp3splt-2.4.3.tar.gz/debian/control -> mp3splt-2.5.2.tar.gz/debian/control Changed

mp3splt-2.4.3.tar.gz/debian/copyright -> mp3splt-2.5.2.tar.gz/debian/copyright Changed

mp3splt-2.4.3.tar.gz/debian/rules -> mp3splt-2.5.2.tar.gz/debian/rules Changed

mp3splt-2.4.3.tar.gz/depcomp -> mp3splt-2.5.2.tar.gz/depcomp Changed

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

mp3splt-2.4.3.tar.gz/doc/Makefile.in -> mp3splt-2.5.2.tar.gz/doc/Makefile.in Changed

@@ -56,9 +56,8 @@
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/mp3splt.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -134,6 +133,8 @@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMP3SPLT_CFLAGS = @LIBMP3SPLT_CFLAGS@
+LIBMP3SPLT_LIBS = @LIBMP3SPLT_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
@@ -144,8 +145,6 @@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MP3SPLT_CFLAGS = @MP3SPLT_CFLAGS@
-MP3SPLT_LIBS = @MP3SPLT_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
@@ -157,6 +156,9 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@

mp3splt-2.4.3.tar.gz/doc/manual.html -> mp3splt-2.5.2.tar.gz/doc/manual.html Changed

@@ -81,17 +81,19 @@
 might fix the issues.
 
 NOTES about TAGS: by default, mp3splt will put the original tags in
-the split files. Custom tags for the split files can be set with the -g option.
-When copying the original file tags, only one artist, album, title are
-supported.
+the split files with one exception: the track number starts at 1 and is incremented along
+split files. When copying the original file tags, only one artist, album, title are supported.
+Custom tags for the split files can be set with the -g option.
+Setting exactly the same tags as the original file is possible with -g %@O (mp3 only) or -g %@o.
 
 NOTE about MP3 TAGS: in order to extract the original tags from mp3 files,
 libmp3splt must be compiled with 'id3tag' support. By default, the output
 files will have the same ID3 tag version as the input file; this behaviour can be changed
 with the -T option. If the input file has no tags and the -g option is used, then both
 ID3v1 and ID3v2 are written. Total tracknumber is not yet supported.
-Only writing ID3v2.4 is supported; note that some software only support ID3v2.3 and will not
-be able to read them.
+Only writing ID3v2.4 is supported for custom tags; note that some software only support ID3v2.3
+and will not be able to read them. However, it is possible to write the exact original tags using
+%@O, keeping the same tags version as in the original file.
 
 NOTE about the OUTPUT DIRECTORY: by default, mp3splt will put the
 split files in the directory of the input file. In order to change the
@@ -154,8 +156,11 @@
 It accepts some parameters with -p option (see below for a detailed description):
 threshold
 
-level (th) which is the sound level to be considered silence. This feature is new and
-probably still needs tweaking; please report any bugs, suggestions, ...
+level (th) which is the sound level to be considered silence,
+min
+
+(min) which is the minimum silence length to trigger a trimming; this amount of silence will be kept
+in the split file at the beginning and at the end.
 
 <DT>-s <DD>
 Silence mode,
@@ -250,6 +255,14 @@
 write a file named &quot;query.cddb&quot; from which will get splitpoints and
 filenames.
 
+Proxy support:
+The first time that the user queries the internet (and if the quiet mode is not enabled), mp3splt asks
+for some information about proxy usage. Mp3splt has basic authentification support using base64 for HTTP
+proxies. A file named '.mp3splt' is created in the user home directory containing the informations
+provided by the user. Deleting this file will make mp3splt to query the user again. Please note that
+the authentification storage is not secure. The 'username:password' is stored as base64 and can be
+easily decoded.
+
 IMPORTANT NOTE FOR CDDB: File split with this option can be not very precise due to:
 
 1) Who extracts CD tracks may use &quot;Remove silence&quot; option. This means
@@ -265,7 +278,7 @@
 4) There are several entries of the same cd on CDDB. In mp3splt they appears with &quot;\=&gt;&quot; symbol.
 Try some of them and find the best for yours; usually you can find the correct splitpoints, so good luck!
 
-YOU CAN USE -a OPTION TO ADJUST SPLITPOINTS!
+YOU CAN USE THE -a OPTION TO ADJUST SPLITPOINTS!
 
 <DT>-a <DD>
 Auto-adjust mode.
@@ -278,6 +291,9 @@
 offset
 
 (off) which is the offset of cutpoint in silence,
+min
+
+(min) which is the minimum silence length in seconds,
 gap
 
 (gap) which is the gap value around splitpoint to search for silence.
@@ -305,6 +321,11 @@
 after the silence. Default is 25. Decrease this value if you need to split files having
 closer silence points.
 
+<DT>min=FLOAT<DD>
+Positive float of the minimum number of seconds to be considered as valid silence. All silences shorter than min are discarded. Default is 0.
+For the trim silence split, it is the minimum silence length to trigger a trimming; this amount of
+silence will be kept in the split file at the beginning and at the end.
+
 <DT>Both -s and -a<DD>
 
 <DT>off=FLOAT<DD>
@@ -317,10 +338,16 @@
 
 <DT>nt=INTEGER<DD>
 Positive integer number of tracks to be split when using -s option. By default all tracks are split.
-<DT>min=FLOAT<DD>
-Positive float of the minimum number of seconds to be considered a valid splitpoint. All silences shorter than min are discarded. Default is 0.
-<DT>rm<DD>
-Does not require an additional number and it used to remove silence when using -s option.
+<DT>rm=FLOAT_FLOAT<DD>
+It is used to remove silence when using the -s option.
+Can be used without additional numbers - by default it will cut all the silence found.
+Users can keep some of the silence found by passing the number of seconds to be kept at the
+beginning of the output files and at the end of the output files. For example, 'rm=2_6' will keep 2
+seconds of silence at the beginning of the split files and 6 seconds at the end.
+If the silence length is less than the sum of the number of seconds passed to the rm parameter,
+the split will convert the values to a percentage of the silence length. Taking the previous example, if
+the silence length is less than 8 seconds, the split will be done at 75% of the silence segment starting from
+the beginning of the silence ( 75% = 6/(2+6) ).
 <DT>trackmin=FLOAT<DD>
 Positive float of the minimum number of seconds for a track to be written out.
 Tracks shorter than trackmin will be skipped during the output phase.
@@ -352,7 +379,7 @@
 
 <DT>-k <DD>
 Input not seekable. Consider input not seekable (default when using STDIN as input).
-This allows you to split mp3 and ogg streams which can be read only one time and can't be
+This allows you to split mp3 streams which can be read only one time and can't be
 seeked. Both framemode and standard mode are available, but framemode can be really slow if used with big
 files, because to seek splitpoints we need to process all bytes and all frames. -k option
 (so STDIN as input too) can't be used together with -s -a -w -e, because input must be seekable for
@@ -420,7 +447,23 @@
 
 @M, @S or @H: the number of minutes, seconds or hundreths of seconds of the end splitpoint**
 
-(**) a digit may follow for the number of digits to output
+(**) One digit may follow defining the number of digits to output.
+ 
+
+If the digit is 0, then a special rule is applied when the pattern value is equal to 0:
+ 
+
+- the pattern is discarded
+ 
+
+- all characters like : _ . and -. preceding it are discarded
+ 
+
+- all characters following it are discarded up to the next @ or a separator like : _ . and -
+ 
+
+This rule is useful for discarding the last part of the time when equal to 0.
+For example @m_@<A HREF="mailto:s_@h0hundreths__">s_@h0hundreths__</A>@M_@S will only output @m_@s__@M_@S if the hundreths of seconds are 0.
 
 When split files are more than one, at least one of @t, @n, @N, @l, @L, @u or
 @U (*) must be present to avoid ambiguous names. You can put any prefix,
@@ -460,12 +503,27 @@
 ID3v1, ID3v2 or ID3v1 and ID3v2. TAGS_VERSION can be 1, 2 or 12. Default is to set the output
 tags version as the tags version of the input file.
 
+<DT>-C ID3V2_TEXT_ENCODING <DD>
+Set encoding of the ID3V2 tags. For mp3 files, set the encoding of ID3V2 tags.
+ID3V2_TEXT_ENCODING can be 1 for latin1 (iso-8859-1), 8 for UTF-8 or 16 for UTF-16.
+Default is UTF-16.
+
+<DT>-I INPUT_TAGS_ENCODING_FOR_ID3V2 <DD>
+Set encoding of the input tags for mp3 files.
+INPUT_TAGS_ENCODING_FOR_ID3V2 can be 1 for latin1 (iso-8859-1), 8 for UTF-8 or 16 for UTF-16.
+Default is UTF-8.
+
 <DT>-N <DD>
 No silence log file. Don't create the 'mp3splt.log' log file when using
 silence detection. This option cannot be used without the '-s' option.
 
+<DT>-K <DD>
+Keep original tags for CDDB or CUE. When importing a CDDB or CUE file, set the original
+input file tags and then replace them with those read from the imported file.
+
 <DT>-g TAGS <DD>
 Custom tags. Set custom tags to the split files.
+If you want to set spaces in tags, you might need to double quote the whole TAGS.
 TAGS should contain a list of square brackets pairs . The tags defined in the first
 pair of square brackets will be set on the first split file, those defined in the
 second pair of square brackets will be set on the second split file, ... Inside
@@ -494,12 +552,15 @@
 @g: genre
 
 
-@n: track number
+@n: track number (set to -2 for none)
 
 
 @o: set original tags
 
 
+@O: set exactly the same original tag bytes and discard other variables (mp3 only)
+ 
+
 @N: auto increment track number: 
 this variable has to be placed inside the % field in order to have the track
 number auto incremented for all the split files following it
@@ -564,6 +625,33 @@
 <DT>-E CUE_FILE <DD>
 Export to .cue file. Creates a .cue file containing the splitpoints.
 Use -P to export the splitpoints without actually splitting.
+The cue file contains the tags of the splitpoints as comments (for example REM ALBUM, REM GENRE, REM
+DATE). There is however one limitation: REM TRACK is not written if the track was auto incremented
+without user defined tags.
+
+<DT>-F FULL_SILENCE_LOG_FILE <DD>
+Export the full log of silence detection. The full log filename is useful to draw the
+amplitude wave of the input file (in dB) in order to choose a threshold.
+
+Note about the file structure: 
+
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-the&nbsp;first&nbsp;column&nbsp;is&nbsp;a&nbsp;dummy&nbsp;column&nbsp;which&nbsp;is&nbsp;always&nbsp;zero,&nbsp;for&nbsp;plotting&nbsp;on&nbsp;zero&nbsp;axis&nbsp;purposes

mp3splt-2.4.3.tar.gz/doc/mp3splt.1 -> mp3splt-2.5.2.tar.gz/doc/mp3splt.1 Changed

@@ -114,17 +114,19 @@
 might fix the issues.
 
 \fBNOTES about TAGS:\fP by default, mp3splt will put the original tags in
-the split files. Custom tags for the split files can be set with the \-g option.
-When copying the original file tags, only one artist, album, title are
-supported.
+the split files with one exception: the track number starts at 1 and is incremented along
+split files. When copying the original file tags, only one artist, album, title are supported.
+Custom tags for the split files can be set with the \-g option.
+Setting exactly the same tags as the original file is possible with \-g %@O (mp3 only) or \-g %@o.
 
 \fBNOTE about MP3 TAGS:\fP in order to extract the original tags from mp3 files,
 libmp3splt must be compiled with 'id3tag' support. By default, the output
 files will have the same ID3 tag version as the input file; this behaviour can be changed
 with the \-T option. If the input file has no tags and the \-g option is used, then both
 ID3v1 and ID3v2 are written. Total tracknumber is not yet supported.
-Only writing ID3v2.4 is supported; note that some software only support ID3v2.3 and will not
-be able to read them.
+Only writing ID3v2.4 is supported for custom tags; note that some software only support ID3v2.3
+and will not be able to read them. However, it is possible to write the exact original tags using
+%@O, keeping the same tags version as in the original file.
 
 \fBNOTE about the OUTPUT DIRECTORY:\fP by default, mp3splt will put the
 split files in the directory of the input file. In order to change the
@@ -183,8 +185,10 @@
 files, so this option can be really slow if used with big files.
 It accepts some parameters with \-p option (see below for a detailed description):
 .I threshold
-level (th) which is the sound level to be considered silence. This feature is new and
-probably still needs tweaking; please report any bugs, suggestions, ...
+level (th) which is the sound level to be considered silence,
+.I min
+(min) which is the minimum silence length to trigger a trimming; this amount of silence will be kept
+in the split file at the beginning and at the end.
 
 .IP "\fB-s\fP         " 10
 \fBSilence mode\fP,
@@ -272,6 +276,14 @@
 write a file named "query.cddb" from which will get splitpoints and
 filenames.
 
+\fBProxy support:\fP
+The first time that the user queries the internet (and if the quiet mode is not enabled), mp3splt asks
+for some information about proxy usage. Mp3splt has basic authentification support using base64 for HTTP
+proxies. A file named \'.mp3splt\' is created in the user home directory containing the informations
+provided by the user. Deleting this file will make mp3splt to query the user again. Please note that
+the authentification storage is not secure. The 'username:password' is stored as base64 and can be
+easily decoded.
+
 \fBIMPORTANT NOTE FOR CDDB\fP: File split with this option can be not very precise due to:
 
 1) Who extracts CD tracks may use "Remove silence" option. This means
@@ -284,7 +296,7 @@
 4) There are several entries of the same cd on CDDB. In mp3splt they appears with "\\=>" symbol.
 Try some of them and find the best for yours; usually you can find the correct splitpoints, so good luck!
 
-\fBYOU CAN USE \-a OPTION TO ADJUST SPLITPOINTS!\fP
+\fBYOU CAN USE THE \-a OPTION TO ADJUST SPLITPOINTS!\fP
 
 .IP "\fB-a\fP         " 10
 \fBAuto-adjust mode\fP.
@@ -295,6 +307,8 @@
 level (th) which is the sound level to be considered silence, cutpoint
 .I offset
 (off) which is the offset of cutpoint in silence,
+.I min
+(min) which is the minimum silence length in seconds,
 .I gap
 (gap) which is the gap value around splitpoint to search for silence.
 If you don't specify any parameter, mp3splt will use the default values.
@@ -321,6 +335,11 @@
 after the silence. Default is 25. Decrease this value if you need to split files having
 closer silence points.
 
+.IP \fBmin=FLOAT\fP
+Positive float of the minimum number of seconds to be considered as valid silence. All silences shorter than min are discarded. Default is 0.
+For the trim silence split, it is the minimum silence length to trigger a trimming; this amount of
+silence will be kept in the split file at the beginning and at the end.
+
 .IP "\fBBoth -s and -a\fP"
 
 .IP \fBoff=FLOAT\fP
@@ -344,10 +363,16 @@
 
 .IP \fBnt=INTEGER\fP
 Positive integer number of tracks to be split when using \-s option. By default all tracks are split.
-.IP \fBmin=FLOAT\fP
-Positive float of the minimum number of seconds to be considered a valid splitpoint. All silences shorter than min are discarded. Default is 0.
-.IP \fBrm\fP
-Does not require an additional number and it used to remove silence when using \-s option.
+.IP \fBrm=FLOAT_FLOAT\fP
+It is used to remove silence when using the \-s option.
+Can be used without additional numbers - by default it will cut all the silence found.
+Users can keep some of the silence found by passing the number of seconds to be kept at the
+beginning of the output files and at the end of the output files. For example, 'rm=2_6' will keep 2
+seconds of silence at the beginning of the split files and 6 seconds at the end.
+If the silence length is less than the sum of the number of seconds passed to the rm parameter,
+the split will convert the values to a percentage of the silence length. Taking the previous example, if
+the silence length is less than 8 seconds, the split will be done at 75% of the silence segment starting from
+the beginning of the silence ( 75% = 6/(2+6) ).
 .IP \fBtrackmin=FLOAT\fP
 Positive float of the minimum number of seconds for a track to be written out.
 Tracks shorter than trackmin will be skipped during the output phase.
@@ -379,7 +404,7 @@
 
 .IP "\fB\-k\fP         " 10
 \fBInput not seekable\fP. Consider input not seekable (default when using STDIN as input).
-This allows you to split mp3 and ogg streams which can be read only one time and can't be
+This allows you to split mp3 streams which can be read only one time and can't be
 seeked. Both framemode and standard mode are available, but framemode can be really slow if used with big
 files, because to seek splitpoints we need to process all bytes and all frames. \-k option
 (so STDIN as input too) can't be used together with \-s \-a \-w \-e, because input must be seekable for
@@ -433,7 +458,18 @@
 .br
 @M, @S or @H: the number of minutes, seconds or hundreths of seconds of the end splitpoint**
 
-(**) a digit may follow for the number of digits to output
+(**) One digit may follow defining the number of digits to output.
+.br
+If the digit is 0, then a special rule is applied when the pattern value is equal to 0:
+.br
+- the pattern is discarded
+.br
+- all characters like : _ . and -. preceding it are discarded
+.br
+- all characters following it are discarded up to the next @ or a separator like : _ . and -
+.br
+This rule is useful for discarding the last part of the time when equal to 0.
+For example @m_@s_@h0hundreths__@M_@S will only output @m_@s__@M_@S if the hundreths of seconds are 0.
 
 When split files are more than one, at least one of @t, @n, @N, @l, @L, @u or
 @U (*) must be present to avoid ambiguous names.  You can put any prefix,
@@ -470,12 +506,27 @@
 ID3v1, ID3v2 or ID3v1 and ID3v2. TAGS_VERSION can be 1, 2 or 12. Default is to set the output
 tags version as the tags version of the input file.
 
+.IP "\fB\-C ID3V2_TEXT_ENCODING\fP         " 10
+\fBSet encoding of the ID3V2 tags\fP. For mp3 files, set the encoding of ID3V2 tags.
+ID3V2_TEXT_ENCODING can be 1 for latin1 (iso-8859-1), 8 for UTF-8 or 16 for UTF-16.
+Default is UTF-16.
+
+.IP "\fB\-I INPUT_TAGS_ENCODING_FOR_ID3V2\fP         " 10
+\fBSet encoding of the input tags for mp3 files\fP.
+INPUT_TAGS_ENCODING_FOR_ID3V2 can be 1 for latin1 (iso-8859-1), 8 for UTF-8 or 16 for UTF-16.
+Default is UTF-8.
+
 .IP "\fB\-N\fP         " 10
 \fBNo silence log file\fP. Don't create the 'mp3splt.log' log file when using
 silence detection. This option cannot be used without the '\-s' option.
 
+.IP "\fB\-K\fP         " 10
+\fBKeep original tags for CDDB or CUE\fP. When importing a CDDB or CUE file, set the original
+input file tags and then replace them with those read from the imported file.
+
 .IP "\fB\-g TAGS\fP         " 10
 \fBCustom tags\fP. Set custom tags to the split files.
+If you want to set spaces in tags, you might need to double quote the whole TAGS.
 TAGS should contain a list of square brackets pairs \fB\fP. The tags defined in the first
 pair of square brackets will be set on the first split file, those defined in the
 second pair of square brackets will be set on the second split file, ... Inside
@@ -498,10 +549,12 @@
 .br
 @g: genre
 .br
-@n: track number
+@n: track number (set to -2 for none)
 .br
 @o: set original tags
 .br
+@O: set exactly the same original tag bytes and discard other variables (mp3 only)
+.br
 @N: auto increment track number: 
 this variable has to be placed inside the % field in order to have the track
 number auto incremented for all the split files following it
@@ -563,6 +616,33 @@
 .IP "\fB\-E CUE_FILE\fP         " 10
 \fBExport to .cue file\fP. Creates a .cue file containing the splitpoints.
 Use \-P to export the splitpoints without actually splitting.
+The cue file contains the tags of the splitpoints as comments (for example REM ALBUM, REM GENRE, REM
+DATE). There is however one limitation: REM TRACK is not written if the track was auto incremented
+without user defined tags.
+
+.IP "\fB\-F FULL_SILENCE_LOG_FILE\fP         " 10
+\fBExport the full log of silence detection\fP. The full log filename is useful to draw the
+amplitude wave of the input file (in dB) in order to choose a threshold.
+
+\fBNote about the file structure:\fP 
+
+     \(hythe first column is a dummy column which is always zero, for plotting on zero axis purposes
+     \(hythe second column is the time in seconds as double
+     \(hythe third column is the dB level
+     \(hythe fourth column is the silences shots counter
+     \(hythe five column is the number of splitpoints found
+     \(hythe sixth column is the start time of the silence spot found
+     \(hythe seventh column is the end time of the silence spot found
+
+Example of plotting the full log file with gnuplot: 
+
+gnuplot -e "file='silence_logs.txt'; set decimalsign locale; set xlabel 'Time in seconds';

mp3splt-2.4.3.tar.gz/install-sh -> mp3splt-2.5.2.tar.gz/install-sh Changed

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

mp3splt-2.4.3.tar.gz/missing -> mp3splt-2.5.2.tar.gz/missing Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2006-05-10.23
+scriptversion=2012-01-06.13; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -86,9 +84,11 @@
 help2man touch the output file
 lex create \`lex.yy.c', if possible, from existing .c
 makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
 yacc create \`y.tab.ch', if possible, from existing .ch
 
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
 Send bug reports to <bug-automake@gnu.org>."
 exit $?
 ;;
@@ -106,23 +106,21 @@
 
 esac
 
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
 # Now exit if we have it, but it failed. Also exit now if we
 # don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
 case $1 in
- lex|yacc)
+ lex*|yacc*)
 # Not GNU programs, they don't have --version.
 ;;
 
- tar)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
 *)
 if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
 # We have it, but it failed.
@@ -138,7 +136,7 @@
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case $1 in
+case $program in
 aclocal*)
 echo 1>&2 "\
 WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +146,7 @@
 touch aclocal.m4
 ;;
 
- autoconf)
+ autoconf*)
 echo 1>&2 "\
 WARNING: \`$1' is $msg. You should only need it if
 you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +155,7 @@
 touch configure
 ;;
 
- autoheader)
+ autoheader*)
 echo 1>&2 "\
 WARNING: \`$1' is $msg. You should only need it if
 you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +185,7 @@
 	 while read f; do touch "$f"; done
 ;;
 
- autom4te)
+ autom4te*)
 echo 1>&2 "\
 WARNING: \`$1' is needed, but is $msg.
 You might have modified some files without having the
@@ -210,7 +208,7 @@
 fi
 ;;
 
- bison|yacc)
+ bison*|yacc*)
 echo 1>&2 "\
 WARNING: \`$1' $msg. You should only need it if
 you modified a \`.y' file. You may need the \`Bison' package
@@ -218,7 +216,7 @@
 \`Bison' from any GNU archive site."
 rm -f y.tab.c y.tab.h
 if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	 SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -240,7 +238,7 @@
 fi
 ;;
 
- lex|flex)
+ lex*|flex*)
 echo 1>&2 "\
 WARNING: \`$1' is $msg. You should only need it if
 you modified a \`.l' file. You may need the \`Flex' package
@@ -248,7 +246,7 @@
 \`Flex' from any GNU archive site."
 rm -f lex.yy.c
 if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
 	case $LASTARG in
 	*.l)
 	 SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -263,7 +261,7 @@
 fi
 ;;
 
- help2man)
+ help2man*)
 echo 1>&2 "\
 WARNING: \`$1' is $msg. You should only need it if
 	 you modified a dependency of a manual page. You may need the
@@ -277,11 +275,11 @@
 else
 	test -z "$file" || exec >$file
 	echo ".ab help2man is required to generate this page"
-	exit 1
+	exit $?
 fi
 ;;
 
- makeinfo)
+ makeinfo*)
 echo 1>&2 "\
 WARNING: \`$1' is $msg. You should only need it if
 you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,41 +308,6 @@
 touch $file
 ;;
 
- tar)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
-	case $firstarg in
-	*o*)
-	 firstarg=`echo "$firstarg" | sed s/o//`
-	 tar "$firstarg" "$@" && exit 0
-	 ;;
-	esac
-	case $firstarg in
-	*h*)
-	 firstarg=`echo "$firstarg" | sed s/h//`
-	 tar "$firstarg" "$@" && exit 0
-	 ;;
-	esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.

mp3splt-2.4.3.tar.gz/po/Makevars -> mp3splt-2.5.2.tar.gz/po/Makevars Changed

mp3splt-2.4.3.tar.gz/po/POTFILES.in -> mp3splt-2.5.2.tar.gz/po/POTFILES.in Changed

mp3splt-2.4.3.tar.gz/po/cs.gmo -> mp3splt-2.5.2.tar.gz/po/cs.gmo Changed

mp3splt-2.4.3.tar.gz/po/cs.po -> mp3splt-2.5.2.tar.gz/po/cs.po Changed

@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mp3splt-gtk\n"
-"Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
-"POT-Creation-Date: 2012-08-27 22:30+0200\n"
+"Report-Msgid-Bugs-To: m@ioalex.net\n"
+"POT-Creation-Date: 2013-03-31 23:06+0200\n"
 "PO-Revision-Date: 2011-09-11 11:11+0000\n"
 "Last-Translator: fri <pavelfric@seznam.cz>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,72 +18,73 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: src/mp3splt.c:257 src/utils.c:36 src/utils.c:52
+#: src/mp3splt.c:308 src/print_utils.c:55 src/freedb.c:434 src/utils.c:36
+#: src/utils.c:52
 msgid "cannot allocate memory !"
 msgstr "Nelze přidělit paměť!"
 
-#: src/mp3splt.c:278
+#: src/mp3splt.c:329
 msgid ""
 "bad overlap time expression.\n"
 "\tMust be min.sec.0-99 or EOF-min.sec.0-99, read man page for details."
 msgstr ""
 
-#: src/mp3splt.c:296
+#: src/mp3splt.c:346
 msgid ""
 "bad time expression for the time split.\n"
 "\tMust be min.sec.0-99 or EOF-min.sec.0-99, read man page for details."
 msgstr ""
 
-#: src/mp3splt.c:359
+#: src/mp3splt.c:409
 msgid "read man page for documentation or type 'mp3splt -h'."
 msgstr ""
 
-#: src/mp3splt.c:425
+#: src/mp3splt.c:475
 msgid "bad argument for -p option. No valid value was recognized !"
 msgstr ""
 
-#: src/mp3splt.c:563
+#: src/mp3splt.c:622
 msgid "no input filename(s)."
 msgstr ""
 
-#: src/mp3splt.c:576
+#: src/mp3splt.c:635
 msgid "multiple splitpoints with stdout !"
 msgstr ""
 
-#: src/mp3splt.c:580
+#: src/mp3splt.c:639
 msgid "using time mode with stdout !"
 msgstr ""
 
-#: src/mp3splt.c:621
+#: src/mp3splt.c:680
 #, c-format
 msgid " Pretending to split file '%s' ...\n"
 msgstr ""
 
-#: src/mp3splt.c:625
+#: src/mp3splt.c:684
 #, c-format
 msgid " Processing file '%s' ...\n"
 msgstr ""
 
-#: src/mp3splt.c:632 src/options_checker.c:49
+#: src/mp3splt.c:690
 msgid ""
 "cannot use -k option (or STDIN) with one of the following options: -S -s -r -"
-"w -l -e -i -a -p"
+"w -l -e -i -a -p -K"
 msgstr ""
 
-#: src/mp3splt.c:688
+#: src/mp3splt.c:766
 msgid "freedb query format ambigous !"
 msgstr ""
 
-#: src/mp3splt.c:732
+#: src/mp3splt.c:812
 msgid "tags format ambiguous !"
 msgstr ""
 
-#: src/mp3splt.c:764
+#: src/mp3splt.c:844
 #, c-format
 msgid " Average silence level: %.2f dB"
 msgstr ""
 
-#: src/mp3splt.c:781
+#: src/mp3splt.c:860
 msgid ""
 "\n"
 " +-----------------------------------------------------------------------------"
@@ -109,422 +110,482 @@
 "+\n"
 msgstr ""
 
-#: src/freedb.c:58
+#: src/print_utils.c:39
 #, c-format
-msgid " Freedb search type: %s , Site: %s , Port: %d\n"
+msgid " Warning: %s\n"
+msgstr " Varování: %s\n"
+
+#: src/print_utils.c:45
+#, c-format
+msgid " Error: %s\n"
+msgstr " Chyba: %s\n"
+
+#: src/print_utils.c:127
+#, c-format
+msgid " File \"%s\" created%s\n"
 msgstr ""
 
-#: src/freedb.c:61
+#: src/print_utils.c:142
 #, c-format
-msgid " Freedb get type: %s , Site: %s , Port: %d\n"
+msgid " preparing \"%s\" (%d of %d)"
 msgstr ""
 
-#: src/freedb.c:71
-msgid "CDDB QUERY. Insert album and artist informations to find cd."
+#: src/print_utils.c:149
+#, c-format
+msgid " creating \"%s\" (%d of %d)"
 msgstr ""
 
-#: src/freedb.c:79
-msgid ""
-"\n"
-"Please search something ..."
+#: src/print_utils.c:156
+#, c-format
+msgid " searching for sync errors..."
 msgstr ""
 
-#: src/freedb.c:85
+#: src/print_utils.c:165
 #, c-format
-msgid "\r Search: "
+msgid "S: %02d, Level: %.2f dB; scanning for silence..."
+msgstr ""
+
+#: src/print_utils.c:170
+#, c-format
+msgid "Level: %.2f dB; scanning for silence..."
+msgstr ""
+
+#: src/print_utils.c:202
+msgid "using"
 msgstr ""
 
-#: src/freedb.c:102
+#: src/print_utils.c:215
 #, c-format
 msgid ""
+"THIS SOFTWARE COMES WITH ABSOLUTELY NO WARRANTY! USE AT YOUR OWN RISK!\n"
+msgstr ""
+
+#: src/print_utils.c:264
+msgid ""
 "\n"
-" Search string: %s\n"
+"All files have been split correctly. Visit http://mp3wrap.sourceforge.net!"
 msgstr ""
 
-#: src/freedb.c:103
-#, c-format
+#: src/print_utils.c:273
 msgid ""
 "\n"
-"Searching from %s on port %d using %s ...\n"
+"USAGE:\n"
+" mp3splt OPTIONS FILE1 FILE2 ... BEGIN_TIME TIME ... "
+"END_TIME\n"
+" TIME FORMAT: min.sec.0-99, even if minutes are over 59\n"
+" or EOF-min.sec.0-99 (or EOF for End Of File). "
 msgstr ""
 
-#: src/freedb.c:116
-msgid "No results found"
+#: src/print_utils.c:278
+msgid ""
+"\n"
+"OPTIONS (split mode options)\n"
+" -t + TIME: to split files every fixed time len. (TIME format same as "
+"above). \n"
+" -c + file.cddb, file.cue or \"query\" or \"query{album}\". Get splitpoints "
+"and\n"
+" filenames from a .cddb or .cue file or from Internet (\"query\").\n"
+" Use -a to auto-adjust splitpoints."

mp3splt-2.4.3.tar.gz/po/de_DE.gmo -> mp3splt-2.5.2.tar.gz/po/de_DE.gmo Changed

mp3splt-2.4.3.tar.gz/po/de_DE.po -> mp3splt-2.5.2.tar.gz/po/de_DE.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: newmp3splt\n"
-"Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
-"POT-Creation-Date: 2012-08-27 22:30+0200\n"
+"Report-Msgid-Bugs-To: m@ioalex.net\n"
+"POT-Creation-Date: 2013-03-31 23:06+0200\n"
 "PO-Revision-Date: 2011-09-15 23:27+0100\n"
 "Last-Translator: Mario Blättermann <mariobl@freenet.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -17,11 +17,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/mp3splt.c:257 src/utils.c:36 src/utils.c:52
+#: src/mp3splt.c:308 src/print_utils.c:55 src/freedb.c:434 src/utils.c:36
+#: src/utils.c:52
 msgid "cannot allocate memory !"
 msgstr "Speicher kann nicht zugewiesen werden!"
 
-#: src/mp3splt.c:278
+#: src/mp3splt.c:329
 #, fuzzy
 msgid ""
 "bad overlap time expression.\n"
@@ -31,7 +32,7 @@
 "\tMuss in min.sec.0-99 oder EOF-min.sec.0-99 angegeben werden, bitte die "
 "Handbuchseite lesen."
 
-#: src/mp3splt.c:296
+#: src/mp3splt.c:346
 msgid ""
 "bad time expression for the time split.\n"
 "\tMust be min.sec.0-99 or EOF-min.sec.0-99, read man page for details."
@@ -40,58 +41,59 @@
 "\tMuss in min.sec.0-99 oder EOF-min.sec.0-99 angegeben werden, bitte die "
 "Handbuchseite lesen."
 
-#: src/mp3splt.c:359
+#: src/mp3splt.c:409
 msgid "read man page for documentation or type 'mp3splt -h'."
 msgstr "Lesen Sie die Handbuchseite oder geben Sie »mp3splt -h« ein."
 
-#: src/mp3splt.c:425
+#: src/mp3splt.c:475
 msgid "bad argument for -p option. No valid value was recognized !"
 msgstr "Falsches Argument für Option -p. Kein gültiger Wert erkannt!"
 
-#: src/mp3splt.c:563
+#: src/mp3splt.c:622
 msgid "no input filename(s)."
 msgstr "Kein(e) Name(n) für Eingabedateien."
 
-#: src/mp3splt.c:576
+#: src/mp3splt.c:635
 msgid "multiple splitpoints with stdout !"
 msgstr "Mehrere Teilungspunkte mit Standardausgabe!"
 
-#: src/mp3splt.c:580
+#: src/mp3splt.c:639
 msgid "using time mode with stdout !"
 msgstr "Zeitmodus mit Standardausgabe wird verwendet!"
 
-#: src/mp3splt.c:621
+#: src/mp3splt.c:680
 #, c-format
 msgid " Pretending to split file '%s' ...\n"
 msgstr " Teilung der Datei »%s« wird simuliert …\n"
 
-#: src/mp3splt.c:625
+#: src/mp3splt.c:684
 #, c-format
 msgid " Processing file '%s' ...\n"
 msgstr " Datei »%s« wird verarbeitet …\n"
 
-#: src/mp3splt.c:632 src/options_checker.c:49
+#: src/mp3splt.c:690
+#, fuzzy
 msgid ""
 "cannot use -k option (or STDIN) with one of the following options: -S -s -r -"
-"w -l -e -i -a -p"
+"w -l -e -i -a -p -K"
 msgstr ""
 "Option -k (oder STDIN) kann nicht mit einer der folgenden Optionen verwendet "
 "werden : -S -s -r -w -l -e -i -a -p"
 
-#: src/mp3splt.c:688
+#: src/mp3splt.c:766
 msgid "freedb query format ambigous !"
 msgstr "Format der Freedb-Abfrage ist nicht eindeutig!"
 
-#: src/mp3splt.c:732
+#: src/mp3splt.c:812
 msgid "tags format ambiguous !"
 msgstr "Tag-Format ist nicht eindeutig!"
 
-#: src/mp3splt.c:764
+#: src/mp3splt.c:844
 #, c-format
 msgid " Average silence level: %.2f dB"
 msgstr " Durchschnittlicher Pegel der Stille: %.2f dB"
 
-#: src/mp3splt.c:781
+#: src/mp3splt.c:860
 msgid ""
 "\n"
 " +-----------------------------------------------------------------------------"
@@ -152,238 +154,6 @@
 " +-----------------------------------------------------------------------------"
 "+\n"
 
-#: src/freedb.c:58
-#, c-format
-msgid " Freedb search type: %s , Site: %s , Port: %d\n"
-msgstr " Freedb-Suchtyp: %s , Seite: %s , Port: %d\n"
-
-#: src/freedb.c:61
-#, c-format
-msgid " Freedb get type: %s , Site: %s , Port: %d\n"
-msgstr " Freedb-Ermittlungstyp: %s , Seite: %s , Port: %d\n"
-
-#: src/freedb.c:71
-msgid "CDDB QUERY. Insert album and artist informations to find cd."
-msgstr ""
-"CDDB-Abfrage. Geben Sie Informationen über Album und Künstler an, um eine CD "
-"zu finden."
-
-#: src/freedb.c:79
-msgid ""
-"\n"
-"Please search something ..."
-msgstr ""
-"\n"
-"Bitte suchen Sie nach etwas …"
-
-#: src/freedb.c:85
-#, c-format
-msgid "\r Search: "
-msgstr "\r Suche: "
-
-#: src/freedb.c:102
-#, c-format
-msgid ""
-"\n"
-" Search string: %s\n"
-msgstr ""
-"\n"
-" Zu suchende Zeichenkette: %s\n"
-
-#: src/freedb.c:103
-#, c-format
-msgid ""
-"\n"
-"Searching from %s on port %d using %s ...\n"
-msgstr ""
-"\n"
-"Suchen von %s auf Port %d mittels %s ...\n"
-
-#: src/freedb.c:116
-msgid "No results found"
-msgstr "Keine Suchergebnisse"
-
-#: src/freedb.c:126
-msgid "List of found cd:"
-msgstr "Liste der gefundenen CDs:"
-
-#: src/freedb.c:140
-#, c-format
-msgid "Revision: %d\n"
-msgstr "Revision: %d\n"
-
-#: src/freedb.c:147
-#, c-format
-msgid "-- 'q' to select cd, Enter for more:"
-msgstr "-- »q« zur Auswahl einer CD, Eingabetaste für mehr:"
-
-#: src/freedb.c:165
-#, c-format
-msgid "-- 'q' to select cd, Enter for more: "
-msgstr "-- »q« zur Auswahl einer CD, Eingabetaste für mehr:"
-
-#: src/freedb.c:192
-#, c-format
-msgid "Select cd #: "
-msgstr "CD-Nummer wählen:"
-
-#: src/freedb.c:207
-#, c-format
-msgid "Please "
-msgstr "Bitte"
-
-#: src/freedb.c:232
-#, c-format
-msgid ""
-"\n"
-"Getting file from %s on port %d using %s ...\n"
-msgstr ""
-"\n"
-"Holen der Datei von %s auf Port %d mittels %s ...\n"

mp3splt-2.4.3.tar.gz/po/es.gmo -> mp3splt-2.5.2.tar.gz/po/es.gmo Changed

mp3splt-2.4.3.tar.gz/po/es.po -> mp3splt-2.5.2.tar.gz/po/es.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mp3splt-gtk\n"
-"Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
-"POT-Creation-Date: 2012-08-27 22:30+0200\n"
+"Report-Msgid-Bugs-To: m@ioalex.net\n"
+"POT-Creation-Date: 2013-03-31 23:06+0200\n"
 "PO-Revision-Date: 2011-02-22 00:08+0000\n"
 "Last-Translator: nemecis1000 <nemecis000@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/mp3splt.c:257 src/utils.c:36 src/utils.c:52
+#: src/mp3splt.c:308 src/print_utils.c:55 src/freedb.c:434 src/utils.c:36
+#: src/utils.c:52
 msgid "cannot allocate memory !"
 msgstr "no puede asignar memoria!"
 
-#: src/mp3splt.c:278
+#: src/mp3splt.c:329
 #, fuzzy
 msgid ""
 "bad overlap time expression.\n"
@@ -31,7 +32,7 @@
 "other\" title=\"Ficha\">»Debe ser min.sec, lea la página man para más "
 "detalles."
 
-#: src/mp3splt.c:296
+#: src/mp3splt.c:346
 #, fuzzy
 msgid ""
 "bad time expression for the time split.\n"
@@ -41,59 +42,59 @@
 "other\" title=\"Ficha\">»Debe ser min.sec, lea la página man para más "
 "detalles."
 
-#: src/mp3splt.c:359
+#: src/mp3splt.c:409
 msgid "read man page for documentation or type 'mp3splt -h'."
 msgstr "lea la página del manual de documentación o de tipo 'Mp3Splt-h'."
 
-#: src/mp3splt.c:425
+#: src/mp3splt.c:475
 msgid "bad argument for -p option. No valid value was recognized !"
 msgstr "mal argumento para la opción-p. No fue reconocido valor válido!"
 
-#: src/mp3splt.c:563
+#: src/mp3splt.c:622
 msgid "no input filename(s)."
 msgstr "sin entrada de nombre de archivo (s)."
 
-#: src/mp3splt.c:576
+#: src/mp3splt.c:635
 msgid "multiple splitpoints with stdout !"
 msgstr "splitpoints múltiples con la salida estándar!"
 
-#: src/mp3splt.c:580
+#: src/mp3splt.c:639
 msgid "using time mode with stdout !"
 msgstr "usando el modo de tiempo con la salida estándar!"
 
-#: src/mp3splt.c:621
+#: src/mp3splt.c:680
 #, c-format
 msgid " Pretending to split file '%s' ...\n"
 msgstr ""
 
-#: src/mp3splt.c:625
+#: src/mp3splt.c:684
 #, c-format
 msgid " Processing file '%s' ...\n"
 msgstr ""
 
-#: src/mp3splt.c:632 src/options_checker.c:49
+#: src/mp3splt.c:690
 #, fuzzy
 msgid ""
 "cannot use -k option (or STDIN) with one of the following options: -S -s -r -"
-"w -l -e -i -a -p"
+"w -l -e -i -a -p -K"
 msgstr ""
 "no puede utilizar la opción-k (o STDIN) con una de las siguientes opciones:-"
 "S-s-w-l-e-i-p-"
 
-#: src/mp3splt.c:688
+#: src/mp3splt.c:766
 msgid "freedb query format ambigous !"
 msgstr "freedb ambigua consulta formato!"
 
-#: src/mp3splt.c:732
+#: src/mp3splt.c:812
 msgid "tags format ambiguous !"
 msgstr "Etiquetas de formato ambiguo!"
 
-#: src/mp3splt.c:764
+#: src/mp3splt.c:844
 #, c-format
 msgid " Average silence level: %.2f dB"
 msgstr ""
 
-#: src/mp3splt.c:781
+#: src/mp3splt.c:860
 msgid ""
 "\n"
 " +-----------------------------------------------------------------------------"
@@ -119,227 +120,6 @@
 "+\n"
 msgstr ""
 
-#: src/freedb.c:58
-#, c-format
-msgid " Freedb search type: %s , Site: %s , Port: %d\n"
-msgstr ""
-
-#: src/freedb.c:61
-#, c-format
-msgid " Freedb get type: %s , Site: %s , Port: %d\n"
-msgstr ""
-
-#: src/freedb.c:71
-msgid "CDDB QUERY. Insert album and artist informations to find cd."
-msgstr ""
-"PREGUNTA CDDB. Introduzca la información de álbum y artista para encontrar "
-"cd."
-
-#: src/freedb.c:79
-msgid ""
-"\n"
-"Please search something ..."
-msgstr ""
-
-#: src/freedb.c:85
-#, c-format
-msgid "\r Search: "
-msgstr "Búsqueda: "
-
-#: src/freedb.c:102
-#, c-format
-msgid ""
-"\n"
-" Search string: %s\n"
-msgstr ""
-
-#: src/freedb.c:103
-#, c-format
-msgid ""
-"\n"
-"Searching from %s on port %d using %s ...\n"
-msgstr ""
-
-#: src/freedb.c:116
-msgid "No results found"
-msgstr ""
-
-#: src/freedb.c:126
-msgid "List of found cd:"
-msgstr "Lista de cd que se encuentran:"
-
-#: src/freedb.c:140
-#, c-format
-msgid "Revision: %d\n"
-msgstr ""
-
-#: src/freedb.c:147
-#, c-format
-msgid "-- 'q' to select cd, Enter for more:"
-msgstr "- 'Q' para seleccionar cd, Enter para más:"
-
-#: src/freedb.c:165
-#, c-format
-msgid "-- 'q' to select cd, Enter for more: "
-msgstr "- 'Q' para seleccionar cd, Enter para más:"
-
-#: src/freedb.c:192
-#, c-format
-msgid "Select cd #: "
-msgstr "Seleccione cd #:"
-
-#: src/freedb.c:207
-#, c-format
-msgid "Please "
-msgstr "Por favor,"
-
-#: src/freedb.c:232
-#, c-format
-msgid ""
-"\n"
-"Getting file from %s on port %d using %s ...\n"
-msgstr ""
-
-#: src/options_checker.c:66
-msgid "the -w option can only be used with -m, -d, -q and -Q"
-msgstr ""
-
-#: src/options_checker.c:82
-msgid "the -l option can only be used with -q"
-msgstr "la opción-l sólo puede ser utilizado con-q"

mp3splt-2.4.3.tar.gz/po/fr_FR.gmo -> mp3splt-2.5.2.tar.gz/po/fr_FR.gmo Changed

mp3splt-2.4.3.tar.gz/po/fr_FR.po -> mp3splt-2.5.2.tar.gz/po/fr_FR.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mp3splt-gtk\n"
-"Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
-"POT-Creation-Date: 2012-08-27 22:30+0200\n"
+"Report-Msgid-Bugs-To: m@ioalex.net\n"
+"POT-Creation-Date: 2013-03-31 23:06+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"
@@ -17,11 +17,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: src/mp3splt.c:257 src/utils.c:36 src/utils.c:52
+#: src/mp3splt.c:308 src/print_utils.c:55 src/freedb.c:434 src/utils.c:36
+#: src/utils.c:52
 msgid "cannot allocate memory !"
 msgstr "impossible d'allouer de la mémoire !"
 
-#: src/mp3splt.c:278
+#: src/mp3splt.c:329
 #, fuzzy
 msgid ""
 "bad overlap time expression.\n"
@@ -30,7 +31,7 @@
 "mauvaise valeur pour la division en plusieurs pistes de même taille.\n"
 "\tDoit être min.sec, lisez le manuel pour les détails."
 
-#: src/mp3splt.c:296
+#: src/mp3splt.c:346
 #, fuzzy
 msgid ""
 "bad time expression for the time split.\n"
@@ -39,61 +40,61 @@
 "mauvaise valeur pour la division en plusieurs pistes de même taille.\n"
 "\tDoit être min.sec, lisez le manuel pour les détails."
 
-#: src/mp3splt.c:359
+#: src/mp3splt.c:409
 msgid "read man page for documentation or type 'mp3splt -h'."
 msgstr "lisez le manuel pour la documentation ou tapez 'mp3splt -h'."
 
-#: src/mp3splt.c:425
+#: src/mp3splt.c:475
 msgid "bad argument for -p option. No valid value was recognized !"
 msgstr ""
 "mauvais argument pour l'option -p. Aucune valeur valide n'a été réconnue !"
 
-#: src/mp3splt.c:563
+#: src/mp3splt.c:622
 msgid "no input filename(s)."
 msgstr "aucun fichier d'entrée."
 
-#: src/mp3splt.c:576
+#: src/mp3splt.c:635
 msgid "multiple splitpoints with stdout !"
 msgstr "plusieurs points de coupure avec le flux de sortie standard (stdout) !"
 
-#: src/mp3splt.c:580
+#: src/mp3splt.c:639
 msgid "using time mode with stdout !"
 msgstr ""
 "utilisation du mode de division 'temps' avec la sortie standard (stdout) !"
 
-#: src/mp3splt.c:621
+#: src/mp3splt.c:680
 #, c-format
 msgid " Pretending to split file '%s' ...\n"
 msgstr " Simulation de division du fichier '%s' ...\n"
 
-#: src/mp3splt.c:625
+#: src/mp3splt.c:684
 #, c-format
 msgid " Processing file '%s' ...\n"
 msgstr " Fichier '%s' ...\n"
 
-#: src/mp3splt.c:632 src/options_checker.c:49
+#: src/mp3splt.c:690
 #, fuzzy
 msgid ""
 "cannot use -k option (or STDIN) with one of the following options: -S -s -r -"
-"w -l -e -i -a -p"
+"w -l -e -i -a -p -K"
 msgstr ""
 "impossible d'utiliser l'option -k (ou flux d'entrée standard) avec une des "
 "options suivantes : -S -s -w -l -e -i -a -p"
 
-#: src/mp3splt.c:688
+#: src/mp3splt.c:766
 msgid "freedb query format ambigous !"
 msgstr "format freedb 'query' ambigu !"
 
-#: src/mp3splt.c:732
+#: src/mp3splt.c:812
 msgid "tags format ambiguous !"
 msgstr "format des tags ambigu !"
 
-#: src/mp3splt.c:764
+#: src/mp3splt.c:844
 #, c-format
 msgid " Average silence level: %.2f dB"
 msgstr " Niveau de silence moyen : %.2f dB"
 
-#: src/mp3splt.c:781
+#: src/mp3splt.c:860
 msgid ""
 "\n"
 " +-----------------------------------------------------------------------------"
@@ -144,237 +145,6 @@
 " +-----------------------------------------------------------------------------"
 "+\n"
 
-#: src/freedb.c:58
-#, c-format
-msgid " Freedb search type: %s , Site: %s , Port: %d\n"
-msgstr " Type de recherche freedb : %s , Site : %s , Port : %d\n"
-
-#: src/freedb.c:61
-#, c-format
-msgid " Freedb get type: %s , Site: %s , Port: %d\n"
-msgstr " Type de récupération freedb : %s , Site : %s , Port : %d\n"
-
-#: src/freedb.c:71
-msgid "CDDB QUERY. Insert album and artist informations to find cd."
-msgstr ""
-"RECHERCHE CDDB. Entrez des informations sur l'album et l'artiste pour "
-"trouver un CD."
-
-#: src/freedb.c:79
-msgid ""
-"\n"
-"Please search something ..."
-msgstr ""
-"\n"
-"S'il vous plaît, cherchez quelque chose ..."
-
-#: src/freedb.c:85
-#, c-format
-msgid "\r Search: "
-msgstr "\r Chercher : "
-
-#: src/freedb.c:102
-#, c-format
-msgid ""
-"\n"
-" Search string: %s\n"
-msgstr ""
-"\n"
-" Chaîne cherchée : %s\n"
-
-#: src/freedb.c:103
-#, c-format
-msgid ""
-"\n"
-"Searching from %s on port %d using %s ...\n"
-msgstr ""
-"\n"
-"Recherche sur %s et le port %d utilisant %s ...\n"
-
-#: src/freedb.c:116
-msgid "No results found"
-msgstr ""
-
-#: src/freedb.c:126
-msgid "List of found cd:"
-msgstr "Liste de CD trouvés :"
-
-#: src/freedb.c:140
-#, c-format
-msgid "Revision: %d\n"
-msgstr "Révision : %d\n"
-
-#: src/freedb.c:147
-#, c-format
-msgid "-- 'q' to select cd, Enter for more:"
-msgstr "-- 'q' pour sélectionner un CD, Entrée pour plus de CDs :"
-
-#: src/freedb.c:165
-#, c-format
-msgid "-- 'q' to select cd, Enter for more: "
-msgstr "-- 'q' pour sélectionner un CD, Entrée pour plus de CDs :"
-
-#: src/freedb.c:192
-#, c-format
-msgid "Select cd #: "
-msgstr "Sélectionnez le CD numéro # :"
-
-#: src/freedb.c:207
-#, c-format
-msgid "Please "
-msgstr "S'il vous plaît "
-
-#: src/freedb.c:232
-#, c-format
-msgid ""
-"\n"
-"Getting file from %s on port %d using %s ...\n"
-msgstr ""

mp3splt-2.4.3.tar.gz/po/mp3splt.pot -> mp3splt-2.5.2.tar.gz/po/mp3splt.pot Changed

@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
-"POT-Creation-Date: 2012-08-27 22:30+0200\n"
+"Report-Msgid-Bugs-To: m@ioalex.net\n"
+"POT-Creation-Date: 2013-03-31 23:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,72 +17,73 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/mp3splt.c:257 src/utils.c:36 src/utils.c:52
+#: src/mp3splt.c:308 src/print_utils.c:55 src/freedb.c:434 src/utils.c:36
+#: src/utils.c:52
 msgid "cannot allocate memory !"
 msgstr ""
 
-#: src/mp3splt.c:278
+#: src/mp3splt.c:329
 msgid ""
 "bad overlap time expression.\n"
 "\tMust be min.sec.0-99 or EOF-min.sec.0-99, read man page for details."
 msgstr ""
 
-#: src/mp3splt.c:296
+#: src/mp3splt.c:346
 msgid ""
 "bad time expression for the time split.\n"
 "\tMust be min.sec.0-99 or EOF-min.sec.0-99, read man page for details."
 msgstr ""
 
-#: src/mp3splt.c:359
+#: src/mp3splt.c:409
 msgid "read man page for documentation or type 'mp3splt -h'."
 msgstr ""
 
-#: src/mp3splt.c:425
+#: src/mp3splt.c:475
 msgid "bad argument for -p option. No valid value was recognized !"
 msgstr ""
 
-#: src/mp3splt.c:563
+#: src/mp3splt.c:622
 msgid "no input filename(s)."
 msgstr ""
 
-#: src/mp3splt.c:576
+#: src/mp3splt.c:635
 msgid "multiple splitpoints with stdout !"
 msgstr ""
 
-#: src/mp3splt.c:580
+#: src/mp3splt.c:639
 msgid "using time mode with stdout !"
 msgstr ""
 
-#: src/mp3splt.c:621
+#: src/mp3splt.c:680
 #, c-format
 msgid " Pretending to split file '%s' ...\n"
 msgstr ""
 
-#: src/mp3splt.c:625
+#: src/mp3splt.c:684
 #, c-format
 msgid " Processing file '%s' ...\n"
 msgstr ""
 
-#: src/mp3splt.c:632 src/options_checker.c:49
+#: src/mp3splt.c:690
 msgid ""
 "cannot use -k option (or STDIN) with one of the following options: -S -s -r -"
-"w -l -e -i -a -p"
+"w -l -e -i -a -p -K"
 msgstr ""
 
-#: src/mp3splt.c:688
+#: src/mp3splt.c:766
 msgid "freedb query format ambigous !"
 msgstr ""
 
-#: src/mp3splt.c:732
+#: src/mp3splt.c:812
 msgid "tags format ambiguous !"
 msgstr ""
 
-#: src/mp3splt.c:764
+#: src/mp3splt.c:844
 #, c-format
 msgid " Average silence level: %.2f dB"
 msgstr ""
 
-#: src/mp3splt.c:781
+#: src/mp3splt.c:860
 msgid ""
 "\n"
 " +-----------------------------------------------------------------------------"
@@ -108,422 +109,482 @@
 "+\n"
 msgstr ""
 
-#: src/freedb.c:58
+#: src/print_utils.c:39
 #, c-format
-msgid " Freedb search type: %s , Site: %s , Port: %d\n"
+msgid " Warning: %s\n"
 msgstr ""
 
-#: src/freedb.c:61
+#: src/print_utils.c:45
 #, c-format
-msgid " Freedb get type: %s , Site: %s , Port: %d\n"
+msgid " Error: %s\n"
 msgstr ""
 
-#: src/freedb.c:71
-msgid "CDDB QUERY. Insert album and artist informations to find cd."
+#: src/print_utils.c:127
+#, c-format
+msgid " File \"%s\" created%s\n"
 msgstr ""
 
-#: src/freedb.c:79
-msgid ""
-"\n"
-"Please search something ..."
+#: src/print_utils.c:142
+#, c-format
+msgid " preparing \"%s\" (%d of %d)"
 msgstr ""
 
-#: src/freedb.c:85
+#: src/print_utils.c:149
 #, c-format
-msgid "\r Search: "
+msgid " creating \"%s\" (%d of %d)"
 msgstr ""
 
-#: src/freedb.c:102
+#: src/print_utils.c:156
 #, c-format
+msgid " searching for sync errors..."
+msgstr ""
+
+#: src/print_utils.c:165
+#, c-format
+msgid "S: %02d, Level: %.2f dB; scanning for silence..."
+msgstr ""
+
+#: src/print_utils.c:170
+#, c-format
+msgid "Level: %.2f dB; scanning for silence..."
+msgstr ""
+
+#: src/print_utils.c:202
+msgid "using"
+msgstr ""
+
+#: src/print_utils.c:215
+#, c-format
+msgid ""
+"THIS SOFTWARE COMES WITH ABSOLUTELY NO WARRANTY! USE AT YOUR OWN RISK!\n"
+msgstr ""
+
+#: src/print_utils.c:264
 msgid ""
 "\n"
-" Search string: %s\n"
+"All files have been split correctly. Visit http://mp3wrap.sourceforge.net!"
 msgstr ""
 
-#: src/freedb.c:103
-#, c-format
+#: src/print_utils.c:273
 msgid ""
 "\n"
-"Searching from %s on port %d using %s ...\n"
+"USAGE:\n"
+" mp3splt OPTIONS FILE1 FILE2 ... BEGIN_TIME TIME ... "
+"END_TIME\n"
+" TIME FORMAT: min.sec.0-99, even if minutes are over 59\n"
+" or EOF-min.sec.0-99 (or EOF for End Of File). "
 msgstr ""
 
-#: src/freedb.c:116
-msgid "No results found"
+#: src/print_utils.c:278
+msgid ""
+"\n"
+"OPTIONS (split mode options)\n"
+" -t + TIME: to split files every fixed time len. (TIME format same as "
+"above). \n"
+" -c + file.cddb, file.cue or \"query\" or \"query{album}\". Get splitpoints "
+"and\n"
+" filenames from a .cddb or .cue file or from Internet (\"query\").\n"
+" Use -a to auto-adjust splitpoints."

mp3splt-2.4.3.tar.gz/src/Makefile.am -> mp3splt-2.5.2.tar.gz/src/Makefile.am Changed

mp3splt-2.4.3.tar.gz/src/Makefile.in -> mp3splt-2.5.2.tar.gz/src/Makefile.in Changed

@@ -59,9 +59,8 @@
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/mp3splt.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -126,6 +125,8 @@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMP3SPLT_CFLAGS = @LIBMP3SPLT_CFLAGS@
+LIBMP3SPLT_LIBS = @LIBMP3SPLT_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
@@ -136,8 +137,6 @@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MP3SPLT_CFLAGS = @MP3SPLT_CFLAGS@
-MP3SPLT_LIBS = @MP3SPLT_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
@@ -149,6 +148,9 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -220,8 +222,8 @@
 	common.h \
 	mp3splt.c
 
-INCLUDES = @MP3SPLT_CFLAGS@
-mp3splt_LDADD = @MP3SPLT_LIBS@ @LIBINTL@ $(am__append_1)
+INCLUDES = @LIBMP3SPLT_CFLAGS@
+mp3splt_LDADD = @LIBMP3SPLT_LIBS@ @LIBINTL@ $(am__append_1)
 all: all-am
 
 .SUFFIXES:

mp3splt-2.4.3.tar.gz/src/common.h -> mp3splt-2.5.2.tar.gz/src/common.h Changed

@@ -2,7 +2,7 @@
 * Mp3Splt -- Utility for mp3/ogg splitting without decoding
 *
 * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2010 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2010 Alexandru Munteanu - <m@ioalex.net>
 *
 * http://mp3splt.sourceforge.net
 *
@@ -18,7 +18,7 @@
 *
 * 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, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #ifndef COMMON_H
@@ -43,7 +43,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #else
-#define VERSION "2.4.3"
+#define VERSION "2.5.2"
 #define PACKAGE_NAME "mp3splt"
 #endif
 
@@ -58,11 +58,11 @@
 # define _(STR) ((const char *)STR)
 #endif
 
-#define MP3SPLT_DATE "27/08/12"
+#define MP3SPLT_DATE "31/03/13"
 #define MP3SPLT_AUTHOR1 "Matteo Trotta"
 #define MP3SPLT_AUTHOR2 "Alexandru Munteanu"
 #define MP3SPLT_EMAIL1 "<mtrotta AT users.sourceforge.net>"
-#define MP3SPLT_EMAIL2 "<io_fx AT yahoo.fr>"
+#define MP3SPLT_EMAIL2 "<m AT ioalex.net>"
 #define MP3SPLT_CDDBFILE "query.cddb"
 
 #define COMMON_H

mp3splt-2.4.3.tar.gz/src/data_manager.c -> mp3splt-2.5.2.tar.gz/src/data_manager.c Changed

@@ -2,7 +2,7 @@
 * Mp3Splt -- Utility for mp3/ogg splitting without decoding
 *
 * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net>
 *
 * http://mp3splt.sourceforge.net
 *
@@ -18,10 +18,12 @@
 *
 * 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, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
 
 #include "data_manager.h"
 #include "utils.h"
@@ -54,6 +56,8 @@
 data->argv = orig_argv;
 #endif
 
+ data->printed_value_length = 0;
+
 return data;
 }
 
@@ -65,7 +69,7 @@
 if (data)
 {
 //try to stop the split
- mp3splt_stop_split(data->state, NULL);
+ mp3splt_stop_split(data->state);
 //free options
 free_options(&data->opt);
 
@@ -113,8 +117,7 @@
 }
 #endif 
 
- //free left variables in the state
- mp3splt_free_state(data->state, NULL);
+ mp3splt_free_state(data->state);
 data->state = NULL;
 
 free(data);

mp3splt-2.4.3.tar.gz/src/data_manager.h -> mp3splt-2.5.2.tar.gz/src/data_manager.h Changed

mp3splt-2.4.3.tar.gz/src/freedb.c -> mp3splt-2.5.2.tar.gz/src/freedb.c Changed

@@ -2,7 +2,7 @@
 * Mp3Splt -- Utility for mp3/ogg splitting without decoding
 *
 * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net>
 *
 * http://mp3splt.sourceforge.net
 *
@@ -18,40 +18,100 @@
 *
 * 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, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+#include <unistd.h>
+
+#ifdef __WIN32__
+#include <conio.h>
+#endif
+
 #include "common.h"
+#include "utils.h"
 #include "print_utils.h"
 
 #include "freedb.h"
 
+static void handle_proxy(main_data *data);
+static void query_for_proxy_and_write_configuration_file(main_data *data);
+static void read_proxy_settings_from_configuration_file(main_data *data);
+static char *get_configuration_filename();
+static char *query_for_proxy_login();
+static char *get_input_line(FILE *input_file, char *key);
+
 extern FILE *console_out;
 
+#if defined(__BEOS__) && !defined (HAS_GETPASS)
+#warning Faking getpass() !!!
+char *getpass(char *p)
+{
+ char *ret = malloc(30);
+ if (!ret)
+ return NULL;
+ puts(p);
+ fgets(ret, 30, stdin);
+ return ret;
+}
+#endif
+
+#ifdef __WIN32__
+char *getpass(char *s)
+{
+ char *pass, c;
+ int i=0;
+ fputs(s, stdout);
+ pass = malloc(100);
+ do {
+ c = _getch();
+ if (c!='\r') {
+ if (c=='\b') {
+ if (i>0) {
+ printf ("\b \b");
+ i--;
+ }
+ }
+ else {
+ printf ("*");
+ passi++ = c;
+ }
+ }
+ else break;
+ } while (i<100);
+
+ passi='\0';
+
+ printf("\n");
+
+ return pass;
+}
+#endif
+
 void do_freedb_search(main_data *data)
 {
+ handle_proxy(data);
+
 int err = SPLT_OK;
 options *opt = data->opt;
 splt_state *state = data->state;
 
- //we find out what search and get type we have
 char search_type30 = "";
 char get_type30 = "";
 if (opt->freedb_search_type == SPLT_FREEDB_SEARCH_TYPE_CDDB_CGI)
 {
- snprintf(search_type,30,"%s","cddb_cgi");
+ snprintf(search_type, 30, "%s", "cddb_cgi");
 }
 else
 {
- snprintf(search_type,30,"%s","web_search");
+ snprintf(search_type, 30 ,"%s", "web_search");
 }
 if (opt->freedb_get_type == SPLT_FREEDB_GET_FILE_TYPE_CDDB_CGI)
 {
- snprintf(get_type,30,"%s","cddb_cgi");
+ snprintf(get_type, 30, "%s", "cddb_cgi");
 }
 else
 {
- snprintf(get_type,30,"%s","cddb_protocol");
+ snprintf(get_type, 30, "%s", "cddb_protocol");
 }
 
 //print out infos about the servers
@@ -67,12 +127,9 @@
 //if we haven't chosen to search from the arguments, interactive search
 if (opt->freedb_arg_search_string0 == '\0')
 {
- //freedb search
- print_message(_("CDDB QUERY. Insert album and"
- " artist informations to find cd."));
+ print_message(_("CDDB QUERY. Insert album and artist informations to find cd."));
 
 short first_time = SPLT_TRUE;
- //here we search freedb
 do {
 if (!first_time)
 {
@@ -89,7 +146,6 @@
 first_time = SPLT_FALSE;
 
 freedb_inputstrlen(freedb_input)-1 = '\0';
-
 } while (strlen(freedb_input)==0);
 
 freedb_search_string = freedb_input;
@@ -104,12 +160,12 @@
 opt->freedb_search_server,opt->freedb_search_port, search_type);
 fflush(console_out);
 
- const splt_freedb_results *f_results = NULL;
+ splt_freedb_results *f_results =
+ mp3splt_get_freedb_search(state, freedb_search_string,
+ &err, opt->freedb_search_type,
+ opt->freedb_search_server,
+ opt->freedb_search_port);
 
- f_results = mp3splt_get_freedb_search(state, freedb_search_string,
- &err, opt->freedb_search_type,
- opt->freedb_search_server,
- opt->freedb_search_port);
 process_confirmation_error(err, data);
 if (!f_results)
 {
@@ -127,20 +183,25 @@
 
 int cd_number = 0;
 short end = SPLT_FALSE;
- while (cd_number < f_results->number) {
- fprintf(console_out,"%3d) %s\n",
- f_results->resultscd_number.id,
- f_results->resultscd_number.name);
+
+ mp3splt_freedb_init_iterator(f_results);
+ const splt_freedb_one_result *f_result = NULL;
+ while ((f_result = mp3splt_freedb_next(f_results))) {
+ int cd_id = mp3splt_freedb_get_id(f_result);
+
+ const char *cd_name = mp3splt_freedb_get_name(f_result);
+ fprintf(console_out,"%3d) %s\n", cd_id, cd_name);
 
 int i = 0;
- for(i = 0; i < f_results->resultscd_number.revision_number; i++)
+ int number_of_revisions = mp3splt_freedb_get_number_of_revisions(f_result);
+ for(i = 0; i < number_of_revisions; i++)
 {
 fprintf(console_out, " |\\=>");
- fprintf(console_out, "%3d) ", f_results->resultscd_number.id+i+1);
+ fprintf(console_out, "%3d) ", cd_id+i+1);
 fprintf(console_out, _("Revision: %d\n"), i+2);
 
 //break at 22
- if (((f_results->resultscd_number.id+i+2)%22)==0)
+ if (((cd_id+i+2) % 22) == 0)
 {
 //duplicate, see below
 char junk18;
@@ -158,7 +219,7 @@
 
 //we read result from the char, q tu select cd or
 //enter to show more results
- if (((f_results->resultscd_number.id+1)%22)==0)
+ if (((cd_id + 1) % 22) == 0)
 {
 //duplicate, see ^^
 char junk18;
@@ -217,26 +278,285 @@
 selected_cd = atoi(sel_cd_input);

mp3splt-2.4.3.tar.gz/src/freedb.h -> mp3splt-2.5.2.tar.gz/src/freedb.h Changed

mp3splt-2.4.3.tar.gz/src/mp3splt.c -> mp3splt-2.5.2.tar.gz/src/mp3splt.c Changed

@@ -2,7 +2,7 @@
 * Mp3Splt -- Utility for mp3/ogg splitting without decoding
 *
 * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net>
 *
 * http://mp3splt.sourceforge.net
 *
@@ -18,7 +18,7 @@
 *
 * 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, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #include "common.h"
@@ -45,10 +45,15 @@
 
 void sigint_handler(int sig)
 {
- mp3splt_stop_split(state, NULL);
+ mp3splt_stop_split(state);
 exit(1);
 }
 
+static int is_stdin(const char *current_filename)
+{
+ return strcmp(current_filename, "-") == 0 || strcmp(current_filename, "o-") == 0;
+}
+
 int main(int argc, char **orig_argv)
 {
 setlocale(LC_ALL, "");
@@ -66,9 +71,7 @@
 
 main_data *data = create_main_struct(argc, orig_argv);
 
-#ifdef ENABLE_NLS
-
-# ifdef __WIN32__
+#ifdef __WIN32__
 char mp3splt_uninstall_file2048 = { '\0' };
 DWORD dwType, dwSize = sizeof(mp3splt_uninstall_file) - 1;
 SHGetValue(HKEY_LOCAL_MACHINE,
@@ -98,13 +101,22 @@
 }
 }
 
+# ifdef ENABLE_NLS
 bindtextdomain(MP3SPLT_GETTEXT_DOMAIN, "translations");
- bindtextdomain(MP3SPLT_LIB_GETTEXT_DOMAIN, "translations");
-
+ bindtextdomain(LIBMP3SPLT_WITH_SONAME, "translations");
 # else
+ #error No NLS detected
+# endif
+
+#else
+
+# ifdef ENABLE_NLS
 bindtextdomain(MP3SPLT_GETTEXT_DOMAIN, LOCALEDIR);
 # endif
 
+#endif
+
+#ifdef ENABLE_NLS
 bind_textdomain_codeset(MP3SPLT_GETTEXT_DOMAIN, "UTF-8");
 #endif
 
@@ -120,10 +132,10 @@
 signal(SIGINT, sigint_handler);
 
 //callback for the library messages
- mp3splt_set_message_function(state, put_library_message, NULL);
+ mp3splt_set_message_function(state, put_library_message, data);
 mp3splt_set_silence_level_function(state, get_silence_level, data->sl);
 //callback for the split files
- mp3splt_set_split_filename_function(state, put_split_file, NULL);
+ mp3splt_set_split_filename_function(state, put_split_file, data);
 
 //default we write mins_secs_hundr for normal split
 mp3splt_set_int_option(state, SPLT_OPT_OUTPUT_FILENAMES, SPLT_OUTPUT_DEFAULT);
@@ -132,7 +144,7 @@
 //parse command line options
 int option;
 while ((option = getopt(data->argc, data->argv,
- "m:O:Dvifkwleqnasrc:d:o:t:p:g:hQN12T:XxPE:A:S:G:")) != -1)
+ "m:O:DvifKkwleqnasrc:d:o:t:p:g:hQN12T:XxPE:A:S:G:F:C:I:")) != -1)
 {
 switch (option)
 {
@@ -156,8 +168,7 @@
 break;
 case 'T':
 opt->T_option_value = atoi(optarg);
- mp3splt_set_int_option(state, SPLT_OPT_FORCE_TAGS_VERSION,
- opt->T_option_value);
+ mp3splt_set_int_option(state, SPLT_OPT_FORCE_TAGS_VERSION, opt->T_option_value);
 opt->T_option = SPLT_TRUE;
 break;
 case 'D':
@@ -177,6 +188,9 @@
 mp3splt_set_int_option(state, SPLT_OPT_INPUT_NOT_SEEKABLE, SPLT_TRUE);
 opt->k_option = SPLT_TRUE;
 break;
+ case 'K':
+ opt->K_option = SPLT_TRUE;
+ break;
 case 'w':
 mp3splt_set_int_option(state, SPLT_OPT_SPLIT_MODE, SPLT_OPTION_WRAP_MODE);
 opt->w_option = SPLT_TRUE;
@@ -217,6 +231,38 @@
 opt->c_option = SPLT_TRUE;
 opt->cddb_arg = strdup(optarg);
 break;
+ case 'C':
+ ;
+ int intarg = atoi(optarg);
+ if (intarg == 8)
+ {
+ mp3splt_set_int_option(state, SPLT_OPT_ID3V2_ENCODING, SPLT_ID3V2_UTF8);
+ }
+ else if (intarg == 16)
+ {
+ mp3splt_set_int_option(state, SPLT_OPT_ID3V2_ENCODING, SPLT_ID3V2_UTF16);
+ }
+ else if (intarg == 1)
+ {
+ mp3splt_set_int_option(state, SPLT_OPT_ID3V2_ENCODING, SPLT_ID3V2_LATIN1);
+ }
+ break;
+ case 'I':
+ ;
+ int intarg2 = atoi(optarg);
+ if (intarg2 == 8)
+ {
+ mp3splt_set_int_option(state, SPLT_OPT_INPUT_TAGS_ENCODING, SPLT_ID3V2_UTF8);
+ }
+ else if (intarg2 == 16)
+ {
+ mp3splt_set_int_option(state, SPLT_OPT_INPUT_TAGS_ENCODING, SPLT_ID3V2_UTF16);
+ }
+ else if (intarg2 == 1)
+ {
+ mp3splt_set_int_option(state, SPLT_OPT_INPUT_TAGS_ENCODING, SPLT_ID3V2_LATIN1);
+ }
+ break;
 case 'P':
 opt->P_option = SPLT_TRUE;
 mp3splt_set_int_option(state, SPLT_OPT_PRETEND_TO_SPLIT, SPLT_TRUE);
@@ -234,6 +280,11 @@
 opt->m3u_arg = strdup(optarg);
 mp3splt_set_m3u_filename(state, opt->m3u_arg);
 break;
+ case 'F':
+ opt->F_option = SPLT_TRUE;
+ opt->full_log_arg = strdup(optarg);
+ mp3splt_set_silence_full_log_filename(state, opt->full_log_arg);
+ break;
 case 'S':
 opt->S_option = SPLT_TRUE;
 opt->S_option_value = atoi(optarg);
@@ -288,8 +339,7 @@
 
 if (converted_time != -LONG_MAX)
 {
- float split_time = (float)converted_time / 100.0;
- mp3splt_set_float_option(state, SPLT_OPT_SPLIT_TIME, split_time);
+ mp3splt_set_long_option(state, SPLT_OPT_SPLIT_TIME, converted_time);
 }
 else
 {
@@ -356,8 +406,7 @@
 fclose(stdout);
 break;
 default:
- print_error_exit(_("read man page for documentation"
- " or type 'mp3splt -h'."), data);
+ print_error_exit(_("read man page for documentation or type 'mp3splt -h'."), data);
 break;
 }
 }
@@ -365,7 +414,7 @@
 //callback for the progress bar
 if (!opt->q_option && !opt->X_option)
 {
- mp3splt_set_progress_function(state, put_progress_bar, NULL);
+ mp3splt_set_progress_function(state, put_progress_bar, data);
 }
 
 //if quiet, does not write authors and other
@@ -417,14 +466,24 @@
 float th = -200, off = -200, min = -200, min_track_length = -200;
 int gap = -200, nt = -200, rm = -200, shots = -200;
 float min_track_join = -200;
+ float keep_silence_left = -200, keep_silence_right = -200;
 int parsed_p_options = 
 parse_silence_options(opt->param_args, &th, &gap, &nt, &off, &rm, &min, &min_track_length,

mp3splt-2.4.3.tar.gz/src/options_checker.c -> mp3splt-2.5.2.tar.gz/src/options_checker.c Changed

@@ -2,7 +2,7 @@
 * Mp3Splt -- Utility for mp3/ogg splitting without decoding
 *
 * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net>
 *
 * http://mp3splt.sourceforge.net
 *
@@ -18,7 +18,7 @@
 *
 * 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, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #include <string.h>
@@ -39,233 +39,254 @@
 {
 console_out = stderr;
 show_small_help_exit(data);
+ return;
 }
- else
+
+ if (opt->k_option)
 {
- if (opt->k_option)
+ if (we_have_incompatible_stdin_option(opt))
 {
- if (we_have_incompatible_stdin_option(opt))
- {
- print_error_exit(_("cannot use -k option (or STDIN) with"
- " one of the following options: -S -s -r -w -l -e -i -a -p"), data);
- }
+ print_error_exit(_("cannot use -k option (or STDIN) with"
+ " one of the following options: -S -s -r -w -l -e -i -a -p -F"), data);
 }
+ }
 
- if (opt->w_option)
+ if (opt->w_option)
+ {
+ if (opt->t_option || opt->c_option ||
+ opt->s_option || opt->l_option ||
+ opt->e_option || opt->i_option ||
+ opt->f_option || opt->a_option ||
+ opt->p_option || opt->o_option ||
+ opt->g_option || opt->n_option ||
+ opt->x_option || opt->A_option ||
+ opt->E_option || opt->S_option ||
+ opt->G_option || opt->r_option ||
+ opt->F_option)
 {
- if (opt->t_option || opt->c_option ||
- opt->s_option || opt->l_option ||
- opt->e_option || opt->i_option ||
- opt->f_option || opt->a_option ||
- opt->p_option || opt->o_option ||
- opt->g_option || opt->n_option ||
- opt->x_option || opt->A_option ||
- opt->E_option || opt->S_option ||
- opt->G_option || opt->r_option)
- {
- print_error_exit(_("the -w option can only be used with -m, -d, -q and -Q"), data);
- }
+ print_error_exit(_("the -w option can only be used with -m, -d, -q and -Q"), data);
 }
+ }
 
- if (opt->l_option)
+ if (opt->l_option)
+ {
+ if (opt->t_option || opt->c_option ||
+ opt->s_option || opt->e_option ||
+ opt->i_option || opt->m_option ||
+ opt->f_option || opt->a_option ||
+ opt->p_option || opt->o_option ||
+ opt->g_option || opt->d_option ||
+ opt->n_option || opt->qq_option ||
+ opt->x_option || opt->A_option ||
+ opt->S_option || opt->G_option ||
+ opt->r_option || opt->F_option)
 {
- if (opt->t_option || opt->c_option ||
- opt->s_option || opt->e_option ||
- opt->i_option || opt->m_option ||
- opt->f_option || opt->a_option ||
- opt->p_option || opt->o_option ||
- opt->g_option || opt->d_option ||
- opt->n_option || opt->qq_option ||
- opt->x_option || opt->A_option ||
- opt->S_option || opt->G_option || opt->r_option)
- {
- print_error_exit(_("the -l option can only be used with -q"), data);
- }
+ print_error_exit(_("the -l option can only be used with -q"), data);
 }
+ }
 
- if (opt->e_option)
+ if (opt->e_option)
+ {
+ if (opt->t_option || opt->c_option || 
+ opt->s_option || opt->i_option || 
+ opt->a_option || opt->p_option ||
+ opt->g_option || opt->n_option ||
+ opt->A_option || opt->E_option ||
+ opt->S_option || opt->G_option ||
+ opt->r_option || opt->F_option)
 {
- if (opt->t_option || opt->c_option || 
- opt->s_option || opt->i_option || 
- opt->a_option || opt->p_option ||
- opt->g_option || opt->n_option ||
- opt->A_option || opt->E_option ||
- opt->S_option || opt->G_option ||
- opt->r_option)
- {
- print_error_exit(_("the -e option can only be used with -m, -f, -o, -d, -q, -Q"), data);
- }
+ print_error_exit(_("the -e option can only be used with -m, -f, -o, -d, -q, -Q"), data);
 }
+ }
 
- if (opt->f_option)
- {
- }
+ if (opt->f_option)
+ {
+ }
 
- if (opt->c_option)
+ if (opt->c_option)
+ {
+ if (opt->t_option || opt->s_option ||
+ opt->i_option || opt->g_option ||
+ opt->A_option || opt->S_option ||
+ opt->G_option || opt->r_option ||
+ opt->F_option)
 {
- if (opt->t_option || opt->s_option ||
- opt->i_option || opt->g_option ||
- opt->A_option || opt->S_option ||
- opt->G_option || opt->r_option)
- {
- print_error_exit(_("the -c option cannot be used with -t, -g, -G, -s, -r, -A, -i or -S"), data);
- }
+ print_error_exit(_("the -c option cannot be used with -t, -g, -G, -s, -r, -A, -i, -S or -F"), data);
 }
+ }
 
- if (opt->A_option)
+ if (opt->A_option)
+ {
+ if (opt->t_option || opt->s_option ||
+ opt->i_option || opt->S_option || 
+ opt->r_option || opt->F_option)
 {
- if (opt->t_option || opt->s_option || opt->i_option || opt->S_option || opt->r_option)
- {
- print_error_exit(_("the -A option cannot be used with -t, -s, -r, -i or -S"), data);
- }
+ print_error_exit(_("the -A option cannot be used with -t, -s, -r, -i, -S or -F"), data);
 }
+ }
 
- if (opt->t_option)
+ if (opt->t_option)
+ {
+ if (opt->s_option || opt->i_option ||
+ opt->S_option || opt->r_option ||
+ opt->F_option)
 {
- if (opt->s_option || opt->i_option || opt->S_option || opt->r_option)
- {
- print_error_exit(_("the -t option cannot be used with -s, -r, -i or -S"), data);
- }
+ print_error_exit(_("the -t option cannot be used with -s, -r, -i, -S or -F"), data);
 }
+ }
 
- if (opt->s_option)
+ if (opt->s_option)
+ {
+ if (opt->a_option || opt->i_option ||
+ opt->S_option || opt->r_option)
 {
- if (opt->a_option || opt->i_option || opt->S_option || opt->r_option)
- {
- print_error_exit(_("-s option cannot be used with -a, -r, -i or -S"), data);
- }
+ print_error_exit(_("-s option cannot be used with -a, -r, -i or -S"), data);
 }
+ }
 
- if (opt->a_option)
+ if (opt->a_option)
+ {

mp3splt-2.4.3.tar.gz/src/options_checker.h -> mp3splt-2.5.2.tar.gz/src/options_checker.h Changed

mp3splt-2.4.3.tar.gz/src/options_manager.c -> mp3splt-2.5.2.tar.gz/src/options_manager.c Changed

@@ -2,7 +2,7 @@
 * Mp3Splt -- Utility for mp3/ogg splitting without decoding
 *
 * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net>
 *
 * http://mp3splt.sourceforge.net
 *
@@ -18,7 +18,7 @@
 *
 * 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, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #include "common.h"
@@ -86,6 +86,12 @@
 (*opt)->m3u_arg = NULL;
 }
 
+ if ((*opt)->full_log_arg)
+ {
+ free((*opt)->full_log_arg);
+ (*opt)->full_log_arg = NULL;
+ }
+
 if ((*opt)->param_args)
 {
 free((*opt)->param_args);
@@ -128,6 +134,7 @@
 opt->r_option = SPLT_FALSE;
 opt->p_option = SPLT_FALSE; opt->o_option = SPLT_FALSE;
 opt->d_option = SPLT_FALSE; opt->k_option = SPLT_FALSE;
+ opt->K_option = SPLT_FALSE;
 opt->g_option = SPLT_FALSE; opt->n_option = SPLT_FALSE;
 opt->q_option = SPLT_FALSE; opt->i_option = SPLT_FALSE;
 opt->N_option = SPLT_FALSE; opt->O_option = SPLT_FALSE;
@@ -139,6 +146,7 @@
 opt->qq_option = SPLT_FALSE;
 opt->A_option = SPLT_FALSE;
 opt->m_option = SPLT_FALSE;
+ opt->F_option = SPLT_FALSE;
 opt->S_option = SPLT_FALSE;
 opt->S_option_value = 0;
 opt->tags_from_fname_regex_arg = NULL;
@@ -146,8 +154,9 @@
 opt->dir_arg = NULL;
 opt->export_cue_arg = NULL;
 opt->audacity_labels_arg = NULL;
- opt->param_args = NULL;
 opt->m3u_arg = NULL;
+ opt->full_log_arg = NULL;
+ opt->param_args = NULL;
 opt->output_format = NULL;
 
 opt->custom_tags = NULL;

mp3splt-2.4.3.tar.gz/src/options_manager.h -> mp3splt-2.5.2.tar.gz/src/options_manager.h Changed

@@ -2,7 +2,7 @@
 * Mp3Splt -- Utility for mp3/ogg splitting without decoding
 *
 * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net>
 *
 * http://mp3splt.sourceforge.net
 *
@@ -18,7 +18,7 @@
 *
 * 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, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #ifndef OPTIONS_MANAGER_H
@@ -37,6 +37,8 @@
 short r_option;
 //output filename, output directory, seekable
 short o_option; short d_option; short k_option;
+ //keep original tags when using cddb or cue import
+ short K_option;
 //custom tags, no tags, quiet option
 short g_option; short n_option; short q_option;
 short E_option;
@@ -52,6 +54,7 @@
 //info -i option, m3u file option
 short i_option;
 short m_option;
+ short F_option;
 short S_option;
 int S_option_value;
 char *tags_from_fname_regex_arg;
@@ -59,10 +62,10 @@
 char *cddb_arg; char *dir_arg; char *param_args;
 char *export_cue_arg;
 char *audacity_labels_arg;
- //the m3u filename
- char *m3u_arg;
 //custom tags with -g
 char *custom_tags;
+ char *m3u_arg;
+ char *full_log_arg;
 //output format (-o)
 char *output_format;
 //the parsed freedb_search_type

mp3splt-2.4.3.tar.gz/src/options_parsers.c -> mp3splt-2.5.2.tar.gz/src/options_parsers.c Changed

@@ -2,7 +2,7 @@
 * Mp3Splt -- Utility for mp3/ogg splitting without decoding
 *
 * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net>
 *
 * http://mp3splt.sourceforge.net
 *
@@ -18,7 +18,7 @@
 *
 * 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, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #include "common.h"
@@ -28,7 +28,7 @@
 
 int parse_silence_options(char *arg, float *th, int *gap,
 int *nt, float *off, int *rm, float *min, float *min_track_length, int *shots,
- float *min_track_join)
+ float *min_track_join, float *keep_silence_left, float *keep_silence_right)
 {
 char *ptr = NULL;
 int found = 0;
@@ -108,9 +108,20 @@
 }
 }
 
- if (rm!=NULL)
+ if (rm != NULL)
 {
- if ((ptr=strstr(arg, "rm"))!=NULL)
+ if ((ptr = strstr(arg, "rm=")) != NULL)
+ {
+ if (sscanf(ptr+3, "%f_%f", keep_silence_left, keep_silence_right) != 2)
+ {
+ *keep_silence_left = -200;
+ *keep_silence_right = -200;
+ print_warning(_("Bad values for the rm argument. rm parameter will be ignored!"));
+ }
+ found++;
+ *rm = 1;
+ }
+ else if ((ptr = strstr(arg, "rm")) != NULL)
 {
 found++;
 *rm = 1;

mp3splt-2.4.3.tar.gz/src/options_parsers.h -> mp3splt-2.5.2.tar.gz/src/options_parsers.h Changed

@@ -2,7 +2,7 @@
 * Mp3Splt -- Utility for mp3/ogg splitting without decoding
 *
 * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net>
 *
 * http://mp3splt.sourceforge.net
 *
@@ -18,7 +18,7 @@
 *
 * 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, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 
@@ -28,7 +28,7 @@
 
 int parse_silence_options(char *arg, float *th, int *gap,
 int *nt, float *off, int *rm, float *min, float *min_track_length, int *shots,
- float *min_track_join);
+ float *min_track_join, float *keep_silence_left, float *keep_silence_right);
 int parse_query_arg(options *opt, const char *query);
 regex_options *parse_tags_from_fname_regex_options(const char *parameters, int *error);

mp3splt-2.4.3.tar.gz/src/print_utils.c -> mp3splt-2.5.2.tar.gz/src/print_utils.c Changed

@@ -2,7 +2,7 @@
 * Mp3Splt -- Utility for mp3/ogg splitting without decoding
 *
 * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net>
 *
 * http://mp3splt.sourceforge.net
 *
@@ -18,7 +18,7 @@
 *
 * 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, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #include "common.h"
@@ -46,12 +46,62 @@
 fflush(console_err);
 }
 
-void put_library_message(const char *message, splt_message_type mess_type, void *data)
+static void print_with_spaces_after(const char *printed_value, int print_carriage_return, 
+ FILE *file, main_data *data)
+{
+ char *value = strdup(printed_value);
+ if (!value)
+ {
+ print_warning(_("cannot allocate memory !"));
+ }
+
+ char temp2048 = "";
+ int this_spaces = strlen(value);
+ int counter = strlen(value);
+ while (counter <= data->printed_value_length)
+ {
+ tempcounter-this_spaces = ' ';
+ counter++;
+ }
+ tempcounter = '\0';
+
+ if (print_carriage_return)
+ {
+ fprintf(file, "%s%s\r", value, temp);
+ }
+ else
+ {
+ int has_slash_n = SPLT_FALSE;
+ if (strlen(value) > 0)
+ {
+ if (valuestrlen(value)-1 == '\n')
+ {
+ has_slash_n = SPLT_TRUE;
+ }
+ }
+
+ if (has_slash_n)
+ {
+ valuestrlen(value)-1 = '\0';
+ fprintf(file, "%s%s\n", value, temp);
+ }
+ else
+ {
+ fprintf(file, "%s%s", value, temp);
+ }
+ }
+
+ fflush(file);
+
+ free(value);
+}
+
+void put_library_message(const char *message, splt_message_type mess_type, void *user_data)
 {
 if (mess_type == SPLT_MESSAGE_INFO)
 {
- fprintf(console_out,"%s",message);
- fflush(console_out);
+ main_data *data = (main_data *) user_data;
+ print_with_spaces_after(message, SPLT_FALSE, console_out, data);
 }
 else if (mess_type == SPLT_MESSAGE_DEBUG)
 {
@@ -60,12 +110,14 @@
 }
 }
 
-void put_split_file(const char *file, int progress_data, void *data)
+void put_split_file(const char *file, void *user_data)
 {
+ main_data *data = (main_data *) user_data;
+
 char temp1024 = "";
 int this_spaces = strlen(file)+16;
 int counter = strlen(file)+16;
- while (counter <= progress_data)
+ while (counter <= data->printed_value_length)
 {
 tempcounter-this_spaces = ' ';
 counter++;
@@ -76,41 +128,47 @@
 fflush(console_out);
 }
 
-void put_progress_bar(splt_progress *p_bar, void *data)
+void put_progress_bar(splt_progress *p_bar, void *user_data)
 {
+ main_data *data = (main_data *)user_data;
+
 char progress_text2048 = " ";
+ char *filename_shorted = mp3splt_progress_get_filename_shorted(p_bar);
 
- switch (p_bar->progress_type)
+ switch (mp3splt_progress_get_type(p_bar))
 {
 case SPLT_PROGRESS_PREPARE:
 snprintf(progress_text,2047,
 _(" preparing \"%s\" (%d of %d)"),
- p_bar->filename_shorted,
- p_bar->current_split,
- p_bar->max_splits);
+ filename_shorted,
+ mp3splt_progress_get_current_split(p_bar),
+ mp3splt_progress_get_max_splits(p_bar));
 break;
 case SPLT_PROGRESS_CREATE:
 snprintf(progress_text,2047,
 _(" creating \"%s\" (%d of %d)"),
- p_bar->filename_shorted,
- p_bar->current_split,
- p_bar->max_splits);
+ filename_shorted,
+ mp3splt_progress_get_current_split(p_bar),
+ mp3splt_progress_get_max_splits(p_bar));
 break;
 case SPLT_PROGRESS_SEARCH_SYNC:
 snprintf(progress_text,2047,
 _(" searching for sync errors..."));
 break;
 case SPLT_PROGRESS_SCAN_SILENCE:
- if (p_bar->silence_found_tracks > 0)
+ ;
+ int silence_found_tracks = mp3splt_progress_get_silence_found_tracks(p_bar);
+ float silence_db_level = mp3splt_progress_get_silence_db_level(p_bar);
+ if (silence_found_tracks > 0)
 {
 snprintf(progress_text,2047,
 _("S: %02d, Level: %.2f dB; scanning for silence..."),
- p_bar->silence_found_tracks, p_bar->silence_db_level);
+ silence_found_tracks, silence_db_level);
 }
 else {
 snprintf(progress_text,2047,
 _("Level: %.2f dB; scanning for silence..."),
- p_bar->silence_db_level);
+ silence_db_level);
 }
 break;
 default:
@@ -118,42 +176,32 @@
 break;
 }
 
+ float percent_progress = mp3splt_progress_get_percent_progress(p_bar);
+
 char printed_value2048 = "";
 //we update the progress
- if (p_bar->percent_progress <= 0.01)
+ if (percent_progress <= 0.01)
 {
- snprintf(printed_value,2047," - %% %s", progress_text);
+ snprintf(printed_value, 2047," - %% %s", progress_text);
 }
 else
 {
- snprintf(printed_value,2047," %.2f %% %s",
- p_bar->percent_progress * 100, progress_text);
- }
-
- //we put necessary spaces
- char temp2048 = "";
- int this_spaces = strlen(printed_value);
- int counter = strlen(printed_value);
- while (counter <= p_bar->user_data)
- {
- tempcounter-this_spaces = ' ';
- counter++;
+ snprintf(printed_value, 2047," %.2f %% %s", percent_progress * 100, progress_text);
 }
- tempcounter = '\0';
 
- fprintf(console_progress,"%s%s\r",printed_value,temp);
- fflush(console_progress);
+ print_with_spaces_after(printed_value, SPLT_TRUE, console_progress, data);
+ data->printed_value_length = strlen(printed_value) + 1;
 
- p_bar->user_data = strlen(printed_value)+1;
+ free(filename_shorted);
 }

mp3splt-2.4.3.tar.gz/src/print_utils.h -> mp3splt-2.5.2.tar.gz/src/print_utils.h Changed

@@ -2,7 +2,7 @@
 * Mp3Splt -- Utility for mp3/ogg splitting without decoding
 *
 * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net>
 *
 * http://mp3splt.sourceforge.net
 *
@@ -18,7 +18,7 @@
 *
 * 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, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #ifndef PRINT_UTILS_H
@@ -31,7 +31,7 @@
 void print_warning(const char *w);
 void print_error(const char *e);
 void put_library_message(const char *message, splt_message_type mess_type, void *data);
-void put_split_file(const char *file, int progress_data, void *data);
+void put_split_file(const char *file, void *data);
 void put_progress_bar(splt_progress *p_bar, void *data);
 void print_version(FILE *std);
 void print_authors(FILE *std);

mp3splt-2.4.3.tar.gz/src/utils.c -> mp3splt-2.5.2.tar.gz/src/utils.c Changed

mp3splt-2.4.3.tar.gz/src/utils.h -> mp3splt-2.5.2.tar.gz/src/utils.h Changed

mp3splt-2.4.3.tar.gz/src/windows_utils.c -> mp3splt-2.5.2.tar.gz/src/windows_utils.c Changed

mp3splt-2.4.3.tar.gz/src/windows_utils.h -> mp3splt-2.5.2.tar.gz/src/windows_utils.h Changed

Changes of Revision 4