Packman Build Service PMBS

libmp3splt.changes Changed

libmp3splt.spec Changed

@@ -15,14 +15,10 @@
 %define soname 0
 
 Name:           libmp3splt
-Version:        0.7.3
+Version:        0.8.2
 Release:        0.pm.1
 Summary:        Library to split MP3 and Ogg Files
 Source:         http://prdownloads.sourceforge.net/mp3splt/libmp3splt-%{version}.tar.gz
-Patch1:         libmp3splt-add_soname_to_plugin_dir.patch
-Patch2:         libmp3splt-add_soname_to_gettext_domain.patch
-Patch3:         libmp3splt-fix_swapped_memset_args.patch
-Patch4:         libmp3splt-fix_array_oob.patch
 Source99:       libmp3splt-rpmlintrc
 URL:            http://mp3splt.sourceforge.net/mp3splt_page/home.php
 Group:          System/Libraries
@@ -99,16 +95,7 @@
 
 %prep
 %setup -q -n "libmp3splt-%{version}"
-%patch1
-%patch2
-%__awk '/^\+\+\+ / {print $2}' < "%{PATCH2}" | grep -E '\.(h|c.*)$' \
-| while read f; do
-    %__sed -i 's|@@SONAME@@|%{soname}|g' "$f"
-done
-%patch3
-%patch4
-
-%__sed -ri 's|^(VERSION *= *).*$|\1 %{version}|' po/Makevars
+#__sed -ri 's|^(VERSION *= *).*$|\1 %{version}|' po/Makevars
 
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"
@@ -117,24 +104,13 @@
 
  -e ./configure  || NOCONFIGURE=1 ./autogen.sh
 
-{
-    %configure \
-        --disable-doxygen_doc \
-    2>&1 || exit 99;
-} | tee configure.stdout.log
-for tag in \
-'\.mp3 format\)' \
-'\.ogg/vorbis format\)' \
-'libid3tag.*' \
-; do
-  %__grep -E "${tag} +yes$" configure.stdout.log \
-  || { echo "ERROR: $tag not enabled"; exit 1; }
-done
-
-%__make %{?_smp_flags} SONAME="%{soname}"
+%configure \
+    --disable-doxygen_doc \
+
+%__make %{?_smp_flags}
 
 %install
-%makeinstall SONAME="%{soname}"
+%makeinstall
 
 %__rm -f "%{buildroot}%{_libdir}/libmp3splt".{a,la}
 
@@ -156,7 +132,7 @@
 
 %files -n %{name}%{soname} -f libmp3splt%{soname}.lang
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libmp3splt.so.%{soname}
 %{_libdir}/libmp3splt.so.%{soname}.*
 %dir %{_libdir}/libmp3splt%{soname}
@@ -173,6 +149,6 @@
 %defattr(-,root,root)
 %{_includedir}/libmp3splt
 %{_libdir}/libmp3splt.so
-%{_datadir}/aclocal/mp3splt.m4
+%{_libdir}/pkgconfig/libmp3splt.pc
 
 %changelog

libmp3splt-add_soname_to_gettext_domain.patch Deleted

libmp3splt-add_soname_to_plugin_dir.patch Deleted

@@ -1,55 +0,0 @@
---- src/Makefile.in.orig	2011-07-21 12:09:34.351999985 +0200
-+++ src/Makefile.in	2011-07-21 12:10:01.071999985 +0200
-@@ -295,7 +295,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- include_HEADERS = $(top_srcdir)/include/libmp3splt/mp3splt.h
--INCLUDES = -DSPLT_PLUGINS_DIR=\"$(libdir)/libmp3splt\" @INCLTDL@ \
-+INCLUDES = -DSPLT_PLUGINS_DIR=\"$(libdir)/libmp3splt$(SONAME)\" @INCLTDL@ \
- 	$(am__append_2) $(am__append_3)
- lib_LTLIBRARIES = libmp3splt.la
- libmp3splt_la_LDFLAGS = -no-undefined -version-info 0:5:0
---- src/Makefile.am.orig	2011-07-21 12:10:03.439999985 +0200
-+++ src/Makefile.am	2011-07-21 12:10:12.911999985 +0200
-@@ -2,7 +2,7 @@
- 
- include_HEADERS = $(top_srcdir)/include/libmp3splt/mp3splt.h
- 
--INCLUDES=-DSPLT_PLUGINS_DIR=\"$(libdir)/libmp3splt\" @INCLTDL@
-+INCLUDES=-DSPLT_PLUGINS_DIR=\"$(libdir)/libmp3splt$(SONAME)\" @INCLTDL@
- 
- lib_LTLIBRARIES = libmp3splt.la
- 
---- plugins/Makefile.in.orig	2011-07-21 12:08:26.783999986 +0200
-+++ plugins/Makefile.in	2011-07-21 12:09:12.569999984 +0200
-@@ -292,13 +292,13 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--plugindir = $(libdir)/libmp3splt
-+plugindir = $(libdir)/libmp3splt$(SONAME)
- plugin_LTLIBRARIES = $(am__append_2) $(am__append_5)
- 
- #ccommon_LDFLAGS = -module -export-dynamic -avoid-version
- common_CPPFLAGS = -I$(top_srcdir)/include/libmp3splt -I$(top_srcdir)/src
- common_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs \
--	-L/lib -no-undefined -lm -lmp3splt @LIBINTL@ $(am__append_1)
-+	-no-undefined -lm -lmp3splt @LIBINTL@ $(am__append_1)
- @MP3_PLUGIN_TRUE@libsplt_mp3_la_SOURCES = mp3.c mp3.h mp3_silence.c mp3_silence.h mp3_utils.c mp3_utils.h \
- @MP3_PLUGIN_TRUE@silence_processors.c silence_processors.h
- 
---- plugins/Makefile.am.orig	2011-07-21 12:09:15.549999984 +0200
-+++ plugins/Makefile.am	2011-07-21 12:09:29.767999985 +0200
-@@ -1,10 +1,10 @@
--plugindir=$(libdir)/libmp3splt
-+plugindir=$(libdir)/libmp3splt$(SONAME)
- 
- plugin_LTLIBRARIES = 
- 
- #ccommon_LDFLAGS = -module -export-dynamic -avoid-version
- common_CPPFLAGS = -I$(top_srcdir)/include/libmp3splt -I$(top_srcdir)/src
--common_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/lib \
-+common_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs \
-    -no-undefined -lm -lmp3splt @LIBINTL@
- 
- if WIN32

libmp3splt-fix_array_oob.patch Deleted

libmp3splt-fix_swapped_memset_args.patch Deleted

libmp3splt-0.7.3.tar.gz/config.guess Deleted

@@ -1,1526 +0,0 @@
-#! /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
-#   Free Software Foundation, Inc.
-
-timestamp='2008-01-23'
-
-# 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
-# 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., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, 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.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 OPTION
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 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."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-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*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/-_.*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:

libmp3splt-0.7.3.tar.gz/config.rpath Deleted

@@ -1,548 +0,0 @@
-#! /bin/sh
-# Output a system dependent set of variables, describing how to set the
-# run time search path of shared libraries in an executable.
-#
-#   Copyright 1996-2003 Free Software Foundation, Inc.
-#   Taken from GNU libtool, 2001
-#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-#   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.
-#
-# The first argument passed to this file is the canonical host specification,
-#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or
-#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
-# should be set by the caller.
-#
-# The set of defined variables is at the end of this script.
-
-# Known limitations:
-# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
-#   than 256 bytes, otherwise the compiler driver will dump core. The only
-#   known workaround is to choose shorter directory names for the build
-#   directory and/or the installation directory.
-
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-libext=a
-shrext=.so
-
-host="$1"
-host_cpu=`echo "$host" | sed 's/^$^-*$-$^-*$-$.*$$/\1/'`
-host_vendor=`echo "$host" | sed 's/^$^-*$-$^-*$-$.*$$/\2/'`
-host_os=`echo "$host" | sed 's/^$^-*$-$^-*$-$.*$$/\3/'`
-
-# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
-
-wl=
-if test "$GCC" = yes; then
-  wl='-Wl,'
-else
-  case "$host_os" in
-    aix*)
-      wl='-Wl,'
-      ;;
-    mingw* | pw32* | os2*)
-      ;;
-    hpux9* | hpux10* | hpux11*)
-      wl='-Wl,'
-      ;;
-    irix5* | irix6* | nonstopux*)
-      wl='-Wl,'
-      ;;
-    newsos6)
-      ;;
-    linux*)
-      case $CC in
-        icc|ecc)
-          wl='-Wl,'
-          ;;
-        ccc)
-          wl='-Wl,'
-          ;;
-      esac
-      ;;
-    osf3* | osf4* | osf5*)
-      wl='-Wl,'
-      ;;
-    sco3.2v5*)
-      ;;
-    solaris*)
-      wl='-Wl,'
-      ;;
-    sunos4*)
-      wl='-Qoption ld '
-      ;;
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      wl='-Wl,'
-      ;;
-    sysv4*MP*)
-      ;;
-    uts4*)
-      ;;
-  esac
-fi
-
-# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
-
-hardcode_libdir_flag_spec=
-hardcode_libdir_separator=
-hardcode_direct=no
-hardcode_minus_L=no
-
-case "$host_os" in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-esac
-
-ld_shlibs=yes
-if test "$with_gnu_ld" = yes; then
-  case "$host_os" in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-        ld_shlibs=no
-      fi
-      ;;
-    amigaos*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can use
-      # them.
-      ld_shlibs=no
-      ;;
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    cygwin* | mingw* | pw32*)
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    netbsd*)
-      ;;
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-        ld_shlibs=no
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    sunos4*)
-      hardcode_direct=yes
-      ;;
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-  esac
-  if test "$ld_shlibs" = yes; then
-    # Unlike libtool, we use -rpath here, not --rpath, since the documented
-    # option of GNU ld is called -rpath, not --rpath.
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-  fi
-else
-  case "$host_os" in
-    aix3*)
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes; then
-        # Neither direct hardcoding nor static linking is supported with a
-        # broken collect2.
-        hardcode_direct=unsupported
-      fi

libmp3splt-0.7.3.tar.gz/config.sub Deleted

@@ -1,1658 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
-
-timestamp='2008-01-16'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# 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
-# 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., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, 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.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 OPTION CPU-MFR-OPSYS
-       $0 OPTION ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 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."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^$.*$-$^-*-^-*$$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^$.*$-$^-*-^-*$$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-^-*$//'`
-    if  $basic_machine != $1 
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun234* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c123* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.4-9*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v4-9*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;

libmp3splt-0.7.3.tar.gz/depcomp Deleted

@@ -1,589 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2007-03-29.01
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 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
-# the Free Software Foundation; either version 2, 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, 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.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp --help --version PROGRAM ARGS
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  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.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-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
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|^\\/*$|'${DEPDIR-.deps}'/&|;s|\.$^.*$$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.$^.*$$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## 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.
-## 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
-## that the space means something, we add a space to the output as
-## well.
-## 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"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # 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
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # 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
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '

libmp3splt-0.7.3.tar.gz/doc/Doxyfile.in Deleted

@@ -1,1640 +0,0 @@
-# Doxyfile 1.7.2
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a hash (#) is considered a comment and will be ignored.
-# The format is:
-#       TAG = value value, ...
-# For lists items can also be appended using:
-#       TAG += value value, ...
-# Values that contain spaces should be placed between quotes (" ").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = libmp3splt
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER         =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       =
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = NO
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC    = YES
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = YES
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful if your file system
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF      = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF           = YES
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = YES
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 8
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL   = NO

libmp3splt-0.7.3.tar.gz/install-sh Deleted

@@ -1,519 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2006-12-25.00
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 OPTION... -T SRCFILE DSTFILE
-   or: $0 OPTION... SRCFILES... DIRECTORY
-   or: $0 OPTION... -t DIRECTORY SRCFILES...
-   or: $0 OPTION... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *''*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0

libmp3splt-0.7.3.tar.gz/missing Deleted

@@ -1,367 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2006-05-10.23
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-#   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
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, 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.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-sed_output='s/.* --output =$^ *$.*/\1/p'
-sed_minuso='s/.* -o $^ *$.*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 OPTION... PROGRAM ARGUMENT...
-
-Handle \`PROGRAM ARGUMENT...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.ch', if possible, from existing .ch
-  flex         create \`lex.yy.c', if possible, from existing .c
-  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
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# 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).
-case $1 in
-  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.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $1 in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^ *ACM_CONFIG_HEADER($^)*$).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^^:*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`

libmp3splt-0.7.3.tar.gz/mkinstalldirs Deleted

@@ -1,111 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs -h --help -m mode dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
-      exit 0
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-case $dirmode in
-  '')
-    if mkdir -p -- . 2>/dev/null; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    fi
-    ;;
-esac
-
-for file
-do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-  shift
-
-  pathcomp=
-  for d
-  do
-    pathcomp="$pathcomp$d"
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-  	errstatus=$lasterr
-      else
-  	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-    	  lasterr=""
-  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-  	  if test ! -z "$lasterr"; then
-  	    errstatus=$lasterr
-  	  fi
-  	fi
-      fi
-    fi
-
-    pathcomp="$pathcomp/"
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# End:
-# mkinstalldirs ends here

libmp3splt-0.7.3.tar.gz/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
-)
-

libmp3splt-0.7.3.tar.gz/po/libmp3splt.pot Deleted

@@ -1,635 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Munteanu Alexandru
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
-"POT-Creation-Date: 2012-08-27 22:29+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/mp3splt.c:845
-#, c-format
-msgid " info: resolving linked filename to '%s'\n"
-msgstr ""
-
-#: src/mp3splt.c:910
-#, c-format
-msgid " info: file matches the plugin '%s'\n"
-msgstr ""
-
-#: src/mp3splt.c:918
-#, c-format
-msgid " M3U file '%s' will be created.\n"
-msgstr ""
-
-#: src/mp3splt.c:939
-#, c-format
-msgid ""
-" Working with SILENCE AUTO-ADJUST (Threshold: %.1f dB Gap: %d sec Offset: "
-"%.2f)\n"
-msgstr ""
-
-#: src/mp3splt.c:1739 src/tags_parser.c:108
-msgid ""
-" warning: cannot set tags from filename regular expression - compiled "
-"without pcre support\n"
-msgstr ""
-
-#: src/checks.c:158
-msgid "directory does not exists"
-msgstr ""
-
-#: src/cddb.c:63
-#, c-format
-msgid " reading informations from CDDB file %s ...\n"
-msgstr ""
-
-#: src/cddb.c:125 src/cue.c:539
-#, c-format
-msgid ""
-"  Tracks: %d\n"
-"\n"
-msgstr ""
-
-#: src/cddb.c:259 src/cue.c:135
-#, c-format
-msgid ""
-"\n"
-"  Artist: %s\n"
-msgstr ""
-
-#: src/cddb.c:262 src/cue.c:139
-#, c-format
-msgid "  Album: %s\n"
-msgstr ""
-
-#: src/splt.c:154
-msgid " info: starting normal split\n"
-msgstr ""
-
-#: src/splt.c:251
-msgid " info: starting error mode split\n"
-msgstr ""
-
-#: src/splt.c:563
-msgid " info: starting time mode split\n"
-msgstr ""
-
-#: src/splt.c:582
-msgid " info: starting 'split in equal tracks' mode\n"
-msgstr ""
-
-#: src/splt.c:624
-#, c-format
-msgid " Trim silence split - Th: %.1f dB\n"
-msgstr ""
-
-#: src/splt.c:758
-#, c-format
-msgid "YES"
-msgstr ""
-
-#: src/splt.c:762
-#, c-format
-msgid "NO"
-msgstr ""
-
-#: src/splt.c:768
-#, c-format
-msgid "User"
-msgstr ""
-
-#: src/splt.c:772
-#, c-format
-msgid "Auto"
-msgstr ""
-
-#: src/splt.c:792
-#, c-format
-msgid ""
-" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: %s, "
-"Min track: %.2f, Shots: %d%s)\n"
-msgstr ""
-
-#: src/splt.c:818
-#, c-format
-msgid ""
-" Found silence log file '%s' ! Reading silence points from file to save "
-"time ;)\n"
-msgstr ""
-
-#: src/splt.c:847
-#, c-format
-msgid " Total silence points found: %d."
-msgstr ""
-
-#: src/splt.c:859
-#, c-format
-msgid " (Selected %d tracks)\n"
-msgstr ""
-
-#: src/splt.c:972
-#, c-format
-msgid " Writing silence log file '%s' ...\n"
-msgstr ""
-
-#: src/splt.c:1028
-msgid " info: starting silence mode split\n"
-msgstr ""
-
-#: src/splt.c:1076
-msgid " info: starting trim using silence mode split\n"
-msgstr ""
-
-#: src/splt.c:1123
-msgid " info: starting wrap mode split\n"
-msgstr ""
-
-#: src/utils.c:71
-#, c-format
-msgid " info: overlapping split files with %ld.%ld.%ld\n"
-msgstr ""
-
-#: src/cue.c:435
-#, c-format
-msgid " reading informations from CUE file %s ...\n"
-msgstr ""
-
-#: src/cue.c:487
-msgid "description here"
-msgstr ""
-
-#: src/cue.c:700
-#, c-format
-msgid " CUE file '%s' created.\n"
-msgstr ""
-
-#: src/audacity.c:237
-#, c-format
-msgid " reading informations from audacity labels file '%s' ...\n"
-msgstr ""
-
-#: src/errors.c:129
-msgid "Network error"
-msgstr ""
-
-#: src/errors.c:179
-msgid " warning: might be VBR, use frame mode"
-msgstr ""
-
-#: src/errors.c:181
-msgid " error mode ok"
-msgstr ""
-
-#: src/errors.c:183
-msgid " error: unknown sync error"
-msgstr ""
-
-#: src/errors.c:185
-msgid " no sync errors found"

libmp3splt-0.7.3.tar.gz/AUTHORS -> libmp3splt-0.8.2.tar.gz/AUTHORS Changed

libmp3splt-0.7.3.tar.gz/COPYING -> libmp3splt-0.8.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-1307  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
@@ -56,7 +56,7 @@
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    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
@@ -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
+                     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+            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
@@ -303,10 +303,9 @@
     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
-
+    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.
 
@@ -336,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.
+

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

@@ -2,9 +2,65 @@
 
 - C library error messages not translated on windows : won't fix
 
-libmp3splt version 0.7.3
+libmp3splt version 0.8.2
+-------------------------------------------------------------
+
+- added option to specify the input tags encoding for when writing ID3v2 tags
+(SPLT_OPT_INPUT_TAGS_ENCODING)
+- enable -O3 by default
+- added LIBMP3SPLT_MAJOR_VERSION, LIBMP3SPLT_MINOR_VERSION and LIBMP3SPLT_MICRO_VERSION
+(feature request #96)
+- added option SPLT_TAGS_ORIGINAL for mp3splt_tags_set 
+- added option to keep the original tags and just replace them when importing a CUE or CDDB file
+(SPLT_OPT_CUE_CDDB_ADD_TAGS_WITH_KEEP_ORIGINAL_TAGS) (feature request #95)
+- added 'split into memory' ability with a callback function for use with 'pretend to split'
+(feature request #94)
+- replaced mp3splt.m4 with pkg-config (bug #145)
+- corrected build files (configure.ac, Makefile.am, ...) and check using 'make distcheck' (bug #147)
+- fixed a lot of doxygen issues
+
+libmp3splt version 0.8.1a
 -------------------------------------------------------------
 
+- corrected ChangeLog file of 0.8.1 release
+- added minimal.c in the distribution for the doxygen documentation
+- added libmp3splt_ico.svg in the distribution for the doxygen documentation
+- added something in the empty_footer.html file to avoid doxygen segfault
+
+libmp3splt version 0.8.1
+-------------------------------------------------------------
+
+- fixed a bug - was crashing when removing tags from skippoints
+- added option to set output ID3v2 tags encoded in latin1, UTF-8 or UTF16
+- forgot to add 'empty_footer.html' in the distribution
+
+libmp3splt version 0.8
+-------------------------------------------------------------
+
+- rewritten libmp3splt public API to target future 1.0 stable release
+- written complete documentation of the public API
+- done issues #40 and #85 - added minimum silence length parameter for auto adjust
+- implemented back the proxy feature with basic authentification - feature #50
+- added option to generate exactly the same input tags bytes using @O
+- added minimum silence length for trim silence mode (minimum silence to trigger a trimming)
+- done issue #12 - added option to output the full silence log useful to plot a graph
+- enhanced the CUE export to export the tags as REM comments and also the splitpoint names
+- fixed bug when detecting the input tags version - output had no tags when the input only had ID3v1
+- 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
+- done issue #79 - added 0 to the number of digits to output in order to be able to support
+the old mp3splt output format
+- fixed bug #141 - when input file is a symlink and output directory is the one of the input file
+- amplitude more precise with ogg vorbis files
+- plugins are now installed in $(libdir)/libmp3splt$(SONAME) instead of $(libdir)/libmp3splt
+- fixed bug #131 - use /usr/lib64 instead of /usr/lib on x64 in mp3splt.m4
+- fixed bug #133 - updated GPLv2 COPYING file
+- fixed bug on mp3 trim silence scan: last frame was skipped
+- fixed bug #134 - use of deprecated gethostbyname()
+
+-------------------------------------------------------------
+libmp3splt version 0.7.3
+
 - added the trackjoin parameter for silence detection split: tracks shorter than trackjoin will be joined with others
 - fixed bug: removing TLEN id3v2 tag from the split files
 - fixed bug #3530488 - regression introduced with ogg multiple logical streams

libmp3splt-0.7.3.tar.gz/Makefile.am -> libmp3splt-0.8.2.tar.gz/Makefile.am Changed

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

@@ -54,13 +54,14 @@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
-	INSTALL NEWS TODO config.guess config.rpath config.sub depcomp \
-	install-sh libltdl/config/compile libltdl/config/config.guess \
+	$(srcdir)/libmp3splt.pc.in $(top_srcdir)/configure \
+	$(top_srcdir)/include/libmp3splt/version.h.in ABOUT-NLS \
+	AUTHORS COPYING ChangeLog INSTALL NEWS TODO \
+	libltdl/config/compile libltdl/config/config.guess \
 	libltdl/config/config.rpath libltdl/config/config.sub \
 	libltdl/config/depcomp libltdl/config/install-sh \
 	libltdl/config/ltmain.sh libltdl/config/missing \
-	libltdl/config/mkinstalldirs missing mkinstalldirs
+	libltdl/config/mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cutter.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -76,7 +77,7 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/libltdl/config/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = libmp3splt.pc include/libmp3splt/version.h
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
@@ -119,8 +120,8 @@
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(m4datadir)"
-DATA = $(m4data_DATA)
+am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
+DATA = $(pkgconfig_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -220,6 +221,9 @@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBLTDL = @LIBLTDL@
+LIBMP3SPLT_MAJOR_VERSION = @LIBMP3SPLT_MAJOR_VERSION@
+LIBMP3SPLT_MICRO_VERSION = @LIBMP3SPLT_MICRO_VERSION@
+LIBMP3SPLT_MINOR_VERSION = @LIBMP3SPLT_MINOR_VERSION@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -269,6 +273,7 @@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SONAME = @SONAME@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@@ -335,9 +340,9 @@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = src plugins test m4 po doc
-m4datadir = $(datadir)/aclocal
-m4data_DATA = mp3splt.m4
-EXTRA_DIST = mp3splt.m4 LIMITS autogen.sh debian/changelog debian/compat debian/control debian/copyright debian/dirs debian/docs debian/rules
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libmp3splt.pc
+EXTRA_DIST = LIMITS autogen.sh debian/changelog debian/compat debian/control debian/copyright debian/dirs debian/docs debian/rules
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -391,6 +396,10 @@
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
+libmp3splt.pc: $(top_builddir)/config.status $(srcdir)/libmp3splt.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+include/libmp3splt/version.h: $(top_builddir)/config.status $(top_srcdir)/include/libmp3splt/version.h.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -400,27 +409,27 @@
 
 distclean-libtool:
 	-rm -f libtool config.lt
-install-m4dataDATA: $(m4data_DATA)
+install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(m4data_DATA)'; test -n "$(m4datadir)" || list=; \
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(m4datadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(m4datadir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(m4datadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(m4datadir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
 	done
 
-uninstall-m4dataDATA:
+uninstall-pkgconfigDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(m4data_DATA)'; test -n "$(m4datadir)" || list=; \
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(m4datadir)'; $(am__uninstall_files_from_dir)
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -749,7 +758,7 @@
 all-am: Makefile $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(m4datadir)"; do \
+	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -804,7 +813,7 @@
 
 info-am:
 
-install-data-am: install-m4dataDATA
+install-data-am: install-pkgconfigDATA
 
 install-dvi: install-dvi-recursive
 
@@ -850,7 +859,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-m4dataDATA
+uninstall-am: uninstall-pkgconfigDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
 	ctags-recursive install-am install-strip tags-recursive
@@ -864,13 +873,13 @@
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-m4dataDATA install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-m4dataDATA
+	uninstall uninstall-am uninstall-pkgconfigDATA
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

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

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

libmp3splt-0.7.3.tar.gz/TODO -> libmp3splt-0.8.2.tar.gz/TODO Changed

libmp3splt-0.7.3.tar.gz/config.h.in -> libmp3splt-0.8.2.tar.gz/config.h.in Changed

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

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libmp3splt 0.7.3.
+# Generated by GNU Autoconf 2.69 for libmp3splt 0.8.2.
 #
-# Report bugs to <io_fx@yahoo.fr>.
+# Report bugs to <m@ioalex.net>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -274,11 +274,10 @@
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and io_fx@yahoo.fr
-$0: about your system, including any error possibly output
-$0: before this message. Then install a modern shell, or
-$0: manually run the script under such a shell if you do
-$0: have one."
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and m@ioalex.net about
+$0: your system, including any error possibly output before
+$0: this message. Then install a modern shell, or manually
+$0: run the script under such a shell if you do have one."
   fi
   exit 1
 fi
@@ -594,9 +593,9 @@
 # Identity of this package.
 PACKAGE_NAME='libmp3splt'
 PACKAGE_TARNAME='libmp3splt'
-PACKAGE_VERSION='0.7.3'
-PACKAGE_STRING='libmp3splt 0.7.3'
-PACKAGE_BUGREPORT='io_fx@yahoo.fr'
+PACKAGE_VERSION='0.8.2'
+PACKAGE_STRING='libmp3splt 0.8.2'
+PACKAGE_BUGREPORT='m@ioalex.net'
 PACKAGE_URL=''
 
 # Factoring default headers for most tests.
@@ -660,6 +659,8 @@
 PKG_CONFIG
 HAS_CUTTER_FALSE
 HAS_CUTTER_TRUE
+FLAC_PLUGIN_FALSE
+FLAC_PLUGIN_TRUE
 VORBISENC_LIBS
 VORBISFILE_LIBS
 VORBIS_LIBS
@@ -718,6 +719,7 @@
 OBJDUMP
 DLLTOOL
 AS
+SONAME
 POSUB
 LTLIBINTL
 LIBINTL
@@ -759,6 +761,9 @@
 LDFLAGS
 CFLAGS
 CC
+LIBMP3SPLT_MICRO_VERSION
+LIBMP3SPLT_MINOR_VERSION
+LIBMP3SPLT_MAJOR_VERSION
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -1429,7 +1434,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libmp3splt 0.7.3 to adapt to many kinds of systems.
+\`configure' configures libmp3splt 0.8.2 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1499,7 +1504,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libmp3splt 0.7.3:";;
+     short | recursive ) echo "Configuration of libmp3splt 0.8.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1520,7 +1525,7 @@
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-ltdl-install   install libltdl
   --enable-c-debug        Enable debugging symbols.
-  --enable-optimise       Enable O2 optimise.
+  --disable-optimise      Disable O3 optimise.
   --enable-extra-warnings Enable extra warnings.
   --enable-win            Enable if compiling on windows with mingw.
   --disable-mp3           Disable mp3 plugin.
@@ -1599,7 +1604,7 @@
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <io_fx@yahoo.fr>.
+Report bugs to <m@ioalex.net>.
 _ACEOF
 ac_status=$?
 fi
@@ -1662,7 +1667,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libmp3splt configure 0.7.3
+libmp3splt configure 0.8.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1821,9 +1826,9 @@
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ----------------------------- ##
-## Report this to io_fx@yahoo.fr ##
-## ----------------------------- ##"
+( $as_echo "## --------------------------- ##
+## Report this to m@ioalex.net ##
+## --------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
@@ -2131,7 +2136,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libmp3splt $as_me 0.7.3, which was
+It was created by libmp3splt $as_me 0.8.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2945,8 +2950,8 @@
 
 
 # Define the identity of the package.
- PACKAGE=libmp3splt
- VERSION=0.7.3
+ PACKAGE='libmp3splt'
+ VERSION='0.8.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3012,6 +3017,13 @@
 
 
 
+LIBMP3SPLT_MAJOR_VERSION=0
+
+LIBMP3SPLT_MINOR_VERSION=8
+
+LIBMP3SPLT_MICRO_VERSION=2
+
+
 #################################################
 # Check for programs
 #################################################
@@ -6376,6 +6388,14 @@
 fi
 
 
+SONAME=0
+
+
+cat >>confdefs.h <<_ACEOF
+#define SPLT_SONAME "$SONAME"
+_ACEOF
+
+
 #################################################################
 # Enable libtool, check for libltdl and define @LIBLTDL@ and @INCLTDL@
 #################################################################
@@ -14917,18 +14937,18 @@
 fi
 
 if test "x$enable_c_debug" = xyes;then
-  CFLAGS="$CFLAGS -g"
+  CFLAGS="$CFLAGS -g -Wall"
 fi
 
 # Check whether --enable-optimise was given.
 if test "${enable_optimise+set}" = set; then :
   enableval=$enable_optimise; enable_optimise=$enableval
 else
-  enable_optimise="no"
+  enable_optimise="yes"
 fi
 
 if test "x$enable_optimise" = xyes;then
-  CFLAGS="$CFLAGS -O2"
+  CFLAGS="$CFLAGS -O3"
 fi
 
 # Check whether --enable-extra-warnings was given.
@@ -15875,6 +15895,32 @@
 
 fi

libmp3splt-0.7.3.tar.gz/configure.ac -> libmp3splt-0.8.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,8 @@
 #
 # 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,13 +33,27 @@
 # Basic initialisations 
 #################################################
 
-AC_PREREQ(2.62)
-AC_INIT(libmp3splt,0.7.3,io_fx@yahoo.fr)
+#inspired from gtk sources
+m4_define(libmp3splt_major_version, 0)
+m4_define(libmp3splt_minor_version, 8)
+m4_define(libmp3splt_micro_version, 2)
+m4_define(libmp3splt_version,
+          libmp3splt_major_version.libmp3splt_minor_version.libmp3splt_micro_version)
+
+AC_PREREQ(2.62)
+AC_INIT(libmp3splt,libmp3splt_version,m@ioalex.net)
 AC_CONFIG_AUX_DIR(libltdl/config)
-AM_INIT_AUTOMAKE(libmp3splt, 0.7.3)
+AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS(config.h)
 AM_MAINTAINER_MODE(enable)
 
+LIBMP3SPLT_MAJOR_VERSION=libmp3splt_major_version
+AC_SUBST(LIBMP3SPLT_MAJOR_VERSION)
+LIBMP3SPLT_MINOR_VERSION=libmp3splt_minor_version
+AC_SUBST(LIBMP3SPLT_MINOR_VERSION)
+LIBMP3SPLT_MICRO_VERSION=libmp3splt_micro_version
+AC_SUBST(LIBMP3SPLT_MICRO_VERSION)
+
 #################################################
 # Check for programs
 #################################################
@@ -58,6 +73,10 @@
 AC_C_BIGENDIAN
 AC_C_CONST
 
+SONAME=0
+AC_SUBST(SONAME)
+AC_DEFINE_UNQUOTED(SPLT_SONAME, "$SONAME", library SONAME)
+
 #################################################################
 # Enable libtool, check for libltdl and define @LIBLTDL@ and @INCLTDL@
 #################################################################
@@ -112,13 +131,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. ) ,
-    enable_optimise=$enableval,enable_optimise="no")
+AC_ARG_ENABLE(optimise, AC_HELP_STRING(--disable-optimise, Disable O3 optimise. ) ,
+    enable_optimise=$enableval,enable_optimise="yes")
 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. ) ,
@@ -201,6 +220,25 @@
       AC_MSG_WARN(Vorbis not found! Will build without ogg/vorbis support.))
 fi
 
+
+#################################################################
+# Check flac plugin libraries
+#################################################################
+
+#flac disabled for this release because not stable enough
+#check for --disable-flac & flac libraries
+AM_CONDITIONAL(FLAC_PLUGIN,false)
+#flac="no" 
+#AC_ARG_ENABLE(flac, AC_HELP_STRING(--disable-flac, Disable flac plugin. ) ,
+#    enable_flac_plugin=$enableval,enable_flac_plugin="yes")
+#
+#if test "x$enable_flac_plugin" = xyes;then
+#  PKG_PROG_PKG_CONFIG
+#  PKG_CHECK_MODULES(FLAC, flac >= 1.2.1,
+#      AM_CONDITIONAL(FLAC_PLUGIN, true) flac="yes" ,
+#      AC_MSG_WARN(libFLAC is not found. Will build without flac support.))
+#fi
+
 #################################################################
 # Check for cutter
 #################################################################
@@ -283,14 +321,15 @@
 
 echo
 echo "---------------------------------------------------------"
-echo "Configuration:"
+echo "Configuration for libmp3splt version "libmp3splt_version" :"
 echo
 echo "    install path:            $prefix"
 echo
 echo " Plugins :"
 echo
-echo "    libmad (.mp3 format)                                    $mp3"
-echo "    libogg, libvorbis (.ogg/vorbis format)                  $ogg"
+echo "    libmad (mp3 format)                                    $mp3"
+echo "    libogg, libvorbis (ogg/vorbis format)                  $ogg"
+#echo "    libFLAC (flac format)                                  $flac"
 echo
 echo " Other :"
 echo
@@ -315,6 +354,18 @@
 # Generate Makefile
 #################################################
 
-AC_CONFIG_FILES(Makefile src/Makefile po/Makefile.in plugins/Makefile test/Makefile m4/Makefile doc/Makefile)
+AC_CONFIG_FILES(Makefile
+libmp3splt.pc
+src/Makefile
+po/Makefile.in
+plugins/Makefile
+test/Makefile
+m4/Makefile
+doc/Makefile
+doc/Doxyfile_all
+doc/Doxyfile_api
+doc/examples/Makefile
+include/libmp3splt/version.h)
+
 AC_OUTPUT

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

libmp3splt-0.7.3.tar.gz/debian/control -> libmp3splt-0.8.2.tar.gz/debian/control Changed

@@ -29,6 +29,27 @@
  This package contains the files needed to build programs against
  libmp3splt.
 
+Package: libmp3splt-doc
+Section: libdevel
+Architecture: any
+Conflicts: libmp3splt
+Replaces: libmp3splt
+Depends:
+Description: documentation for libmp3splt
+ Mp3Splt-project is a utility to split mp3 and ogg files selecting a
+ begin and an end time position, without decoding. It's very useful to
+ split large mp3/ogg to make smaller files or to split entire albums to
+ obtain original tracks. If you want to split an album, you can select
+ split points and filenames manually or you can get them automatically
+ from CDDB (internet or a local file) or from .cue files. Supports also
+ automatic silence split, that can be used also to adjust cddb/cue
+ splitpoints. You can extract tracks from Mp3Wrap or AlbumWrap files in
+ few seconds. For mp3 files, both ID3v1 & ID3v2 tags are
+ supported. Mp3splt-project is split in 3 parts: libmp3splt, mp3splt
+ and mp3splt-gtk.
+ .
+ This package contains the documentation of the libmp3splt library.
+
 Package: libmp3splt0-ogg
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, libmp3splt0 (= ${binary:Version})

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

libmp3splt-0.8.2.tar.gz/doc/Doxyfile_all.in Added

@@ -0,0 +1,1785 @@
+# Doxyfile 1.8.1.2
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a hash (#) is considered a comment and will be ignored.
+# The format is:
+#       TAG = value value, ...
+# For lists items can also be appended using:
+#       TAG += value value, ...
+# Values that contain spaces should be placed between quotes (" ").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
+
+PROJECT_NAME           = libmp3splt
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER=@VERSION@
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "Lossless library for splitting audio formats like mp3 and ogg vorbis."
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO           = @top_srcdir@/doc/libmp3splt_ico.svg
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       =
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = NO
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    = YES
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH        = @top_srcdir@
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful if your file system
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = YES
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding

libmp3splt-0.8.2.tar.gz/doc/Doxyfile_api.in Added

@@ -0,0 +1,1785 @@
+# Doxyfile 1.8.1.2
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a hash (#) is considered a comment and will be ignored.
+# The format is:
+#       TAG = value value, ...
+# For lists items can also be appended using:
+#       TAG += value value, ...
+# Values that contain spaces should be placed between quotes (" ").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
+
+PROJECT_NAME           = libmp3splt
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER=@VERSION@
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "Lossless library for splitting audio formats like mp3 and ogg vorbis."
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO           = @top_srcdir@/doc/libmp3splt_ico.svg
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       =
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = NO
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    = YES
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH        = @top_srcdir@
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful if your file system
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = YES
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding

libmp3splt-0.7.3.tar.gz/doc/Makefile.am -> libmp3splt-0.8.2.tar.gz/doc/Makefile.am Changed

@@ -1,33 +1,57 @@
-EXTRA_DIST = Doxyfile.in
+SUBDIRS = examples
+
+EXTRA_DIST = Doxyfile_all.in Doxyfile_api.in empty_footer.html libmp3splt_ico.svg
 
 if HAVE_DOXYGEN
-html: doc
+html: api_doc
 
 doc: doxyfile.temp
 
+api_doc: doxyfile_api.temp
+
+BUILD_DOC_DIR=$(top_builddir)/doc
+
+doxyfile_api.temp:
+	cat $(BUILD_DOC_DIR)/Doxyfile_api > $(BUILD_DOC_DIR)/Doxyfile
+if HAVE_GRAPHVIZ
+	echo "HAVE_DOT = YES" >> $(BUILD_DOC_DIR)/Doxyfile
+else
+	echo "HAVE_DOT = NO" >> $(BUILD_DOC_DIR)/Doxyfile
+endif
+	@echo "Running doxygen to generate the API documentation"
+	doxygen
+	echo temporary > $(BUILD_DOC_DIR)/doxyfile.temp
+
 doxyfile.temp:
-	cat Doxyfile.in >Doxyfile
+	cat $(BUILD_DOC_DIR)/Doxyfile_all > $(BUILD_DOC_DIR)/Doxyfile
 if HAVE_GRAPHVIZ
-	echo "HAVE_DOT = YES" >> Doxyfile
+	echo "HAVE_DOT = YES" >> $(BUILD_DOC_DIR)/Doxyfile
 else
-	echo "HAVE_DOT = NO" >> Doxyfile
+	echo "HAVE_DOT = NO" >> $(BUILD_DOC_DIR)/Doxyfile
 endif
-	echo "STRIP_FROM_PATH = $(top_builddir)" >> Doxyfile
 	@echo "Running doxygen to generate the code documentation"
 	doxygen
-	echo temporary > doxyfile.temp
+	echo temporary > $(BUILD_DOC_DIR)/doxyfile.temp
 
-CLEANFILES=doxyfile.temp
+CLEANFILES=$(BUILD_DOC_DIR)/doxyfile.temp $(BUILD_DOC_DIR)/doxyfile_api.temp \
+$(BUILD_DOC_DIR)/Doxyfile
 
 all-local: html 
 
 clean-local:
-	-rm -f $(top_srcdir)/doc/doxygen/*.html
-	-rm -f $(top_srcdir)/doc/doxygen/*.png
-	-rm -f $(top_srcdir)/doc/doxygen/*.md5
-	-rm -f $(top_srcdir)/doc/doxygen/*.map
-	-rm -f $(top_srcdir)/doc/doxygen/*.js
-	-rm -f $(top_srcdir)/doc/doxygen/*.css
+	-rm -f $(top_builddir)/doc/doxygen/search/*.css
+	-rm -f $(top_builddir)/doc/doxygen/search/*.html
+	-rm -f $(top_builddir)/doc/doxygen/search/*.js
+	-rm -f $(top_builddir)/doc/doxygen/search/*.png
+	-rmdir $(top_builddir)/doc/doxygen/search
+	-rm -f $(top_builddir)/doc/doxygen/*.html
+	-rm -f $(top_builddir)/doc/doxygen/*.png
+	-rm -f $(top_builddir)/doc/doxygen/*.md5
+	-rm -f $(top_builddir)/doc/doxygen/*.map
+	-rm -f $(top_builddir)/doc/doxygen/*.js
+	-rm -f $(top_builddir)/doc/doxygen/*.css
+	-rm -f $(top_builddir)/doc/doxygen/*.svg
+	-rmdir $(top_builddir)/doc/doxygen
 
 doxygen_target_dir=$(DESTDIR)$(docdir)/doxygen
 
@@ -39,14 +63,26 @@
 	-$(INSTALL_DATA) doxygen/*.map $(doxygen_target_dir)
 	-$(INSTALL_DATA) doxygen/*.js $(doxygen_target_dir)
 	-$(INSTALL_DATA) doxygen/*.css $(doxygen_target_dir)
+	-$(INSTALL_DATA) doxygen/*.svg $(doxygen_target_dir)
+	-$(MKDIR_P) $(doxygen_target_dir)/search
+	-$(INSTALL_DATA) doxygen/search/*.css $(doxygen_target_dir)/search
+	-$(INSTALL_DATA) doxygen/search/*.html $(doxygen_target_dir)/search
+	-$(INSTALL_DATA) doxygen/search/*.js $(doxygen_target_dir)/search
+	-$(INSTALL_DATA) doxygen/search/*.png $(doxygen_target_dir)/search
 
 uninstall-local:
-	-rm -f $(doxygen_target_dir)/*.html
-	-rm -f $(doxygen_target_dir)/*.png
-	-rm -f $(doxygen_target_dir)/*.md5
-	-rm -f $(doxygen_target_dir)/*.map
-	-rm -f $(doxygen_target_dir)/*.js
-	-rm -f $(doxygen_target_dir)/*.css
+	-rm $(doxygen_target_dir)/search/*.css
+	-rm $(doxygen_target_dir)/search/*.html
+	-rm $(doxygen_target_dir)/search/*.js
+	-rm $(doxygen_target_dir)/search/*.png
+	-rmdir $(doxygen_target_dir)/search
+	-rm $(doxygen_target_dir)/*.html
+	-rm $(doxygen_target_dir)/*.png
+	-rm $(doxygen_target_dir)/*.md5
+	-rm $(doxygen_target_dir)/*.map
+	-rm $(doxygen_target_dir)/*.js
+	-rm $(doxygen_target_dir)/*.css
+	-rm $(doxygen_target_dir)/*.svg
 	-rmdir $(doxygen_target_dir)
 
 else

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

@@ -51,7 +51,8 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Doxyfile_all.in $(srcdir)/Doxyfile_api.in \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cutter.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -65,16 +66,56 @@
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/libltdl/config/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = Doxyfile_all Doxyfile_api
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$^/*$/.*$$,\1,'; \
+  sed_rest='s,^^/*/*,,'; \
+  sed_last='s,^.*/$^/*$$$,\1,'; \
+  sed_butlast='s,/*^/*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -126,6 +167,9 @@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBLTDL = @LIBLTDL@
+LIBMP3SPLT_MAJOR_VERSION = @LIBMP3SPLT_MAJOR_VERSION@
+LIBMP3SPLT_MICRO_VERSION = @LIBMP3SPLT_MICRO_VERSION@
+LIBMP3SPLT_MINOR_VERSION = @LIBMP3SPLT_MINOR_VERSION@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -175,6 +219,7 @@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SONAME = @SONAME@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@@ -239,10 +284,14 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = Doxyfile.in
-@HAVE_DOXYGEN_TRUE@CLEANFILES = doxyfile.temp
+SUBDIRS = examples
+EXTRA_DIST = Doxyfile_all.in Doxyfile_api.in empty_footer.html libmp3splt_ico.svg
+@HAVE_DOXYGEN_TRUE@BUILD_DOC_DIR = $(top_builddir)/doc
+@HAVE_DOXYGEN_TRUE@CLEANFILES = $(BUILD_DOC_DIR)/doxyfile.temp $(BUILD_DOC_DIR)/doxyfile_api.temp \
+@HAVE_DOXYGEN_TRUE@$(BUILD_DOC_DIR)/Doxyfile
+
 @HAVE_DOXYGEN_TRUE@doxygen_target_dir = $(DESTDIR)$(docdir)/doxygen
-all: all-am
+all: all-recursive
 
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -275,18 +324,151 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+Doxyfile_all: $(top_builddir)/config.status $(srcdir)/Doxyfile_all.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+Doxyfile_api: $(top_builddir)/config.status $(srcdir)/Doxyfile_api.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --!k*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --!k*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
 tags: TAGS
-TAGS:

libmp3splt-0.8.2.tar.gz/doc/empty_footer.html Added

libmp3splt-0.8.2.tar.gz/doc/examples Added

libmp3splt-0.8.2.tar.gz/doc/examples/Makefile.am Added

libmp3splt-0.8.2.tar.gz/doc/examples/Makefile.in Added

@@ -0,0 +1,439 @@
+# 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 = doc/examples
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/cutter.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/id3.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/mad.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/vorbis.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/libltdl/config/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@
+AR = @AR@
+ARGZ_H = @ARGZ_H@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CUTTER = @CUTTER@
+CUTTER_CFLAGS = @CUTTER_CFLAGS@
+CUTTER_LIBS = @CUTTER_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GMSGFMT = @GMSGFMT@
+GRAPHVIZ = @GRAPHVIZ@
+GREP = @GREP@
+ID3_CFLAGS = @ID3_CFLAGS@
+ID3_LIBS = @ID3_LIBS@
+INCLTDL = @INCLTDL@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBLTDL = @LIBLTDL@
+LIBMP3SPLT_MAJOR_VERSION = @LIBMP3SPLT_MAJOR_VERSION@
+LIBMP3SPLT_MICRO_VERSION = @LIBMP3SPLT_MICRO_VERSION@
+LIBMP3SPLT_MINOR_VERSION = @LIBMP3SPLT_MINOR_VERSION@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
+LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
+MAD_CFLAGS = @MAD_CFLAGS@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+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@
+PCRE_CFLAGS = @PCRE_CFLAGS@
+PCRE_LIBS = @PCRE_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SONAME = @SONAME@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBISENC_LIBS = @VORBISENC_LIBS@
+VORBISFILE_LIBS = @VORBISFILE_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@

libmp3splt-0.8.2.tar.gz/doc/examples/minimal.c Added

@@ -0,0 +1,100 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <libmp3splt/mp3splt.h>
+
+static void print_confirmation_and_exit_if_error(splt_state *state, splt_code error);
+static void print_message_from_library(const char *message, splt_message_type type, void *data);
+static void print_split_filename(const char *filename, void *data);
+
+//Main program
+//Please note that not all errors are handled in this example.
+//Compile with:
+//    $ gcc minimal.c -o minimal -lmp3splt
+int main(int argc, char *argv)
+{
+  if (argc != 2)
+  {
+    fprintf(stderr, "Please provide the input file to be split as the first argument.\n");
+    fflush(stderr);
+    return EXIT_FAILURE;
+  }
+
+  splt_code error = SPLT_OK;
+
+  //initialisation of the main state
+  splt_state *state = mp3splt_new_state(NULL);
+
+  //register callback functions
+  mp3splt_set_message_function(state, print_message_from_library, NULL);
+  mp3splt_set_split_filename_function(state, print_split_filename, NULL);
+
+  //look for the available plugins
+  error = mp3splt_find_plugins(state);
+  print_confirmation_and_exit_if_error(state, error);
+
+  //set the input filename to be split
+  mp3splt_set_filename_to_split(state, argv1);
+
+  //append two splitpoints
+  splt_point *first_point = mp3splt_point_new(0, NULL);
+  mp3splt_append_splitpoint(state, first_point);
+  splt_point *second_point = mp3splt_point_new(100 * 60 * 1, NULL);
+  mp3splt_append_splitpoint(state, second_point);
+
+  //do the effective split
+  error = mp3splt_split(state);
+  print_confirmation_and_exit_if_error(state, error);
+
+  //free the memory of the main state
+  mp3splt_free_state(state);
+
+  return EXIT_SUCCESS;
+}
+
+//Callback function that handles error code from libmp3splt.
+static void print_confirmation_and_exit_if_error(splt_state *state, splt_code error)
+{
+  char *message = mp3splt_get_strerror(state, error);
+  if (!message)
+  {
+    return;
+  }
+
+  if (error < 0)
+  {
+    fprintf(stderr, "%s\n", message);
+    fflush(stderr);
+    mp3splt_free_state(state);
+    exit(1);
+  }
+  else
+  {
+    fprintf(stdout, "%s\n", message);
+    fflush(stdout);
+  }
+
+  free(message);
+}
+
+//Callback function printing any messages from libmp3splt.
+static void print_message_from_library(const char *message, splt_message_type type, void *data)
+{
+  if (type == SPLT_MESSAGE_INFO)
+  {
+    fprintf(stdout, message);
+    fflush(stdout);
+    return;
+  }
+
+  fprintf(stderr, message);
+  fflush(stderr);
+}
+
+//Callback function printing the created filenames.
+static void print_split_filename(const char *filename, void *data)
+{
+  fprintf(stdout, "   %s created.\n", filename);
+  fflush(stdout);
+}
+

libmp3splt-0.8.2.tar.gz/doc/libmp3splt_ico.svg Added

@@ -0,0 +1,391 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="icon.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4222">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.112;"
+         offset="0"
+         id="stop4224" />
+      <stop
+         style="stop-color:#55ddff;stop-opacity:0.32800001;"
+         offset="1"
+         id="stop4226" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3828">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop3830" />
+      <stop
+         style="stop-color:#ffdc00;stop-opacity:1;"
+         offset="1"
+         id="stop3832" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3808">
+      <stop
+         id="stop3810"
+         offset="0"
+         style="stop-color:#16271f;stop-opacity:1;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0.39056605"
+         id="stop3812" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.5"
+         id="stop3814" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0.55000001"
+         id="stop3816" />
+      <stop
+         id="stop3818"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3759">
+      <stop
+         style="stop-color:#16271f;stop-opacity:1;"
+         offset="0"
+         id="stop3761" />
+      <stop
+         id="stop3773"
+         offset="0.40000001"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop3767"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3771"
+         offset="0.55000001"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop3763" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3808"
+       id="linearGradient3954"
+       gradientUnits="userSpaceOnUse"
+       x1="273.62683"
+       y1="443.06738"
+       x2="330.37317"
+       y2="419.65698"
+       gradientTransform="matrix(0.78688525,0,0,0.84210526,20.762182,80.567982)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3808-8"
+       id="linearGradient3954-9"
+       gradientUnits="userSpaceOnUse"
+       x1="273.62683"
+       y1="443.06738"
+       x2="330.37317"
+       y2="419.65698"
+       gradientTransform="matrix(0.78688525,0,0,0.84210526,20.762182,80.567982)" />
+    <linearGradient
+       id="linearGradient3808-8">
+      <stop
+         id="stop3810-1"
+         offset="0"
+         style="stop-color:#16271f;stop-opacity:1;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0.39056605"
+         id="stop3812-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.5"
+         id="stop3814-9" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0.55000001"
+         id="stop3816-8" />
+      <stop
+         id="stop3818-9"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="419.65698"
+       x2="330.37317"
+       y1="442.15625"
+       x1="272.99283"
+       gradientTransform="matrix(0.73886599,-0.27395797,0.2513644,0.66163649,-11.108639,226.24127)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3988"
+       xlink:href="#linearGradient3808-8"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3808-3"
+       id="linearGradient3954-4"
+       gradientUnits="userSpaceOnUse"
+       x1="273.62683"
+       y1="443.06738"
+       x2="330.37317"
+       y2="419.65698"
+       gradientTransform="matrix(0.78688525,0,0,0.84210526,20.762182,80.567982)" />
+    <linearGradient
+       id="linearGradient3808-3">
+      <stop
+         id="stop3810-7"
+         offset="0"
+         style="stop-color:#16271f;stop-opacity:1;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0.39056605"
+         id="stop3812-3" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.5"
+         id="stop3814-6" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0.55000001"
+         id="stop3816-1" />
+      <stop
+         id="stop3818-8"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3808-6"
+       id="linearGradient3954-5"
+       gradientUnits="userSpaceOnUse"
+       x1="273.62683"
+       y1="443.06738"
+       x2="330.37317"
+       y2="419.65698"
+       gradientTransform="matrix(0.78688525,0,0,0.84210526,20.762182,80.567982)" />
+    <linearGradient
+       id="linearGradient3808-6">
+      <stop
+         id="stop3810-5"
+         offset="0"
+         style="stop-color:#16271f;stop-opacity:1;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0.39056605"
+         id="stop3812-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.5"
+         id="stop3814-4" />
+      <stop

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

@@ -1,10 +1,12 @@
 /**********************************************************
  *
- * libmp3splt -- library based on mp3splt,
+ * libmp3splt -- library based on mp3splt v2.1c,
  *               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
+ *
+ * And others ... see the AUTHORS file provided with libmp3splt source.
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,859 +26,83 @@
  *
  * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
 
-#ifndef MP3SPLT_MP3SPLT_H
-
-#include <sys/types.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-//libtool 1.4e is buggy on mingw if we include ltdl.h
-#ifndef __WIN32__
-#include <ltdl.h>
-#endif
-
 /**
- * @file  mp3splt.h
- * 
- * @brief Main types, error codes and confirmations.
+ * \file mp3splt.h
  * 
- * This is the main file containing the most important types, error
- * codes and confirmations
- *
- * The errors are negative values, the warnings and the confirmations
- * are positive values
- */
-
-/**
- * @brief True value
- */
-#define SPLT_TRUE 1
-/**
- * @brief False value
- */
-#define SPLT_FALSE 0
-
-/******************************/
-/* Structures for the freedb  */
-
-/**
- * @brief Defines one search result from the freedb search
- *
- * @see splt_freedb_results
- * @see mp3splt_get_freedb_search
- */
-typedef struct {
-  /**
-   * @brief Name of the album for this result
-   */
-  char *name;
-  /**
-   * @brief Unique identifier for this result
-   */
-  int id;
-  /**
-   * @brief How many revisions this result has
-   *
-   * If having revisions, the unique identifier for a revision is
-   * #id + revision + 1, with 0 <= revision < #revision_number\n
-   */
-  int revision_number;
-  /**
-   * @brief Contains the revisions of the result
-   * 
-   * The #revisions table contains #revision_number elements,
-   * the consecutive numbers starting at 2 (you might not need it)
-   */
-  int *revisions;
-} splt_freedb_one_result;
-
-/**
- * @brief All the freedb search results
- *
- * @see splt_freedb_one_result
- * @see mp3splt_get_freedb_search
- */
-typedef struct {
-  /**
-   * @brief All the freedb results
-   */
-  splt_freedb_one_result *results;
-  /**
-   * @brief How many results we have
-   */
-  int number;
-} splt_freedb_results;
-
-/**
- * @brief Maximum results for the freedb search
+ * \brief libmp3splt API 
  */
-#define SPLT_MAXCD 512
-
-//maximum length of the disc id
-#define SPLT_DISCIDLEN 8
-
-//structure for the freedb search
-struct splt_cd {
-  char discidSPLT_DISCIDLEN+1;
-  char category20;
-};
-
-typedef struct {
-  struct splt_cd discsSPLT_MAXCD;
-  int foundcd;
-} splt_cd_state;
-
-//structure containing everything used for the
-//freedb search
-typedef struct {
-  //we stock here the results of the freedb search
-  splt_freedb_results *search_results;
-  //we stock the state of the CD
-  //(for the freedb search)
-  splt_cd_state *cdstate;
-} splt_freedb;
-
-/******************************/
-/* Structures for the wrap    */
 
-/**
- * @brief The wrapped filenames found inside a file
- *
- * @see mp3splt_get_wrap_files
+/** \mainpage API documentation
+
+This is the documentation of the library that stands behind mp3splt (version >= 2.2) and mp3splt-gtk.\n
+Libmp3splt is licensed under the <a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General
+Public License version 2</a>.\n
+Source code and binaries can be found on the <a
+href="http://mp3splt.sourceforge.net/mp3splt_page/home.php">mp3splt-project home page</a>.\n
+
+Some of the library features include:
+ - losslessly split of mp3 (using <a href="http://www.underbit.com/products/mad/">libmad</a>) and
+   ogg vorbis (using <a href="http://xiph.org/vorbis/">libvorbis</a>) files
+ - extensibility to other audio formats using plugins
+ - querying tags from <a href="http://tracktype.org">tracktype.org</a>
+ - split on silences
+ - trim using silence detection
+ - split by a fixed time or equal time length
+ - CDDB, CUE, audacity labels import
+ - CUE export
+ - extract tracks created with <a href="http://mp3wrap.sourceforge.net">Mp3Wrap</a> or AlbumWrap
+
+In order to use the library in another project:
+- Start with the \ref splt_state_ section, continue with \ref splt_filepaths_ and
+  \ref splt_callback_ and then finish with \ref splt_splitpoints_ and \ref splt_split_.
+- A minimal example on how to use this library can be found in \ref minimal.c
+- For any other example or question, contact Alexandru Munteanu at m@ioalex.net.
+
+For writing a plugin to support other file type:
+- Look at the #splt_plugin_func from the \ref splt_plugin_api.
+
+A list of <a href="modules.html">all modules</a> is also available.
  */
-typedef struct {
-  /**
-   * @brief How many filenames we have
-   */
-  int wrap_files_num;
-  /**
-   * @brief The filenames
-   */
-  char **wrap_files;
-} splt_wrap;
-
-/************************************/
-/* Structures for the syncerrors    */
 
-/**
- * @brief The number of syncerrors
- *
- * @see mp3splt_get_syncerrors
+/** \example minimal.c
+ *  A minimal usage example.
  */
-typedef struct {

libmp3splt-0.8.2.tar.gz/include/libmp3splt/version.h Added

@@ -0,0 +1,49 @@
+/**********************************************************
+ *
+ * libmp3splt -- library based on mp3splt v2.1c,
+ *               for mp3/ogg splitting without decoding
+ *
+ * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
+ *
+ * And others ... see the AUTHORS file provided with libmp3splt source.
+ *
+ * http://mp3splt.sourceforge.net
+ *
+ *********************************************************/
+
+/**********************************************************
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *********************************************************/
+
+#ifndef MP3SPLT_VERSION_H
+
+/**
+ * @defgroup libmp3splt_version Versions
+@{
+ */
+
+#define LIBMP3SPLT_MAJOR_VERSION 0
+#define LIBMP3SPLT_MINOR_VERSION 8
+#define LIBMP3SPLT_MICRO_VERSION 2
+
+//@}
+
+#define MP3SPLT_VERSION_H
+#endif
+

libmp3splt-0.8.2.tar.gz/include/libmp3splt/version.h.in Added

@@ -0,0 +1,49 @@
+/**********************************************************
+ *
+ * libmp3splt -- library based on mp3splt v2.1c,
+ *               for mp3/ogg splitting without decoding
+ *
+ * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
+ *
+ * And others ... see the AUTHORS file provided with libmp3splt source.
+ *
+ * http://mp3splt.sourceforge.net
+ *
+ *********************************************************/
+
+/**********************************************************
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *********************************************************/
+
+#ifndef MP3SPLT_VERSION_H
+
+/**
+ * @defgroup libmp3splt_version Versions
+@{
+ */
+
+#define LIBMP3SPLT_MAJOR_VERSION @LIBMP3SPLT_MAJOR_VERSION@
+#define LIBMP3SPLT_MINOR_VERSION @LIBMP3SPLT_MINOR_VERSION@
+#define LIBMP3SPLT_MICRO_VERSION @LIBMP3SPLT_MICRO_VERSION@
+
+//@}
+
+#define MP3SPLT_VERSION_H
+#endif
+

libmp3splt-0.8.2.tar.gz/libmp3splt.pc.in Added

libmp3splt-0.7.3.tar.gz/m4/Makefile.am -> libmp3splt-0.8.2.tar.gz/m4/Makefile.am Changed

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

libmp3splt-0.7.3.tar.gz/m4/id3.m4 -> libmp3splt-0.8.2.tar.gz/m4/id3.m4 Changed

libmp3splt-0.7.3.tar.gz/m4/mad.m4 -> libmp3splt-0.8.2.tar.gz/m4/mad.m4 Changed

libmp3splt-0.7.3.tar.gz/plugins/Makefile.am -> libmp3splt-0.8.2.tar.gz/plugins/Makefile.am Changed

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

@@ -60,6 +60,9 @@
 
 #OGG plugin
 @OGG_PLUGIN_TRUE@am__append_5 = libsplt_ogg.la
+
+#FLAC plugin
+@FLAC_PLUGIN_TRUE@am__append_6 = libsplt_flac.la
 subdir = plugins
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -106,6 +109,22 @@
   }
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
+libsplt_flac_la_LIBADD =
+am__libsplt_flac_la_SOURCES_DIST = flac_frame_reader.c \
+	flac_frame_reader.h flac_utils.c flac_utils.h \
+	from_flac_library.c from_flac_library.h flac.c flac.h \
+	flac_metadata_utils.c flac_metadata_utils.h
+@FLAC_PLUGIN_TRUE@am_libsplt_flac_la_OBJECTS =  \
+@FLAC_PLUGIN_TRUE@	libsplt_flac_la-flac_frame_reader.lo \
+@FLAC_PLUGIN_TRUE@	libsplt_flac_la-flac_utils.lo \
+@FLAC_PLUGIN_TRUE@	libsplt_flac_la-from_flac_library.lo \
+@FLAC_PLUGIN_TRUE@	libsplt_flac_la-flac.lo \
+@FLAC_PLUGIN_TRUE@	libsplt_flac_la-flac_metadata_utils.lo
+libsplt_flac_la_OBJECTS = $(am_libsplt_flac_la_OBJECTS)
+libsplt_flac_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libsplt_flac_la_LDFLAGS) $(LDFLAGS) -o $@
+@FLAC_PLUGIN_TRUE@am_libsplt_flac_la_rpath = -rpath $(plugindir)
 libsplt_mp3_la_DEPENDENCIES =
 am__libsplt_mp3_la_SOURCES_DIST = mp3.c mp3.h mp3_silence.c \
 	mp3_silence.h mp3_utils.c mp3_utils.h silence_processors.c \
@@ -147,8 +166,10 @@
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(libsplt_mp3_la_SOURCES) $(libsplt_ogg_la_SOURCES)
-DIST_SOURCES = $(am__libsplt_mp3_la_SOURCES_DIST) \
+SOURCES = $(libsplt_flac_la_SOURCES) $(libsplt_mp3_la_SOURCES) \
+	$(libsplt_ogg_la_SOURCES)
+DIST_SOURCES = $(am__libsplt_flac_la_SOURCES_DIST) \
+	$(am__libsplt_mp3_la_SOURCES_DIST) \
 	$(am__libsplt_ogg_la_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
@@ -209,6 +230,9 @@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBLTDL = @LIBLTDL@
+LIBMP3SPLT_MAJOR_VERSION = @LIBMP3SPLT_MAJOR_VERSION@
+LIBMP3SPLT_MICRO_VERSION = @LIBMP3SPLT_MICRO_VERSION@
+LIBMP3SPLT_MINOR_VERSION = @LIBMP3SPLT_MINOR_VERSION@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -258,6 +282,7 @@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SONAME = @SONAME@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@@ -322,13 +347,13 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-plugindir = $(libdir)/libmp3splt
-plugin_LTLIBRARIES = $(am__append_2) $(am__append_5)
+plugindir = $(libdir)/libmp3splt$(SONAME)
+plugin_LTLIBRARIES = $(am__append_2) $(am__append_5) $(am__append_6)
 
 #ccommon_LDFLAGS = -module -export-dynamic -avoid-version
 common_CPPFLAGS = -I$(top_srcdir)/include/libmp3splt -I$(top_srcdir)/src
 common_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs \
-	-L/lib -no-undefined -lm -lmp3splt @LIBINTL@ $(am__append_1)
+	-no-undefined -lm -lmp3splt @LIBINTL@ $(am__append_1)
 @MP3_PLUGIN_TRUE@libsplt_mp3_la_SOURCES = mp3.c mp3.h mp3_silence.c mp3_silence.h mp3_utils.c mp3_utils.h \
 @MP3_PLUGIN_TRUE@silence_processors.c silence_processors.h
 
@@ -341,6 +366,11 @@
 
 @OGG_PLUGIN_TRUE@libsplt_ogg_la_CPPFLAGS = $(common_CPPFLAGS) @OGG_CFLAGS@ @VORBIS_CFLAGS@
 @OGG_PLUGIN_TRUE@libsplt_ogg_la_LDFLAGS = $(common_LDFLAGS) @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ 
+@FLAC_PLUGIN_TRUE@libsplt_flac_la_SOURCES = flac_frame_reader.c flac_frame_reader.h flac_utils.c flac_utils.h \
+@FLAC_PLUGIN_TRUE@from_flac_library.c from_flac_library.h flac.c flac.h flac_metadata_utils.c flac_metadata_utils.h
+
+@FLAC_PLUGIN_TRUE@libsplt_flac_la_CPPFLAGS = $(common_CPPFLAGS) @FLAC_CFLAGS@
+@FLAC_PLUGIN_TRUE@libsplt_flac_la_LDFLAGS = $(common_LDFLAGS) @FLAC_LIBS@
 all: all-am
 
 .SUFFIXES:
@@ -407,6 +437,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
+libsplt_flac.la: $(libsplt_flac_la_OBJECTS) $(libsplt_flac_la_DEPENDENCIES) $(EXTRA_libsplt_flac_la_DEPENDENCIES) 
+	$(libsplt_flac_la_LINK) $(am_libsplt_flac_la_rpath) $(libsplt_flac_la_OBJECTS) $(libsplt_flac_la_LIBADD) $(LIBS)
 libsplt_mp3.la: $(libsplt_mp3_la_OBJECTS) $(libsplt_mp3_la_DEPENDENCIES) $(EXTRA_libsplt_mp3_la_DEPENDENCIES) 
 	$(libsplt_mp3_la_LINK) $(am_libsplt_mp3_la_rpath) $(libsplt_mp3_la_OBJECTS) $(libsplt_mp3_la_LIBADD) $(LIBS)
 libsplt_ogg.la: $(libsplt_ogg_la_OBJECTS) $(libsplt_ogg_la_DEPENDENCIES) $(EXTRA_libsplt_ogg_la_DEPENDENCIES) 
@@ -418,6 +450,11 @@
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsplt_flac_la-flac.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsplt_flac_la-flac_frame_reader.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsplt_flac_la-flac_metadata_utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsplt_flac_la-flac_utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsplt_flac_la-from_flac_library.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsplt_mp3_la-mp3.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsplt_mp3_la-mp3_silence.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsplt_mp3_la-mp3_utils.Plo@am__quote@
@@ -449,6 +486,41 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+libsplt_flac_la-flac_frame_reader.lo: flac_frame_reader.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_flac_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsplt_flac_la-flac_frame_reader.lo -MD -MP -MF $(DEPDIR)/libsplt_flac_la-flac_frame_reader.Tpo -c -o libsplt_flac_la-flac_frame_reader.lo `test -f 'flac_frame_reader.c' || echo '$(srcdir)/'`flac_frame_reader.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libsplt_flac_la-flac_frame_reader.Tpo $(DEPDIR)/libsplt_flac_la-flac_frame_reader.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='flac_frame_reader.c' object='libsplt_flac_la-flac_frame_reader.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_flac_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsplt_flac_la-flac_frame_reader.lo `test -f 'flac_frame_reader.c' || echo '$(srcdir)/'`flac_frame_reader.c
+
+libsplt_flac_la-flac_utils.lo: flac_utils.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_flac_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsplt_flac_la-flac_utils.lo -MD -MP -MF $(DEPDIR)/libsplt_flac_la-flac_utils.Tpo -c -o libsplt_flac_la-flac_utils.lo `test -f 'flac_utils.c' || echo '$(srcdir)/'`flac_utils.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libsplt_flac_la-flac_utils.Tpo $(DEPDIR)/libsplt_flac_la-flac_utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='flac_utils.c' object='libsplt_flac_la-flac_utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_flac_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsplt_flac_la-flac_utils.lo `test -f 'flac_utils.c' || echo '$(srcdir)/'`flac_utils.c
+
+libsplt_flac_la-from_flac_library.lo: from_flac_library.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_flac_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsplt_flac_la-from_flac_library.lo -MD -MP -MF $(DEPDIR)/libsplt_flac_la-from_flac_library.Tpo -c -o libsplt_flac_la-from_flac_library.lo `test -f 'from_flac_library.c' || echo '$(srcdir)/'`from_flac_library.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libsplt_flac_la-from_flac_library.Tpo $(DEPDIR)/libsplt_flac_la-from_flac_library.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='from_flac_library.c' object='libsplt_flac_la-from_flac_library.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_flac_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsplt_flac_la-from_flac_library.lo `test -f 'from_flac_library.c' || echo '$(srcdir)/'`from_flac_library.c
+
+libsplt_flac_la-flac.lo: flac.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_flac_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsplt_flac_la-flac.lo -MD -MP -MF $(DEPDIR)/libsplt_flac_la-flac.Tpo -c -o libsplt_flac_la-flac.lo `test -f 'flac.c' || echo '$(srcdir)/'`flac.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libsplt_flac_la-flac.Tpo $(DEPDIR)/libsplt_flac_la-flac.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='flac.c' object='libsplt_flac_la-flac.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_flac_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsplt_flac_la-flac.lo `test -f 'flac.c' || echo '$(srcdir)/'`flac.c
+
+libsplt_flac_la-flac_metadata_utils.lo: flac_metadata_utils.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_flac_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsplt_flac_la-flac_metadata_utils.lo -MD -MP -MF $(DEPDIR)/libsplt_flac_la-flac_metadata_utils.Tpo -c -o libsplt_flac_la-flac_metadata_utils.lo `test -f 'flac_metadata_utils.c' || echo '$(srcdir)/'`flac_metadata_utils.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libsplt_flac_la-flac_metadata_utils.Tpo $(DEPDIR)/libsplt_flac_la-flac_metadata_utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='flac_metadata_utils.c' object='libsplt_flac_la-flac_metadata_utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_flac_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsplt_flac_la-flac_metadata_utils.lo `test -f 'flac_metadata_utils.c' || echo '$(srcdir)/'`flac_metadata_utils.c
+
 libsplt_mp3_la-mp3.lo: mp3.c
 @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsplt_mp3_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsplt_mp3_la-mp3.lo -MD -MP -MF $(DEPDIR)/libsplt_mp3_la-mp3.Tpo -c -o libsplt_mp3_la-mp3.lo `test -f 'mp3.c' || echo '$(srcdir)/'`mp3.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libsplt_mp3_la-mp3.Tpo $(DEPDIR)/libsplt_mp3_la-mp3.Plo

libmp3splt-0.8.2.tar.gz/plugins/flac.c Added

@@ -0,0 +1,219 @@
+/**********************************************************
+ *
+ * libmp3splt flac plugin 
+ *
+ * Copyright (c) 2013 Alexandru Munteanu - <m@ioalex.net>
+ *
+ * http://mp3splt.sourceforge.net
+ *
+ *********************************************************/
+
+/**********************************************************
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *********************************************************/
+
+#include <string.h>
+
+#include "splt.h"
+
+#include "flac_metadata_utils.h"
+#include "flac.h"
+
+static void splt_flac_get_info(splt_state *state, FILE *file_input, splt_code *error);
+static splt_flac_state *splt_flac_info(FILE *in, splt_state *state, splt_code *error);
+static FILE *splt_flac_open_file_read(splt_state *state, const char *filename, splt_code *error);
+static splt_flac_state *splt_flac_state_new(splt_code *error);
+static void splt_flac_state_free(splt_flac_state *flacstate);
+
+void splt_pl_set_plugin_info(splt_plugin_info *info, int *error)
+{
+  info->version = 1.0;
+
+  info->name = malloc(40);
+  if (info->name == NULL)
+  {
+    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
+    return;
+  }
+  snprintf(info->name, 39, "flac (libflac)");
+
+  info->extension = malloc(strlen(SPLT_FLAC_EXT)+2);
+  if (info->extension == NULL)
+  {
+    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
+    return;
+  }
+  snprintf(info->extension, strlen(SPLT_FLAC_EXT)+1, SPLT_FLAC_EXT);
+
+  info->upper_extension = splt_su_convert(info->extension, SPLT_TO_UPPERCASE, error);
+}
+
+int splt_pl_check_plugin_is_for_file(splt_state *state, int *error)
+{
+  char *input_filename = splt_t_get_filename_to_split(state);
+
+  //TODO: stdin
+
+  FLAC__StreamMetadata stream_info;
+  if (!FLAC__metadata_get_streaminfo(input_filename, &stream_info))
+  {
+    splt_d_print_debug(state, "File %s is not a valid flac file.\n", input_filename);
+    return SPLT_FALSE;
+  }
+
+  splt_d_print_debug(state, "File %s is a valid flac file.\n", input_filename);
+
+  return SPLT_TRUE;
+}
+
+void splt_pl_init(splt_state *state, int *error)
+{
+  //TODO: stdin warning
+
+  char *input_filename = splt_t_get_filename_to_split(state);
+  FILE *file_input = splt_flac_open_file_read(state, input_filename, error);
+  if (file_input == NULL) { return; }
+
+  splt_flac_get_info(state, file_input, error);
+}
+
+void splt_pl_end(splt_state *state, int *error)
+{
+  splt_flac_state *flacstate = state->codec;
+  if (!flacstate) { return; }
+
+  //TODO: check stdin
+
+  splt_flac_state_free(flacstate);
+  state->codec = NULL;
+}
+
+double splt_pl_split(splt_state *state, const char *output_fname,
+    double begin_point, double end_point, int *error, int save_end_point) 
+{
+  splt_flac_state *flacstate = state->codec;
+
+  splt_flac_fr_read_and_write_frames(state, flacstate->fr, output_fname,
+      begin_point, end_point, save_end_point,
+      flacstate->streaminfo.min_blocksize, 
+      flacstate->streaminfo.max_blocksize,
+      flacstate->streaminfo.bits_per_sample,
+      flacstate->streaminfo.sample_rate,
+      flacstate->streaminfo.channels,
+      flacstate->streaminfo.min_framesize,
+      flacstate->streaminfo.max_framesize,
+      error);
+
+  return end_point;
+}
+
+static void splt_flac_get_info(splt_state *state, FILE *file_input, splt_code *error)
+{
+  splt_flac_state *flacstate = splt_flac_info(file_input, state, error);
+  state->codec = flacstate;
+  if (*error < 0) { return; }
+
+  if (! splt_o_messages_locked(state))
+  {
+    char flac_infos1024 = { '\0' };
+    snprintf(flac_infos, 1023, 
+        _(" info: Native FLAC - %u Hz - %d channels of %d bits"),
+        flacstate->streaminfo.sample_rate, flacstate->streaminfo.channels,
+        flacstate->streaminfo.bits_per_sample);
+
+    char total_time256 = { '\0' };
+    int total_seconds = (int) splt_t_get_total_time(state) / 100;
+    int minutes = total_seconds / 60;
+    int seconds = total_seconds % 60;
+    snprintf(total_time, 255, _(" - Total time: %dm.%02ds"), minutes, seconds%60);
+
+    splt_c_put_info_message_to_client(state, "%s%s\n", flac_infos, total_time);
+  }
+}
+
+static splt_flac_state *splt_flac_info(FILE *in, splt_state *state, splt_code *error)
+{
+  splt_flac_state *flacstate = splt_flac_state_new(error);
+  if (flacstate == NULL) { return NULL; }
+
+  flacstate->fr = splt_flac_fr_new(in);
+  if (flacstate->fr == NULL)
+  {
+    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
+    splt_flac_state_free(flacstate);
+    return NULL;
+  }
+
+  //TODO: stdin check ?
+
+  splt_flac_mu_read(flacstate, state, in, error);
+  if (*error < 0)
+  {
+    splt_flac_state_free(flacstate);
+    return NULL;
+  }
+
+  double total_time =
+    ((double) flacstate->streaminfo.total_samples / 
+     (double) flacstate->streaminfo.sample_rate) * 100.0;
+  splt_t_set_total_time(state, (long)total_time);
+
+  return flacstate;
+}
+
+static FILE *splt_flac_open_file_read(splt_state *state, const char *filename, splt_code *error)
+{
+  //TODO: stdin check
+
+  FILE *file_input = splt_io_fopen(filename, "rb");
+  if (file_input == NULL)
+  {
+    splt_e_set_strerror_msg_with_data(state, filename);
+    *error = SPLT_ERROR_CANNOT_OPEN_FILE;
+  }
+
+  return file_input;
+}
+
+static splt_flac_state *splt_flac_state_new(splt_code *error)
+{
+  splt_flac_state *flacstate = malloc(sizeof(splt_flac_state));
+  if (flacstate == NULL)
+  {
+    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
+    return NULL;

libmp3splt-0.8.2.tar.gz/plugins/flac.h Added

@@ -0,0 +1,46 @@
+/**********************************************************
+ *
+ * libmp3splt flac plugin 
+ *
+ * Copyright (c) 2013 Alexandru Munteanu - <m@ioalex.net>
+ *
+ * http://mp3splt.sourceforge.net
+ *
+ *********************************************************/
+
+/**********************************************************
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *********************************************************/
+
+#ifndef MP3SPLT_FLAC_H
+
+#include <FLAC/all.h>
+
+#include "flac_frame_reader.h"
+
+#define SPLT_FLAC_EXT ".flac"
+
+typedef struct {
+  FLAC__StreamMetadata_StreamInfo streaminfo;
+  splt_flac_frame_reader *fr;
+} splt_flac_state;
+
+#define MP3SPLT_FLAC_H
+
+#endif
+

libmp3splt-0.8.2.tar.gz/plugins/flac_frame_reader.c Added

@@ -0,0 +1,837 @@
+/**********************************************************
+ *
+ * libmp3splt flac plugin 
+ *
+ * Copyright (c) 2013 Alexandru Munteanu - <m@ioalex.net>
+ *
+ * http://mp3splt.sourceforge.net
+ *
+ *********************************************************/
+
+/**********************************************************
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *********************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <string.h>
+
+#include <math.h>
+
+#include "flac_frame_reader.h"
+#include "flac_utils.h"
+#include "from_flac_library.h"
+#include "flac_metadata_utils.h"
+
+static void splt_flac_fr_read_header(splt_flac_frame_reader *fr,
+    unsigned min_blocksize, unsigned max_blocksize, unsigned metadata_bits_per_sample, 
+    splt_flac_code *error)
+{
+  fr->crc8 = 0;
+  fr->bytes_between_frame_number_and_crc8 = 0;
+
+  //sync code start
+  splt_flac_u_read_next_byte(fr, error);
+  if (*error < 0) { return; }
+  unsigned char sync_code_end = splt_flac_u_read_next_byte(fr, error);
+  if (*error < 0) { return; }
+  unsigned char blocksize_and_sample_rate = splt_flac_u_read_next_byte(fr, error);
+  if (*error < 0) { return; }
+
+  unsigned previous_blocksize = fr->blocksize;
+
+  unsigned char blocksize_bits = blocksize_and_sample_rate >> 4;
+  if (blocksize_bits == 1)
+    fr->blocksize = 192;
+  else if (blocksize_bits > 1 && blocksize_bits <= 5)
+    fr->blocksize = 576 << (blocksize_bits - 2);
+  else if (blocksize_bits >= 8 && blocksize_bits <= 15)
+    fr->blocksize = 256 << (blocksize_bits - 8);
+
+  unsigned char channel_assignment_and_sample_size = splt_flac_u_read_next_byte(fr, error);
+  if (*error < 0) { return; }
+  unsigned char blocking_strategy = sync_code_end & 0x01;
+  fr->blocking_strategy = blocking_strategy;
+
+  unsigned char sample_size_in_bits = (channel_assignment_and_sample_size & 0x0e) >> 1;
+  switch (sample_size_in_bits)
+  {
+    case 0:
+      fr->bits_per_sample = metadata_bits_per_sample;
+      break;
+    case 1:
+      fr->bits_per_sample = 8;
+      break;
+    case 2:
+      fr->bits_per_sample = 12;
+      break;
+    default:
+      fr->bits_per_sample = sample_size_in_bits * 4;
+      break;
+  }
+
+  unsigned char channel_assignment = (channel_assignment_and_sample_size & 0xf0) >> 4;
+  if (channel_assignment & 8)
+  {
+    fr->channels = 2;
+    switch (channel_assignment & 7)
+    {
+      case 0:
+        fr->channel_assignment = SPLT_FLAC_LEFT_SIDE;
+        break;
+      case 1:
+        fr->channel_assignment = SPLT_FLAC_RIGHT_SIDE;
+        break;
+      case 2:
+        fr->channel_assignment = SPLT_FLAC_MID_SIDE;
+        break;
+    }
+  }
+  else {
+    fr->channels = (unsigned) channel_assignment + 1;
+    fr->channel_assignment = SPLT_FLAC_INDEPENDENT;
+  }
+
+  fr->blocking_strategy = blocking_strategy || min_blocksize != max_blocksize;
+  if (fr->blocking_strategy)
+  {
+    fr->current_sample_number = splt_flac_l_read_utf8_uint64(fr, error, &fr->sample_number_bytes);
+    if (*error < 0) { return; }
+  }
+  else
+  {
+    uint32_t frame_number = splt_flac_l_read_utf8_uint32(fr, error, &fr->frame_number_bytes);
+    if (*error < 0) { return; }
+    fr->current_sample_number = frame_number * previous_blocksize;
+  }
+
+  if (blocksize_bits == 6)
+  {
+    unsigned char byte = splt_flac_u_read_next_byte(fr, error);
+    if (*error < 0) { return; }
+
+    fr->blocksize = byte + 1;
+    fr->bytes_between_frame_number_and_crc8 = 1;
+  }
+  else if (blocksize_bits == 7)
+  {
+    unsigned char byte1 = splt_flac_u_read_next_byte(fr, error);
+    if (*error < 0) { return; }
+    unsigned char byte2 = splt_flac_u_read_next_byte(fr, error);
+    if (*error < 0) { return; }
+
+    unsigned size = (byte1 << 8) | byte2;
+    fr->blocksize = size + 1;
+    fr->bytes_between_frame_number_and_crc8 = 2;
+  }
+
+  if (fr->blocksize < fr->out_streaminfo.min_blocksize || fr->out_streaminfo.min_blocksize == 0)
+  {
+    fr->out_streaminfo.min_blocksize = fr->blocksize;
+  }
+
+  if (fr->blocksize > fr->out_streaminfo.max_blocksize || fr->out_streaminfo.max_blocksize == 0)
+  {
+    fr->out_streaminfo.max_blocksize = fr->blocksize;
+  }
+
+  unsigned char sample_bits = blocksize_and_sample_rate & 0x0f;
+  if (sample_bits == 12)
+  {
+    splt_flac_u_read_next_byte(fr, error);
+    if (*error < 0) { return; }
+    fr->bytes_between_frame_number_and_crc8 += 1;
+  }
+  else if (sample_bits == 13 || sample_bits == 14)
+  {
+    splt_flac_u_read_next_byte(fr, error);
+    if (*error < 0) { return; }
+    splt_flac_u_read_next_byte(fr, error);
+    if (*error < 0) { return; }
+    fr->bytes_between_frame_number_and_crc8 += 2;
+  }
+
+  unsigned char computed_crc8 = fr->crc8;
+  unsigned char crc8 = splt_flac_u_read_next_byte(fr, error);
+  if (*error < 0) { return; }
+
+  if (crc8 != computed_crc8) { *error = SPLT_FLAC_ERR_BAD_CRC8; }
+}
+
+static void splt_flac_fr_read_constant_subframe(splt_flac_frame_reader *fr, unsigned bits_per_sample,
+    splt_flac_code *error)
+{
+  splt_flac_u_read_up_to_total_bits(fr, bits_per_sample, error);
+}
+
+static void splt_flac_fr_read_verbatim_subframe(splt_flac_frame_reader *fr, unsigned bits_per_sample,
+    splt_flac_code *error)
+{
+  splt_flac_u_read_up_to_total_bits(fr, bits_per_sample * fr->blocksize, error);
+}
+
+static void splt_flac_fr_read_rice_residual(splt_flac_frame_reader *fr, unsigned order,
+    splt_flac_code *error)
+{
+  unsigned char rice_method = 4;
+
+  unsigned char first_bit = splt_flac_u_read_bit(fr, error);
+  if (*error < 0) { return; }
+  unsigned char second_bit = splt_flac_u_read_bit(fr, error);
+  if (*error < 0) { return; }
+  if (first_bit == 0 && second_bit == 1)
+  {

libmp3splt-0.8.2.tar.gz/plugins/flac_frame_reader.h Added

@@ -0,0 +1,136 @@
+/**********************************************************
+ *
+ * libmp3splt flac plugin 
+ *
+ * Copyright (c) 2013 Alexandru Munteanu - <m@ioalex.net>
+ *
+ * http://mp3splt.sourceforge.net
+ *
+ *********************************************************/
+
+/**********************************************************
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *********************************************************/
+
+#ifndef MP3SPLT_FLAC_FRAME_READER_H
+
+#include <stdio.h>
+#include <stdint.h>
+
+#include <FLAC/all.h>
+
+#include "splt.h"
+
+typedef enum {
+  SPLT_FLAC_ERR_FAILED_TO_OPEN_FILE = -12,
+  SPLT_FLAC_ERR_BEGIN_OUT_OF_FILE = -11,
+  SPLT_FLAC_ERR_FAILED_TO_WRITE_OUTPUT_FILE = -10,
+  SPLT_FLAC_ERR_CANNOT_ALLOCATE_MEMORY = -9,
+  SPLT_FLAC_ERR_ZERO_BIT_OF_SUBFRAME_HEADER_IS_WRONG = -8,
+  SPLT_FLAC_ERR_BAD_SUBFRAME_TYPE = -7,
+  SPLT_FLAC_ERR_BAD_CRC16 = -6,
+  SPLT_FLAC_ERR_BAD_CRC8 = -5,
+  SPLT_FLAC_ERR_LOST_SYNC = -2,
+
+  SPLT_FLAC_EOF = -1,
+
+  SPLT_FLAC_OK = 1,
+} splt_flac_code;
+
+typedef struct {
+  //input file
+  FILE *in;
+  //input buffer
+  unsigned char *buffer;
+
+  //output file
+  FILE *out;
+  //output buffer
+  unsigned char *output_buffer;
+  unsigned output_buffer_times;
+  FLAC__StreamMetadata_StreamInfo out_streaminfo;
+
+  //computed crc8 and crc16 for checking purposes
+  unsigned char crc8;
+  unsigned crc16;
+
+  //store infos about the current frame
+  unsigned bits_per_sample;
+  unsigned blocksize;
+  unsigned char blocking_strategy;
+  unsigned char channels;
+  unsigned char channel_assignment;
+
+  //byte reader informations
+  unsigned char remaining_bits;
+  unsigned char last_byte;
+  unsigned next_byte;
+  unsigned read_bytes;
+
+  //for frame modification variables
+
+  //sample and frame number to be written to the modified frame
+  FLAC__uint64 frame_number;
+  FLAC__uint64 sample_number;
+
+  uint64_t current_sample_number;
+
+  unsigned char *frame_number_as_utf8;
+  unsigned char frame_number_as_utf8_length;
+  unsigned char *sample_number_as_utf8;
+  unsigned char sample_number_as_utf8_length;
+
+  //sample number of bytes read from original frame
+  unsigned char sample_number_bytes;
+  unsigned char frame_number_bytes;
+
+  int bytes_between_frame_number_and_crc8;
+
+  //we have to read 1 more frame for each file to know where to stop the split
+  //and we backup this frame here for the next file split
+  unsigned char *previous_frame;
+  size_t previous_frame_length;
+} splt_flac_frame_reader;
+
+splt_flac_frame_reader *splt_flac_fr_new(FILE *in);
+void splt_flac_fr_free(splt_flac_frame_reader *fr);
+
+void splt_flac_fr_read_and_write_frames(splt_state *state, splt_flac_frame_reader *fr,
+    const char *output_fname,
+    double begin_point, double end_point, int save_end_point,
+    unsigned min_blocksize, unsigned max_blocksize, 
+    unsigned bits_per_sample, unsigned sample_rate, unsigned channels, 
+    unsigned min_framesize, unsigned max_framesize,
+    int *error);
+
+#define SPLT_FLAC_FR_BUFFER_SIZE 2048
+
+#define SPLT_FLAC_SUBFRAME_CONSTANT 1
+#define SPLT_FLAC_SUBFRAME_FIXED 2
+#define SPLT_FLAC_SUBFRAME_LPC 3
+#define SPLT_FLAC_SUBFRAME_VERBATIM 4
+
+#define SPLT_FLAC_LEFT_SIDE 1
+#define SPLT_FLAC_RIGHT_SIDE 2
+#define SPLT_FLAC_MID_SIDE 3
+#define SPLT_FLAC_INDEPENDENT 4
+
+#define MP3SPLT_FLAC_FRAME_READER_H
+
+#endif
+

libmp3splt-0.8.2.tar.gz/plugins/flac_metadata_utils.c Added

@@ -0,0 +1,143 @@
+/**********************************************************
+ *
+ * libmp3splt flac plugin 
+ *
+ * Copyright (c) 2013 Alexandru Munteanu - <m@ioalex.net>
+ *
+ * http://mp3splt.sourceforge.net
+ *
+ *********************************************************/
+
+/**********************************************************
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *********************************************************/
+
+#include <string.h>
+
+#include "flac_metadata_utils.h"
+
+static unsigned char *splt_flac_mu_read_metadata(FLAC__uint32 total_block_length, FILE *in, splt_code *error)
+{
+  unsigned char *bytes = malloc(total_block_length);
+  if (bytes == NULL)
+  {
+    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
+    return NULL;
+  }
+
+  fread(bytes, 1, total_block_length, in);
+
+  return bytes;
+}
+
+static void splt_flac_mu_skip_metadata(FLAC__uint32 total_block_length, FILE *in, splt_code *error)
+{
+  unsigned char *bytes = splt_flac_mu_read_metadata(total_block_length, in, error);
+  if (*error < 0 || !bytes) { return; }
+
+  free(bytes);
+}
+
+static void splt_flac_mu_read_streaminfo(splt_flac_state *flacstate,
+    FLAC__uint32 total_block_length, FILE *in, splt_code *error)
+{
+  unsigned char *bytes = splt_flac_mu_read_metadata(total_block_length, in, error);
+  if (*error < 0 || !bytes) { return; }
+
+  splt_flac_l_convert_to_streaminfo(&flacstate->streaminfo, bytes);
+  free(bytes);
+}
+
+static void splt_flac_mu_read_metadata_of_type(splt_flac_state *flacstate, 
+    unsigned char block_type, FLAC__uint32 total_block_length, FILE *in, splt_code *error)
+{
+  switch (block_type)
+  {
+    case SPLT_FLAC_METADATA_STREAMINFO:
+      splt_flac_mu_read_streaminfo(flacstate, total_block_length, in, error);
+      return;
+    case SPLT_FLAC_METADATA_PADDING:
+      splt_flac_mu_skip_metadata(total_block_length, in, error);
+      return;
+    case SPLT_FLAC_METADATA_APPLICATION:
+      splt_flac_mu_skip_metadata(total_block_length, in, error);
+      return;
+    case SPLT_FLAC_METADATA_SEEKTABLE:
+      splt_flac_mu_skip_metadata(total_block_length, in, error);
+      return;
+    case SPLT_FLAC_METADATA_VORBIS_COMMENT:
+      splt_flac_mu_skip_metadata(total_block_length, in, error);
+      return;
+    case SPLT_FLAC_METADATA_CUESHEET:
+      splt_flac_mu_skip_metadata(total_block_length, in, error);
+      return;
+    case SPLT_FLAC_METADATA_PICTURE:
+      splt_flac_mu_skip_metadata(total_block_length, in, error);
+      return;
+    case 127:
+      *error = SPLT_ERROR_INVALID;
+      //TODO: set filename ?
+      return;
+    default:
+      splt_flac_mu_skip_metadata(total_block_length, in, error);
+      return;
+  }
+}
+
+void splt_flac_mu_read(splt_flac_state *flacstate, splt_state *state, FILE *in, splt_code *error)
+{
+  char flac_stream_marker4 = { '\0' };
+  fread(&flac_stream_marker, 1, 4, in);
+
+  if (flac_stream_marker0 != 'f' || flac_stream_marker1 != 'L' ||
+      flac_stream_marker2 != 'a' || flac_stream_marker3 != 'C')
+  {
+    *error = SPLT_ERROR_INVALID;
+    return;
+  }
+
+  unsigned char is_last_block = 0;
+  while (!is_last_block)
+  {
+    unsigned char metadata_block_flag_and_block_type;
+    fread(&metadata_block_flag_and_block_type, 1, 1, in);
+
+    is_last_block = metadata_block_flag_and_block_type >> 7;
+    unsigned char block_type = metadata_block_flag_and_block_type & 0x7f;
+
+    unsigned char block_length3;
+    fread(block_length, 1, 3, in);
+    FLAC__uint32 total_block_length = splt_flac_l_unpack_uint32(block_length, 3);
+
+    splt_flac_mu_read_metadata_of_type(flacstate, block_type, total_block_length, in, error);
+    if (*error < 0) { return; }
+  }
+}
+
+unsigned char *splt_flac_mu_build_metadata_header(unsigned char type, unsigned char is_last,
+    unsigned length)
+{
+  unsigned char *metadata_header = malloc(4);
+  if (metadata_header == NULL) { return NULL; }
+
+  metadata_header0 = type | (is_last << 7);
+  splt_flac_l_pack_uint32(length, metadata_header + 1, 3); 
+
+  return metadata_header;
+}
+

libmp3splt-0.8.2.tar.gz/plugins/flac_metadata_utils.h Added

@@ -0,0 +1,54 @@
+/**********************************************************
+ *
+ * libmp3splt flac plugin 
+ *
+ * Copyright (c) 2013 Alexandru Munteanu - <m@ioalex.net>
+ *
+ * http://mp3splt.sourceforge.net
+ *
+ *********************************************************/
+
+/**********************************************************
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *********************************************************/
+
+#ifndef MP3SPLT_FLAC_METADATA_UTILS_H
+
+#include "splt.h"
+
+#include "flac.h"
+#include "from_flac_library.h"
+
+void splt_flac_mu_read(splt_flac_state *flacstate, splt_state *state, FILE *in, splt_code *error);
+unsigned char *splt_flac_mu_build_metadata_header(unsigned char type, unsigned char is_last,
+    unsigned length);
+
+#define SPLT_FLAC_METADATA_STREAMINFO 0
+#define SPLT_FLAC_METADATA_PADDING 1
+#define SPLT_FLAC_METADATA_APPLICATION 2
+#define SPLT_FLAC_METADATA_SEEKTABLE 3
+#define SPLT_FLAC_METADATA_VORBIS_COMMENT 4
+#define SPLT_FLAC_METADATA_CUESHEET 5
+#define SPLT_FLAC_METADATA_PICTURE 6
+
+#define SPLT_FLAC_METADATA_HEADER_LENGTH 4
+
+#define MP3SPLT_FLAC_METADATA_UTILS_H
+
+#endif
+

libmp3splt-0.8.2.tar.gz/plugins/flac_utils.c Added

@@ -0,0 +1,259 @@
+/**********************************************************
+ *
+ * libmp3splt flac plugin 
+ *
+ * Copyright (c) 2013 Alexandru Munteanu - <m@ioalex.net>
+ *
+ * http://mp3splt.sourceforge.net
+ *
+ *********************************************************/
+
+/**********************************************************
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *********************************************************/
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "flac_utils.h"
+#include "from_flac_library.h"
+
+static const unsigned char splt_flac_u_bit_access_table = { 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f };
+
+static void splt_flac_u_read_byte_skip(splt_flac_frame_reader *fr, splt_flac_code *error);
+
+static void splt_flac_u_read_bits_skip(splt_flac_frame_reader *fr, unsigned char bits_number,
+    splt_flac_code *error)
+{
+  if (bits_number > fr->remaining_bits)
+  {
+    splt_flac_u_read_byte_skip(fr, error);
+    fr->remaining_bits = (fr->remaining_bits + 8) - bits_number;
+    return;
+  }
+
+  fr->remaining_bits -= bits_number;
+}
+
+unsigned char splt_flac_u_read_bits(splt_flac_frame_reader *fr, unsigned char bits_number,
+    splt_flac_code *error)
+{
+  if (bits_number > fr->remaining_bits)
+  {
+    unsigned char bits = splt_flac_u_read_next_byte(fr, error) >> (8 - bits_number);
+    fr->remaining_bits = (fr->remaining_bits + 8) - bits_number;
+    return bits;
+  }
+
+  unsigned char bits = fr->last_byte << (8 - fr->remaining_bits);
+  fr->remaining_bits -= bits_number;
+  return bits >> (8 - bits_number);
+}
+
+static void splt_flac_u_read_bit_skip(splt_flac_frame_reader *fr, splt_flac_code *error)
+{
+  if (fr->remaining_bits == 0)
+  {
+    splt_flac_u_read_next_byte(fr, error);
+    fr->remaining_bits = 7;
+    return;
+  }
+
+  fr->remaining_bits--;
+}
+
+unsigned char splt_flac_u_read_bit(splt_flac_frame_reader *fr, splt_flac_code *error)
+{
+  if (fr->remaining_bits == 0)
+  {
+    unsigned char byte = splt_flac_u_read_next_byte(fr, error) >> 7;
+    fr->remaining_bits = 7;
+    return byte;
+  }
+
+  fr->remaining_bits--;
+
+  return (fr->last_byte & splt_flac_u_bit_access_tablefr->remaining_bits) >> fr->remaining_bits;
+}
+
+static void splt_flac_u_append_input_buffer_to_output_buffer(splt_flac_frame_reader *fr,
+    splt_flac_code *error)
+{
+  if (fr->buffer == NULL) { return; }
+
+  size_t existing_size = SPLT_FLAC_FR_BUFFER_SIZE * fr->output_buffer_times;
+  fr->output_buffer = realloc(fr->output_buffer, existing_size + SPLT_FLAC_FR_BUFFER_SIZE);
+  if (fr->output_buffer == NULL)
+  {
+    *error = SPLT_FLAC_ERR_CANNOT_ALLOCATE_MEMORY;
+    return;
+  }
+
+  memcpy(fr->output_buffer + existing_size, fr->buffer, SPLT_FLAC_FR_BUFFER_SIZE);
+
+  fr->output_buffer_times++;
+}
+
+void splt_flac_u_process_frame(splt_flac_frame_reader *fr, unsigned frame_byte_buffer_start,
+    splt_flac_code *error,
+    void (*frame_processor)(unsigned char *frame, size_t frame_length,
+      splt_flac_code *error, void *user_data),
+    void *user_data)
+{
+  splt_flac_u_append_input_buffer_to_output_buffer(fr, error);
+  if (*error < 0) { return; }
+
+  if (frame_processor != NULL)
+  {
+    unsigned frame_byte_cut_end = 0;
+    if (fr->next_byte < SPLT_FLAC_FR_BUFFER_SIZE)
+    {
+      frame_byte_cut_end = SPLT_FLAC_FR_BUFFER_SIZE - fr->next_byte;
+    }
+
+    size_t total_length =
+      (fr->output_buffer_times * SPLT_FLAC_FR_BUFFER_SIZE) - frame_byte_buffer_start - frame_byte_cut_end;
+
+    frame_processor(fr->output_buffer + frame_byte_buffer_start, total_length, error, user_data);
+  }
+
+  free(fr->output_buffer);
+  fr->output_buffer = NULL;
+  fr->output_buffer_times = 0;
+}
+
+static void splt_flac_u_sync_buffer_to_next_byte(splt_flac_frame_reader *fr, splt_flac_code *error)
+{
+  if (fr->next_byte >= SPLT_FLAC_FR_BUFFER_SIZE)
+  {
+    if (feof(fr->in))
+    {
+      *error = SPLT_FLAC_EOF;
+      return;
+    }
+
+    splt_flac_u_append_input_buffer_to_output_buffer(fr, error);
+    if (*error < 0) { return; }
+
+    if (fr->buffer) { free(fr->buffer); }
+    fr->buffer = calloc(SPLT_FLAC_FR_BUFFER_SIZE, 1);
+    if (fr->buffer == NULL)
+    {
+      *error = SPLT_FLAC_ERR_CANNOT_ALLOCATE_MEMORY;
+      return;
+    }
+
+    fr->read_bytes = fread(fr->buffer, 1, SPLT_FLAC_FR_BUFFER_SIZE, fr->in);
+
+    fr->last_byte = fr->buffer0;
+    fr->next_byte = 1;
+
+    SPLT_FLAC_UPDATE_CRC16(fr->crc16, fr->last_byte);
+    return;
+  }
+
+  fr->last_byte = fr->bufferfr->next_byte;
+  fr->next_byte++;
+
+  SPLT_FLAC_UPDATE_CRC16(fr->crc16, fr->last_byte); 
+}
+
+void splt_flac_u_read_zeroes_and_the_next_one(splt_flac_frame_reader *fr, splt_flac_code *error)
+{
+  if (fr->remaining_bits > 0)
+  {
+    unsigned char current = fr->last_byte << (8 - fr->remaining_bits);
+    if (current > 0)
+    {
+      fr->remaining_bits -= (splt_flac_l_byte_to_unary_tablecurrent + 1);
+      return;
+    }
+  }
+
+  fr->remaining_bits = 0;
+
+  while (1)
+  {
+    splt_flac_u_sync_buffer_to_next_byte(fr, error);
+    if (*error < 0) { return; }
+
+    if (fr->last_byte > 0)
+    {
+      fr->remaining_bits = 8 - (splt_flac_l_byte_to_unary_tablefr->last_byte + 1);
+      return;
+    }

libmp3splt-0.8.2.tar.gz/plugins/flac_utils.h Added

@@ -0,0 +1,54 @@
+/**********************************************************
+ *
+ * libmp3splt flac plugin 
+ *
+ * Copyright (c) 2013 Alexandru Munteanu - <m@ioalex.net>
+ *
+ * http://mp3splt.sourceforge.net
+ *
+ *********************************************************/
+
+/**********************************************************
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *********************************************************/
+
+#ifndef MP3SPLT_FLAC_UTILS_H
+
+#include "flac_frame_reader.h"
+
+unsigned char splt_flac_u_read_next_byte(splt_flac_frame_reader *fr, splt_flac_code *error);
+unsigned char splt_flac_u_read_bit(splt_flac_frame_reader *fr, splt_flac_code *error);
+unsigned char splt_flac_u_read_bits(splt_flac_frame_reader *fr, unsigned char bits_number,
+    splt_flac_code *error);
+
+void splt_flac_u_read_up_to_total_bits(splt_flac_frame_reader *fr, unsigned total_bits,
+    splt_flac_code *error);
+unsigned splt_flac_u_read_unsigned(splt_flac_frame_reader *fr, splt_flac_code *error);
+
+void splt_flac_u_read_zeroes_and_the_next_one(splt_flac_frame_reader *fr, splt_flac_code *error);
+
+void splt_flac_u_process_frame(splt_flac_frame_reader *fr,
+    unsigned frame_byte_buffer_start, splt_flac_code *error,
+    void (*frame_processor)(unsigned char *frame, size_t frame_length, 
+      splt_flac_code *error, void *user_data),
+    void *user_data);
+
+#define MP3SPLT_FLAC_UTILS_H
+
+#endif
+

libmp3splt-0.8.2.tar.gz/plugins/from_flac_library.c Added

@@ -0,0 +1,398 @@
+/* libFLAC - Free Lossless Audio Codec library
+ * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Xiph.org Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Alexandru Munteanu's note : copied from libflac and modified
+ * File part of the libmp3splt flac plugin.
+ *
+ * Copyright (c) 2013 Alexandru Munteanu - <m@ioalex.net>
+ *
+ * http://mp3splt.sourceforge.net
+ */
+
+/**********************************************************
+ *
+ * Libmp3splt license:
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *********************************************************/
+
+#include "flac_utils.h"
+#include "from_flac_library.h"
+
+#include <string.h>
+
+/* CRC-8, poly = x^8 + x^2 + x^1 + x^0, init = 0 */
+unsigned char const splt_flac_l_crc8_table256 = {
+	0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15,
+	0x38, 0x3F, 0x36, 0x31, 0x24, 0x23, 0x2A, 0x2D,
+	0x70, 0x77, 0x7E, 0x79, 0x6C, 0x6B, 0x62, 0x65,
+	0x48, 0x4F, 0x46, 0x41, 0x54, 0x53, 0x5A, 0x5D,
+	0xE0, 0xE7, 0xEE, 0xE9, 0xFC, 0xFB, 0xF2, 0xF5,
+	0xD8, 0xDF, 0xD6, 0xD1, 0xC4, 0xC3, 0xCA, 0xCD,
+	0x90, 0x97, 0x9E, 0x99, 0x8C, 0x8B, 0x82, 0x85,
+	0xA8, 0xAF, 0xA6, 0xA1, 0xB4, 0xB3, 0xBA, 0xBD,
+	0xC7, 0xC0, 0xC9, 0xCE, 0xDB, 0xDC, 0xD5, 0xD2,
+	0xFF, 0xF8, 0xF1, 0xF6, 0xE3, 0xE4, 0xED, 0xEA,
+	0xB7, 0xB0, 0xB9, 0xBE, 0xAB, 0xAC, 0xA5, 0xA2,
+	0x8F, 0x88, 0x81, 0x86, 0x93, 0x94, 0x9D, 0x9A,
+	0x27, 0x20, 0x29, 0x2E, 0x3B, 0x3C, 0x35, 0x32,
+	0x1F, 0x18, 0x11, 0x16, 0x03, 0x04, 0x0D, 0x0A,
+	0x57, 0x50, 0x59, 0x5E, 0x4B, 0x4C, 0x45, 0x42,
+	0x6F, 0x68, 0x61, 0x66, 0x73, 0x74, 0x7D, 0x7A,
+	0x89, 0x8E, 0x87, 0x80, 0x95, 0x92, 0x9B, 0x9C,
+	0xB1, 0xB6, 0xBF, 0xB8, 0xAD, 0xAA, 0xA3, 0xA4,
+	0xF9, 0xFE, 0xF7, 0xF0, 0xE5, 0xE2, 0xEB, 0xEC,
+	0xC1, 0xC6, 0xCF, 0xC8, 0xDD, 0xDA, 0xD3, 0xD4,
+	0x69, 0x6E, 0x67, 0x60, 0x75, 0x72, 0x7B, 0x7C,
+	0x51, 0x56, 0x5F, 0x58, 0x4D, 0x4A, 0x43, 0x44,
+	0x19, 0x1E, 0x17, 0x10, 0x05, 0x02, 0x0B, 0x0C,
+	0x21, 0x26, 0x2F, 0x28, 0x3D, 0x3A, 0x33, 0x34,
+	0x4E, 0x49, 0x40, 0x47, 0x52, 0x55, 0x5C, 0x5B,
+	0x76, 0x71, 0x78, 0x7F, 0x6A, 0x6D, 0x64, 0x63,
+	0x3E, 0x39, 0x30, 0x37, 0x22, 0x25, 0x2C, 0x2B,
+	0x06, 0x01, 0x08, 0x0F, 0x1A, 0x1D, 0x14, 0x13,
+	0xAE, 0xA9, 0xA0, 0xA7, 0xB2, 0xB5, 0xBC, 0xBB,
+	0x96, 0x91, 0x98, 0x9F, 0x8A, 0x8D, 0x84, 0x83,
+	0xDE, 0xD9, 0xD0, 0xD7, 0xC2, 0xC5, 0xCC, 0xCB,
+	0xE6, 0xE1, 0xE8, 0xEF, 0xFA, 0xFD, 0xF4, 0xF3
+};
+
+/* CRC-16, poly = x^16 + x^15 + x^2 + x^0, init = 0 */
+unsigned splt_flac_l_crc16_table256 = {
+	0x0000,  0x8005,  0x800f,  0x000a,  0x801b,  0x001e,  0x0014,  0x8011,
+	0x8033,  0x0036,  0x003c,  0x8039,  0x0028,  0x802d,  0x8027,  0x0022,
+	0x8063,  0x0066,  0x006c,  0x8069,  0x0078,  0x807d,  0x8077,  0x0072,
+	0x0050,  0x8055,  0x805f,  0x005a,  0x804b,  0x004e,  0x0044,  0x8041,
+	0x80c3,  0x00c6,  0x00cc,  0x80c9,  0x00d8,  0x80dd,  0x80d7,  0x00d2,
+	0x00f0,  0x80f5,  0x80ff,  0x00fa,  0x80eb,  0x00ee,  0x00e4,  0x80e1,
+	0x00a0,  0x80a5,  0x80af,  0x00aa,  0x80bb,  0x00be,  0x00b4,  0x80b1,
+	0x8093,  0x0096,  0x009c,  0x8099,  0x0088,  0x808d,  0x8087,  0x0082,
+	0x8183,  0x0186,  0x018c,  0x8189,  0x0198,  0x819d,  0x8197,  0x0192,
+	0x01b0,  0x81b5,  0x81bf,  0x01ba,  0x81ab,  0x01ae,  0x01a4,  0x81a1,
+	0x01e0,  0x81e5,  0x81ef,  0x01ea,  0x81fb,  0x01fe,  0x01f4,  0x81f1,
+	0x81d3,  0x01d6,  0x01dc,  0x81d9,  0x01c8,  0x81cd,  0x81c7,  0x01c2,
+	0x0140,  0x8145,  0x814f,  0x014a,  0x815b,  0x015e,  0x0154,  0x8151,
+	0x8173,  0x0176,  0x017c,  0x8179,  0x0168,  0x816d,  0x8167,  0x0162,
+	0x8123,  0x0126,  0x012c,  0x8129,  0x0138,  0x813d,  0x8137,  0x0132,
+	0x0110,  0x8115,  0x811f,  0x011a,  0x810b,  0x010e,  0x0104,  0x8101,
+	0x8303,  0x0306,  0x030c,  0x8309,  0x0318,  0x831d,  0x8317,  0x0312,
+	0x0330,  0x8335,  0x833f,  0x033a,  0x832b,  0x032e,  0x0324,  0x8321,
+	0x0360,  0x8365,  0x836f,  0x036a,  0x837b,  0x037e,  0x0374,  0x8371,
+	0x8353,  0x0356,  0x035c,  0x8359,  0x0348,  0x834d,  0x8347,  0x0342,
+	0x03c0,  0x83c5,  0x83cf,  0x03ca,  0x83db,  0x03de,  0x03d4,  0x83d1,
+	0x83f3,  0x03f6,  0x03fc,  0x83f9,  0x03e8,  0x83ed,  0x83e7,  0x03e2,
+	0x83a3,  0x03a6,  0x03ac,  0x83a9,  0x03b8,  0x83bd,  0x83b7,  0x03b2,
+	0x0390,  0x8395,  0x839f,  0x039a,  0x838b,  0x038e,  0x0384,  0x8381,
+	0x0280,  0x8285,  0x828f,  0x028a,  0x829b,  0x029e,  0x0294,  0x8291,
+	0x82b3,  0x02b6,  0x02bc,  0x82b9,  0x02a8,  0x82ad,  0x82a7,  0x02a2,
+	0x82e3,  0x02e6,  0x02ec,  0x82e9,  0x02f8,  0x82fd,  0x82f7,  0x02f2,
+	0x02d0,  0x82d5,  0x82df,  0x02da,  0x82cb,  0x02ce,  0x02c4,  0x82c1,
+	0x8243,  0x0246,  0x024c,  0x8249,  0x0258,  0x825d,  0x8257,  0x0252,
+	0x0270,  0x8275,  0x827f,  0x027a,  0x826b,  0x026e,  0x0264,  0x8261,
+	0x0220,  0x8225,  0x822f,  0x022a,  0x823b,  0x023e,  0x0234,  0x8231,
+	0x8213,  0x0216,  0x021c,  0x8219,  0x0208,  0x820d,  0x8207,  0x0202
+};
+
+uint32_t splt_flac_l_read_utf8_uint32(splt_flac_frame_reader *fr, splt_flac_code *error, 
+    unsigned char *number_of_bytes)
+{
+  uint32_t val = 0;
+  unsigned i;
+
+  uint32_t byte = splt_flac_u_read_next_byte(fr, error);
+  if (*error < 0) { *number_of_bytes = 0; return 0xffffffff; }
+  *number_of_bytes = 1;
+
+  if(!(byte & 0x80)) { /* 0xxxxxxx */
+    val = byte;
+    i = 0;
+  }
+  else if(byte & 0xC0 && !(byte & 0x20)) { /* 110xxxxx */
+    val = byte & 0x1F;
+    i = 1;
+  }
+  else if(byte & 0xE0 && !(byte & 0x10)) { /* 1110xxxx */
+    val = byte & 0x0F;
+    i = 2;
+  }
+  else if(byte & 0xF0 && !(byte & 0x08)) { /* 11110xxx */
+    val = byte & 0x07;
+    i = 3;
+  }
+  else if(byte & 0xF8 && !(byte & 0x04)) { /* 111110xx */
+    val = byte & 0x03;
+    i = 4;
+  }
+  else if(byte & 0xFC && !(byte & 0x02)) { /* 1111110x */
+    val = byte & 0x01;
+    i = 5;
+  }
+  else {
+    *number_of_bytes = 0;
+    return 0xffffffff;
+  }
+
+  for ( ; i; i--) {
+    byte = splt_flac_u_read_next_byte(fr, error);
+    if (*error < 0) { *number_of_bytes = 0; return 0xffffffff; }
+    *number_of_bytes = *number_of_bytes + 1;
+
+    if(!(byte & 0x80) || (byte & 0x40)) { /* 10xxxxxx */
+      *number_of_bytes = 0;
+      return 0xffffffff;
+    }
+
+    val <<= 6;
+    val |= (byte & 0x3F);
+  }
+
+  return val;
+}
+
+uint64_t splt_flac_l_read_utf8_uint64(splt_flac_frame_reader *fr, splt_flac_code *error,
+    unsigned char *number_of_bytes)
+{
+  uint64_t val = 0;
+  unsigned i;
+
+  uint32_t byte = splt_flac_u_read_next_byte(fr, error);

libmp3splt-0.8.2.tar.gz/plugins/from_flac_library.h Added

@@ -0,0 +1,106 @@
+/* libFLAC - Free Lossless Audio Codec library
+ * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Xiph.org Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Alexandru Munteanu's note : copied from libflac and modified
+ * File part of the libmp3splt flac plugin.
+ *
+ * Copyright (c) 2013 Alexandru Munteanu - <m@ioalex.net>
+ *
+ * http://mp3splt.sourceforge.net
+ */
+
+/**********************************************************
+ *
+ * Libmp3splt license:
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *********************************************************/
+
+#ifndef MP3SPLT_FROM_FLAC_LIBRARY_H
+
+#include "flac_frame_reader.h"
+
+#define SPLT_FLAC_STREAMINFO_LENGTH 34
+
+extern unsigned splt_flac_l_crc16_table256;
+extern unsigned char const splt_flac_l_crc8_table256;
+
+#define SPLT_FLAC_UPDATE_CRC16(crc16, data) crc16 = ((crc16<<8) ^ splt_flac_l_crc16_table(crc16>>8) ^ data) & 0xffff
+#define SPLT_FLAC_UPDATE_CRC8(crc8, data) crc8 = splt_flac_l_crc8_tablecrc8 ^ data
+
+uint32_t splt_flac_l_read_utf8_uint32(splt_flac_frame_reader *fr, splt_flac_code *error, 
+    unsigned char *number_of_bytes);
+uint64_t splt_flac_l_read_utf8_uint64(splt_flac_frame_reader *fr, splt_flac_code *error,
+    unsigned char *number_of_bytes);
+
+void splt_flac_l_convert_to_streaminfo(FLAC__StreamMetadata_StreamInfo *block, unsigned char *bytes);
+unsigned char *splt_flac_l_convert_from_streaminfo(FLAC__StreamMetadata_StreamInfo *block);
+FLAC__uint32 splt_flac_l_unpack_uint32(FLAC__byte *b, unsigned bytes);
+void splt_flac_l_pack_uint32(FLAC__uint32 val, FLAC__byte *b, unsigned bytes);
+
+unsigned char *splt_flac_l_convert_to_utf8(FLAC__uint64 val, unsigned char *utf8_used_bytes);
+
+static const unsigned char splt_flac_l_byte_to_unary_table = {
+  8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+#define MP3SPLT_FROM_FLAC_LIBRARY_H
+
+#endif
+

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

@@ -3,7 +3,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  *********************************************************/
 
@@ -20,8 +20,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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *********************************************************/
 /*! \file
@@ -35,6 +34,11 @@
 #include "mp3_silence.h"
 #include "mp3_utils.h"
 
+static void splt_mp3_free_bytes_and_size(tag_bytes_and_size *bytes_and_size);
+static tag_bytes_and_size *splt_mp3_new_bytes_and_size();
+static char *splt_mp3_get_same_bytes_tags(int version, tag_bytes_and_size *bytes_and_size, 
+    unsigned long *number_of_bytes, int *error);
+
 /****************************/
 /* mp3 constants */
 
@@ -122,17 +126,19 @@
 };
 
 static void splt_mp3_save_end_point(splt_state *state, splt_mp3_state *mp3state,
-    int save_end_point, off_t end)
+    int save_end_point, off_t end, unsigned long fend)
 {
   mp3state->end_non_zero = end;
 
   if (save_end_point)
   {
     mp3state->end = end;
+    mp3state->fend = fend;
   }
   else
   {
     mp3state->end = 0;
+    mp3state->fend = 0;
   }
 }
 
@@ -383,64 +389,75 @@
 \param tags_version Is filled with the version of the tag by this function.
 \return The string containing the tags
 */
-static id3_byte_t *splt_mp3_get_id3_tag_bytes(splt_state *state, const char *filename,
-    id3_length_t *length, int *error, int *tags_version)
+static tag_bytes_and_size *splt_mp3_get_id3_tag_bytes(splt_state *state, const char *filename, 
+    int *error)
 {
-  *length = 0;
+  id3_length_t length = 0;
+  int tags_version = 0;
   id3_byte_t *bytes = NULL;
+  tag_bytes_and_size *bytes_and_size = NULL;
 
   FILE *file = splt_io_fopen(filename, "rb");
-
-  if (! file)
+  if (!file)
   {
     splt_e_set_strerror_msg_with_data(state, filename);
     *error = SPLT_ERROR_CANNOT_OPEN_FILE;
     goto end;
   }
-  else
+
+  bytes_and_size = splt_mp3_new_bytes_and_size();
+  if (bytes_and_size == NULL)
   {
-    id3_length_t id3v1_length = 0;
-    id3_byte_t *id3v1_bytes = splt_mp3_get_id3v1_tag_bytes(file, &id3v1_length);
+    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
+    goto end;
+  }
 
-    id3_length_t id3v2_length = 0;
-    id3_byte_t *id3v2_bytes = splt_mp3_get_id3v2_tag_bytes(file, &id3v2_length);
+  id3_length_t id3v1_length = 0;
+  id3_byte_t *id3v1_bytes = splt_mp3_get_id3v1_tag_bytes(file, &id3v1_length);
 
-    if (id3v2_bytes)
-    {
-      *tags_version = 2;
-      bytes = id3v2_bytes;
-      *length = id3v2_length;
+  id3_length_t id3v2_length = 0;
+  id3_byte_t *id3v2_bytes = splt_mp3_get_id3v2_tag_bytes(file, &id3v2_length);
 
-      if (id3v1_bytes)
-      {
-        *tags_version = 12;
-        free(id3v1_bytes);
-        id3v1_bytes = NULL;
-      }
-    }
-    else if (id3v1_bytes)
+  if (id3v2_bytes)
+  {
+    bytes = id3v2_bytes;
+    length = id3v2_length;
+    tags_version = 2;
+
+    if (id3v1_bytes)
     {
-      *tags_version = 1;
-      bytes = id3v1_bytes;
-      *length = id3v1_length;
+      bytes_and_size->tag_bytes_v1 = id3v1_bytes;
+      bytes_and_size->tag_length_v1 = id3v1_length;
+      tags_version = 12;
     }
   }
+  else if (id3v1_bytes)
+  {
+    bytes = id3v1_bytes;
+    length = id3v1_length;
+    tags_version = 1;
+  }
+
+  bytes_and_size->tag_bytes = bytes;
+  bytes_and_size->tag_length = length;
+  bytes_and_size->version = tags_version;
+
+  if (tags_version == 12)
+  {
+    bytes_and_size->bytes_tags_version = 2;
+  }
+  else
+  {
+    bytes_and_size->bytes_tags_version = tags_version;
+  }
 
 end:
   if (file)
   {
-    if (fclose(file) != 0)
-    {
-      if (bytes)
-      {
-        free(bytes);
-        bytes = NULL;
-      }
-      return NULL;
-    }
+    fclose(file);
   }
 
-  return bytes;
+  return bytes_and_size;
 }
 
 //!puts a original field on id3 conforming to frame_type
@@ -503,6 +520,10 @@
             char *genre = (char *)tag_value;
 
             int id3v1 = atoi(genre);
+            if (id3v1 == 0 && genre0 == '(')
+            {
+              id3v1 = atoi(genre+1);
+            }
             if ((id3v1 > 0) &&
                 (id3v1 < SPLT_ID3V1_NUMBER_OF_GENRES) &&
                 (state->original_tags.tags.genre == NULL))
@@ -550,73 +571,58 @@
 static void splt_mp3_get_original_tags(const char *filename,
     splt_state *state, int *tag_error)
 {
-  int err = SPLT_OK;
-
-  //we get the id3 from the original file using libid3tag
+  tag_bytes_and_size *bytes_and_size = NULL;
   struct id3_tag *id3tag = NULL;
 
-  //get out the tags from the file; id3_file_open doesn't work with win32 utf16 filenames
-  id3_length_t id3_tag_length = 0;
-  int tags_version = 0;
-  id3_byte_t *id3_tag_bytes =
-    splt_mp3_get_id3_tag_bytes(state, filename, &id3_tag_length, tag_error,
-        &tags_version);
-
-  if (*tag_error >= 0)
-  {
-    if (id3_tag_bytes)
-    {
-      id3tag = id3_tag_parse(id3_tag_bytes, id3_tag_length);
-
-      if (id3tag)
-      {

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -59,6 +58,12 @@
 typedef struct {
   id3_byte_t *tag_bytes;
   id3_length_t tag_length;
+
+  id3_byte_t *tag_bytes_v1;
+  id3_length_t tag_length_v1;
+
+  unsigned int version;
+  unsigned int bytes_tags_version;
 } tag_bytes_and_size;
 #endif
 
@@ -106,6 +111,7 @@
   unsigned long frames;
   int syncdetect;
   off_t end;
+  unsigned long fend;
   off_t end_non_zero;
   off_t end2;
   off_t bytes;

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

@@ -3,7 +3,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  *********************************************************/
 
@@ -20,8 +20,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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *********************************************************/
 
@@ -34,7 +33,7 @@
 
 static void splt_mp3_scan_silence_and_process(splt_state *state, off_t begin_offset, 
     float max_threshold, unsigned long length, 
-    short process_silence(double time, int silence_was_found, short must_flush,
+    short process_silence(double time, float level, int silence_was_found, short must_flush,
       splt_scan_silence_data *ssd, int *found, int *error),
     splt_scan_silence_data *ssd, int *error);
 static int splt_mp3_silence(splt_mp3_state *mp3state, int channels, mad_fixed_t threshold);
@@ -51,7 +50,7 @@
 */
 int splt_mp3_scan_silence(splt_state *state, off_t begin, unsigned long length,
     float threshold, float min, int shots, short output, int *error,
-    short silence_processor(double time, int silence_was_found, short must_flush,
+    short silence_processor(double time, float level, int silence_was_found, short must_flush,
       splt_scan_silence_data *ssd, int *found, int *error))
 {
   splt_scan_silence_data *ssd = splt_scan_silence_data_new(state, output, min, shots, SPLT_TRUE); 
@@ -77,14 +76,15 @@
 
 static void splt_mp3_scan_silence_and_process(splt_state *state, off_t begin_offset, 
     float max_threshold, unsigned long length, 
-    short process_silence(double time, int silence_was_found, short must_flush,
+    short process_silence(double time, float level, int silence_was_found, short must_flush,
       splt_scan_silence_data *ssd, int *found, int *error),
     splt_scan_silence_data *ssd, int *error)
 {
   int found = 0;
   short stop = SPLT_FALSE;
 
-  mad_fixed_t threshold = mad_f_tofixed(splt_co_convert_from_dB(max_threshold));
+  mad_fixed_t threshold = mad_f_tofixed(splt_co_convert_from_db(max_threshold));
+
   splt_mp3_state *mp3state = state->codec;
 
   splt_c_put_progress_text(state, SPLT_PROGRESS_SCAN_SILENCE);
@@ -108,8 +108,11 @@
   do {
     int mad_err = SPLT_OK;
 
-    switch (splt_mp3_get_valid_frame(state, &mad_err))
+    int result = splt_mp3_get_valid_frame(state, &mad_err);
+
+    switch (result)
     {
+      case -1:
       case 1:
         //1 we have a valid frame
         mad_timer_add(&mp3state->timer, mp3state->frame.header.duration);
@@ -119,10 +122,12 @@
         int silence_was_found =
           splt_mp3_silence(mp3state, MAD_NCHANNELS(&mp3state->frame.header), threshold);
  
+        float level = splt_co_convert_to_db(mad_f_todouble(mp3state->temp_level));
+
         int err = SPLT_OK;
         short must_flush = (length > 0 && time >= length);
         double time_in_double = (double) time / 100.f;
-        stop = process_silence(time_in_double, silence_was_found, must_flush, ssd, &found, &err);
+        stop = process_silence(time_in_double, level, silence_was_found, must_flush, ssd, &found, &err);
         if (stop || stop == -1)
         {
           stop = SPLT_TRUE;
@@ -133,7 +138,6 @@
         {
           off_t pos = ftello(mp3state->file_input);
 
-          float level = splt_co_convert_to_dB(mad_f_todouble(mp3state->temp_level));
           if (state->split.get_silence_level)
           {
             state->split.get_silence_level(time, level, state->split.silence_level_client_data);
@@ -160,14 +164,16 @@
                 (double)(mp3state->mp3file.len), 1,0,SPLT_DEFAULT_PROGRESS_RATE);
           }
         }
+
+        //-1 means eof
+        if (result == -1)
+        {
+          stop = SPLT_TRUE;
+        }
         break;
       case 0:
         //0 do nothing
         break;
-      case -1:
-        //-1 means eof
-        stop = SPLT_TRUE;
-        break;
       case -3:
         //error from libmad
         stop = SPLT_TRUE;
@@ -181,7 +187,7 @@
 
   int junk;
   int err = SPLT_OK;
-  process_silence(-1, SPLT_FALSE, SPLT_FALSE, ssd, &junk, &err);
+  process_silence(-1, -96, SPLT_FALSE, SPLT_FALSE, ssd, &junk, &err);
   if (err < 0) { *error = err; }
  
   //only if we have silence mode, we set progress to 100%

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -35,6 +34,6 @@
 
 int splt_mp3_scan_silence(splt_state *state, off_t begin, unsigned long length,
     float threshold, float min, int shots, short output, int *error,
-    short silence_processor(double time, int silence_was_found, short must_flush,
+    short silence_processor(double time, float level, int silence_was_found, short must_flush,
       splt_scan_silence_data *ssd, int *found, int *error));

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

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

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net>
  *
  * Large parts of this files have been copied from the 'vcut' 1.6
  * program provided with 'vorbis-tools' :
@@ -31,8 +31,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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -72,7 +71,6 @@
 /* some function prototypes */
 
 splt_ogg_state *splt_ogg_info(FILE *in, splt_state *state, int *error);
-static void splt_ogg_clear_sync_in(splt_ogg_state *oggstate);
 static void splt_ogg_clear_sync_in_and_free(splt_ogg_state *oggstate);
 
 /****************************/
@@ -794,8 +792,8 @@
 //Warning ! cutpoint is not the end cutpoint, but the length between the
 //begin and the end
 static int splt_ogg_find_end_cutpoint(splt_state *state, ogg_stream_state *stream,
-    FILE *in, FILE *f, ogg_int64_t cutpoint, int adjust, float threshold, int shots,
-    int *error, const char *output_fname, int save_end_point,
+    FILE *in, FILE *f, ogg_int64_t cutpoint, int adjust, float threshold, float min_length,
+    int shots, int *error, const char *output_fname, int save_end_point,
     double *sec_split_time_length)
 {
   splt_c_put_progress_text(state, SPLT_PROGRESS_CREATE);
@@ -1027,7 +1025,7 @@
             if (adjust)
             {
               if (splt_ogg_scan_silence(state,
-                    (2 * adjust), threshold, 0.f, shots, 0, &page, current_granpos, error, first_cut_granpos,
+                    (2 * adjust), threshold, min_length, shots, 0, &page, current_granpos, error, first_cut_granpos,
                     splt_scan_silence_processor) > 0)
               {
                 cutpoint = (splt_siu_silence_position(state->silence_list, 
@@ -1232,7 +1230,7 @@
 
 double splt_ogg_split(const char *output_fname, splt_state *state,
     double sec_begin, double sec_end, short seekable, 
-    int adjust, float threshold, int shots, int *error, int save_end_point)
+    int adjust, float threshold, float min_length, int shots, int *error, int save_end_point)
 {
   splt_ogg_state *oggstate = state->codec;
 
@@ -1322,7 +1320,7 @@
 
   double sec_split_time_length = sec_end - sec_begin;
   splt_ogg_find_end_cutpoint(state, &stream_out, oggstate->in, 
-      oggstate->out, cutpoint, adjust, threshold, shots, error, output_fname,
+      oggstate->out, cutpoint, adjust, threshold, min_length, shots, error, output_fname,
       save_end_point, &sec_split_time_length);
   sec_end_time = sec_begin + sec_split_time_length;
 
@@ -1490,11 +1488,12 @@
     int gap = splt_o_get_int_option(state, SPLT_OPT_PARAM_GAP);
     float threshold = splt_o_get_int_option(state, SPLT_OPT_PARAM_THRESHOLD);
     int shots = splt_o_get_int_option(state, SPLT_OPT_PARAM_SHOTS);
-    
+    float min_length = splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_LENGTH);
+ 
     int input_not_seekable = splt_o_get_int_option(state, SPLT_OPT_INPUT_NOT_SEEKABLE);
 
     return splt_ogg_split(final_fname, state, begin_point, end_point, 
-        input_not_seekable, gap, threshold, shots, error, save_end_point);
+        input_not_seekable, gap, threshold, min_length, shots, error, save_end_point);
   }
 
   return end_point;

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

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net>
  *
  * Parts of this file have been copied from the 'vcut' 1.6
  * program provided with 'vorbis-tools' :
@@ -31,8 +31,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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -77,7 +76,7 @@
 }
 
 void splt_ogg_initialise_for_new_stream(splt_ogg_new_stream_handler *nsh, 
-    const ogg_page *page, long *cutpoint, long previous_granulepos)
+    ogg_page *page, ogg_int64_t *cutpoint, ogg_int64_t previous_granulepos)
 {
   splt_ogg_state *oggstate = nsh->oggstate;

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net>
  *
  * Parts of this file have been copied from the 'vcut' 1.6
  * program provided with 'vorbis-tools' :
@@ -31,8 +31,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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -58,8 +57,10 @@
     splt_ogg_state *oggstate, ogg_stream_state *stream_out, const char *output_fname,
     int write_header_packets, ogg_stream_state *optional_stream_in);
 
+void splt_ogg_nsh_free(splt_ogg_new_stream_handler **nsh);
+
 void splt_ogg_initialise_for_new_stream(splt_ogg_new_stream_handler *nsh, 
-    const ogg_page *page, long *cutpoint, long previous_granulepos);
+    ogg_page *page, ogg_int64_t *cutpoint, ogg_int64_t previous_granulepos);
 int splt_ogg_new_stream_needs_header_packet();
 void splt_ogg_new_stream_handle_header_packet(splt_ogg_new_stream_handler *nsh, ogg_packet *packet, int *error);

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net>
  *
  * Parts of this file have been copied from the 'vcut' 1.6
  * program provided with 'vorbis-tools' :
@@ -31,8 +31,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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -48,7 +47,7 @@
 
 static void splt_ogg_scan_silence_and_process(splt_state *state, short seconds,
     float max_threshold, ogg_page *page,  ogg_int64_t granpos, ogg_int64_t first_cut_granpos,
-    short process_silence(double time, int silence_was_found, short must_flush,
+    short process_silence(double time, float level, int silence_was_found, short must_flush,
       splt_scan_silence_data *ssd, int *found, int *error),
     splt_scan_silence_data *ssd, int *error);
 static int splt_ogg_silence(splt_ogg_state *oggstate, vorbis_dsp_state *vd, float threshold);
@@ -56,7 +55,7 @@
 int splt_ogg_scan_silence(splt_state *state, short seconds, float threshold, 
     float min, int shots, short output, ogg_page *page, ogg_int64_t granpos,
     int *error, ogg_int64_t first_cut_granpos,
-    short silence_processor(double time, int silence_was_found, short must_flush,
+    short silence_processor(double time, float level, int silence_was_found, short must_flush,
       splt_scan_silence_data *ssd, int *found, int *error))
 {
   splt_scan_silence_data *ssd = splt_scan_silence_data_new(state, output, min, shots, SPLT_FALSE);
@@ -82,7 +81,7 @@
 
 static void splt_ogg_scan_silence_and_process(splt_state *state, short seconds,
     float max_threshold, ogg_page *page,  ogg_int64_t granpos, ogg_int64_t first_cut_granpos,
-    short process_silence(double time, int silence_was_found, short must_flush,
+    short process_silence(double time, float level, int silence_was_found, short must_flush,
       splt_scan_silence_data *ssd, int *found, int *error),
     splt_scan_silence_data *ssd, int *error)
 {
@@ -108,7 +107,7 @@
 
   ogg_page og;
 
-  float threshold = splt_co_convert_from_dB(max_threshold);
+  float threshold = splt_co_convert_from_db(max_threshold);
 
   int result = 0;
 
@@ -253,7 +252,10 @@
             time_in_double = (double) (pos - first_cut_granpos);
             time_in_double /= oggstate->vi->rate;
             time_in_double += previous_streams_time_in_double;
-            int stop = process_silence(time_in_double, silence_was_found, must_flush, ssd, &found, &err);
+
+            float level = splt_co_convert_to_db(oggstate->temp_level);
+
+            int stop = process_silence(time_in_double, level, silence_was_found, must_flush, ssd, &found, &err);
             if (stop || stop == -1)
             {
               eos = 1;
@@ -262,6 +264,43 @@
               if (stop == -1)
                 break;
             }
+
+            //BEGIN silence callbacks
+            if (state->split.get_silence_level)
+            {
+              long time = (long) (((double) pos / oggstate->vi->rate) * 100.0);
+              if (is_stream && stream_time0 == 0 && time != 0)
+              {
+                stream_time0 = time;
+                //          fprintf(stdout, "stream_time0 = %ld\n", stream_time0);
+                //          fflush(stdout);
+              }
+
+              //        fprintf(stdout, "level = %f, time = %ld, time - stream_time0 = %ld\n", 
+              //            level, time, (long) (time - stream_time0));
+              //        fflush(stdout);
+
+              state->split.get_silence_level(time - stream_time0, level,
+                  state->split.silence_level_client_data);
+            }
+            state->split.p_bar->silence_db_level = level;
+            state->split.p_bar->silence_found_tracks = found;
+
+            if (option_silence_mode)
+            {
+              if (splt_t_split_is_canceled(state))
+              {
+                eos = 1;
+              }
+              splt_c_update_progress(state,(double)pos * 100,
+                  (double)(oggstate->len), 1,0,SPLT_DEFAULT_PROGRESS_RATE2);
+            }
+            else
+            {
+              splt_c_update_progress(state,(double)begin, (double)end, 2,0.5,SPLT_DEFAULT_PROGRESS_RATE2);
+            }
+            //END silence callbacks
+
           }
         }
       }
@@ -292,47 +331,12 @@
 //        fprintf(stdout,"Y page number = %ld\n", page_number);
 //        fflush(stdout);
 //      }
-
-      float level = splt_co_convert_to_dB(oggstate->temp_level);
-      if (state->split.get_silence_level)
-      {
-        long time = (long) (((double) pos / oggstate->vi->rate) * 100.0);
-        if (is_stream && stream_time0 == 0 && time != 0)
-        {
-          stream_time0 = time;
-//          fprintf(stdout, "stream_time0 = %ld\n", stream_time0);
-//          fflush(stdout);
-        }
-
-//        fprintf(stdout, "level = %f, time = %ld, time - stream_time0 = %ld\n", 
-//            level, time, (long) (time - stream_time0));
-//        fflush(stdout);
-
-        state->split.get_silence_level(time - stream_time0, level,
-            state->split.silence_level_client_data);
-      }
-      state->split.p_bar->silence_db_level = level;
-      state->split.p_bar->silence_found_tracks = found;
-
-      if (option_silence_mode)
-      {
-        if (splt_t_split_is_canceled(state))
-        {
-          eos = 1;
-        }
-        splt_c_update_progress(state,(double)pos * 100,
-            (double)(oggstate->len), 1,0,SPLT_DEFAULT_PROGRESS_RATE2);
-      }
-      else
-      {
-        splt_c_update_progress(state,(double)begin, (double)end, 2,0.5,SPLT_DEFAULT_PROGRESS_RATE2);
-      }
     }
   }
 
   int junk;
   int err = SPLT_OK;
-  process_silence(-1, SPLT_FALSE, SPLT_FALSE, ssd, &junk, &err);
+  process_silence(-1, -96, SPLT_FALSE, SPLT_FALSE, ssd, &junk, &err);
   if (err < 0) { *error = err; }
 
 function_end:

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net>
  *
  * Parts of this file have been copied from the 'vcut' 1.6
  * program provided with 'vorbis-tools' :
@@ -31,8 +31,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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -46,7 +45,7 @@
 int splt_ogg_scan_silence(splt_state *state, short seconds, float threshold, 
     float min, int shots, short output, ogg_page *page, ogg_int64_t granpos,
     int *error, ogg_int64_t first_cut_granpos,
-    short silence_processor(double time, int silence_was_found, short must_flush,
+    short silence_processor(double time, float level, int silence_was_found, short must_flush,
       splt_scan_silence_data *ssd, int *found, int *error));
 
 #define MP3SPLT_OGG_SILENCE_H

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

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

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

@@ -3,7 +3,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  *********************************************************/
 
@@ -20,13 +20,15 @@
  *
  * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *********************************************************/
 
 #include "silence_processors.h"
 
+static void write_to_full_log(splt_state *state, double time, float level, int shots, int found,
+    double begin_position, double end_position);
+
 splt_scan_silence_data *splt_scan_silence_data_new(splt_state *state, short first, 
     float min, int shots, short set_new_length)
 {
@@ -50,6 +52,7 @@
   ssd->shot = shots;
   ssd->silence_begin_was_found = SPLT_FALSE;
   ssd->continue_after_silence = SPLT_FALSE;
+  ssd->previous_time = 0;
 
   return ssd;
 }
@@ -65,7 +68,7 @@
   *ssd = NULL;
 }
 
-short splt_scan_silence_processor(double time, int silence_was_found,
+short splt_scan_silence_processor(double time, float level, int silence_was_found,
     short must_flush, splt_scan_silence_data *ssd, int *found_silence_points, int *error)
 {
   if (time < 0) { return SPLT_TRUE; }
@@ -98,15 +101,20 @@
     ssd->silence_end = time;
 
     *found_silence_points = ssd->found;
+
+    write_to_full_log(ssd->state, time, level, ssd->shot, ssd->found, -1, -1);
     return stop;
   }
 
+  double begin_position = -1;
+  double end_position = -1;
+
   if (ssd->len > SPLT_DEFAULTSILLEN)
   {
     if (ssd->flush || (ssd->shot <= 0))
     {
-      double begin_position = ssd->silence_begin;
-      double end_position = ssd->silence_end;
+      begin_position = ssd->silence_begin;
+      end_position = ssd->silence_end;
 
       if (ssd->set_new_length)
       {
@@ -120,6 +128,8 @@
         {
           ssd->found = -1;
           *found_silence_points = ssd->found;
+
+          write_to_full_log(ssd->state, time, level, ssd->shot, ssd->found, begin_position, end_position);
           return SPLT_TRUE;
         }
 
@@ -137,6 +147,7 @@
 
   if (ssd->flush)
   {
+    write_to_full_log(ssd->state, time, level, ssd->shot, ssd->found, begin_position, end_position);
     return -1;
   }
 
@@ -157,10 +168,30 @@
 
   *found_silence_points = ssd->found;
 
+  write_to_full_log(ssd->state, time, level, ssd->shot, ssd->found, begin_position, end_position);
   return stop;
 }
 
-static short splt_detect_where_begin_silence_ends(double time, int silence_was_found,
+static void write_to_full_log(splt_state *state, double time, float level, int shots, int found,
+    double begin_position, double end_position)
+{
+  FILE *full_log_file_descriptor = splt_t_get_silence_full_log_file_descriptor(state);
+  if (!full_log_file_descriptor)
+  {
+    return;
+  }
+
+  if (begin_position > 0 && end_position > 0)
+  {
+    fprintf(full_log_file_descriptor, "0\t%lf\t%f\t%d\t%d\t%lf\t%lf\n", time, level, shots, found,
+        begin_position, end_position);
+    return;
+  }
+
+  fprintf(full_log_file_descriptor, "0\t%lf\t%f\t%d\t%d\t\t\n", time, level, shots, found);
+}
+
+static short splt_detect_where_begin_silence_ends(double time, float level, int silence_was_found,
     short must_flush, splt_scan_silence_data *ssd, int *found_silence_points, int *error)
 {
   if (silence_was_found)
@@ -175,7 +206,27 @@
 
   if (ssd->shot <= 0)
   {
-    if (splt_siu_ssplit_new(&ssd->state->silence_list, ssd->silence_end, ssd->silence_end, 0, error) == -1)
+    double silence_end = ssd->silence_end;
+
+    float min_length = splt_o_get_float_option(ssd->state, SPLT_OPT_PARAM_MIN_LENGTH);
+    if (min_length > 0)
+    {
+      if (silence_end > min_length)
+      {
+        silence_end -= min_length;
+      }
+      else
+      {
+        silence_end = 0;
+      }
+
+      long mins, secs, hundr;
+      splt_co_get_mins_secs_hundr(splt_co_time_to_long(silence_end), &mins, &secs, &hundr);
+      splt_c_put_info_message_to_client(ssd->state,
+          _(" info: trim begin split at %ldm_%.2lds_%.2ldh\n"), mins, secs, hundr);
+    }
+ 
+    if (splt_siu_ssplit_new(&ssd->state->silence_list, silence_end, silence_end, 0, error) == -1)
     {
       return SPLT_TRUE;
     }
@@ -193,12 +244,32 @@
   return SPLT_FALSE;
 }
 
-static short splt_detect_where_end_silence_begins(double time, int silence_was_found, 
+static short splt_detect_where_end_silence_begins(double time, float level, int silence_was_found, 
     short must_flush, splt_scan_silence_data *ssd, int *found_silence_points, int *error)
 {
   if (time < 0)
   {
-    if (splt_siu_ssplit_new(&ssd->state->silence_list, ssd->silence_begin, ssd->silence_begin, 0, error) == -1)
+    double silence_begin = ssd->silence_begin;
+
+    float min_length = splt_o_get_float_option(ssd->state, SPLT_OPT_PARAM_MIN_LENGTH);
+    if (min_length > 0)
+    {
+      if (ssd->previous_time - silence_begin > min_length)
+      {
+        silence_begin += min_length;
+      }
+      else
+      {
+        silence_begin = ssd->previous_time;
+      }
+
+      long mins, secs, hundr;
+      splt_co_get_mins_secs_hundr(splt_co_time_to_long(silence_begin), &mins, &secs, &hundr);
+      splt_c_put_info_message_to_client(ssd->state,
+          _(" info: trim end split at %ldm_%.2lds_%.2ldh\n"), mins, secs, hundr);
+    }
+
+    if (splt_siu_ssplit_new(&ssd->state->silence_list, silence_begin, silence_begin, 0, error) == -1)
     {
       return SPLT_TRUE;
     }
@@ -208,6 +279,8 @@
     return SPLT_TRUE;
   }
 
+  ssd->previous_time = time;
+
   if (silence_was_found)
   {
     if (ssd->len == 0)
@@ -260,16 +333,16 @@
   return SPLT_FALSE;
 }
 
-short splt_trim_silence_processor(double time, int silence_was_found, 
+short splt_trim_silence_processor(double time, float level, int silence_was_found, 
     short must_flush, splt_scan_silence_data *ssd, int *found_silence_points, int *error)
 {
   if (!ssd->silence_begin_was_found)
   {
-    splt_detect_where_begin_silence_ends(time, silence_was_found, must_flush, ssd, found_silence_points, error);

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

@@ -3,7 +3,7 @@
  *               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
  *
  *********************************************************/
 
@@ -20,8 +20,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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *********************************************************/
 
@@ -44,12 +43,13 @@
   short set_new_length;
 
   short continue_after_silence;
+  double previous_time;
 } splt_scan_silence_data;
 
-short splt_scan_silence_processor(double time, int silence_was_found, short must_flush, 
+short splt_scan_silence_processor(double time, float level, int silence_was_found, short must_flush, 
     splt_scan_silence_data *data, int *found_silence_points, int *error);
 
-short splt_trim_silence_processor(double time, int silence_was_found, short must_flush,
+short splt_trim_silence_processor(double time, float level, int silence_was_found, short must_flush,
     splt_scan_silence_data *data, int *found_silence_points, int *error);
 
 splt_scan_silence_data *splt_scan_silence_data_new(splt_state *state, short first,

libmp3splt-0.7.3.tar.gz/po/Makevars -> libmp3splt-0.8.2.tar.gz/po/Makevars Changed

@@ -1,7 +1,7 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
-VERSION = 0.5.6
-PACKAGE = libmp3splt
+VERSION = $(VERSION)
+PACKAGE = libmp3splt0
 
 # Usually the message domain is the same as the package name.
 DOMAIN = $(PACKAGE)
@@ -23,7 +23,7 @@
 # or entity, or to disclaim their copyright.  The empty string stands for
 # the public domain; in this case the translators are expected to disclaim
 # their copyright.
-COPYRIGHT_HOLDER = Munteanu Alexandru
+COPYRIGHT_HOLDER = Alexandru Munteanu
 
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
@@ -39,8 +39,9 @@
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS = io_fx@yahoo.fr
+MSGID_BUGS_ADDRESS = m@ioalex.net
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
+

libmp3splt-0.7.3.tar.gz/po/POTFILES.in -> libmp3splt-0.8.2.tar.gz/po/POTFILES.in Changed

@@ -1,20 +1,47 @@
 # List of files which contain translatable strings.
+src/debug.c
+src/silence_utils.c
+src/tags_utils.c
+src/input_output.c
+src/socket_manager.c
+src/output_format.c
+src/cue.c
+src/errors.c
 src/mp3splt.c
 src/checks.c
+src/freedb_utils.c
 src/cddb.c
+src/conversions.c
+src/string_utils.c
+src/freedb.c
+src/oformat_parser.c
+src/pair.c
 src/types_func.c
+src/audacity.c
+src/options.c
+src/filename_regex.c
 src/splt.c
+src/split_points.c
+src/wrap.c
 src/utils.c
-src/plugins.c
-src/cue.c
-src/freedb.c
-src/cddb_cue_common.c
 src/splt_array.c
-src/audacity.c
-src/errors.c
-src/filename_regex.c
-src/string_utils.c
+src/sync_errors.c
+src/win32.c
+src/plugins.c
 src/tags_parser.c
+src/cddb_cue_common.c
+src/client.c
+src/proxy.c
+plugins/ogg_silence.c
+plugins/mp3_silence.c
 plugins/mp3.c
 plugins/ogg.c
-
+plugins/ogg_utils.c
+plugins/mp3_utils.c
+plugins/ogg_new_stream_handler.c
+plugins/silence_processors.c
+plugins/flac.c
+plugins/flac_frame_reader.c
+plugins/flac_metadata_utils.c
+plugins/flac_utils.c
+plugins/from_flac_library.c

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

libmp3splt-0.7.3.tar.gz/po/cs.po -> libmp3splt-0.8.2.tar.gz/po/cs.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:29+0200\n"
+"Report-Msgid-Bugs-To: m@ioalex.net\n"
+"POT-Creation-Date: 2013-03-27 23:05+0100\n"
 "PO-Revision-Date: 2011-07-03 00:37+0000\n"
 "Last-Translator: fri <pavelfric@seznam.cz>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,56 +17,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: src/mp3splt.c:845
+#: src/cue.c:175 src/cddb.c:276
 #, c-format
-msgid " info: resolving linked filename to '%s'\n"
-msgstr " Informace: Spojený název souboru je vyřešen do »%s«\n"
-
-#: src/mp3splt.c:910
-#, c-format
-msgid " info: file matches the plugin '%s'\n"
-msgstr " Informace: Soubor odpovídá přídavnému modulu »%s«\n"
-
-#: src/mp3splt.c:918
-#, c-format
-msgid " M3U file '%s' will be created.\n"
-msgstr " Soubor M3U »%s« bude vytvořen.\n"
-
-#: src/mp3splt.c:939
-#, c-format
-msgid ""
-" Working with SILENCE AUTO-ADJUST (Threshold: %.1f dB Gap: %d sec Offset: "
-"%.2f)\n"
-msgstr ""
-"Pracuje se s SILENCE AUTO-ADJUST (Práh: %.1f dB Mezera: %d s Posun: %.2f)\n"
-
-#: src/mp3splt.c:1739 src/tags_parser.c:108
-msgid ""
-" warning: cannot set tags from filename regular expression - compiled "
-"without pcre support\n"
-msgstr ""
-" Varování: Značky nelze naplnit z regulárního výrazu souboru  - sestaveno "
-"bez podpory pcre\n"
-
-#: src/checks.c:158
-msgid "directory does not exists"
-msgstr "Adresář neexistuje"
-
-#: src/cddb.c:63
-#, c-format
-msgid " reading informations from CDDB file %s ...\n"
-msgstr " Čtou se informace ze souboru CDDB %s …\n"
-
-#: src/cddb.c:125 src/cue.c:539
-#, c-format
-msgid ""
-"  Tracks: %d\n"
-"\n"
-msgstr ""
-"  Skladby: %d\n"
-"\n"
+msgid "  Album: %s\n"
+msgstr "  Album: %s\n"
 
-#: src/cddb.c:259 src/cue.c:135
+#: src/cue.c:209 src/cddb.c:273
 #, c-format
 msgid ""
 "\n"
@@ -75,228 +31,134 @@
 "\n"
 "  Umělec: %s\n"
 
-#: src/cddb.c:262 src/cue.c:139
-#, c-format
-msgid "  Album: %s\n"
-msgstr "  Album: %s\n"
-
-#: src/splt.c:154
-msgid " info: starting normal split\n"
-msgstr " Informace: Spouští se dělení v obvyklém režimu\n"
-
-#: src/splt.c:251
-msgid " info: starting error mode split\n"
-msgstr " Informace: Spouští se dělení v chybovém režimu\n"
-
-#: src/splt.c:563
-msgid " info: starting time mode split\n"
-msgstr " Informace: Spouští se dělení v časovém režimu\n"
-
-#: src/splt.c:582
-msgid " info: starting 'split in equal tracks' mode\n"
-msgstr ""
-" Informace: Spouští se dělení v režimu »dělení na stejně dlouhé skladby«\n"
-
-#: src/splt.c:624
-#, c-format
-msgid " Trim silence split - Th: %.1f dB\n"
-msgstr ""
-
-#: src/splt.c:758
-#, c-format
-msgid "YES"
-msgstr "Ano"
-
-#: src/splt.c:762
-#, c-format
-msgid "NO"
-msgstr "Ne"
-
-#: src/splt.c:768
-#, c-format
-msgid "User"
-msgstr "Uživatel"
-
-#: src/splt.c:772
+#: src/cue.c:513
 #, c-format
-msgid "Auto"
-msgstr "Automaticky"
-
-#: src/splt.c:792
-#, fuzzy, c-format
-msgid ""
-" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: %s, "
-"Min track: %.2f, Shots: %d%s)\n"
-msgstr ""
-" Typ dělení pomocí zjištění ticha: Režim %s (Práh: %.1f dB, Posun: %.2f, "
-"Min: %.2f, Odstranění: %s)\n"
+msgid " reading informations from CUE file %s ...\n"
+msgstr " Čtou se informace ze souboru CUE %s …\n"
 
-#: src/splt.c:818
+#: src/cue.c:587 src/cddb.c:133
 #, c-format
 msgid ""
-" Found silence log file '%s' ! Reading silence points from file to save "
-"time ;)\n"
-msgstr ""
-" Byl nalezen soubor se zápisem pro ticho »%s«! Aby se ušetřil čas, jsou body "
-"rozdělení čteny z tohoto souboru ;)\n"
-
-#: src/splt.c:847
-#, c-format
-msgid " Total silence points found: %d."
-msgstr " Celkem nalezeno bodů ticha: %d."
-
-#: src/splt.c:859
-#, c-format
-msgid " (Selected %d tracks)\n"
-msgstr " (%d skladeb vybráno)\n"
-
-#: src/splt.c:972
-#, c-format
-msgid " Writing silence log file '%s' ...\n"
-msgstr " Zapisuje se soubor se zápisem o tichu »%s« …\n"
-
-#: src/splt.c:1028
-msgid " info: starting silence mode split\n"
-msgstr " Informace: Začíná se s dělením v režimu ticha\n"
-
-#: src/splt.c:1076
-msgid " info: starting trim using silence mode split\n"
-msgstr ""
-
-#: src/splt.c:1123
-msgid " info: starting wrap mode split\n"
+"  Tracks: %d\n"
+"\n"
 msgstr ""
-" Informace: Začíná se s dělením v režimu automatického zalomení (wrap)\n"
-
-#: src/utils.c:71
-#, c-format
-msgid " info: overlapping split files with %ld.%ld.%ld\n"
-msgstr " Informace: Překrytí dělení souborů %ld.%ld.%ld\n"
-
-#: src/cue.c:435
-#, c-format
-msgid " reading informations from CUE file %s ...\n"
-msgstr " Čtou se informace ze souboru CUE %s …\n"
-
-#: src/cue.c:487
-msgid "description here"
-msgstr "Popis zde"
+"  Skladby: %d\n"
+"\n"
 
-#: src/cue.c:700
+#: src/cue.c:810
 #, c-format
 msgid " CUE file '%s' created.\n"
 msgstr " Byl vytvořen soubor CUE »%s«.\n"
 
-#: src/audacity.c:237
-#, c-format
-msgid " reading informations from audacity labels file '%s' ...\n"

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

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

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libmp3splt\n"
-"Report-Msgid-Bugs-To: io_fx@yahoo.fr\n"
-"POT-Creation-Date: 2012-08-27 22:29+0200\n"
+"Report-Msgid-Bugs-To: m@ioalex.net\n"
+"POT-Creation-Date: 2013-03-27 23:05+0100\n"
 "PO-Revision-Date: 2011-09-16 00:13+0100\n"
 "Last-Translator: Mario Blättermann <mariobl@freenet.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -17,57 +17,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/mp3splt.c:845
+#: src/cue.c:175 src/cddb.c:276
 #, c-format
-msgid " info: resolving linked filename to '%s'\n"
-msgstr " Info: Verknüpfter Dateiname wird in »%s« aufgelöst\n"
-
-#: src/mp3splt.c:910
-#, c-format
-msgid " info: file matches the plugin '%s'\n"
-msgstr " Info: Datei passt zum Plugin »%s«\n"
-
-#: src/mp3splt.c:918
-#, c-format
-msgid " M3U file '%s' will be created.\n"
-msgstr " M3U-Datei »%s« wird erstellt.\n"
-
-#: src/mp3splt.c:939
-#, c-format
-msgid ""
-" Working with SILENCE AUTO-ADJUST (Threshold: %.1f dB Gap: %d sec Offset: "
-"%.2f)\n"
-msgstr ""
-"Mit SILENCE AUTO-ADJUST wird gearbeitet (Ansprechschwelle: %.1f dB Pause: %d "
-"s Versatz: %.2f)\n"
-
-#: src/mp3splt.c:1739 src/tags_parser.c:108
-msgid ""
-" warning: cannot set tags from filename regular expression - compiled "
-"without pcre support\n"
-msgstr ""
-" Warnung: Tags können nicht aus regulärem Ausdruck des Dateinamens gesetzt "
-"werden - ohne pcre-Unterstützung gesetzt\n"
-
-#: src/checks.c:158
-msgid "directory does not exists"
-msgstr "Ordner existiert nicht"
-
-#: src/cddb.c:63
-#, c-format
-msgid " reading informations from CDDB file %s ...\n"
-msgstr " Informationen aus CDDB-Datei %s werden gelesen …\n"
-
-#: src/cddb.c:125 src/cue.c:539
-#, c-format
-msgid ""
-"  Tracks: %d\n"
-"\n"
-msgstr ""
-"  Titel: %d\n"
-"\n"
+msgid "  Album: %s\n"
+msgstr "  Album: %s\n"
 
-#: src/cddb.c:259 src/cue.c:135
+#: src/cue.c:209 src/cddb.c:273
 #, c-format
 msgid ""
 "\n"
@@ -76,229 +31,137 @@
 "\n"
 "  Künstler: %s\n"
 
-#: src/cddb.c:262 src/cue.c:139
-#, c-format
-msgid "  Album: %s\n"
-msgstr "  Album: %s\n"
-
-#: src/splt.c:154
-msgid " info: starting normal split\n"
-msgstr " Info: Teilung im normalen Modus wird gestartet\n"
-
-#: src/splt.c:251
-msgid " info: starting error mode split\n"
-msgstr " Info: Teilung im Fehlermodus wird gestartet\n"
-
-#: src/splt.c:563
-msgid " info: starting time mode split\n"
-msgstr " Info: Teilung im Zeitmodus wird gestartet\n"
-
-#: src/splt.c:582
-msgid " info: starting 'split in equal tracks' mode\n"
-msgstr " Info: Teilung im Modus »Gleich große Teile« wird gestartet\n"
-
-#: src/splt.c:624
-#, c-format
-msgid " Trim silence split - Th: %.1f dB\n"
-msgstr "Trimmen nach Stille-Erkennung - Ansprechschwelle: %.1f dB\n"
-
-#: src/splt.c:758
-#, c-format
-msgid "YES"
-msgstr "JA"
-
-#: src/splt.c:762
+#: src/cue.c:513
 #, c-format
-msgid "NO"
-msgstr "NEIN"
-
-#: src/splt.c:768
-#, c-format
-msgid "User"
-msgstr "Benutzer"
-
-#: src/splt.c:772
-#, c-format
-msgid "Auto"
-msgstr "Automatisch"
-
-#: src/splt.c:792
-#, fuzzy, c-format
-msgid ""
-" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: %s, "
-"Min track: %.2f, Shots: %d%s)\n"
-msgstr ""
-" Stille-Teilungstyp: Modus %s (Ansprechschwelle: %.1f dB, Aus: %.2f, Min: "
-"%.2f, Entfernen: %s, Min-Titel: %.2f)\n"
+msgid " reading informations from CUE file %s ...\n"
+msgstr " Informationen aus CUE-Datei %s werden gelesen …\n"
 
-#: src/splt.c:818
+#: src/cue.c:587 src/cddb.c:133
 #, c-format
 msgid ""
-" Found silence log file '%s' ! Reading silence points from file to save "
-"time ;)\n"
+"  Tracks: %d\n"
+"\n"
 msgstr ""
-" Stille-Protokolldatei »%s« wurde gefunden! Um Zeit zu sparen, werden die "
-"Teilungspunkte aus dieser Datei gelesen ;)\n"
-
-#: src/splt.c:847
-#, c-format
-msgid " Total silence points found: %d."
-msgstr " Insgesamt gefundene Teilungspunkte: %d."
-
-#: src/splt.c:859
-#, c-format
-msgid " (Selected %d tracks)\n"
-msgstr " (%d Titel ausgewählt)\n"
-
-#: src/splt.c:972
-#, c-format
-msgid " Writing silence log file '%s' ...\n"
-msgstr "Stille-Protokolldatei »%s« wird geschrieben …\n"
-
-#: src/splt.c:1028
-msgid " info: starting silence mode split\n"
-msgstr " Info: Teilung im Stille-Modus wird gestartet\n"
-
-#: src/splt.c:1076
-msgid " info: starting trim using silence mode split\n"
-msgstr " Info: Trimmen im Stille-Modus wird gestartet\n"
-
-#: src/splt.c:1123
-msgid " info: starting wrap mode split\n"
-msgstr " Info: Teilung im Wrap-Modus wird gestartet\n"
-
-#: src/utils.c:71
-#, c-format
-msgid " info: overlapping split files with %ld.%ld.%ld\n"
-msgstr " Info: Überlappung der Dateiteilung mit %ld.%ld.%ld\n"
-
-#: src/cue.c:435
-#, c-format
-msgid " reading informations from CUE file %s ...\n"
-msgstr " Informationen aus CUE-Datei %s werden gelesen …\n"
-
-#: src/cue.c:487
-msgid "description here"
-msgstr "Beschreibung hier"
+"  Titel: %d\n"
+"\n"
 
-#: src/cue.c:700
+#: src/cue.c:810
 #, c-format
 msgid " CUE file '%s' created.\n"
 msgstr " CUE-Datei »%s« wurde erstellt.\n"
 
-#: src/audacity.c:237
-#, c-format
-msgid " reading informations from audacity labels file '%s' ...\n"
-msgstr " Informationen aus Audacity-Labels-Datei »%s« werden gelesen …\n"

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

libmp3splt-0.7.3.tar.gz/po/es.po -> libmp3splt-0.8.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:29+0200\n"
+"Report-Msgid-Bugs-To: m@ioalex.net\n"
+"POT-Creation-Date: 2013-03-27 23:05+0100\n"
 "PO-Revision-Date: 2011-02-22 00:08+0000\n"
 "Last-Translator: nemecis1000 <nemecis000@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,272 +17,143 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/mp3splt.c:845
+#: src/cue.c:175 src/cddb.c:276
 #, c-format
-msgid " info: resolving linked filename to '%s'\n"
-msgstr ""
-
-#: src/mp3splt.c:910
-#, c-format
-msgid " info: file matches the plugin '%s'\n"
-msgstr ""
-
-#: src/mp3splt.c:918
-#, c-format
-msgid " M3U file '%s' will be created.\n"
-msgstr ""
-
-#: src/mp3splt.c:939
-#, c-format
-msgid ""
-" Working with SILENCE AUTO-ADJUST (Threshold: %.1f dB Gap: %d sec Offset: "
-"%.2f)\n"
-msgstr ""
-
-#: src/mp3splt.c:1739 src/tags_parser.c:108
-msgid ""
-" warning: cannot set tags from filename regular expression - compiled "
-"without pcre support\n"
-msgstr ""
-
-#: src/checks.c:158
-msgid "directory does not exists"
-msgstr ""
-
-#: src/cddb.c:63
-#, c-format
-msgid " reading informations from CDDB file %s ...\n"
-msgstr ""
-
-#: src/cddb.c:125 src/cue.c:539
-#, c-format
-msgid ""
-"  Tracks: %d\n"
-"\n"
+msgid "  Album: %s\n"
 msgstr ""
 
-#: src/cddb.c:259 src/cue.c:135
+#: src/cue.c:209 src/cddb.c:273
 #, c-format
 msgid ""
 "\n"
 "  Artist: %s\n"
 msgstr ""
 
-#: src/cddb.c:262 src/cue.c:139
-#, c-format
-msgid "  Album: %s\n"
-msgstr ""
-
-#: src/splt.c:154
-msgid " info: starting normal split\n"
-msgstr ""
-
-#: src/splt.c:251
-msgid " info: starting error mode split\n"
-msgstr ""
-
-#: src/splt.c:563
-msgid " info: starting time mode split\n"
-msgstr ""
-
-#: src/splt.c:582
-msgid " info: starting 'split in equal tracks' mode\n"
-msgstr ""
-
-#: src/splt.c:624
-#, c-format
-msgid " Trim silence split - Th: %.1f dB\n"
-msgstr ""
-
-#: src/splt.c:758
-#, c-format
-msgid "YES"
-msgstr "SÍ"
-
-#: src/splt.c:762
-#, c-format
-msgid "NO"
-msgstr "NO"
-
-#: src/splt.c:768
-#, c-format
-msgid "User"
-msgstr "Usuario"
-
-#: src/splt.c:772
-#, c-format
-msgid "Auto"
-msgstr "Auto"
-
-#: src/splt.c:792
+#: src/cue.c:513
 #, c-format
-msgid ""
-" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: %s, "
-"Min track: %.2f, Shots: %d%s)\n"
+msgid " reading informations from CUE file %s ...\n"
 msgstr ""
 
-#: src/splt.c:818
+#: src/cue.c:587 src/cddb.c:133
 #, c-format
 msgid ""
-" Found silence log file '%s' ! Reading silence points from file to save "
-"time ;)\n"
-msgstr ""
-
-#: src/splt.c:847
-#, c-format
-msgid " Total silence points found: %d."
-msgstr ""
-
-#: src/splt.c:859
-#, c-format
-msgid " (Selected %d tracks)\n"
-msgstr ""
-
-#: src/splt.c:972
-#, c-format
-msgid " Writing silence log file '%s' ...\n"
-msgstr ""
-
-#: src/splt.c:1028
-msgid " info: starting silence mode split\n"
-msgstr ""
-
-#: src/splt.c:1076
-msgid " info: starting trim using silence mode split\n"
-msgstr ""
-
-#: src/splt.c:1123
-msgid " info: starting wrap mode split\n"
-msgstr ""
-
-#: src/utils.c:71
-#, c-format
-msgid " info: overlapping split files with %ld.%ld.%ld\n"
-msgstr ""
-
-#: src/cue.c:435
-#, c-format
-msgid " reading informations from CUE file %s ...\n"
-msgstr ""
-
-#: src/cue.c:487
-msgid "description here"
+"  Tracks: %d\n"
+"\n"
 msgstr ""
 
-#: src/cue.c:700
+#: src/cue.c:810
 #, c-format
 msgid " CUE file '%s' created.\n"
 msgstr ""
 
-#: src/audacity.c:237
-#, c-format
-msgid " reading informations from audacity labels file '%s' ...\n"
-msgstr ""
-
-#: src/errors.c:129
+#: src/errors.c:126
 msgid "Network error"
 msgstr ""
 
-#: src/errors.c:179
+#: src/errors.c:176
 msgid " warning: might be VBR, use frame mode"
 msgstr ""
 
-#: src/errors.c:181
+#: src/errors.c:178
 msgid " error mode ok"
 msgstr ""

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

libmp3splt-0.7.3.tar.gz/po/fr_FR.po -> libmp3splt-0.8.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:29+0200\n"
+"Report-Msgid-Bugs-To: m@ioalex.net\n"
+"POT-Creation-Date: 2013-03-27 23:05+0100\n"
 "PO-Revision-Date: 2011-02-22 00:08+0000\n"
 "Last-Translator: Chris38 <ch.daudin@free.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,57 +17,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: src/mp3splt.c:845
+#: src/cue.c:175 src/cddb.c:276
 #, c-format
-msgid " info: resolving linked filename to '%s'\n"
-msgstr " info: le fichier du lien symbolique est '%s'\n"
-
-#: src/mp3splt.c:910
-#, c-format
-msgid " info: file matches the plugin '%s'\n"
-msgstr " info : le fichier correspond au module '%s'\n"
-
-#: src/mp3splt.c:918
-#, c-format
-msgid " M3U file '%s' will be created.\n"
-msgstr " Le fichier M3U '%s' sera créé.\n"
-
-#: src/mp3splt.c:939
-#, c-format
-msgid ""
-" Working with SILENCE AUTO-ADJUST (Threshold: %.1f dB Gap: %d sec Offset: "
-"%.2f)\n"
-msgstr ""
-" Avec ajustement du silence (Seuil : %.1f dB Ecart : %d sec Compensation : "
-"%.2f)\n"
-
-#: src/mp3splt.c:1739 src/tags_parser.c:108
-msgid ""
-" warning: cannot set tags from filename regular expression - compiled "
-"without pcre support\n"
-msgstr ""
-"avertissement : impossible de remplir les tags avec l'expression régulière "
-"fichier - compilé sans support pcre\n"
-
-#: src/checks.c:158
-msgid "directory does not exists"
-msgstr "le dossier n'existe pas"
-
-#: src/cddb.c:63
-#, c-format
-msgid " reading informations from CDDB file %s ...\n"
-msgstr " lecture des informations du fichier CDDB %s ...\n"
-
-#: src/cddb.c:125 src/cue.c:539
-#, c-format
-msgid ""
-"  Tracks: %d\n"
-"\n"
-msgstr ""
-"  Pistes : %d\n"
-"\n"
+msgid "  Album: %s\n"
+msgstr "  Album : %s\n"
 
-#: src/cddb.c:259 src/cue.c:135
+#: src/cue.c:209 src/cddb.c:273
 #, c-format
 msgid ""
 "\n"
@@ -76,228 +31,133 @@
 "\n"
 "  Artiste : %s\n"
 
-#: src/cddb.c:262 src/cue.c:139
-#, c-format
-msgid "  Album: %s\n"
-msgstr "  Album : %s\n"
-
-#: src/splt.c:154
-msgid " info: starting normal split\n"
-msgstr " info : début de la division normale\n"
-
-#: src/splt.c:251
-msgid " info: starting error mode split\n"
-msgstr ""
-" info : début de la division avec recherche d'erreurs de synchronisation\n"
-
-#: src/splt.c:563
-msgid " info: starting time mode split\n"
-msgstr " info : début de la division en plusieurs pistes de même taille\n"
-
-#: src/splt.c:582
-msgid " info: starting 'split in equal tracks' mode\n"
-msgstr " info : début de la division en morceaux egaux\n"
-
-#: src/splt.c:624
-#, c-format
-msgid " Trim silence split - Th: %.1f dB\n"
-msgstr ""
-
-#: src/splt.c:758
-#, c-format
-msgid "YES"
-msgstr "OUI"
-
-#: src/splt.c:762
-#, c-format
-msgid "NO"
-msgstr "NON"
-
-#: src/splt.c:768
-#, c-format
-msgid "User"
-msgstr "Utilisateur"
-
-#: src/splt.c:772
+#: src/cue.c:513
 #, c-format
-msgid "Auto"
-msgstr "Automatique"
-
-#: src/splt.c:792
-#, fuzzy, c-format
-msgid ""
-" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: %s, "
-"Min track: %.2f, Shots: %d%s)\n"
-msgstr ""
-" Division avec recherche du silence : mode %s (Seuil : %.1f dB, Ecart : "
-"%.2f, Min : %.2f, Suppression : %s)\n"
+msgid " reading informations from CUE file %s ...\n"
+msgstr " lecture des informations du fichier CUE %s ...\n"
 
-#: src/splt.c:818
+#: src/cue.c:587 src/cddb.c:133
 #, c-format
 msgid ""
-" Found silence log file '%s' ! Reading silence points from file to save "
-"time ;)\n"
+"  Tracks: %d\n"
+"\n"
 msgstr ""
-"Fichier journal silence trouvé '%s' ! Lecture des points silence points pour "
-"gagner du temps ;)\n"
-
-#: src/splt.c:847
-#, c-format
-msgid " Total silence points found: %d."
-msgstr "Total des points silence trouvés  : %d."
-
-#: src/splt.c:859
-#, c-format
-msgid " (Selected %d tracks)\n"
-msgstr " (%d pistes sélectionnées)\n"
-
-#: src/splt.c:972
-#, c-format
-msgid " Writing silence log file '%s' ...\n"
-msgstr " Ecriture du fichier de log avec les points de silence '%s' ...\n"
-
-#: src/splt.c:1028
-msgid " info: starting silence mode split\n"
-msgstr " info : début de la division avec recherche de silence\n"
-
-#: src/splt.c:1076
-#, fuzzy
-msgid " info: starting trim using silence mode split\n"
-msgstr " info : début de la division avec recherche de silence\n"
-
-#: src/splt.c:1123
-msgid " info: starting wrap mode split\n"
-msgstr " info : début de la division 'wrap'\n"
-
-#: src/utils.c:71
-#, c-format
-msgid " info: overlapping split files with %ld.%ld.%ld\n"
-msgstr " info : chevauchement des fichiers obtenus avec %ld.%ld.%ld\n"
-
-#: src/cue.c:435
-#, c-format
-msgid " reading informations from CUE file %s ...\n"
-msgstr " lecture des informations du fichier CUE %s ...\n"
-
-#: src/cue.c:487
-msgid "description here"
-msgstr "description"
+"  Pistes : %d\n"
+"\n"
 
-#: src/cue.c:700
+#: src/cue.c:810
 #, c-format
 msgid " CUE file '%s' created.\n"
 msgstr " Fichier CUE '%s' créé.\n"
 
-#: src/audacity.c:237
-#, c-format

libmp3splt-0.7.3.tar.gz/po/hr.gmo -> libmp3splt-0.8.2.tar.gz/po/hr.gmo Changed

libmp3splt-0.7.3.tar.gz/po/hr.po -> libmp3splt-0.8.2.tar.gz/po/hr.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:29+0200\n"
+"Report-Msgid-Bugs-To: m@ioalex.net\n"
+"POT-Creation-Date: 2013-03-27 23:05+0100\n"
 "PO-Revision-Date: 2012-04-15 12:44+0000\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,53 +19,12 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
-#: src/mp3splt.c:845
+#: src/cue.c:175 src/cddb.c:276
 #, c-format
-msgid " info: resolving linked filename to '%s'\n"
-msgstr " info: rješavanje povezanog naziva datoteke u '%s'\n"
-
-#: src/mp3splt.c:910
-#, c-format
-msgid " info: file matches the plugin '%s'\n"
-msgstr "info: datoteka se podudara s priključkom '%s'\n"
-
-#: src/mp3splt.c:918
-#, c-format
-msgid " M3U file '%s' will be created.\n"
-msgstr " M3U datoteka '%s' biti će  izrađena.\n"
-
-#: src/mp3splt.c:939
-#, c-format
-msgid ""
-" Working with SILENCE AUTO-ADJUST (Threshold: %.1f dB Gap: %d sec Offset: "
-"%.2f)\n"
-msgstr ""
-
-#: src/mp3splt.c:1739 src/tags_parser.c:108
-msgid ""
-" warning: cannot set tags from filename regular expression - compiled "
-"without pcre support\n"
-msgstr ""
-
-#: src/checks.c:158
-msgid "directory does not exists"
-msgstr "direktorij ne postoji"
-
-#: src/cddb.c:63
-#, c-format
-msgid " reading informations from CDDB file %s ...\n"
-msgstr " čitanje informacija iz CDDB datoteke %s ...\n"
-
-#: src/cddb.c:125 src/cue.c:539
-#, c-format
-msgid ""
-"  Tracks: %d\n"
-"\n"
-msgstr ""
-"  Pjesme: %d\n"
-"\n"
+msgid "  Album: %s\n"
+msgstr "  Album: %s\n"
 
-#: src/cddb.c:259 src/cue.c:135
+#: src/cue.c:209 src/cddb.c:273
 #, c-format
 msgid ""
 "\n"
@@ -74,225 +33,133 @@
 "\n"
 "  Izvođač: %s\n"
 
-#: src/cddb.c:262 src/cue.c:139
-#, c-format
-msgid "  Album: %s\n"
-msgstr "  Album: %s\n"
-
-#: src/splt.c:154
-msgid " info: starting normal split\n"
-msgstr " info: pokretanje normalne podjele\n"
-
-#: src/splt.c:251
-msgid " info: starting error mode split\n"
-msgstr " info: pokretanje načina greške\n"
-
-#: src/splt.c:563
-msgid " info: starting time mode split\n"
-msgstr " info: pokretanje načina vremena\n"
-
-#: src/splt.c:582
-msgid " info: starting 'split in equal tracks' mode\n"
-msgstr " info: pokretanje načina 'podijeli na jednake pjesme'\n"
-
-#: src/splt.c:624
-#, c-format
-msgid " Trim silence split - Th: %.1f dB\n"
-msgstr " Izreži podjelu tišine - Th: %.1f dB\n"
-
-#: src/splt.c:758
-#, c-format
-msgid "YES"
-msgstr "DA"
-
-#: src/splt.c:762
-#, c-format
-msgid "NO"
-msgstr "NE"
-
-#: src/splt.c:768
-#, c-format
-msgid "User"
-msgstr "Korisnik"
-
-#: src/splt.c:772
+#: src/cue.c:513
 #, c-format
-msgid "Auto"
-msgstr "Auto"
-
-#: src/splt.c:792
-#, fuzzy, c-format
-msgid ""
-" Silence split type: %s mode (Th: %.1f dB, Off: %.2f, Min: %.2f, Remove: %s, "
-"Min track: %.2f, Shots: %d%s)\n"
+msgid " reading informations from CUE file %s ...\n"
 msgstr ""
-" Vrsta podjele tišine: %s način (Th: %.1f dB, Isključeno: %.2f, Min: %.2f, "
-"Ukloni: %s, Min pjesma: %.2f, Pogotci: %d)\n"
 
-#: src/splt.c:818
+#: src/cue.c:587 src/cddb.c:133
 #, c-format
 msgid ""
-" Found silence log file '%s' ! Reading silence points from file to save "
-"time ;)\n"
-msgstr ""
-" Peonađena datoteka popisa tišine '%s' ! Očitavnje točaka tišine iz "
-"datoteke, radi bržeg očitavanja ;)\n"
-
-#: src/splt.c:847
-#, c-format
-msgid " Total silence points found: %d."
-msgstr "Pronađeno ukupno točaka tišine: %d."
-
-#: src/splt.c:859
-#, c-format
-msgid " (Selected %d tracks)\n"
-msgstr " (Odabrano %d pjesama)\n"
-
-#: src/splt.c:972
-#, c-format
-msgid " Writing silence log file '%s' ...\n"
-msgstr " Zapisujem datoteku popisa tišine '%s' ...\n"
-
-#: src/splt.c:1028
-msgid " info: starting silence mode split\n"
-msgstr ""
-
-#: src/splt.c:1076
-msgid " info: starting trim using silence mode split\n"
-msgstr ""
-
-#: src/splt.c:1123
-msgid " info: starting wrap mode split\n"
-msgstr ""
-
-#: src/utils.c:71
-#, c-format
-msgid " info: overlapping split files with %ld.%ld.%ld\n"
-msgstr ""
-
-#: src/cue.c:435
-#, c-format
-msgid " reading informations from CUE file %s ...\n"
+"  Tracks: %d\n"
+"\n"
 msgstr ""
+"  Pjesme: %d\n"
+"\n"
 
-#: src/cue.c:487
-msgid "description here"
-msgstr "opis ovdje"
-
-#: src/cue.c:700
+#: src/cue.c:810
 #, c-format
 msgid " CUE file '%s' created.\n"
 msgstr " CUE datoteka '%s' izrađena\n"
 
-#: src/audacity.c:237
-#, c-format
-msgid " reading informations from audacity labels file '%s' ...\n"
-msgstr ""
-
-#: src/errors.c:129
+#: src/errors.c:126
 msgid "Network error"
 msgstr "Greška mreže"

libmp3splt-0.8.2.tar.gz/po/libmp3splt0.pot Added

@@ -0,0 +1,660 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Alexandru Munteanu
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: m@ioalex.net\n"
+"POT-Creation-Date: 2013-03-27 23:05+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/cue.c:175 src/cddb.c:276
+#, c-format
+msgid "  Album: %s\n"
+msgstr ""
+
+#: src/cue.c:209 src/cddb.c:273
+#, c-format
+msgid ""
+"\n"
+"  Artist: %s\n"
+msgstr ""
+
+#: src/cue.c:513
+#, c-format
+msgid " reading informations from CUE file %s ...\n"
+msgstr ""
+
+#: src/cue.c:587 src/cddb.c:133
+#, c-format
+msgid ""
+"  Tracks: %d\n"
+"\n"
+msgstr ""
+
+#: src/cue.c:810
+#, c-format
+msgid " CUE file '%s' created.\n"
+msgstr ""
+
+#: src/errors.c:126
+msgid "Network error"
+msgstr ""
+
+#: src/errors.c:176
+msgid " warning: might be VBR, use frame mode"
+msgstr ""
+
+#: src/errors.c:178
+msgid " error mode ok"
+msgstr ""
+
+#: src/errors.c:180
+msgid " error: unknown sync error"
+msgstr ""
+
+#: src/errors.c:182
+msgid " no sync errors found"
+msgstr ""
+
+#: src/errors.c:185
+msgid " sync error: too many sync errors"
+msgstr ""
+
+#: src/errors.c:189
+msgid " maximum number of found CD reached"
+msgstr ""
+
+#: src/errors.c:191
+msgid " cue file processed"
+msgstr ""
+
+#: src/errors.c:193
+msgid " cddb file processed"
+msgstr ""
+
+#: src/errors.c:195
+msgid " freedb file downloaded"
+msgstr ""
+
+#: src/errors.c:197
+msgid " freedb search processed"
+msgstr ""
+
+#: src/errors.c:201
+#, c-format
+msgid " freedb error: cannot initialise socket (%s)"
+msgstr ""
+
+#: src/errors.c:205
+#, c-format
+msgid " freedb error: cannot get host '%s' by name (%s)"
+msgstr ""
+
+#: src/errors.c:209
+#, c-format
+msgid " freedb error: cannot open socket (%s)"
+msgstr ""
+
+#: src/errors.c:212
+#, c-format
+msgid " freedb error: cannot connect to host '%s' (%s)"
+msgstr ""
+
+#: src/errors.c:216
+#, c-format
+msgid " freedb error: cannot disconnect from host (%s)"
+msgstr ""
+
+#: src/errors.c:220
+#, c-format
+msgid " freedb error: cannot send message to host '%s' (%s)"
+msgstr ""
+
+#: src/errors.c:224
+msgid " freedb error: invalid server answer"
+msgstr ""
+
+#: src/errors.c:227
+msgid " freedb error: site returned code 201"
+msgstr ""
+
+#: src/errors.c:230
+msgid " freedb error: site returned code 200"
+msgstr ""
+
+#: src/errors.c:233
+msgid " freedb error: bad communication with site"
+msgstr ""
+
+#: src/errors.c:236
+#, c-format
+msgid " freedb error: could not get infos from site '%s'"
+msgstr ""
+
+#: src/errors.c:239
+msgid " no CD found for this search"
+msgstr ""
+
+#: src/errors.c:242
+#, c-format
+msgid " freedb error: cannot receive message from server '%s' (%s)"
+msgstr ""
+
+#: src/errors.c:246
+msgid " proxy not supported with this type of protocol"
+msgstr ""
+
+#: src/errors.c:248
+#, c-format
+msgid " cue error: invalid cue file '%s'"
+msgstr ""
+
+#: src/errors.c:251
+#, c-format
+msgid " cddb error: invalid cddb file '%s'"
+msgstr ""
+
+#: src/errors.c:255
+msgid " freedb error: No such CD entry in database"
+msgstr ""
+
+#: src/errors.c:258
+msgid " freedb error: bad response from remote host"
+msgstr ""
+
+#: src/errors.c:261
+msgid " wrap split ok"
+msgstr ""
+
+#: src/errors.c:264
+msgid " wrap error: incorrect file length"
+msgstr ""
+
+#: src/errors.c:267
+msgid " wrap error: libmp3splt version too old for this wrap file"
+msgstr ""
+
+#: src/errors.c:270
+msgid " wrap error: no file found or bad index"
+msgstr ""
+
+#: src/errors.c:273
+#, c-format
+msgid " wrap error: file '%s' damaged or incomplete"
+msgstr ""
+
+#: src/errors.c:277
+msgid " wrap error: maybe not a wrapped file or wrap file damaged"
+msgstr ""
+

libmp3splt-0.7.3.tar.gz/src/Makefile.am -> libmp3splt-0.8.2.tar.gz/src/Makefile.am Changed

@@ -1,12 +1,13 @@
 includedir = $(prefix)/include/libmp3splt/
 
-include_HEADERS = $(top_srcdir)/include/libmp3splt/mp3splt.h
+include_HEADERS = $(top_srcdir)/include/libmp3splt/mp3splt.h \
+$(top_srcdir)/include/libmp3splt/version.h
 
-INCLUDES=-DSPLT_PLUGINS_DIR=\"$(libdir)/libmp3splt\" @INCLTDL@
+INCLUDES=-DSPLT_PLUGINS_DIR=\"$(libdir)/libmp3splt$(SONAME)\" -DLIBMP3SPLT_VERSION=\"$(VERSION)\" @INCLTDL@
 
 lib_LTLIBRARIES = libmp3splt.la
 
-libmp3splt_la_LDFLAGS = -no-undefined -version-info 0:5:0
+libmp3splt_la_LDFLAGS = -no-undefined -version-info 0:8:0
 libmp3splt_la_CPPFLAGS = -I$(top_srcdir)/include/libmp3splt
 libmp3splt_la_LIBADD = @LIBINTL@ -lm
 
@@ -37,6 +38,7 @@
   types_func.c types_func.h \
   splt.c splt.h  \
   mp3splt.c $(top_srcdir)/include/libmp3splt/mp3splt.h \
+  $(top_srcdir)/include/libmp3splt/version.h \
   cddb.c cddb.h \
   checks.c checks.h \
   utils.c utils.h \
@@ -65,7 +67,8 @@
   pair.c pair.h \
   debug.c debug.h \
   filename_regex.c filename_regex.h \
-  socket_manager.c socket_manager.h
+  socket_manager.c socket_manager.h \
+  proxy.c proxy.h
 
 # Define a C macro LOCALEDIR indicating where catalogs will be installed.
 localedir = $(datadir)/locale

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

@@ -127,7 +127,7 @@
 	libmp3splt_la-conversions.lo libmp3splt_la-tags_parser.lo \
 	libmp3splt_la-oformat_parser.lo libmp3splt_la-pair.lo \
 	libmp3splt_la-debug.lo libmp3splt_la-filename_regex.lo \
-	libmp3splt_la-socket_manager.lo
+	libmp3splt_la-socket_manager.lo libmp3splt_la-proxy.lo
 libmp3splt_la_OBJECTS = $(am_libmp3splt_la_OBJECTS)
 libmp3splt_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -207,6 +207,9 @@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBLTDL = @LIBLTDL@
+LIBMP3SPLT_MAJOR_VERSION = @LIBMP3SPLT_MAJOR_VERSION@
+LIBMP3SPLT_MICRO_VERSION = @LIBMP3SPLT_MICRO_VERSION@
+LIBMP3SPLT_MINOR_VERSION = @LIBMP3SPLT_MINOR_VERSION@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -256,6 +259,7 @@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SONAME = @SONAME@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@@ -322,11 +326,14 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-include_HEADERS = $(top_srcdir)/include/libmp3splt/mp3splt.h
-INCLUDES = -DSPLT_PLUGINS_DIR=\"$(libdir)/libmp3splt\" @INCLTDL@ \
-	$(am__append_2) $(am__append_3)
+include_HEADERS = $(top_srcdir)/include/libmp3splt/mp3splt.h \
+$(top_srcdir)/include/libmp3splt/version.h
+
+INCLUDES = -DSPLT_PLUGINS_DIR=\"$(libdir)/libmp3splt$(SONAME)\" \
+	-DLIBMP3SPLT_VERSION=\"$(VERSION)\" @INCLTDL@ $(am__append_2) \
+	$(am__append_3)
 lib_LTLIBRARIES = libmp3splt.la
-libmp3splt_la_LDFLAGS = -no-undefined -version-info 0:5:0
+libmp3splt_la_LDFLAGS = -no-undefined -version-info 0:8:0
 libmp3splt_la_CPPFLAGS = -I$(top_srcdir)/include/libmp3splt
 libmp3splt_la_LIBADD = @LIBINTL@ -lm $(am__append_1) $(am__append_4) \
 	$(am__append_5) $(am__append_6) $(am__append_7) \
@@ -335,6 +342,7 @@
   types_func.c types_func.h \
   splt.c splt.h  \
   mp3splt.c $(top_srcdir)/include/libmp3splt/mp3splt.h \
+  $(top_srcdir)/include/libmp3splt/version.h \
   cddb.c cddb.h \
   checks.c checks.h \
   utils.c utils.h \
@@ -363,7 +371,8 @@
   pair.c pair.h \
   debug.c debug.h \
   filename_regex.c filename_regex.h \
-  socket_manager.c socket_manager.h
+  socket_manager.c socket_manager.h \
+  proxy.c proxy.h
 
 all: all-am
 
@@ -459,6 +468,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmp3splt_la-output_format.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmp3splt_la-pair.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmp3splt_la-plugins.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmp3splt_la-proxy.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmp3splt_la-silence_utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmp3splt_la-socket_manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmp3splt_la-split_points.Plo@am__quote@
@@ -718,6 +728,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmp3splt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmp3splt_la-socket_manager.lo `test -f 'socket_manager.c' || echo '$(srcdir)/'`socket_manager.c
 
+libmp3splt_la-proxy.lo: proxy.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmp3splt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmp3splt_la-proxy.lo -MD -MP -MF $(DEPDIR)/libmp3splt_la-proxy.Tpo -c -o libmp3splt_la-proxy.lo `test -f 'proxy.c' || echo '$(srcdir)/'`proxy.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmp3splt_la-proxy.Tpo $(DEPDIR)/libmp3splt_la-proxy.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='proxy.c' object='libmp3splt_la-proxy.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmp3splt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmp3splt_la-proxy.lo `test -f 'proxy.c' || echo '$(srcdir)/'`proxy.c
+
 mostlyclean-libtool:
 	-rm -f *.lo

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

@@ -1,11 +1,11 @@
 /**********************************************************
  *
  * audacity.c -- Audacity label file parser portion of the Mp3Splt utility
- *                    Utility for mp3/ogg splitting without decoding
+ *               Utility for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2004 M. Trotta - <matteo.trotta@lib.unimib.it>
  * Copyright (c) 2007 Federico Grau - <donfede@casagrau.org>
- * Copyright (c) 2010-2012 Alexandru Munteanu <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net>
  *
  * http://mp3splt.sourceforge.net
  * http://audacity.sourceforge.net/
@@ -25,8 +25,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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -45,7 +44,6 @@
 
 #include "splt.h"
 
-
 static long splt_audacity_get_begin(splt_audacity *sa)
 {
   return sa->begin;
@@ -146,7 +144,6 @@
 
 static long to_hundreths(char *str)
 {
-  long hun = 0;
   long seconds = 0, hundreths = 0;
   sscanf(str, "%ld.%4ld", &seconds, &hundreths);
 
@@ -221,6 +218,9 @@
 
 int splt_audacity_put_splitpoints(const char *file, splt_state *state, int *error)
 {
+  char *line = NULL;
+  splt_audacity *previous_aud = NULL;
+
 	int tracks = -1;
 
   if (file == NULL)
@@ -256,10 +256,8 @@
   int err = SPLT_OK;
 
   splt_audacity *aud = NULL;
-  splt_audacity *previous_aud = NULL;
 
   tracks = 0;
-  char *line = NULL;
   while ((line = splt_io_readline(file_input, error)) != NULL)
   {
     if (*error < 0) { goto end; }
@@ -271,8 +269,7 @@
       continue;
     }
 
-    aud = splt_audacity_process_line(state, line, previous_aud,
-        &append_begin_point, &err);
+    aud = splt_audacity_process_line(state, line, previous_aud, &append_begin_point, &err);
     if (err < 0) { goto end; }
 
     if (previous_aud)

libmp3splt-0.7.3.tar.gz/src/audacity.h -> libmp3splt-0.8.2.tar.gz/src/audacity.h Changed

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

@@ -3,7 +3,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  *********************************************************/
 
@@ -20,7 +20,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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * 02111-1307, USA.
  *********************************************************/
 
@@ -75,7 +75,7 @@
   if (err < 0) { *error = err; return tracks; }
   cdu->file = file;
 
-  if (!(file_input=splt_io_fopen(file, "r")))
+  if (!(file_input = splt_io_fopen(file, "r")))
   {
     splt_cddb_cdu_free(&cdu);
     splt_e_set_strerror_msg_with_data(state, file);
@@ -83,6 +83,8 @@
     return tracks;
   }
 
+  splt_tags *all_tags = splt_tu_new_tags(error);
+
   if (fseek(file_input, 0, SEEK_SET) != 0)
   {
     splt_e_set_strerror_msg_with_data(state, file);
@@ -102,9 +104,15 @@
     if (cdu->error < 0) { *error = cdu->error; goto function_end; }
   }
 
-  splt_cc_put_filenames_from_tags(state, tracks, error);
+  if (*error < 0) { goto function_end; }
+  splt_tags *tags_at_0 = splt_tu_get_tags_at(state, 0);
+  splt_tu_copy_tags(tags_at_0, all_tags, error);
+  if (*error < 0) { goto function_end; }
+
+  splt_cc_put_filenames_from_tags(state, tracks, error, all_tags);
 
 function_end:
+  splt_tu_free_one_tags(&all_tags);
   splt_cddb_cdu_free(&cdu);
 
   if (line)
@@ -217,7 +225,7 @@
     *slash = '\0';
 
     char *performer = splt_su_trim_spaces(equal_ptr + 1);
-   err = splt_tu_set_tags_field(state, index, SPLT_TAGS_PERFORMER, performer);
+    err = splt_tu_set_tags_field(state, index, SPLT_TAGS_PERFORMER, performer);
     if (err < 0) { cdu->error = err; return; }
   }
   else
@@ -226,6 +234,12 @@
     err = splt_tu_set_tags_field(state, index, SPLT_TAGS_TITLE, title);
     if (err < 0) { cdu->error = err; return; }
   }
+
+  if (splt_o_get_int_option(state, SPLT_OPT_CUE_CDDB_ADD_TAGS_WITH_KEEP_ORIGINAL_TAGS))
+  {
+    int true_value = SPLT_TRUE;
+    splt_tu_set_tags_field(state, index, SPLT_TAGS_ORIGINAL, &true_value);
+  }
 }
 
 static void splt_cddb_process_dtitle_line(const char *line_content, cddb_utils *cdu, splt_state *state)

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

libmp3splt-0.7.3.tar.gz/src/cddb_cue_common.c -> libmp3splt-0.8.2.tar.gz/src/cddb_cue_common.c Changed

@@ -3,7 +3,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2010 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  *********************************************************/
 
@@ -20,7 +20,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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * 02111-1307, USA.
  *********************************************************/
 
@@ -38,9 +38,10 @@
   What we deem to be a sensible file name can be controlled by the
   user using the format that is handled by oformat_parser.c
  */
-void splt_cc_put_filenames_from_tags(splt_state *state, int tracks, int *error)
+void splt_cc_put_filenames_from_tags(splt_state *state, int tracks, int *error, 
+    const splt_tags *all_tags)
 {
-  int err = splt_tu_copy_first_common_tags_on_all_tracks(state, tracks);
+  int err = splt_tu_copy_tags_on_all_tracks(state, tracks, all_tags);
   if (err < 0) { *error = err; return; }
 
   if (splt_o_get_int_option(state, SPLT_OPT_OUTPUT_FILENAMES) == SPLT_OUTPUT_DEFAULT)

libmp3splt-0.7.3.tar.gz/src/cddb_cue_common.h -> libmp3splt-0.8.2.tar.gz/src/cddb_cue_common.h Changed

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

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

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -45,7 +44,7 @@
 
   if (state->split.file_split != NULL)
   {
-    state->split.file_split(filename, state->split.p_bar->user_data, state->split.file_split_cb_data);
+    state->split.file_split(filename, state->split.file_split_cb_data);
     error = splt_c_append_to_m3u_file(state, filename);
   }
   else

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

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -80,7 +79,7 @@
 }
 
 //! Convert a factor to the corresponding dB value
-float splt_co_convert_to_dB(double input)
+float splt_co_convert_to_db(double input)
 {
   float level;
   if (input <= 0.0)
@@ -96,7 +95,7 @@
 }
 
 //! Convert a dB value to a factor
-double splt_co_convert_from_dB(float input)
+double splt_co_convert_from_db(float input)
 {
   double amp;
   if (input <- 96.0)

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Munteanu Alexandru - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -33,8 +32,8 @@
 #ifndef SPLT_CONVERSIONS_H
 
 long splt_co_convert_to_hundreths (const char *s);
-float splt_co_convert_to_dB(double input);
-double splt_co_convert_from_dB(float input);
+float splt_co_convert_to_db(double input);
+double splt_co_convert_from_db(float input);
 void splt_co_get_mins_secs_hundr(long split_hundr, long *mins, long *secs, long *hundr);
 long splt_co_time_to_long(double time);
 long splt_co_time_to_long_ceil(double time);

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

@@ -3,7 +3,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  *********************************************************/
 
@@ -20,7 +20,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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * 02111-1307, USA.
  *********************************************************/
 
@@ -36,10 +36,12 @@
 
 #include "cue.h"
 
+static void splt_cue_cu_free(cue_utils **cu);
+
 //! Process the rest of a cue line that begins with the word TRACK
 static void splt_cue_process_track_line(char *line_content, cue_utils *cu, splt_state *state)
 {
-  // Skip the word TRACK
+  //skip the word TRACK
   line_content += 5;
 
   if (cu->tracks == -1) 
@@ -53,13 +55,17 @@
     cu->error = SPLT_INVALID_CUE_FILE;
   }
 
-  cu->performer = SPLT_FALSE;
-  cu->title = SPLT_FALSE;
   cu->time_for_track = SPLT_FALSE;
   cu->tracks++;
   cu->current_track_type = SPLT_SPLITPOINT;
 
   splt_tu_new_tags_if_necessary(state, cu->tracks - 1);
+
+  if (splt_o_get_int_option(state, SPLT_OPT_CUE_CDDB_ADD_TAGS_WITH_KEEP_ORIGINAL_TAGS))
+  {
+    int true_value = SPLT_TRUE;
+    splt_tu_set_tags_field(state, cu->tracks - 1, SPLT_TAGS_ORIGINAL, &true_value);
+  }
 }
 
 static void remove_trailing_spaces_and_quote(char *ptr_e, char *in)
@@ -115,30 +121,32 @@
   return ptr_b;
 }
 
-//! Update data for a track in the central splt_state structure.
-static int splt_cue_store_value(splt_state *state, char *in,
-    int index, int tag_field)
+static char *splt_cue_parse_and_duplicate_value(char *in, int *error)
 {
-  if (!in)
-  {
-    return SPLT_OK;
-  }
-
   const char *ptr_b = splt_cue_parse_value(in, SPLT_FALSE);
 
   char *out = NULL;
-  int error = splt_su_append(&out, ptr_b, strlen(ptr_b) + 1, NULL);
-  if (error < 0) { return error; }
-
-  if (tag_field == SPLT_TAGS_ARTIST)
+  int err = splt_su_append(&out, ptr_b, strlen(ptr_b) + 1, NULL);
+  if (err < 0)
   {
-    splt_c_put_info_message_to_client(state, _("\n  Artist: %s\n"), out);
+    *error = err;
   }
-  else if (tag_field == SPLT_TAGS_ALBUM)
+
+  return out;
+}
+
+//! Update data for a track in the central splt_state structure.
+static int splt_cue_store_value(splt_state *state, char *in, int index, int tag_field, cue_utils *cu)
+{
+  if (!in)
   {
-    splt_c_put_info_message_to_client(state, _("  Album: %s\n"), out);
+    return SPLT_OK;
   }
 
+  splt_code error = SPLT_OK;
+  char *out = splt_cue_parse_and_duplicate_value(in, &error);
+  if (error < 0) { return error; }
+
   error = splt_tu_set_tags_field(state, index, tag_field, out);
   if (out)
   {
@@ -154,31 +162,32 @@
 {
   int err = SPLT_OK;
 
-  // Skip the word TITLE
+  //skip the word TITLE
   line_content += 5;
 
   if (cu->tracks == -1)
   {
-    if ((err = splt_cue_store_value(state, line_content, 
-            0, SPLT_TAGS_ALBUM)) != SPLT_OK)
+    char *album = splt_cue_parse_and_duplicate_value(line_content, &err);
+    if (err < 0) { cu->error = err; return; }
+
+    if (album)
     {
-      cu->error = err;
-      return;
+      splt_c_put_info_message_to_client(state, _("  Album: %s\n"), album);
+      err = splt_tu_set_field_on_tags(cu->all_tags, SPLT_TAGS_ALBUM, album);
+      free(album);
+      if (err < 0) { cu->error = err; return; }
     }
   }
   else
   {
     if (cu->tracks > 0)
     {
-      if ((err = splt_cue_store_value(state, line_content,
-              cu->tracks-1, SPLT_TAGS_TITLE)) != SPLT_OK)
+      if ((err = splt_cue_store_value(state, line_content, cu->tracks-1, SPLT_TAGS_TITLE, cu)) != SPLT_OK)
       {
         cu->error = err;
         return;
       }
     }
-
-    cu->title = SPLT_TRUE;
   }
 }
 
@@ -187,38 +196,41 @@
 {
   int err = SPLT_OK;
 
-  // Skip the word PERFORMER
+  //skip the word PERFORMER
   line_content += 9;
 
   if (cu->tracks == -1)
   {
-    //we always have one artist in a cue file, we
-    //put the performers if more than one artist
-    if ((err = splt_cue_store_value(state, line_content,
-            0, SPLT_TAGS_ARTIST)) != SPLT_OK)
+    char *artist = splt_cue_parse_and_duplicate_value(line_content, &err);
+    if (err < 0) { cu->error = err; return; }
+
+    if (artist)
     {
-      cu->error = err;
-      return;
+      splt_c_put_info_message_to_client(state, _("\n  Artist: %s\n"), artist);
+      err = splt_tu_set_field_on_tags(cu->all_tags, SPLT_TAGS_ARTIST, artist);
+      free(artist);
+      if (err < 0) { cu->error = err; return; }
     }
   }
   else
   {
     if (cu->tracks > 0)
     {
-      if ((err = splt_cue_store_value(state, line_content,
-              cu->tracks - 1, SPLT_TAGS_PERFORMER)) != SPLT_OK)
+      if ((err = splt_cue_store_value(state, line_content, cu->tracks - 1, SPLT_TAGS_ARTIST, cu)) != SPLT_OK)
+      {
+        cu->error = err;
+        return;
+      }
+
+      if ((err = splt_cue_store_value(state, line_content, cu->tracks - 1, SPLT_TAGS_PERFORMER, cu)) != SPLT_OK)
       {
         cu->error = err;
         return;
       }
     }
- 
-    cu->performer = SPLT_TRUE;
   }
-
 }
 
-
 //! Process the rest of a cue line that begins with the word INDEX
 static void splt_cue_process_index_line(char *line_content, cue_utils *cu, splt_state *state)
 {
@@ -241,10 +253,15 @@
     return;
   }

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -38,24 +37,10 @@
   int tracks;
   int time_for_track;
   int error;
-  int performer;
-  int title;
   /*! \brief cue input filename
-  */
+   */
   const char *file;
   int counter;
-  /*! \brief Do we have to build the file name from the tags?
-
-    - SPLT_FALSE means we build a filename from the tags 
-    - SPLT_TRUE means filename is track name
-  */
-  int title_is_filename;
-
-  /*! \brief Has this file been created by us?
-
-    If not we append a splitpoint at the end of the file.
-  */
-  int file_has_been_created_by_us;
 
   /*! \brief The type of the current track.
 
@@ -65,6 +50,9 @@
 
    */
   int current_track_type;
+  char *current_name;
+
+  splt_tags *all_tags;
 } cue_utils;
 
 int splt_cue_put_splitpoints(const char *file, splt_state *state, int *error);

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

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

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -47,8 +46,6 @@
 
 #include "splt.h"
 
-static void splt_e_set_strerr_msg(splt_state *state, const char *message);
-
 void splt_e_set_errors_default_values(splt_state *state)
 {
   splt_error *err = &state->err;
@@ -244,6 +241,9 @@
       return splt_su_get_formatted_message(state,
           _(" freedb error: cannot receive message from server '%s' (%s)"),
           state->err.error_data, state->err.strerror_msg);
+    case SPLT_FREEDB_ERROR_PROXY_NOT_SUPPORTED:
+      return splt_su_get_formatted_message(state,
+          _(" proxy not supported with this type of protocol"));
     case SPLT_INVALID_CUE_FILE:
       return splt_su_get_formatted_message(state, _(" cue error: invalid cue file '%s'"),
           state->err.error_data);
@@ -255,7 +255,7 @@
           _(" freedb error: No such CD entry in database"));
     case SPLT_FREEDB_ERROR_SITE:
       return splt_su_get_formatted_message(state,
-          _(" freedb error: site returned an unknown error"));
+          _(" freedb error: bad response from remote host"));
       //
     case SPLT_DEWRAP_OK:
       return splt_su_get_formatted_message(state, _(" wrap split ok"));
@@ -442,7 +442,7 @@
   return NULL;
 }
 
-static void splt_e_set_strerr_msg(splt_state *state, const char *message)
+void splt_e_set_strerr_msg(splt_state *state, const char *message)
 {
   splt_su_copy(message, &state->err.strerror_msg);
 }

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Munteanu Alexandru - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -45,6 +44,7 @@
 
 void splt_e_set_strerr_msg_with_data(splt_state *state, const char *message, const char *data);
 void splt_e_set_strerror_msg_with_data(splt_state *state, const char *data);
+void splt_e_set_strerr_msg(splt_state *state, const char *message);
 
 void splt_e_error(int error_type, const char *function, int arg_int, const char *arg_char);

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

@@ -3,7 +3,8 @@
  * libmp3splt -- library based on mp3splt,
  *               for mp3/ogg splitting without decoding
  *
- * Copyright (c) 2010-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2010 David Belohrad
+ * Copyright (c) 2010-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -23,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -112,7 +112,7 @@
     return NULL;
   }
 
-  splt_tags *tags = splt_tu_new_tags(state, error);
+  splt_tags *tags = splt_tu_new_tags(error);
   if (*error < 0)
   {
     pcre_free(re);
@@ -137,9 +137,8 @@
       SPLT_TAGS_YEAR, tags, SPLT_NO_CONVERSION, SPLT_FALSE, error);
   if (*error < 0) { goto error; }
 
-  char *pattern = NULL;
   format = splt_o_get_int_option(state, SPLT_OPT_COMMENT_TAG_FORMAT);
-  pattern = splt_fr_get_pattern(re, filename, ovector, rc, "comment");
+  char *pattern = splt_fr_get_pattern(re, filename, ovector, rc, "comment");
   if (pattern)
   {
     splt_fr_set_char_field_on_tags_and_convert(tags, SPLT_TAGS_COMMENT,

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

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

@@ -3,7 +3,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  *********************************************************/
 
@@ -20,7 +20,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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * 02111-1307, USA.
  *********************************************************/
 
@@ -51,142 +51,6 @@
 #define DONT_SKIP_LINES 0
 #define SKIP_ONE_LINE 1
 
-#if defined(__BEOS__) && !defined (HAS_GETPASS)
-//used for proxy (proxy not implemented)
-//#warning Faking getpass() !!!
-//char *getpass(char *p)
-//{
-//      char *ret;
-//      ret = malloc(30);
-//      if (!ret)
-//              return NULL;
-//      puts(p);
-//      fgets(ret,30,stdin);
-//      return ret;
-//}
-#endif
-
-// The alphabet fpr the base64 algorithm - for proxy (proxy not implemented)
-//
-// Base64 Algorithm: Base64.java v. 1.3.6 by Robert Harder
-// Ported and optimized for C by Matteo Trotta
-//
-//const char alphabet  = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-//char *encode3to4 (unsigned char *source, int srcoffset, int num, char *destination, int destoffset)
-//{
-//
-//    int inbuff=(num>0?(sourcesrcoffset<<16):0)|(num>1?(sourcesrcoffset+1<<8):0)|(num>2?(sourcesrcoffset+2):0);
-//    switch(num)
-//    {
-//      case 3:
-//          destinationdestoffset = alphabet(inbuff>>18);
-//          destinationdestoffset+1 = alphabet(inbuff>>12)&0x3f;
-//          destinationdestoffset+2 = alphabet(inbuff>>6)&0x3f;
-//          destinationdestoffset+3 = alphabet(inbuff)&0x3f;
-//          return destination;
-//
-//      case 2:
-//          destinationdestoffset = alphabet(inbuff>>18);
-//          destinationdestoffset+1 = alphabet(inbuff>>12)&0x3f;
-//          destinationdestoffset+2 = alphabet(inbuff>>6)&0x3f;
-//          destinationdestoffset+3 = '=';
-//          return destination;
-//
-//      case 1:
-//          destinationdestoffset = alphabet(inbuff>>18);
-//          destinationdestoffset+1 = alphabet(inbuff>>12)&0x3f;
-//          destinationdestoffset+2 = '=';
-//          destinationdestoffset+3 = '=';
-//          return destination;
-//      default:
-//          return destination;
-//    }
-//}
-
-//used for proxy (proxy not implemented)
-//char *b64 (unsigned char *source, int len)
-//{
-//      char *out;
-//      int d, e=0;
-//      d = ((len*4/3)+((len%3)>0?4:0));
-//      
-//      out = malloc(d+1);
-//      
-//      memset(out, 0x00, d+1);
-//      for(d=0;d<(len-2);d+=3,e+=4)
-//              out = encode3to4(source, d, 3, out, e);
-//      if(d<len)
-//              out = encode3to4(source, d, len-d, out, e);
-//
-//      return out;
-//}
-// End of Base64 Algorithm
-
-//char *login (char *s)
-//{
-//      char *pass, junk130;
-//      fprintf (stdout, "Username: ");
-//      fgets(junk, 128, stdin);
-//      junkstrlen(junk)-1='\0';
-//      pass = getpass("Password: ");
-//      sprintf (s, "%s:%s", junk, pass);
-//      memset (pass, 0x00, strlen(pass));
-//      free(pass);
-//      return s;
-//}
-
-/*static splt_addr splt_freedb_useproxy(splt_proxy *proxy, splt_addr dest,
-    const char search_server256, int port)
-{
-  dest.proxy=0;
-  memset(dest.hostname, 0, 256);
-  //memset(line, 0, 270);
-
-  //if (proxy->use_proxy)
-  if (proxy)
-  {
-    //TODO
-    strncpy(dest.hostname, proxy->hostname, 255);
-    dest.port = proxy->port;
-    dest.proxy = proxy->use_proxy;
-
-    fprintf(stderr, "Using Proxy: %s on Port %d\n", dest.hostname, dest.port);
-
-    dest.auth = malloc(strlen(line)+1);
-    if (dest.auth==NULL)
-    {
-      perror("malloc");
-      exit(1);
-    }
-    memset(dest.auth, 0x0, strlen(line)+1);
-    strncpy(dest.auth, line, strlen(line));
-    //dest.auth = b64(line, strlen(line));
-  }
-
-  if (!dest.proxy) 
-  {
-    if (strlen(search_server) == 0)
-    {
-      strncpy(dest.hostname, SPLT_FREEDB2_SITE, 255);
-    }
-    else
-    {
-      strncpy(dest.hostname, search_server, 255);
-    }
-
-    if (port == -1)
-    {
-      dest.port = SPLT_FREEDB_CDDB_CGI_PORT;
-    }
-    else
-    {
-      dest.port = port;
-    }      
-  }
-
-  return dest;
-}*/
-
 char *get_cgi_path_and_cut_server(int type, const char *search_server)
 {
   char *cgi_path = NULL;
@@ -200,7 +64,7 @@
   if (type == SPLT_FREEDB_SEARCH_TYPE_CDDB_CGI ||
       type == SPLT_FREEDB_GET_FILE_TYPE_CDDB_CGI)
   {
-    char *path = strchr(search_server,'/');
+    char *path = strchr(search_server, '/');
     if (path)
     {
       splt_su_copy(path, &cgi_path);
@@ -322,7 +186,7 @@
     err = splt_fu_freedb_init_search(state);
     if (err < 0) { error = err; goto disconnect; }
 
-    splt_sm_receive_and_process_without_headers(sh, state,
+    splt_sm_receive_and_process_without_headers(sh, state, 
         splt_freedb_search_result_processor, state, SKIP_ONE_LINE);
     if (sh->error < 0) { error = sh->error; goto disconnect; }
   }
@@ -495,6 +359,12 @@
   }
   else if (get_type == SPLT_FREEDB_GET_FILE_TYPE_CDDB)
   {
+    if (splt_pr_has_proxy(state))
+    {
+      *error = SPLT_FREEDB_ERROR_PROXY_NOT_SUPPORTED;
+      goto disconnect;
+    }
+
     get_file->stop_on_dot = SPLT_TRUE;
 
     splt_sm_send_http_message(sh, SPLT_FREEDB_HELLO, state);
@@ -513,6 +383,9 @@
     splt_sm_receive_and_process(sh, state, splt_freedb_process_get_file, get_file);
     if (get_file->err < 0) { *error = get_file->err; goto disconnect; }
     if (sh->error < 0) { *error = sh->error; goto disconnect; }
+
+    splt_sm_send_http_message(sh, "quit", state);
+    if (sh->error < 0) { *error = sh->error; goto disconnect; }
   }

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,22 +24,13 @@
  *
  * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
 
 #ifndef FREEDB_H
 
-//structure for the socket connection
-typedef struct {
-  short proxy;
-  char hostname512;
-  int port;
-  char *auth;
-} splt_addr;
-
 typedef struct {
   int err;
   char *file;
@@ -67,11 +58,6 @@
 #define SPLT_FREEDB_HELLO_PROTO "&hello=nouser+mp3splt.sf.net+"SPLT_PACKAGE_NAME"+"SPLT_PACKAGE_VERSION"&proto=5"
 #define SPLT_FREEDB_CDDB_CGI_GET_FILE "GET %s?cmd=cddb+read+%s+%s"SPLT_FREEDB_HELLO_PROTO
 
-//proxy stuff
-//#define PROXYCONFIG ".mp3splt"
-//#define PROXYDLG "HTTP/1.0\nUserAgent: "PACKAGE_NAME"/"PACKAGE_VERSION"\n"
-//#define SPLT_AUTH "Proxy-Authorization: Basic "
-
 #define FREEDB_H
 
 #endif

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -88,6 +87,7 @@
     {
       fdb->search_results->number = 0;
       fdb->search_results->results = NULL;
+      fdb->search_results->iterator_counter = 0;
     }
   }
 
@@ -199,7 +199,7 @@
   if (res)
   {
     int i = 0;
-    for(i = 0; i < res->number;i++)
+    for (i = 0; i < res->number;i++)
     {
       if (res->resultsi.revisions)
       {
@@ -221,6 +221,7 @@
     }
 
     res->number = 0;
+    res->iterator_counter = 0;
 
     free(state->fdb.search_results);
     state->fdb.search_results = NULL;

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

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

@@ -3,7 +3,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  *********************************************************/
 
@@ -20,8 +20,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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *********************************************************/
 
@@ -126,7 +125,7 @@
   return NULL;
 }
 
-char *splt_io_get_linked_fname(const char *fname, int *number_of_symlinks)
+static char *splt_io_get_linked_fname_one_level(const char *fname, int *number_of_symlinks)
 {
   char *previous_linked_fname = NULL;
 
@@ -208,6 +207,26 @@
   return linked_fname_with_path;
 }
 
+char *splt_io_get_linked_fname(const char *fname, int *number_of_symlinks)
+{
+  int num_of_symlinks = 0;
+
+  char *output_fname = splt_io_get_linked_fname_one_level(fname, number_of_symlinks);
+  while (output_fname != NULL && splt_io_file_type_is(output_fname, S_IFLNK))
+  {
+    char *new_output_fname = splt_io_get_linked_fname_one_level(output_fname, &num_of_symlinks);
+    free(output_fname);
+    output_fname = new_output_fname;
+
+    if (num_of_symlinks == MAX_SYMLINKS)
+    {
+      break;
+    }
+  }
+
+  return output_fname;
+}
+
 static int splt_io_linked_file_type_is(const char *fname, int file_type)
 {
   int linked_file_is_of_type = SPLT_FALSE;
@@ -689,11 +708,14 @@
   }
 }
 
-size_t splt_io_fwrite(splt_state *state, const void *ptr,
-    size_t size, size_t nmemb, FILE *stream)
+size_t splt_io_fwrite(splt_state *state, const void *ptr, size_t size, size_t nmemb, FILE *stream)
 {
   if (splt_o_get_int_option(state, SPLT_OPT_PRETEND_TO_SPLIT))
   {
+    if (state->split.write_cb != NULL)
+    {
+      state->split.write_cb(ptr, size, nmemb, state->split.write_cb_data);
+    }
     return size * nmemb;
   }
   else

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

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2006 Alexandru Munteanu - io_alex_2002@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -43,27 +42,6 @@
 should therefore not be too hard a task...
  */
 
-/*! \mainpage Using libmp3splt
-
-This is the documentation for the library that stands behind
-mp3splt-gtk and mp3splt.\n
-Features include
- - losslessly editing mp3 and og files
- - extensibility to other formats using plug-ins
- - freedb search
-
-Documentation can be found at several points:
-- A minimal example on how to use this library can be found in \ref test_library.c
-- There is a \ref API
-- For plug-in writers there is a \ref PluginAPI_MP3
-- And --- also for plugin-writers there is a \ref PluginAPI_MP3 as well.
- */
-
-/*!   \example test_library.c
-
-  A minimal usage example
- */
-
 #include <sys/stat.h>
 #include <string.h>
 
@@ -71,6 +49,44 @@
 
 #include "splt.h"
 
+const char splt_id3v1_genresSPLT_ID3V1_NUMBER_OF_GENRES25 = {
+  {"Blues"},
+  {"Classic Rock"}, {"Country"}, {"Dance"}, 
+  {"Disco"},{"Funk"},{"Grunge"},{"Hip-Hop"},{"Jazz"},
+  {"Metal"},{"New Age"},{"Oldies"}, {"Other"}, {"Pop"},
+  {"R&B"}, {"Rap"}, {"Reggae"}, {"Rock"}, {"Techno"},
+  {"Industrial"}, {"Alternative"}, {"Ska"}, {"Death metal"},
+  {"Pranks"}, {"Soundtrack"}, {"Euro-Techno"},
+  {"Ambient"}, {"Trip-hop"}, {"Vocal"}, {"Jazz+Funk"},
+  {"Fusion"}, {"Trance"}, {"Classical"}, {"Instrumental"},
+  {"Acid"}, {"House"}, {"Game"}, {"Sound clip"}, {"Gospel"},
+  {"Noise"}, {"Alt. Rock"}, {"Bass"}, {"Soul"}, {"Punk"}, 
+  {"Space"}, {"Meditative"}, {"Instrumental pop"}, 
+  {"Instrumental rock"}, {"Ethnic"}, {"Gothic"},{"Darkwave"},
+  {"Techno-Industrial"},{"Electronic"},{"Pop-Folk"},{"Eurodance"},
+  {"Dream"},{"Southern Rock"},{"Comedy"}, {"Cult"},{"Gangsta"},
+  {"Top 40"},{"Christian Rap"},{"Pop/Funk"}, {"Jungle"},
+  {"Native American"},{"Cabaret"},{"New Wave"}, {"Psychedelic"},
+  {"Rave"},{"Showtunes"},{"Trailer"}, {"Lo-Fi"},{"Tribal"},
+  {"Acid Punk"},{"Acid Jazz"}, {"Polka"}, {"Retro"},
+  {"Musical"},{"Rock & Roll"},{"Hard Rock"},
+
+  {"Folk"}, {"Folk-Rock"}, {"National Folk"}, {"Swing"},
+  {"Fast Fusion"}, {"Bebob"}, {"Latin"}, {"Revival"},
+  {"Celtic"}, {"Bluegrass"}, {"Avantgarde"}, {"Gothic Rock"},
+  {"Progressive Rock"}, {"Psychedelic Rock"}, {"Symphonic Rock"},
+  {"Slow Rock"}, {"Big Band"}, {"Chorus"}, {"Easy Listening"},
+  {"Acoustic"}, {"Humour"}, {"Speech"}, {"Chanson"}, {"Opera"},
+  {"Chamber Music"}, {"Sonata"}, {"Symphony"}, {"Booty Bass"},
+  {"Primus"}, {"Porn Groove"}, {"Satire"}, {"Slow Jam"},
+  {"Club"}, {"Tango"}, {"Samba"}, {"Folklore"}, {"Ballad"},
+  {"Power Ballad"}, {"Rhythmic Soul"}, {"Freestyle"}, {"Duet"},
+  {"Punk Rock"}, {"Drum Solo"}, {"A capella"}, {"Euro-House"},
+  {"Dance Hall"},
+
+  {"misc"},
+};
+
 int global_debug = SPLT_FALSE;
 
 /*! 
@@ -95,7 +111,7 @@
 
  \param error Contains the error code if an error occours.
 */
-splt_state *mp3splt_new_state(int *error)
+splt_state *mp3splt_new_state(splt_code *error)
 {
   splt_state *state = NULL;
 
@@ -127,7 +143,7 @@
 
 \return The error code if necessary
 */
-int mp3splt_find_plugins(splt_state *state)
+splt_code mp3splt_find_plugins(splt_state *state)
 {
   return splt_p_find_get_plugins_data(state);
 }
@@ -141,38 +157,28 @@
 \param state the splt_state structure that keeps all data for 
  our library
 */
-void mp3splt_free_state(splt_state *state, int *error)
+splt_code mp3splt_free_state(splt_state *state)
 {
   if (!state)
   {
-    return;
+    return SPLT_ERROR_STATE_NULL;
   }
 
-  int erro = SPLT_OK;
-  int *err = &erro;
-  if (error != NULL) { err = error; }
-
-  if (state != NULL)
+  if (!splt_o_library_locked(state))
   {
-    if (!splt_o_library_locked(state))
-    {
-      splt_o_lock_library(state);
-
-      splt_t_free_state(state);
-    }
-    else
-    {
-      *err = SPLT_ERROR_LIBRARY_LOCKED;
-    }
+    splt_o_lock_library(state);
+    splt_t_free_state(state);
   }
   else
   {
-    *err = SPLT_ERROR_STATE_NULL;
+    return SPLT_ERROR_LIBRARY_LOCKED;
   }
+
+  return SPLT_OK;
 }
 
 //! Set the output path
-int mp3splt_set_path_of_split(splt_state *state, const char *path)
+splt_code mp3splt_set_path_of_split(splt_state *state, const char *path)
 {
   int error = SPLT_OK;
 
@@ -204,7 +210,7 @@
 \param state the splt_state structure that keeps all our data
 \param filename Constains the file name that is to be set
  */
-int mp3splt_set_m3u_filename(splt_state *state, const char *filename)
+splt_code mp3splt_set_m3u_filename(splt_state *state, const char *filename)
 {
   int error = SPLT_OK;
 
@@ -231,31 +237,45 @@
   return error;
 }
 
-//!sets the m3u filename
-int mp3splt_set_silence_log_filename(splt_state *state, const char *filename)
+splt_code mp3splt_set_silence_log_filename(splt_state *state, const char *filename)
 {
-  int error = SPLT_OK;
+  if (state == NULL)
+  {
+    return SPLT_ERROR_STATE_NULL;
+  }
 
-  if (state != NULL)
+  if (splt_o_library_locked(state))
   {
-    if (!splt_o_library_locked(state))
-    {
-      splt_o_lock_library(state);
+    return SPLT_ERROR_LIBRARY_LOCKED;
+  }
 
-      error = splt_t_set_silence_log_fname(state, filename);
+  splt_o_lock_library(state);
 
-      splt_o_unlock_library(state);
-    }
-    else
-    {
-      error = SPLT_ERROR_LIBRARY_LOCKED;
-    }
+  int error = splt_t_set_silence_log_fname(state, filename);

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -40,6 +39,28 @@
 
 #include "splt.h"
 
+static void splt_of_trim_on_separator_characters(char *filename);
+static const char *splt_of_goto_last_non_separator_character(const char *format);
+
+static char *duplicate_and_clean(splt_state *state, const char *str, int *error)
+{
+  char *dup = strdup(str);
+  if (!dup)
+  {
+    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
+    return NULL;
+  }
+
+  splt_su_clean_string(state, dup, error);
+  if (error < 0)
+  {
+    free(dup);
+    return NULL;
+  }
+
+  return dup;
+}
+
 /*! \brief Is a placeholder char valid in a filename format string?
 
 \param v The character that is to be tested
@@ -48,7 +69,7 @@
 
 \todo Why do we need amb?
  */
-static short splt_u_output_variable_is_valid(char v, int *amb)
+static short splt_of_output_variable_is_valid(char v, int *amb)
 {
   switch (v)
   {
@@ -152,7 +173,7 @@
       len = SPLT_MAXOLEN;
     }
 
-    if (!splt_u_output_variable_is_valid(cf, &amb))
+    if (!splt_of_output_variable_is_valid(cf, &amb))
     {
       err0 = cf;
       splt_e_set_error_data(state, err);
@@ -167,7 +188,7 @@
   if (last_ptre && *last_ptre != '\0')
   {
     char v = *(last_ptre+1);
-    if (!splt_u_output_variable_is_valid(v, &amb))
+    if (!splt_of_output_variable_is_valid(v, &amb))
     {
       err0 = v;
       splt_e_set_error_data(state, err);
@@ -190,16 +211,29 @@
   return amb;
 }
 
-static const char *splt_u_get_format_ptr(const char *format, char *temp)
+static const char *splt_u_get_format_ptr(const char *format, char *temp,
+    int *number_of_digits_to_output)
 {
   int format_length = strlen(format);
   const char *format_ptr = format;
 
   if ((format_length > 2) && isdigit(format2))
   {
+    if (number_of_digits_to_output)
+    {
+      sscanf(&format2, "%d", number_of_digits_to_output);
+    }
+
     temp2 = format2;
     format_ptr = format + 1;
   }
+  else
+  {
+    if (number_of_digits_to_output)
+    {
+      *number_of_digits_to_output = -1;
+    }
+  }
 
   return format_ptr;
 }
@@ -336,12 +370,12 @@
   char *output_filename = NULL;
   int output_filename_size = 0;
 
-  char *title = NULL;
-  char *artist = NULL;
-  char *album = NULL;
-  char *genre = NULL;
-  char *performer = NULL;
-  char *artist_or_performer = NULL;
+  const char *title = NULL;
+  const char *artist = NULL;
+  const char *album = NULL;
+  const char *genre = NULL;
+  const char *performer = NULL;
+  const char *artist_or_performer = NULL;
   char *original_filename = NULL;
 
   int split_file_number = splt_t_get_current_split_file_number(state);
@@ -371,9 +405,14 @@
   int fm_length = 0;
 
   //if we get the tags from the first file
-  int remaining_tags_like_x = 
-    splt_o_get_int_option(state,SPLT_OPT_ALL_REMAINING_TAGS_LIKE_X);
-  if ((tags_index >= state->split.real_tagsnumber) &&
+  int remaining_tags_like_x = splt_o_get_int_option(state,SPLT_OPT_ALL_REMAINING_TAGS_LIKE_X);
+  int real_tags_number = 0;
+  if (state->split.tags_group)
+  {
+    real_tags_number = state->split.tags_group->real_tagsnumber;
+  }
+
+  if ((tags_index >= real_tags_number) &&
       (remaining_tags_like_x != -1))
   {
     tags_index = remaining_tags_like_x;
@@ -398,6 +437,7 @@
     {
       break;
     }
+
     //if we have some % in the format (@ has been converted to %)
     if (state->oformat.formati0 == '%')
     {
@@ -472,32 +512,28 @@
               const char *format = NULL;
               int offset = 5;
 
-              //don't print out @h or @H if 0 for default output
-              if ((strcmp(state->oformat.format_string, SPLT_DEFAULT_OUTPUT) == 0) &&
-                  (mMsShH_value == 0) &&
-                  (char_variable == 'h' || char_variable == 'H'))
+              int number_of_digits_to_output = 0;
+              const char *new_format = 
+                splt_u_get_format_ptr(state->oformat.formati, temp, &number_of_digits_to_output);
+
+              if (number_of_digits_to_output == 0 && mMsShH_value == 0)
               {
-                if (char_variable == 'h')
-                {
-                  format = state->oformat.formati+2;
-                  offset = 0;
-                }
-                else
-                {
-                  output_filenamestrlen(output_filename)-1 = '\0';
-                  break;
-                }
+                const char *start_format = state->oformat.formati + 3;
+                format = splt_of_goto_last_non_separator_character(start_format);
+                offset = 0;
+
+                splt_of_trim_on_separator_characters(output_filename);
               }
               else
               {
-                format = splt_u_get_format_ptr(state->oformat.formati, temp);
+                format = new_format + 2;
               }
 
               int requested_num_of_digits = 0;
               int max_number_of_digits = splt_u_get_requested_num_of_digits(state,
                   state->oformat.formati, &requested_num_of_digits, SPLT_FALSE);
 
-              snprintf(temp + offset, temp_len, format + 2);
+              snprintf(temp + offset, temp_len, format);
 
               fm_length = strlen(temp) + 1 + max_number_of_digits;
               if ((fm = malloc(fm_length * sizeof(char))) == NULL)
@@ -511,19 +547,12 @@
           }
           break;
         case 'A':

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

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -64,6 +63,8 @@
   state->options.set_file_from_cue_if_file_tag_found = SPLT_FALSE;
 
   state->options.parameter_remove_silence = SPLT_FALSE;
+  state->options.keep_silence_right = SPLT_DEFAULT_KEEP_SILENCE_RIGHT;
+  state->options.keep_silence_left = SPLT_DEFAULT_KEEP_SILENCE_LEFT;
   state->options.parameter_gap = SPLT_DEFAULT_PARAM_GAP;
   state->options.remaining_tags_like_x = -1;
   state->options.auto_increment_tracknumber_tags = 0;
@@ -71,6 +72,11 @@
   state->options.force_tags_version = 0;
   state->options.length_split_file_number = 1;
   state->options.replace_tags_in_tags = SPLT_FALSE;
+  state->options.cue_set_splitpoint_names_from_rem_name = SPLT_FALSE;
+  state->options.cue_disable_cue_file_created_message = SPLT_FALSE;
+  state->options.cue_cddb_add_tags_with_keep_original_tags = SPLT_FALSE;
+  state->options.id3v2_encoding = SPLT_ID3V2_UTF16;
+  state->options.input_tags_encoding = SPLT_ID3V2_UTF8;
 }
 
 void splt_o_set_option(splt_state *state, int option_name, const void *data)
@@ -119,6 +125,27 @@
     case SPLT_OPT_PARAM_REMOVE_SILENCE:
       state->options.parameter_remove_silence = *((int *)data);
       break;
+    case SPLT_OPT_KEEP_SILENCE_LEFT:
+      state->options.keep_silence_left = *((float *)data);
+      break;
+    case SPLT_OPT_KEEP_SILENCE_RIGHT:
+      state->options.keep_silence_right = *((float *)data);
+      break;
+    case SPLT_OPT_CUE_SET_SPLITPOINT_NAMES_FROM_REM_NAME:
+      state->options.cue_set_splitpoint_names_from_rem_name = *((int *)data);
+      break;
+    case SPLT_OPT_CUE_DISABLE_CUE_FILE_CREATED_MESSAGE:
+      state->options.cue_disable_cue_file_created_message = *((int *)data);
+      break;
+    case SPLT_OPT_CUE_CDDB_ADD_TAGS_WITH_KEEP_ORIGINAL_TAGS:
+      state->options.cue_cddb_add_tags_with_keep_original_tags = *((int *)data);
+      break;
+    case SPLT_OPT_ID3V2_ENCODING:
+      state->options.id3v2_encoding = *((int *) data);
+      break;
+    case SPLT_OPT_INPUT_TAGS_ENCODING:
+      state->options.input_tags_encoding = *((int *) data); 
+      break;
     case SPLT_OPT_PARAM_GAP:
       state->options.parameter_gap = *((int *)data);
       break;
@@ -146,7 +173,7 @@
       break;
 
     case SPLT_OPT_SPLIT_TIME:
-      state->options.split_time = *((float *)data);
+      state->options.split_time = *((long *)data);
       break;
     case SPLT_OPT_PARAM_THRESHOLD:
       state->options.parameter_threshold = *((float *)data);
@@ -232,6 +259,20 @@
       return &state->options.parameter_shots;
     case SPLT_OPT_PARAM_REMOVE_SILENCE:
       return &state->options.parameter_remove_silence;
+    case SPLT_OPT_KEEP_SILENCE_LEFT:
+      return &state->options.keep_silence_left;
+    case SPLT_OPT_KEEP_SILENCE_RIGHT:
+      return &state->options.keep_silence_right;
+    case SPLT_OPT_CUE_SET_SPLITPOINT_NAMES_FROM_REM_NAME:
+      return &state->options.cue_set_splitpoint_names_from_rem_name;
+    case SPLT_OPT_CUE_DISABLE_CUE_FILE_CREATED_MESSAGE:
+      return &state->options.cue_disable_cue_file_created_message;
+    case SPLT_OPT_CUE_CDDB_ADD_TAGS_WITH_KEEP_ORIGINAL_TAGS:
+      return &state->options.cue_cddb_add_tags_with_keep_original_tags;
+    case SPLT_OPT_ID3V2_ENCODING:
+      return &state->options.id3v2_encoding;
+    case SPLT_OPT_INPUT_TAGS_ENCODING:
+      return &state->options.input_tags_encoding;
     case SPLT_OPT_PARAM_GAP:
       return &state->options.parameter_gap;
     case SPLT_OPT_ALL_REMAINING_TAGS_LIKE_X:

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

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

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

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

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

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -294,8 +293,7 @@
       }
       memset(pl->datapl->number_of_plugins_found.func, 0, sizeof(splt_plugin_func));
 
-      splt_su_copy(dir_and_fname, 
-          &pl->datapl->number_of_plugins_found.plugin_filename);
+      splt_su_copy(dir_and_fname, &pl->datapl->number_of_plugins_found.plugin_filename);
 
       pl->number_of_plugins_found++;
 
@@ -414,6 +412,8 @@
 int splt_p_move_replace_plugin_data(splt_state *state, int old, int new)
 {
   splt_plugins *pl = state->plug;
+  fprintf(stdout, "move old %d to new %d\n", old, new);
+  fflush(stdout);
 
   splt_p_free_plugin_data(&pl->datanew);
 
@@ -444,6 +444,12 @@
   int i = 0;
   splt_plugins *pl = state->plug;
 
+  if (index == pl->number_of_plugins_found - 1)
+  {
+    splt_p_free_plugin_data(&pl->dataindex);
+    return SPLT_OK;
+  }
+
   for (i = index+1;i < pl->number_of_plugins_found;i++)
   {
     int err = splt_p_move_replace_plugin_data(state, i, i - 1);
@@ -497,11 +503,11 @@
     {
       splt_d_print_debug(state," - success !\n");
 
-      pl->datai.func->set_plugin_info =
+      pl->datai.func->splt_pl_set_plugin_info =
         lt_dlsym(pl->datai.plugin_handle, "splt_pl_set_plugin_info");
-      if (pl->datai.func->set_plugin_info != NULL)
+      if (pl->datai.func->splt_pl_set_plugin_info != NULL)
       {
-        pl->datai.func->set_plugin_info(&pl->datai.info,&error);
+        pl->datai.func->splt_pl_set_plugin_info(&pl->datai.info,&error);
       }
 
       //look if we already have a plugin with the same name
@@ -610,34 +616,34 @@
     {
       pl->datai.plugin_handle = lt_dlopen(pl->datai.plugin_filename);
 
-      pl->datai.func->check_plugin_is_for_file =
+      pl->datai.func->splt_pl_check_plugin_is_for_file =
         lt_dlsym(pl->datai.plugin_handle, "splt_pl_check_plugin_is_for_file");
-      pl->datai.func->search_syncerrors =
+      pl->datai.func->splt_pl_search_syncerrors =
         lt_dlsym(pl->datai.plugin_handle, "splt_pl_search_syncerrors");
-      pl->datai.func->dewrap =
+      pl->datai.func->splt_pl_dewrap =
         lt_dlsym(pl->datai.plugin_handle, "splt_pl_dewrap");
-      pl->datai.func->simple_split =
-        lt_dlsym(pl->datai.plugin_handle, "splt_pl_simple_split");
-      pl->datai.func->split =
+      pl->datai.func->splt_pl_offset_split =
+        lt_dlsym(pl->datai.plugin_handle, "splt_pl_offset_split");
+      pl->datai.func->splt_pl_split =
         lt_dlsym(pl->datai.plugin_handle, "splt_pl_split");
-      pl->datai.func->init =
+      pl->datai.func->splt_pl_init =
         lt_dlsym(pl->datai.plugin_handle, "splt_pl_init");
-      pl->datai.func->end =
+      pl->datai.func->splt_pl_end =
         lt_dlsym(pl->datai.plugin_handle, "splt_pl_end");
-      pl->datai.func->scan_silence =
+      pl->datai.func->splt_pl_scan_silence =
         lt_dlsym(pl->datai.plugin_handle, "splt_pl_scan_silence");
-      pl->datai.func->scan_trim_silence =
+      pl->datai.func->splt_pl_scan_trim_silence =
         lt_dlsym(pl->datai.plugin_handle, "splt_pl_scan_trim_silence");
-      pl->datai.func->set_original_tags =
+      pl->datai.func->splt_pl_set_original_tags =
         lt_dlsym(pl->datai.plugin_handle, "splt_pl_set_original_tags");
-      pl->datai.func->clear_original_tags =
+      pl->datai.func->splt_pl_clear_original_tags =
         lt_dlsym(pl->datai.plugin_handle, "splt_pl_clear_original_tags");
-      pl->datai.func->set_plugin_info =
+      pl->datai.func->splt_pl_set_plugin_info =
         lt_dlsym(pl->datai.plugin_handle, "splt_pl_set_plugin_info");
-      if (pl->datai.func->set_plugin_info != NULL)
+      if (pl->datai.func->splt_pl_set_plugin_info != NULL)
       {
         splt_p_free_plugin_data_info(&pl->datai);
-        pl->datai.func->set_plugin_info(&pl->datai.info,&err);
+        pl->datai.func->splt_pl_set_plugin_info(&pl->datai.info,&err);
       }
 
       splt_p_set_current_plugin(state, i);
@@ -736,9 +742,9 @@
   }
   else
   {
-    if (pl->datacurrent_plugin.func->check_plugin_is_for_file != NULL)
+    if (pl->datacurrent_plugin.func->splt_pl_check_plugin_is_for_file != NULL)
     {
-      return pl->datacurrent_plugin.func->check_plugin_is_for_file(state, error);
+      return pl->datacurrent_plugin.func->splt_pl_check_plugin_is_for_file(state, error);
     }
     else
     {
@@ -759,10 +765,10 @@
   }
   else
   {
-    if (pl->datacurrent_plugin.func->search_syncerrors != NULL)
+    if (pl->datacurrent_plugin.func->splt_pl_search_syncerrors != NULL)
     {
       splt_se_serrors_free(state);
-      pl->datacurrent_plugin.func->search_syncerrors(state, error);
+      pl->datacurrent_plugin.func->splt_pl_search_syncerrors(state, error);
     }
     else
     {
@@ -782,9 +788,9 @@
   }
   else
   {
-    if (pl->datacurrent_plugin.func->dewrap != NULL)
+    if (pl->datacurrent_plugin.func->splt_pl_dewrap != NULL)
     {
-      pl->datacurrent_plugin.func->dewrap(state, listonly, dir, error);
+      pl->datacurrent_plugin.func->splt_pl_dewrap(state, listonly, dir, error);
     }
     else
     {
@@ -812,9 +818,9 @@
     splt_io_create_output_dirs_if_necessary(state, final_fname, &err);
     if (err < 0) { *error = err; return end_point; }
 
-    if (pl->datacurrent_plugin.func->split != NULL)
+    if (pl->datacurrent_plugin.func->splt_pl_split != NULL)
     {
-      double new_end_point = pl->datacurrent_plugin.func->split(state, final_fname,
+      double new_end_point = pl->datacurrent_plugin.func->splt_pl_split(state, final_fname,
           begin_point, end_point, error, save_end_point);
 
       splt_d_print_debug(state, "New end point after split = _%lf_\n", new_end_point);
@@ -841,9 +847,9 @@
   }
   else
   {
-    if (pl->datacurrent_plugin.func->init != NULL)
+    if (pl->datacurrent_plugin.func->splt_pl_init != NULL)
     {
-      pl->datacurrent_plugin.func->init(state, error);
+      pl->datacurrent_plugin.func->splt_pl_init(state, error);
     }
     else
     {
@@ -863,9 +869,9 @@
   }
   else
   {
-    if (pl->datacurrent_plugin.func->end != NULL)
+    if (pl->datacurrent_plugin.func->splt_pl_end != NULL)
     {
-      pl->datacurrent_plugin.func->end(state, error);
+      pl->datacurrent_plugin.func->splt_pl_end(state, error);
     }
     else
     {
@@ -887,9 +893,9 @@
   }
   else
   {
-    if (pl->datacurrent_plugin.func->simple_split != NULL)
+    if (pl->datacurrent_plugin.func->splt_pl_offset_split != NULL)
     {
-      error = pl->datacurrent_plugin.func->simple_split(state, output_fname, begin, end);
+      error = pl->datacurrent_plugin.func->splt_pl_offset_split(state, output_fname, begin, end);
     }
     else

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -39,7 +38,6 @@
 int splt_p_check_plugin_is_for_file(splt_state *state, int *error);
 void splt_p_search_syncerrors(splt_state *state, int *error);
 void splt_p_dewrap(splt_state *state, int listonly, const char *dir, int *error);
-void splt_p_set_total_time(splt_state *state, int *error);
 double splt_p_split(splt_state *state, const char *final_fname, double begin_point,
     double end_point, int *error, int save_end_point);
 int splt_p_simple_split(splt_state *state, const char *output_fname, off_t begin,

libmp3splt-0.8.2.tar.gz/src/proxy.c Added

@@ -0,0 +1,190 @@
+/**********************************************************
+ *
+ * libmp3splt -- library based on mp3splt,
+ *               for mp3/ogg splitting without decoding
+ *
+ * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
+ *
+ * http://mp3splt.sourceforge.net
+ *
+ *********************************************************/
+
+/**********************************************************
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *********************************************************/
+
+#include "splt.h"
+
+#include <string.h>
+
+static void splt_pr_free_proxy_address(splt_state *state);
+static void splt_pr_free_proxy_authentification(splt_state *state);
+static char *splt_pr_encode3to4(const unsigned char *source, int srcoffset, int num, 
+    char *destination, int destoffset);
+
+splt_code splt_pr_use_proxy(splt_state *state, const char *proxy_address, int proxy_port)
+{
+  if (proxy_address == NULL || proxy_address0 == '\0')
+  {
+    return SPLT_OK;
+  }
+
+  splt_pr_free_proxy_address(state);
+  splt_su_copy(proxy_address, &state->proxy.proxy_address);
+
+  state->proxy.proxy_port = proxy_port;
+
+  return SPLT_OK;
+}
+
+int splt_pr_has_proxy(splt_state *state)
+{
+  return state->proxy.proxy_address != NULL && state->proxy.proxy_port != -1;
+}
+
+int splt_pr_has_proxy_authentification(splt_state *state)
+{
+  return state->proxy.authentification != NULL;
+}
+
+const char *splt_pr_get_proxy_authentification(splt_state *state)
+{
+  return state->proxy.authentification;
+}
+
+const char *splt_pr_get_proxy_address(splt_state *state)
+{
+  return state->proxy.proxy_address;
+}
+
+int splt_pr_get_proxy_port(splt_state *state)
+{
+  return state->proxy.proxy_port;
+}
+
+splt_code splt_pr_use_base64_authentification(splt_state *state, 
+    const char *base64_authentification)
+{
+  if (base64_authentification == NULL)
+  {
+    return SPLT_OK;
+  }
+
+  splt_pr_free_proxy_authentification(state);
+  splt_su_copy(base64_authentification, &state->proxy.authentification);
+
+  return SPLT_OK;
+}
+
+void splt_pr_set_default_values(splt_state *state)
+{
+  state->proxy.proxy_address = NULL;
+  state->proxy.proxy_port = -1;
+  state->proxy.authentification = NULL;
+}
+
+void splt_pr_free(splt_state *state)
+{
+  splt_pr_free_proxy_address(state);
+  splt_pr_free_proxy_authentification(state);
+  splt_pr_set_default_values(state);
+}
+
+char *splt_pr_base64(const unsigned char *source)
+{
+  int len = strlen((char *)source);
+
+  int d = ((len*4/3)+((len%3)>0?4:0));
+
+  char *out = malloc(d + 1);
+  if (out == NULL) { return NULL; }
+  memset(out, 0x00, d+1);
+
+  int e = 0;
+  for (d = 0;d < (len-2); d+=3,e+=4)
+  {
+    out = splt_pr_encode3to4(source, d, 3, out, e);
+  }
+
+  if (d < len)
+  {
+    out = splt_pr_encode3to4(source, d, len-d, out, e);
+  }
+
+  return out;
+}
+
+static void splt_pr_free_proxy_address(splt_state *state)
+{
+  if (state->proxy.proxy_address)
+  {
+    free(state->proxy.proxy_address);
+    state->proxy.proxy_address = NULL;
+  }
+}
+
+static void splt_pr_free_proxy_authentification(splt_state *state)
+{
+  if (state->proxy.authentification)
+  {
+    size_t authentification_length = strlen(state->proxy.authentification);
+    memset(state->proxy.authentification, '\0', authentification_length);
+    free(state->proxy.authentification);
+    state->proxy.authentification = NULL;
+  }
+}
+
+/*
+ * Base64 Algorithm: Base64.java v. 1.3.6 by Robert Harder
+ * Ported and optimized for C by Matteo Trotta
+ */
+static const char alphabet  = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+static char *splt_pr_encode3to4(const unsigned char *source, int srcoffset, int num, char *destination, int destoffset)
+{
+  int inbuff=
+    (num>0 ? (sourcesrcoffset << 16) : 0)|
+    (num>1 ? (sourcesrcoffset+1 << 8) : 0) |
+    (num > 2 ? (sourcesrcoffset+2) : 0);
+
+  switch (num)
+  {
+    case 3:
+      destinationdestoffset = alphabet(inbuff>>18);
+      destinationdestoffset+1 = alphabet(inbuff>>12) & 0x3f;
+      destinationdestoffset+2 = alphabet(inbuff>>6) & 0x3f;
+      destinationdestoffset+3 = alphabet(inbuff) & 0x3f;
+      return destination;
+    case 2:
+      destinationdestoffset = alphabet(inbuff>>18);
+      destinationdestoffset+1 = alphabet(inbuff>>12) & 0x3f;
+      destinationdestoffset+2 = alphabet(inbuff>>6) & 0x3f;
+      destinationdestoffset+3 = '=';
+      return destination;
+    case 1:
+      destinationdestoffset = alphabet(inbuff>>18);
+      destinationdestoffset+1 = alphabet(inbuff>>12) & 0x3f;
+      destinationdestoffset+2 = '=';
+      destinationdestoffset+3 = '=';
+      return destination;
+    default:
+      return destination;
+  }
+}
+

libmp3splt-0.8.2.tar.gz/src/proxy.h Added

@@ -0,0 +1,51 @@
+/**********************************************************
+ *
+ * libmp3splt -- library based on mp3splt,
+ *               for mp3/ogg splitting without decoding
+ *
+ * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
+ *
+ * http://mp3splt.sourceforge.net
+ *
+ *********************************************************/
+
+/**********************************************************
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *********************************************************/
+
+#ifndef MP3SPLT_PROXY_H
+
+void splt_pr_set_default_values(splt_state *state);
+void splt_pr_free(splt_state *state);
+
+splt_code splt_pr_use_proxy(splt_state *state, const char *proxy_address, int proxy_port);
+splt_code splt_pr_use_base64_authentification(splt_state *state, const char *base64_authentification);
+char *splt_pr_base64(const unsigned char *source);
+
+int splt_pr_has_proxy(splt_state *state);
+int splt_pr_has_proxy_authentification(splt_state *state);
+
+const char *splt_pr_get_proxy_address(splt_state *state);
+int splt_pr_get_proxy_port(splt_state *state);
+const char *splt_pr_get_proxy_authentification(splt_state *state);
+
+#define MP3SPLT_PROXY_H
+
+#endif
+

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

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

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

@@ -1,14 +1,12 @@
 /**********************************************************
  *
- * audacity.c -- Audacity label file parser portion of the Mp3Splt utility
+ * socket_manager.c -- Socket Manager file handler portion of the Mp3Splt utility
  *                    Utility for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2004 M. Trotta - <matteo.trotta@lib.unimib.it>
- * Copyright (c) 2007 Federico Grau - <donfede@casagrau.org>
- * Copyright (c) 2010-2012 Alexandru Munteanu <io_fx@yahoo.fr>
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
- * http://audacity.sourceforge.net/
  */
 
 /**********************************************************
@@ -25,8 +23,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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -39,14 +36,22 @@
 #include <unistd.h>
 
 #ifdef __WIN32__
-#include <conio.h>
-#include <winsock.h>
+#define _WIN32_WINNT 0x0501
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
 #else
 #include <netdb.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #endif
 
+#ifdef __WIN32__
+#include <malloc.h>
+#else
+#include <alloca.h>
+#endif
+
 #include <string.h>
 
 #include "splt.h"
@@ -55,12 +60,27 @@
 #define SPLT_BUFFER_SIZE 1024
 #define SPLT_MAXIMUM_NUMBER_OF_LINES_READ 1000
 
+static void splt_sm_handle_response_and_free(char **first_line, splt_socket_handler *sh,
+    splt_state *state);
 
-void splt_sm_connect(splt_socket_handler *sh, const char *hostname, int port,
-    splt_state *state)
+static char *get_message_decorated_with_http(splt_socket_handler *sh, const char *message,
+    splt_state *state);
+static char *get_message_with_proxy(splt_socket_handler *sh, const char *message, splt_state *state);
+static char *get_message_without_proxy(splt_socket_handler *sh, const char *message);
+static int message_starts_with_get(const char *message);
+
+void splt_sm_connect(splt_socket_handler *sh, const char *hostname, int port, splt_state *state)
 {
-  struct hostent *host_entity = NULL;
-  
+  const char *real_hostname = hostname;
+  int real_port = port;
+  if (splt_pr_has_proxy(state))
+  {
+    real_hostname = splt_pr_get_proxy_address(state);
+    real_port = splt_pr_get_proxy_port(state);
+  }
+
+  splt_d_print_debug(state, "\nConnecting on host %s:%d\n", real_hostname, real_port);
+
   int err = splt_su_copy(hostname, &sh->hostname);
   if (err < 0) { sh->error = err; return; }
 
@@ -75,57 +95,78 @@
   }
 #endif
 
-  host_entity = gethostbyname(hostname);
+  struct addrinfo hints;
+  memset(&hints, 0, sizeof(struct addrinfo));
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_STREAM;
 
-  if (host_entity == NULL)
-  {
-    splt_e_set_strherror_msg(state);
-    splt_e_set_error_data(state, hostname);
+  struct addrinfo *result;
+
+  char *port_as_string = alloca(16);
+  snprintf(port_as_string, 16, "%d", real_port);
+
+  int return_code = getaddrinfo(real_hostname, port_as_string, &hints, &result);
+  if (return_code != 0) {
+    splt_e_set_strerr_msg(state, gai_strerror(return_code));
+    splt_e_set_error_data(state, real_hostname);
     sh->error = SPLT_FREEDB_ERROR_CANNOT_GET_HOST;
     return;
   }
 
-  struct sockaddr_in my_socket;
-  memset(&my_socket, 0x0, sizeof(my_socket));
-  my_socket.sin_family = AF_INET;
-  my_socket.sin_addr.s_addr = ((struct in_addr *) (host_entity->h_addr)) ->s_addr;
-  my_socket.sin_port = htons(port);
-
-  sh->fd = socket(AF_INET, SOCK_STREAM, 0);
-  if (sh->fd == -1)
+  struct addrinfo *result_p;
+  for (result_p = result; result_p != NULL; result_p = result_p->ai_next)
   {
+    sh->fd = socket(result_p->ai_family, result_p->ai_socktype, result_p->ai_protocol);
+    if (sh->fd == -1)
+    {
+      splt_e_set_strerror_msg(state);
+      continue;
+    }
+
+    if (connect(sh->fd, result_p->ai_addr, result_p->ai_addrlen) != -1)
+    {
+      break;
+    }
+
     splt_e_set_strerror_msg(state);
-    sh->error = SPLT_FREEDB_ERROR_CANNOT_OPEN_SOCKET;
-    return;
+    close(sh->fd);
   }
 
-  if (connect(sh->fd, (void *)&my_socket, sizeof(my_socket)) < 0)
-  {
-    splt_e_set_strerror_msg(state);
-    splt_e_set_error_data(state, hostname);
+  if (result_p == NULL) {
+    splt_e_set_error_data(state, real_hostname);
     sh->error = SPLT_FREEDB_ERROR_CANNOT_CONNECT;
+    freeaddrinfo(result);
     return;
   }
+
+  freeaddrinfo(result);
+
+  splt_d_print_debug(state, " ... connected.\n");
 }
 
 void splt_sm_send(splt_socket_handler *sh, const char *message, 
     splt_state *state)
 {
+  splt_d_print_debug(state, "\nSending message _%s_\n", message);
+
   if (send(sh->fd, message, strlen(message), 0) == -1)
   {
     splt_e_set_strerror_msg(state);
     splt_e_set_error_data(state, sh->hostname);
     sh->error = SPLT_FREEDB_ERROR_CANNOT_SEND_MESSAGE;
   }
+
+  splt_d_print_debug(state, " ... message sent.\n");
 }
 
 void splt_sm_send_http_message(splt_socket_handler *sh, const char *message,
     splt_state *state)
 {
-  char *message_with_http = NULL;
-  int err = splt_su_append_str(&message_with_http, 
-      message, " HTTP/1.0\r\nHost: ", sh->hostname, "\r\n\r\n", NULL);
-  if (err < 0) { sh->error = err; return; }
+  char *message_with_http = get_message_decorated_with_http(sh, message, state);
+  if (message_with_http == NULL)
+  {
+    return;
+  }
 
   splt_sm_send(sh, message_with_http, state);
 
@@ -136,6 +177,76 @@
   }
 }
 
+static char *get_message_decorated_with_http(splt_socket_handler *sh, const char *message,
+    splt_state *state)
+{
+  if (splt_pr_has_proxy(state) && message_starts_with_get(message))
+  {
+    return get_message_with_proxy(sh, message, state);
+  }
+
+  return get_message_without_proxy(sh, message);
+}

libmp3splt-0.7.3.tar.gz/src/socket_manager.h -> libmp3splt-0.8.2.tar.gz/src/socket_manager.h Changed

@@ -1,13 +1,13 @@
-/*
- * audacity.h -- Audacity label file parser portion of the Mp3Splt utility
- *                    Utility for mp3/ogg splitting without decoding
+/**
+ * libmp3splt 
+ *
+ *        Utility for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2004 M. Trotta - <matteo.trotta@lib.unimib.it>
- * Copyright (c) 2007 Federico Grau - <donfede@casagrau.org>
+ * Copyright (c) 2005-2013 Alexandru Munteanu <m@ioalex.net>
  *
  * http://mp3splt.sourceforge.net
- * http://audacity.sourceforge.net/
- */
+ **/
 
 /**********************************************************
  *
@@ -23,8 +23,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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -69,15 +68,18 @@
 void splt_sm_receive_and_process_without_headers(splt_socket_handler *sh, splt_state *state,
     int (*process_functor)(const char *received_line, int line_number, void *user_data),
     void *user_data, int number_of_lines_to_skip_after_headers);
-void splt_sm_receive_and_process_without_headers_with_recv(splt_socket_handler *sh, 
+
+char *splt_sm_receive_and_process_without_headers_with_recv(splt_socket_handler *sh, 
     splt_state *state,
     ssize_t (*recv_func)(int fd, void *buf, size_t len, int flags),
     int (*process_functor)(const char *received_line, int line_number, void *user_data),
     void *user_data, int number_of_lines_to_skip_after_headers);
+
 void splt_sm_receive_and_process(splt_socket_handler *sh, splt_state *state,
     int (*process_functor)(const char *received_line, int line_number, void *user_data),
     void *user_data);
-void splt_sm_receive_and_process_with_recv(splt_socket_handler *sh, splt_state *state,
+
+char *splt_sm_receive_and_process_with_recv(splt_socket_handler *sh, splt_state *state,
     ssize_t (*recv_func)(int fd, void *buf, size_t len, int flags),
     int (*process_functor)(const char *received_line, int line_number, void *user_data),
     void *user_data);

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2010 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -41,7 +40,8 @@
 
 int splt_sp_splitpoint_exists(splt_state *state, int index)
 {
-  if ((index >= 0) && (index < state->split.real_splitnumber))
+  if (state->split.points &&
+      (index >= 0) && (index < state->split.points->real_splitnumber))
   {
     return SPLT_TRUE;
   }
@@ -51,6 +51,16 @@
   }
 }
 
+int splt_sp_get_real_splitpoints_number(splt_state *state)
+{
+  if (state->split.points == NULL)
+  {
+    return 0;
+  }
+
+  return state->split.points->real_splitnumber;
+}
+
 int splt_sp_append_splitpoint(splt_state *state, long split_value,
     const char *name, int type)
 {
@@ -61,28 +71,37 @@
   splt_d_print_debug(state,"Appending splitpoint _%s_ with value _%ld_\n",
       name, split_value);
 
-  split->real_splitnumber++;
-
   if (!split->points)
   {
-    split->allocated_splitnumber = split->real_splitnumber;
-    if ((split->points = malloc(sizeof(splt_point))) == NULL)
+    split->points = malloc(sizeof(splt_points));
+    if (split->points == NULL)
     {
       return SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
     }
+
+    split->points->real_splitnumber = 0;
+    split->points->iterator_counter = 0;
+
+    if ((split->points->points = malloc(sizeof(splt_point))) == NULL)
+    {
+      free(split->points);
+      split->points = NULL;
+      return SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
+    }
   }
-  else if (split->real_splitnumber > split->allocated_splitnumber)
+  else
   {
-    split->allocated_splitnumber = split->real_splitnumber;
-    if ((split->points = 
-          realloc(split->points, split->allocated_splitnumber * sizeof(splt_point))) == NULL)
+    if ((split->points->points =
+          realloc(split->points->points, (split->points->real_splitnumber + 1) * sizeof(splt_point))) == NULL)
     {
       return SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
     }
   }
 
-  int index = split->real_splitnumber - 1;
-  split->pointsindex.name = NULL;
+  split->points->real_splitnumber++;
+
+  int index = split->points->real_splitnumber - 1;
+  split->points->pointsindex.name = NULL;
 
   error = splt_sp_set_splitpoint_value(state, index, split_value);
   if (error != SPLT_OK) { return error; }
@@ -102,21 +121,22 @@
 
   int error = SPLT_OK;
 
-  if ((index >= 0) && (index < state->split.real_splitnumber))
+  if (state->split.points &&
+      (index >= 0) && (index < state->split.points->real_splitnumber))
   {
-    if (state->split.pointsindex.name)
+    if (state->split.points->pointsindex.name)
     {
-      free(state->split.pointsindex.name);
-      state->split.pointsindex.name = NULL;
+      free(state->split.points->pointsindex.name);
+      state->split.points->pointsindex.name = NULL;
     }
 
     int i;
-    for (i = index + 1; i < state->split.real_splitnumber;i++)
+    for (i = index + 1; i < state->split.points->real_splitnumber;i++)
     {
-      state->split.pointsi - 1 = state->split.pointsi;
+      state->split.points->pointsi - 1 = state->split.points->pointsi;
     }
 
-    state->split.real_splitnumber--;
+    state->split.points->real_splitnumber--;
   }
   else
   {
@@ -126,11 +146,9 @@
   return error;
 }
 
-splt_point *splt_sp_get_splitpoints(splt_state *state, int *splitpoints_number)
+splt_points *splt_sp_get_splitpoints(splt_state *state)
 {
-  splt_struct *split = &state->split;
-  *splitpoints_number = split->real_splitnumber;
-  return split->points;
+  return state->split.points;
 }
 
 void splt_sp_free_splitpoints(splt_state *state)
@@ -140,21 +158,34 @@
   if (split->points)
   {
     int i = 0;
-    for (i = 0; i < split->real_splitnumber; i++)
+    for (i = 0; i < split->points->real_splitnumber; i++)
     {
-      if (split->pointsi.name)
+      if (split->points->pointsi.name)
       {
-        free(split->pointsi.name);
-        split->pointsi.name = NULL;
+        free(split->points->pointsi.name);
+        split->points->pointsi.name = NULL;
       }
     }
 
+    free(split->points->points);
+    split->points->points = NULL;
+
     free(split->points);
     split->points = NULL;
   }
 
   split->splitnumber = 0;
-  split->real_splitnumber = 0;
+}
+
+void splt_sp_free_one_splitpoint(splt_point *point)
+{
+  if (!point) { return; }
+
+  if (point->name)
+  {
+    free(point->name);
+  }
+  free(point);
 }
 
 int splt_sp_set_splitpoint_value(splt_state *state, int index, long split_value)
@@ -163,10 +194,10 @@
 
   int error = SPLT_OK;
 
-  if ((index >= 0) &&
-      (index < state->split.real_splitnumber))
+  if (state->split.points &&
+      (index >= 0) && (index < state->split.points->real_splitnumber))
   {
-    state->split.pointsindex.value = split_value;
+    state->split.points->pointsindex.value = split_value;
   }
   else
   {
@@ -181,9 +212,10 @@
   splt_d_print_debug(state,"Splitpoint name at _%d_ is _%s_\n", index, name);
 
   int error = SPLT_OK;
-  splt_point *points = state->split.points;
+  splt_point *points = state->split.points->points;
 
-  if ((index >= 0) && (index < state->split.real_splitnumber))

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2010 Munteanu Alexandru - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -33,11 +32,13 @@
 #ifndef SPLT_SPLIT_POINTS_H
 
 int splt_sp_splitpoint_exists(splt_state *state, int index);
+int splt_sp_get_real_splitpoints_number(splt_state *state);
 
 int splt_sp_append_splitpoint(splt_state *state, long split_value,
     const char *name, int type);
-splt_point *splt_sp_get_splitpoints(splt_state *state, int *splitpoints_number);
+splt_points *splt_sp_get_splitpoints(splt_state *state);
 void splt_sp_free_splitpoints(splt_state *state);
+void splt_sp_free_one_splitpoint(splt_point *point);
 
 int splt_sp_set_splitpoint_value(splt_state *state, int index, long split_value);
 int splt_sp_set_splitpoint_name(splt_state *state, int index, const char *name);

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -41,8 +40,12 @@
 
 #include "splt.h"
 
+static splt_code splt_s_open_full_log_filename(splt_state *state);
+static void splt_s_close_full_log_filename(splt_state *state);
+
 /****************************/
 /*! normal split */
+
 static long splt_s_real_split(double splt_beg, double splt_end, 
     int save_end_point, int *error, splt_state *state)
 {
@@ -562,14 +565,14 @@
 {
   splt_c_put_info_message_to_client(state, _(" info: starting time mode split\n"));
 
-  double split_time_length = (double) splt_o_get_float_option(state, SPLT_OPT_SPLIT_TIME);
-  if (((long)split_time_length) == 0)
+  long split_time_length = splt_o_get_long_option(state, SPLT_OPT_SPLIT_TIME);
+  if (split_time_length == 0)
   {
     *error = SPLT_ERROR_TIME_SPLIT_VALUE_INVALID;
     return;
   }
 
-  splt_s_split_by_time(state, error, split_time_length, -1);
+  splt_s_split_by_time(state, error, split_time_length / 100.0, -1);
 }
 
 /*! function used with the -L option (length split)
@@ -621,8 +624,9 @@
   if (! splt_o_get_int_option(state,SPLT_OPT_QUIET_MODE))
   {
     splt_c_put_info_message_to_client(state, 
-        _(" Trim silence split - Th: %.1f dB\n"),
-        splt_o_get_float_option(state, SPLT_OPT_PARAM_THRESHOLD));
+        _(" Trim silence split - Th: %.1f dB, Min: %.2f sec\n"),
+        splt_o_get_float_option(state, SPLT_OPT_PARAM_THRESHOLD),
+        splt_o_get_float_option(state, SPLT_OPT_PARAM_MIN_LENGTH));
   }
 
   if (state->split.get_silence_level)
@@ -755,11 +759,13 @@
   char remove_str128 = { '\0' };
   if (splt_o_get_int_option(state, SPLT_OPT_PARAM_REMOVE_SILENCE))
   {
-    snprintf(remove_str,128,_("YES"));
+    snprintf(remove_str, 128, "%s(%.2f-%.2f)", _ ("YES"),
+        splt_o_get_float_option(state, SPLT_OPT_KEEP_SILENCE_LEFT),
+        splt_o_get_float_option(state, SPLT_OPT_KEEP_SILENCE_RIGHT));
   }
   else
   {
-    snprintf(remove_str,128,_("NO"));
+    snprintf(remove_str, 128 ,_("NO"));
   }
 
   char auto_user_str128 = { '\0' };
@@ -833,7 +839,13 @@
     {
       state->split.get_silence_level(0, INT_MAX, state->split.silence_level_client_data);
     }
+
+    int err = splt_s_open_full_log_filename(state);
+    if (err < 0) { *error = err; goto end; }
+
     found = splt_p_scan_silence(state, error);
+
+    splt_s_close_full_log_filename(state);
   }
 
   //if no error
@@ -880,8 +892,6 @@
 
       int i;
 
-      //we take all splitpoints found and we remove silence 
-      //if needed
       for (i = 1; i < found; i++)
       {
         if (temp == NULL)
@@ -890,51 +900,58 @@
           break;
         }
 
-        long end_track_point = 0;
-        long end_track_point_after_silence = 0;
-        if (splt_o_get_int_option(state, SPLT_OPT_PARAM_REMOVE_SILENCE))
-        {
-          end_track_point = splt_co_time_to_long(temp->begin_position);
-          end_track_point_after_silence = splt_co_time_to_long(temp->end_position);
-        }
-        else 
-        {
-          end_track_point = splt_co_time_to_long(splt_siu_silence_position(temp, offset));
-        }
-
         if (i == 1)
         {
           append_error = splt_sp_append_splitpoint(state, 0, NULL, SPLT_SPLITPOINT);
           if (append_error < 0) { *error = append_error; found = i; break;}
+
+          splitpoints_appended++;
         }
 
         if (splt_o_get_int_option(state, SPLT_OPT_PARAM_REMOVE_SILENCE))
         {
-          append_error = splt_sp_append_splitpoint(state, end_track_point, NULL, SPLT_SKIPPOINT);
-          if (append_error < 0) { *error = append_error; found = i; break;}
-          append_error =
-            splt_sp_append_splitpoint(state, end_track_point_after_silence, NULL, SPLT_SPLITPOINT);
-          if (append_error < 0) { *error = append_error; found = i; break;}
+          long end_track_point = splt_co_time_to_long(temp->begin_position);
+          long end_track_point_after_silence = splt_co_time_to_long(temp->end_position);
+          long silence_length = end_track_point_after_silence - end_track_point;
+
+          float keep_silence_left = splt_o_get_float_option(state, SPLT_OPT_KEEP_SILENCE_LEFT);
+          float keep_silence_right = splt_o_get_float_option(state, SPLT_OPT_KEEP_SILENCE_RIGHT);
+          long keep_silence_total = splt_co_time_to_long(keep_silence_left + keep_silence_right);
+
+          if (silence_length > keep_silence_total)
+          {
+            long adjusted_silence_left = splt_co_time_to_long(temp->begin_position + keep_silence_right);
+            long adjusted_silence_right = splt_co_time_to_long(temp->end_position - keep_silence_left);
+
+            append_error = splt_sp_append_splitpoint(state, adjusted_silence_left, NULL, SPLT_SKIPPOINT);
+            if (append_error < 0) { *error = append_error; found = i; break;}
+            append_error =
+              splt_sp_append_splitpoint(state, adjusted_silence_right, NULL, SPLT_SPLITPOINT);
+            if (append_error < 0) { *error = append_error; found = i; break;}
+
+            splitpoints_appended += 2;
+          }
+          else
+          {
+            float offset = keep_silence_right / (keep_silence_left + keep_silence_right);
+            long end_track_point = splt_co_time_to_long(splt_siu_silence_position(temp, offset));
+            append_error = splt_sp_append_splitpoint(state, end_track_point, NULL, SPLT_SPLITPOINT);
+            if (append_error < 0) { *error = append_error; found = i; break;}
+            splitpoints_appended++;
+          }
         }
         else
         {
+          long end_track_point = splt_co_time_to_long(splt_siu_silence_position(temp, offset));
           append_error = splt_sp_append_splitpoint(state, end_track_point, NULL, SPLT_SPLITPOINT);
           if (append_error != SPLT_OK) { *error = append_error; found = i; break; }
+
+          splitpoints_appended++;
         }
 
         temp = temp->next;
       }
 
-      //we order the splitpoints
-      if (splt_o_get_int_option(state, SPLT_OPT_PARAM_REMOVE_SILENCE))
-      {
-        splitpoints_appended = (found-1)*2+1;
-      }
-      else 
-      {
-        splitpoints_appended = found;
-      }
-
       splt_d_print_debug(state,"Order splitpoints...\n");
       splt_sp_order_splitpoints(state, splitpoints_appended);
 
@@ -968,11 +985,10 @@
       //if we write the silence points log file
       if (splt_o_get_int_option(state, SPLT_OPT_ENABLE_SILENCE_LOG))
       {
-        splt_c_put_info_message_to_client(state, 
-            _(" Writing silence log file '%s' ...\n"),
-            splt_t_get_silence_log_fname(state));
-
         char *fname = splt_t_get_silence_log_fname(state);
+
+        splt_c_put_info_message_to_client(state, _(" Writing silence log file '%s' ...\n"), fname);
+
         if (! splt_o_get_int_option(state, SPLT_OPT_PRETEND_TO_SPLIT))

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,15 +24,597 @@
  *
  * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
 
 #ifndef MP3SPLT_SPLT_H
 
+#include <stdio.h>
+#include <sys/types.h>
+
+//libtool 1.4e is buggy on mingw if we include ltdl.h
+#ifndef __WIN32__
+#include <ltdl.h>
+#endif
+
 #include "mp3splt.h"
+
+struct _splt_freedb_one_result {
+  /**
+   * @brief Name of the album for this result
+   */
+  char *name;
+  /**
+   * @brief Unique identifier for this result
+   */
+  int id;
+  /**
+   * @brief How many revisions this result has
+   *
+   * If having revisions, the unique identifier for a revision is
+   * #id + revision + 1, with 0 <= revision < #revision_number\n
+   */
+  int revision_number;
+  /**
+   * @brief Contains the revisions of the result
+   * 
+   * The #revisions table contains #revision_number elements,
+   * the consecutive numbers starting at 2 (you might not need it)
+   */
+  int *revisions;
+};
+
+struct _splt_freedb_results {
+  /**
+   * @brief All the freedb results
+   */
+  splt_freedb_one_result *results;
+  /**
+   * @brief How many results we have
+   */
+  int number;
+  int iterator_counter;
+};
+
+/**
+ * @brief Maximum results for the freedb search
+ */
+#define SPLT_MAXCD 512
+
+//maximum length of the disc id
+#define SPLT_DISCIDLEN 8
+
+//structure for the freedb search
+struct splt_cd {
+  char discidSPLT_DISCIDLEN+1;
+  char category20;
+};
+
+typedef struct {
+  struct splt_cd discsSPLT_MAXCD;
+  int foundcd;
+} splt_cd_state;
+
+//structure containing everything used for the
+//freedb search
+typedef struct {
+  //we stock here the results of the freedb search
+  struct _splt_freedb_results *search_results;
+  //we stock the state of the CD
+  //(for the freedb search)
+  splt_cd_state *cdstate;
+} splt_freedb;
+
+typedef char _splt_one_wrap;
+
+struct _splt_wrap {
+  /**
+   * @brief How many filenames we have
+   */
+  int wrap_files_num;
+  /**
+   * @brief The filenames
+   */
+  char **wrap_files;
+  int iterator_counter;
+};
+
+struct _splt_syncerrors {
+  off_t *serrors_points;
+  /**
+   * @brief How many syncerrors have been found
+   */
+  long int serrors_points_num;
+};
+
+/**
+ * @brief The number of syncerrors
+ *
+ * @see mp3splt_get_syncerrors
+ */
+typedef struct _splt_syncerrors splt_syncerrors;
+
+struct _splt_tags {
+  /**
+   * @brief The title
+   */
+  char *title;
+  /**
+   * @brief The artist
+   */
+  char *artist;
+  /**
+   * @brief The album
+   */
+  char *album;
+  /**
+   * @brief The performer
+   * 
+   * The performer is not part of the tags, but may replace the
+   * #artist in some cases and it is useful for the output filenames\n
+   * You can also look at #SPLT_OPT_OUTPUT_DEFAULT
+   */
+  char *performer;
+  /**
+   * @brief The year
+   */
+  char *year;
+  /**
+   * @brief A comment
+   */
+  char *comment;
+  /**
+   * @brief The track number
+   */
+  int track;
+  /**
+   * @brief The genre
+   */
+  char *genre;
+
+  /*
+   * @brief tags version (for mp3): 1 or 2 or 1 & 2
+   */
+  int tags_version;
+
+  int set_original_tags;
+  int was_auto_incremented;
+};
+
+struct _splt_original_tags {
+  splt_tags tags;
+  void *all_original_tags;
+  int last_plugin_used;
+};
+
+struct _splt_tags_group {
+  splt_tags *tags;
+  int real_tagsnumber;
+  int iterator_counter;
+};
+
+#define SPLT_MAXOLEN 255
+#define SPLT_OUTNUM  20
+
+//structure defining the output format
+typedef struct {
+  //format as @n_@t.. as a string
+  char *format_string;
+  //when we have @n option on output format
+  char output_format_digits;
+  int output_alpha_format_digits;
+  //format for the cddb cue output
+  char formatSPLT_OUTNUM+1SPLT_MAXOLEN;
+} splt_oformat;
+

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

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

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -109,9 +108,9 @@
   return NULL;
 }
 
-int splt_su_append_str(char **str, const char *to_append, ...)
+splt_code splt_su_append_str(char **str, const char *to_append, ...)
 {
-  int err = SPLT_OK;
+  splt_code err = SPLT_OK;
   va_list ap;
 
   va_start(ap, to_append);
@@ -777,6 +776,8 @@
       }
       return new_str;
       break;
+    default:
+      break;
   }
 
   return NULL;

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

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

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

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -56,8 +55,8 @@
 static void splt_tp_check_ambigous_next_position(const char *tag_variable_start,
     tags_parser_utils *tpu);
 static void splt_tp_process_original_tags_variable(tags_parser_utils *tpu,
-    splt_state *state, int *error);
-static void splt_tp_get_original_tags(splt_state *state, int *error);
+    splt_state *state, int *error, int set_original_tags);
+static void splt_tp_get_original_tags_and_append(splt_state *state, int *error);
 static int splt_tp_tpu_has_one_current_tag_set(tags_parser_utils *tpu);
 static char *splt_tp_look_for_end_paranthesis(tags_parser_utils *tpu);
 static void splt_tp_look_for_all_tags_char(const char *tags,
@@ -194,7 +193,7 @@
     if (*error < 0) { goto end; }
 
     splt_tu_append_tags_to_state(state, tpu->current_tags,
-        !tpu->original_tags_found, error);
+        !tpu->original_tags_found, tpu->original_tags_value, SPLT_FALSE, error);
     if (*error < 0) { goto end; }
 
     if (tpu->set_all_tags)
@@ -206,7 +205,13 @@
     }
     else if (tpu->we_had_all_tags && !tpu->original_tags_found)
     {
-      int index = state->split.real_tagsnumber - 1;
+      int real_tags_number = 0;
+      if (state->split.tags_group)
+      {
+        real_tags_number = state->split.tags_group->real_tagsnumber;
+      }
+
+      int index = real_tags_number - 1;
       splt_tu_set_new_tags_where_current_tags_are_null(state, 
           tpu->current_tags, tpu->all_tags, index, error);
       if (*error < 0) { goto end; }
@@ -307,6 +312,13 @@
 {
   const char *tracknumber = splt_tp_tpu_get_tracknumber(tpu);
 
+  if (tracknumber != NULL && strcmp(tracknumber, "-2") == 0)
+  {
+    int track = -2;
+    splt_tp_tpu_set_tags_value(tpu, SPLT_TAGS_TRACK, &track);
+    return;
+  }
+
   if (tracknumber)
   {
     int is_number = SPLT_TRUE;
@@ -344,7 +356,11 @@
   switch (tag_variable)
   {
     case 'o':
-      splt_tp_process_original_tags_variable(tpu, state, error);
+      splt_tp_process_original_tags_variable(tpu, state, error, SPLT_TRUE);
+      if (*error < 0) { return; }
+      break;
+    case 'O':
+      splt_tp_process_original_tags_variable(tpu, state, error, SAME_BYTES_AS_TAGS);
       if (*error < 0) { return; }
       break;
     case 'a':
@@ -481,7 +497,7 @@
 }
 
 static void splt_tp_process_original_tags_variable(tags_parser_utils *tpu,
-    splt_state *state, int *error)
+    splt_state *state, int *error, int set_original_tags)
 {
   if (tpu->original_tags_found)
   {
@@ -495,18 +511,20 @@
 
   splt_o_lock_messages(state);
 
-  splt_tp_get_original_tags(state, error);
+  splt_tp_get_original_tags_and_append(state, error);
   if (*error < 0) { goto end; }
 
+  splt_tags appended_tags = splt_tu_get_last_tags(state);
+  splt_tu_set_field_on_tags(&appended_tags, SPLT_TAGS_ORIGINAL, &set_original_tags);
+
   if (tpu->set_all_tags)
   {
-    splt_tags last_tags = splt_tu_get_last_tags(state);
-    splt_tu_copy_tags(&last_tags, tpu->all_tags, error);
-    tpu->all_tags->set_original_tags = SPLT_TRUE;
+    splt_tu_copy_tags(&appended_tags, tpu->all_tags, error);
     if (*error < 0) { goto end; }
   }
 
   tpu->original_tags_found = SPLT_TRUE;
+  tpu->original_tags_value = set_original_tags;
 
   if (splt_tp_tpu_has_one_current_tag_set(tpu))
   {
@@ -517,7 +535,7 @@
   splt_o_unlock_messages(state);
 }
 
-static void splt_tp_get_original_tags(splt_state *state, int *error)
+static void splt_tp_get_original_tags_and_append(splt_state *state, int *error)
 {
   splt_check_file_type(state, error);
   if (*error < 0) { return; }
@@ -586,10 +604,10 @@
   tpu->set_all_tags = SPLT_FALSE;
   tpu->we_had_all_tags = SPLT_FALSE;
 
-  tpu->all_tags = splt_tu_new_tags(state, error);
+  tpu->all_tags = splt_tu_new_tags(error);
   if (*error < 0) { goto mem_error; }
 
-  tpu->current_tags = splt_tu_new_tags(state, error);
+  tpu->current_tags = splt_tu_new_tags(error);
   if (*error < 0) { goto mem_error; }
 
   tpu->current_tracknumber = NULL;
@@ -622,6 +640,7 @@
   splt_tu_free_one_tags_content(tpu->current_tags);
 
   tpu->original_tags_found = SPLT_FALSE;
+  tpu->original_tags_value = SPLT_FALSE;
 
   if (tpu->current_tracknumber)
   {

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

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

@@ -1,9 +1,10 @@
+
 /**********************************************************
  * libmp3splt -- library based on mp3splt,
  *               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
  *
  *********************************************************/
 
@@ -20,8 +21,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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *********************************************************/
 
@@ -70,11 +70,44 @@
   splt_p_clear_original_tags(state, &err);
 }
 
-//! Get all tags for split point number x
-splt_tags *splt_tu_get_tags(splt_state *state, int *tags_number)
+splt_tags_group *splt_tu_get_tags_group(splt_state *state)
 {
-  *tags_number = state->split.real_tagsnumber;
-  return state->split.tags;
+  return state->split.tags_group;
+}
+
+static splt_tags *splt_tu_duplicate_tags(splt_state *state, splt_code *error, int *tags_number)
+{
+  *tags_number = 0;
+
+  if (state->split.tags_group == NULL) { return NULL; }
+
+  int total_tags = state->split.tags_group->real_tagsnumber;
+  if (total_tags == 0) { return NULL; }
+
+  splt_tags *tags = malloc(sizeof(splt_tags) * total_tags);
+  if (tags == NULL)
+  {
+    *error = SPLT_ERROR_CANNOT_ALLOCATE_MEMORY;
+    return NULL;
+  }
+
+  int i = 0;
+  for (i = 0;i < total_tags;i++)
+  {
+    splt_tu_reset_tags(&tagsi);
+    splt_tu_copy_tags(&state->split.tags_group->tagsi, &tagsi, error);
+    (*tags_number)++;
+
+    if (*error < 0)
+    {
+      int j = 0;
+      for (j = 0; i < i; j++) { splt_tu_free_one_tags_content(&tagsi); }
+      *tags_number = 0;
+      return NULL;
+    }
+  }
+
+  return tags;
 }
 
 void splt_tu_auto_increment_tracknumber(splt_state *state)
@@ -83,47 +116,68 @@
   int old_current_split = current_split;
 
   int remaining_tags_like_x = splt_o_get_int_option(state, SPLT_OPT_ALL_REMAINING_TAGS_LIKE_X);
-  if (remaining_tags_like_x != -1)
+  if (remaining_tags_like_x == -1)
+  {
+    return;
+  }
+
+  int real_tags_number = 0;
+  if (state->split.tags_group)
+  {
+    real_tags_number = state->split.tags_group->real_tagsnumber;
+  }
+
+  if (current_split >= real_tags_number)
+  {
+    current_split = remaining_tags_like_x;
+  }
+
+  if (splt_o_get_int_option(state, SPLT_OPT_AUTO_INCREMENT_TRACKNUMBER_TAGS) <= 0)
+  {
+    return;
+  }
+
+  if (current_split != remaining_tags_like_x)
   {
-    if (current_split >= state->split.real_tagsnumber)
+    return;
+  }
+
+  if ((old_current_split > 0) && 
+      (old_current_split-1 < real_tags_number) && 
+      (old_current_split != remaining_tags_like_x))
+  {
+    const int *prev_track = splt_tu_get_tags_field(state, old_current_split - 1, SPLT_TAGS_TRACK);
+    int previous_track = 0;
+    if (prev_track != NULL)
     {
-      current_split = remaining_tags_like_x;
+      previous_track = *prev_track;
     }
+    splt_tu_set_tags_field(state, remaining_tags_like_x, SPLT_TAGS_TRACK, &previous_track);
+
+    splt_tags *tags_like_x = splt_tu_get_tags_like_x(state);
+    tags_like_x->was_auto_incremented = SPLT_TRUE;
+  }
 
-    if (splt_o_get_int_option(state, SPLT_OPT_AUTO_INCREMENT_TRACKNUMBER_TAGS) > 0)
+  if (old_current_split != current_split)
+  {
+    int tracknumber = 1;
+    if (splt_tu_tags_exists(state, current_split))
     {
-      if (current_split == remaining_tags_like_x)
+      const int *track = splt_tu_get_tags_field(state, current_split, SPLT_TAGS_TRACK);
+      if (track != NULL)
       {
-        if ((old_current_split > 0) && 
-            (old_current_split-1 < state->split.real_tagsnumber) && 
-            (old_current_split != remaining_tags_like_x))
-        {
-          int *prev_track = (int *)splt_tu_get_tags_field(state, old_current_split - 1, SPLT_TAGS_TRACK);
-          int previous_track = 0;
-          if (prev_track != NULL)
-          {
-            previous_track = *prev_track;
-          }
-          splt_tu_set_tags_field(state, remaining_tags_like_x, SPLT_TAGS_TRACK, &previous_track);
-        }
-
-        if (old_current_split != current_split)
-        {
-          int tracknumber = 1;
-          if (splt_tu_tags_exists(state, current_split))
-          {
-            int *track = (int *)splt_tu_get_tags_field(state, current_split, SPLT_TAGS_TRACK);
-            if (track != NULL)
-            {
-              tracknumber = *track;
-            }
-          }
-          int new_tracknumber = tracknumber + 1;
-          splt_tu_set_tags_field(state, current_split, SPLT_TAGS_TRACK, &new_tracknumber);
-          splt_tu_set_like_x_tags_field(state, SPLT_TAGS_TRACK, &new_tracknumber);
-        }
+        tracknumber = *track;
       }
     }
+    int new_tracknumber = tracknumber + 1;
+    splt_tu_set_tags_field(state, current_split, SPLT_TAGS_TRACK, &new_tracknumber);
+    splt_tags *tags = splt_tu_get_tags_at(state, current_split);
+    tags->was_auto_incremented = SPLT_TRUE;
+
+    splt_tu_set_like_x_tags_field(state, SPLT_TAGS_TRACK, &new_tracknumber);
+
+    splt_tags *tags_like_x = splt_tu_get_tags_like_x(state);
+    tags_like_x->was_auto_incremented = SPLT_TRUE;
   }
 }
 
@@ -143,7 +197,11 @@
     int track, const char *genre, int set_original_tags)
 {
   int error = SPLT_OK;
-  int old_tagsnumber = state->split.real_tagsnumber;
+  int old_tagsnumber = 0;
+  if (state->split.tags_group)
+  {
+    old_tagsnumber = state->split.tags_group->real_tagsnumber;
+  }
 
   error = splt_tu_set_tags_field(state, old_tagsnumber, SPLT_TAGS_TITLE, title);
   if (error != SPLT_OK)
@@ -181,6 +239,29 @@
   return error;
 }
 
+int splt_tu_set_char_field_on_tag(splt_tags *tags, splt_tag_key key, const char *value)
+{
+  if (key == SPLT_TAGS_TRACK)
+  {
+    int track = atoi(value);
+    return splt_tu_set_field_on_tags(tags, key, &track);
+  }
+
+  if (key == SPLT_TAGS_ORIGINAL)
+  {

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,19 +24,20 @@
  *
  * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
 
 #ifndef MP3SPLT_TAGS_UTILS_H
 
+#define SAME_BYTES_AS_TAGS 2
+
 void splt_tu_free_original_tags(splt_state *state);
 void splt_tu_auto_increment_tracknumber(splt_state *state);
 int splt_tu_append_original_tags(splt_state *state);
 void splt_tu_reset_tags(splt_tags *tags);
-splt_tags *splt_tu_new_tags(splt_state *state, int *error);
+splt_tags *splt_tu_new_tags(int *error);
 void splt_tu_free_one_tags(splt_tags **tags);
 void splt_tu_free_one_tags_content(splt_tags *tags);
 int splt_tu_has_one_tag_set(splt_tags *tags);
@@ -51,13 +52,14 @@
     int tags_field, const void *data);
 void splt_tu_set_original_tags_data(splt_state *state, void *data);
 void *splt_tu_get_original_tags_data(splt_state *state);
-splt_tags *splt_tu_get_tags(splt_state *state, int *tags_number);
+splt_tags_group *splt_tu_get_tags_group(splt_state *state);
 splt_tags *splt_tu_get_original_tags_tags(splt_state *state);
 
 int splt_tu_set_tags_in_tags(splt_state *state, int current_tags);
 splt_tags *splt_tu_get_tags_at(splt_state *state, int tags_index);
 splt_tags splt_tu_get_last_tags(splt_state *state);
-void *splt_tu_get_tags_field(splt_state *state, int index, int tags_field);
+const void *splt_tu_get_tags_field(splt_state *state, int index, int tags_field);
+const void *splt_tu_get_tags_value(const splt_tags *tags, int tags_field);
 void splt_tu_free_tags(splt_state *state);
 splt_tags *splt_tu_get_tags_like_x(splt_state *state);
 splt_tags *splt_tu_get_current_tags(splt_state *state);
@@ -65,9 +67,9 @@
 
 char *splt_tu_get_artist_or_performer_ptr(splt_tags *tags);
 
-int splt_tu_copy_first_common_tags_on_all_tracks(splt_state *state, int tracks);
+int splt_tu_copy_tags_on_all_tracks(splt_state *state, int tracks, const splt_tags *all_tags);
 
-int splt_tu_set_field_on_tags(splt_tags *tags, int tags_field, const void *data);
+int splt_tu_set_char_field_on_tag(splt_tags *tags, splt_tag_key key, const char *value);
 
 int splt_tu_append_tags(splt_state *state, 
     const char *title, const char *artist,
@@ -75,8 +77,10 @@
     const char *year, const char *comment,
     int track, const char *genre, int set_original_tags);
 
+int splt_tu_append_or_set_tag(splt_state *state, int tags_index, splt_tag_key key, const char *value);
+
 void splt_tu_append_tags_to_state(splt_state *state, splt_tags *tags, 
-    int append_null_tags, int *error);
+    int append_new_tags, int original_tags_value, int use_original_tags_set, int *error);
 
 void splt_tu_set_new_tags_where_current_tags_are_null(splt_state *state,
     splt_tags *current_tags, splt_tags *new_tags, 
@@ -88,6 +92,13 @@
     const char *year, const char *comment,
     int track, const char *genre, int set_original_tags);
 
+void splt_tu_set_original_tags_last_plugin_used(splt_state *state, int plugin_used);
+int splt_tu_get_original_tags_last_plugin_used(splt_state *state);
+
+splt_code splt_tu_remove_tags_of_skippoints(splt_state *state);
+
+int splt_tu_set_field_on_tags(splt_tags *tags, int tags_field, const void *data);
+
 #define MP3SPLT_TAGS_UTILS_H
 
 #endif

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Alexandru Munteanu - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Alexandru Munteanu - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -42,7 +41,7 @@
 
 static void splt_t_set_default_state_values(splt_state *state, int *error)
 {
-  state->split.tags = NULL;
+  state->split.tags_group = NULL;
   splt_tu_reset_tags(splt_tu_get_tags_like_x(state));
   state->split.points = NULL;
   state->fname_to_split = NULL;
@@ -52,9 +51,9 @@
   state->default_comment_tag = NULL;
   state->default_genre_tag = NULL;
   state->silence_log_fname = NULL;
+  state->silence_full_log_fname = NULL;
+  state->full_log_file_descriptor = NULL;
 
-  state->split.real_tagsnumber = 0;
-  state->split.real_splitnumber = 0;
   state->split.splitnumber = 0;
   state->split.current_split_file_number = 1;
   state->split.get_silence_level = NULL;
@@ -62,6 +61,8 @@
   state->split.put_message_cb_data = NULL;
   state->split.file_split = NULL;
   state->split.file_split_cb_data = NULL;
+  state->split.write_cb = NULL;
+  state->split.write_cb_data = NULL;
   state->split.p_bar->progress_text_max_char = 40;
   snprintf(state->split.p_bar->filename_shorted,512, "%s","");
   state->split.p_bar->percent_progress = 0;
@@ -70,7 +71,6 @@
   state->split.p_bar->progress_type = SPLT_PROGRESS_PREPARE;
   state->split.p_bar->silence_found_tracks = 0;
   state->split.p_bar->silence_db_level = 0;
-  state->split.p_bar->user_data = 0;
   state->split.p_bar->progress = NULL;
   state->split.p_bar->progress_cb_data = NULL;
   state->cancel_split = SPLT_FALSE;
@@ -88,6 +88,7 @@
   splt_o_set_options_default_values(state);
   splt_o_set_ioptions_default_values(state);
   splt_p_set_default_values(state);
+  splt_pr_set_default_values(state);
 }
 
 splt_state *splt_t_new_state(splt_state *state, int *error)
@@ -181,6 +182,11 @@
       free(state->silence_log_fname);
       state->silence_log_fname = NULL;
     }
+    if (state->silence_full_log_fname)
+    {
+      free(state->silence_full_log_fname);
+      state->silence_full_log_fname = NULL;
+    }
     if (state->wrap)
     {
       free(state->wrap);
@@ -220,6 +226,7 @@
       state->split.p_bar = NULL;
     }
     splt_e_free_errors(state);
+    splt_pr_free(state);
     splt_t_free_state_struct(state);
   }
 }
@@ -357,6 +364,22 @@
   return state->silence_log_fname;
 }
 
+int splt_t_set_silence_full_log_fname(splt_state *state, const char *filename)
+{
+  splt_d_print_debug(state,"Setting silence full log fname to _%s_\n", filename);
+  return splt_su_copy(filename, &state->silence_full_log_fname);
+}
+
+char *splt_t_get_silence_full_log_fname(splt_state *state)
+{
+  return state->silence_full_log_fname;
+}
+
+FILE *splt_t_get_silence_full_log_file_descriptor(splt_state *state)
+{
+  return state->full_log_file_descriptor;
+}
+
 //! Sets the name of the file that has to be split.
 int splt_t_set_filename_to_split(splt_state *state, const char *filename)
 {
@@ -375,7 +398,7 @@
   state->split.current_split_file_number = index;
 }
 
-static void splt_t_set_current_split_file_number_next(splt_state *state)
+void splt_t_set_current_split_file_number_next(splt_state *state)
 {
   splt_t_set_current_split_file_number(state, state->split.current_split_file_number+1);
 }

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

@@ -4,7 +4,7 @@
  *               for mp3/ogg splitting without decoding
  *
  * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net>
- * Copyright (c) 2005-2012 Munteanu Alexandru - io_fx@yahoo.fr
+ * Copyright (c) 2005-2013 Munteanu Alexandru - m@ioalex.net
  *
  * http://mp3splt.sourceforge.net
  *
@@ -24,8 +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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  *
  *********************************************************/
@@ -61,6 +60,9 @@
 
 int splt_t_set_silence_log_fname(splt_state *state, const char *filename);
 char *splt_t_get_silence_log_fname(splt_state *state);
+int splt_t_set_silence_full_log_fname(splt_state *state, const char *filename);
+char *splt_t_get_silence_full_log_fname(splt_state *state);
+FILE *splt_t_get_silence_full_log_file_descriptor(splt_state *state);
 
 int splt_t_set_filename_to_split(splt_state *state, const char *filename);
 char *splt_t_get_filename_to_split(splt_state *state);
@@ -82,6 +84,8 @@
 int splt_t_split_is_canceled(splt_state *state);
 void splt_t_set_stop_split(splt_state *state, int bool_value);
 
+void splt_t_set_current_split_file_number_next(splt_state *state);
+
 #define SPLT_TYPES_FUNC_H
 
 #endif

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

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

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

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

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

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

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

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

@@ -96,6 +96,14 @@
 @HAS_CUTTER_TRUE@	test_socket_manager.lo
 test_socket_manager_la_OBJECTS = $(am_test_socket_manager_la_OBJECTS)
 @HAS_CUTTER_TRUE@am_test_socket_manager_la_rpath =
+test_splitpoints_handling_la_LIBADD =
+am__test_splitpoints_handling_la_SOURCES_DIST =  \
+	test_splitpoints_handling.c
+@HAS_CUTTER_TRUE@am_test_splitpoints_handling_la_OBJECTS =  \
+@HAS_CUTTER_TRUE@	test_splitpoints_handling.lo
+test_splitpoints_handling_la_OBJECTS =  \
+	$(am_test_splitpoints_handling_la_OBJECTS)
+@HAS_CUTTER_TRUE@am_test_splitpoints_handling_la_rpath =
 test_splt_array_la_LIBADD =
 am__test_splt_array_la_SOURCES_DIST = test_splt_array.c tests.h
 @HAS_CUTTER_TRUE@am_test_splt_array_la_OBJECTS = test_splt_array.lo
@@ -107,6 +115,12 @@
 @HAS_CUTTER_TRUE@	test_string_utils.lo
 test_string_utils_la_OBJECTS = $(am_test_string_utils_la_OBJECTS)
 @HAS_CUTTER_TRUE@am_test_string_utils_la_rpath =
+test_tags_handling_la_LIBADD =
+am__test_tags_handling_la_SOURCES_DIST = test_tags_handling.c
+@HAS_CUTTER_TRUE@am_test_tags_handling_la_OBJECTS =  \
+@HAS_CUTTER_TRUE@	test_tags_handling.lo
+test_tags_handling_la_OBJECTS = $(am_test_tags_handling_la_OBJECTS)
+@HAS_CUTTER_TRUE@am_test_tags_handling_la_rpath =
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/libltdl/config/depcomp
 am__depfiles_maybe = depfiles
@@ -123,13 +137,17 @@
 SOURCES = $(test_filename_regex_la_SOURCES) \
 	$(test_minimum_track_join_la_SOURCES) $(test_pair_la_SOURCES) \
 	$(test_socket_manager_la_SOURCES) \
-	$(test_splt_array_la_SOURCES) $(test_string_utils_la_SOURCES)
+	$(test_splitpoints_handling_la_SOURCES) \
+	$(test_splt_array_la_SOURCES) $(test_string_utils_la_SOURCES) \
+	$(test_tags_handling_la_SOURCES)
 DIST_SOURCES = $(am__test_filename_regex_la_SOURCES_DIST) \
 	$(am__test_minimum_track_join_la_SOURCES_DIST) \
 	$(am__test_pair_la_SOURCES_DIST) \
 	$(am__test_socket_manager_la_SOURCES_DIST) \
+	$(am__test_splitpoints_handling_la_SOURCES_DIST) \
 	$(am__test_splt_array_la_SOURCES_DIST) \
-	$(am__test_string_utils_la_SOURCES_DIST)
+	$(am__test_string_utils_la_SOURCES_DIST) \
+	$(am__test_tags_handling_la_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -191,6 +209,9 @@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBLTDL = @LIBLTDL@
+LIBMP3SPLT_MAJOR_VERSION = @LIBMP3SPLT_MAJOR_VERSION@
+LIBMP3SPLT_MICRO_VERSION = @LIBMP3SPLT_MICRO_VERSION@
+LIBMP3SPLT_MINOR_VERSION = @LIBMP3SPLT_MINOR_VERSION@
 LIBOBJS = @LIBOBJS@
 LIBS = $(CUTTER_LIBS) $(top_builddir)/src/libmp3splt.la
 LIBTOOL = @LIBTOOL@
@@ -240,6 +261,7 @@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SONAME = @SONAME@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@@ -304,6 +326,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+EXTRA_DIST = run-tests.sh
 INCLUDES = $(CUTTER_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/src
 AM_LDFLAGS = -module -rpath $(libdir) -avoid-version -no-undefined
 @HAS_CUTTER_TRUE@noinst_LTLIBRARIES = test_splt_array.la \
@@ -311,7 +334,9 @@
 @HAS_CUTTER_TRUE@test_string_utils.la \
 @HAS_CUTTER_TRUE@test_filename_regex.la \
 @HAS_CUTTER_TRUE@test_socket_manager.la \
-@HAS_CUTTER_TRUE@test_minimum_track_join.la
+@HAS_CUTTER_TRUE@test_minimum_track_join.la \
+@HAS_CUTTER_TRUE@test_splitpoints_handling.la \
+@HAS_CUTTER_TRUE@test_tags_handling.la
 
 @HAS_CUTTER_TRUE@test_splt_array_la_SOURCES = test_splt_array.c tests.h
 @HAS_CUTTER_TRUE@test_pair_la_SOURCES = test_pair.c tests.h
@@ -319,7 +344,9 @@
 @HAS_CUTTER_TRUE@test_filename_regex_la_SOURCES = test_filename_regex.c tests.c tests.h
 @HAS_CUTTER_TRUE@test_socket_manager_la_SOURCES = test_socket_manager.c tests.h
 @HAS_CUTTER_TRUE@test_minimum_track_join_la_SOURCES = test_minimum_track_join.c tests.h
-@HAS_CUTTER_TRUE@TESTS = run-tests.sh
+@HAS_CUTTER_TRUE@test_splitpoints_handling_la_SOURCES = test_splitpoints_handling.c
+@HAS_CUTTER_TRUE@test_tags_handling_la_SOURCES = test_tags_handling.c
+@HAS_CUTTER_TRUE@TESTS = $(top_srcdir)/test/run-tests.sh
 @HAS_CUTTER_TRUE@TESTS_ENVIRONMENT = NO_MAKE=yes CUTTER="$(CUTTER)"
 all: all-am
 
@@ -372,10 +399,14 @@
 	$(LINK) $(am_test_pair_la_rpath) $(test_pair_la_OBJECTS) $(test_pair_la_LIBADD) $(LIBS)
 test_socket_manager.la: $(test_socket_manager_la_OBJECTS) $(test_socket_manager_la_DEPENDENCIES) $(EXTRA_test_socket_manager_la_DEPENDENCIES) 
 	$(LINK) $(am_test_socket_manager_la_rpath) $(test_socket_manager_la_OBJECTS) $(test_socket_manager_la_LIBADD) $(LIBS)
+test_splitpoints_handling.la: $(test_splitpoints_handling_la_OBJECTS) $(test_splitpoints_handling_la_DEPENDENCIES) $(EXTRA_test_splitpoints_handling_la_DEPENDENCIES) 
+	$(LINK) $(am_test_splitpoints_handling_la_rpath) $(test_splitpoints_handling_la_OBJECTS) $(test_splitpoints_handling_la_LIBADD) $(LIBS)
 test_splt_array.la: $(test_splt_array_la_OBJECTS) $(test_splt_array_la_DEPENDENCIES) $(EXTRA_test_splt_array_la_DEPENDENCIES) 
 	$(LINK) $(am_test_splt_array_la_rpath) $(test_splt_array_la_OBJECTS) $(test_splt_array_la_LIBADD) $(LIBS)
 test_string_utils.la: $(test_string_utils_la_OBJECTS) $(test_string_utils_la_DEPENDENCIES) $(EXTRA_test_string_utils_la_DEPENDENCIES) 
 	$(LINK) $(am_test_string_utils_la_rpath) $(test_string_utils_la_OBJECTS) $(test_string_utils_la_LIBADD) $(LIBS)
+test_tags_handling.la: $(test_tags_handling_la_OBJECTS) $(test_tags_handling_la_DEPENDENCIES) $(EXTRA_test_tags_handling_la_DEPENDENCIES) 
+	$(LINK) $(am_test_tags_handling_la_rpath) $(test_tags_handling_la_OBJECTS) $(test_tags_handling_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -387,8 +418,10 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_minimum_track_join.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_pair.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_socket_manager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_splitpoints_handling.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_splt_array.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_string_utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tags_handling.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tests.Plo@am__quote@
 
 .c.o:

libmp3splt-0.8.2.tar.gz/test/run-tests.sh Added

libmp3splt-0.7.3.tar.gz/test/test_filename_regex.c -> libmp3splt-0.8.2.tar.gz/test/test_filename_regex.c Changed

@@ -24,7 +24,7 @@
 
 void cut_teardown()
 {
-  mp3splt_free_state(state, NULL);
+  mp3splt_free_state(state);
   splt_tu_free_one_tags(&tags);
   tags = NULL;
 }
@@ -41,14 +41,27 @@
 
   cut_assert_equal_int(SPLT_REGEX_OK, error);
 
-  cut_assert_equal_string("artist", tags->artist);
-  cut_assert_equal_string("geek", tags->title);
-  cut_assert_equal_string("album", tags->album);
-  cut_assert_equal_string("comment", tags->comment);
-  cut_assert_equal_string("2007", tags->year);
-  cut_assert_equal_int(2, tags->track);
-  cut_assert_equal_string("Slow Rock", tags->genre);
-  //tags->total_tracks
+  char *artist = mp3splt_tags_get(tags, SPLT_TAGS_ARTIST);
+  cut_assert_equal_string("artist", artist);
+  free(artist);
+  char *title = mp3splt_tags_get(tags, SPLT_TAGS_TITLE);
+  cut_assert_equal_string("geek", title);
+  free(title);
+  char *album = mp3splt_tags_get(tags, SPLT_TAGS_ALBUM);
+  cut_assert_equal_string("album", album);
+  free(album);
+  char *comment = mp3splt_tags_get(tags, SPLT_TAGS_COMMENT);
+  cut_assert_equal_string("comment", comment);
+  free(comment);
+  char *year = mp3splt_tags_get(tags, SPLT_TAGS_YEAR);
+  cut_assert_equal_string("2007", year);
+  free(year);
+  char *track = mp3splt_tags_get(tags, SPLT_TAGS_TRACK);
+  cut_assert_equal_string("2", track);
+  free(track);
+  char *genre = mp3splt_tags_get(tags, SPLT_TAGS_GENRE);
+  cut_assert_equal_string("Slow Rock", genre);
+  free(genre);
 }
 
 void test_all_fields_to_uppercase()
@@ -66,14 +79,27 @@
 
   cut_assert_equal_int(SPLT_REGEX_OK, error);
 
-  cut_assert_equal_string("ARTIST", tags->artist);
-  cut_assert_equal_string("GEEK", tags->title);
-  cut_assert_equal_string("ALBUM", tags->album);
-  cut_assert_equal_string("COMMENT", tags->comment);
-  cut_assert_equal_string("2007", tags->year);
-  cut_assert_equal_int(2, tags->track);
-  cut_assert_equal_string("Slow Rock", tags->genre);
-  //tags->total_tracks
+  char *artist = mp3splt_tags_get(tags, SPLT_TAGS_ARTIST);
+  cut_assert_equal_string("ARTIST", artist);
+  free(artist);
+  char *title = mp3splt_tags_get(tags, SPLT_TAGS_TITLE);
+  cut_assert_equal_string("GEEK", title);
+  free(title);
+  char *album = mp3splt_tags_get(tags, SPLT_TAGS_ALBUM);
+  cut_assert_equal_string("ALBUM", album);
+  free(album);
+  char *comment = mp3splt_tags_get(tags, SPLT_TAGS_COMMENT);
+  cut_assert_equal_string("COMMENT", comment);
+  free(comment);
+  char *year = mp3splt_tags_get(tags, SPLT_TAGS_YEAR);
+  cut_assert_equal_string("2007", year);
+  free(year);
+  char *track = mp3splt_tags_get(tags, SPLT_TAGS_TRACK);
+  cut_assert_equal_string("2", track);
+  free(track);
+  char *genre = mp3splt_tags_get(tags, SPLT_TAGS_GENRE);
+  cut_assert_equal_string("Slow Rock", genre);
+  free(genre);
 }
 
 void test_all_fields_to_lowercase()
@@ -90,14 +116,27 @@
 
   cut_assert_equal_int(SPLT_REGEX_OK, error);
 
-  cut_assert_equal_string("artist", tags->artist);
-  cut_assert_equal_string("geek", tags->title);
-  cut_assert_equal_string("album", tags->album);
-  cut_assert_equal_string("comment", tags->comment);
-  cut_assert_equal_string("2007", tags->year);
-  cut_assert_equal_int(2, tags->track);
-  cut_assert_equal_string("Slow Rock", tags->genre);
-  //tags->total_tracks
+  char *artist = mp3splt_tags_get(tags, SPLT_TAGS_ARTIST);
+  cut_assert_equal_string("artist", artist);
+  free(artist);
+  char *title = mp3splt_tags_get(tags, SPLT_TAGS_TITLE);
+  cut_assert_equal_string("geek", title);
+  free(title);
+  char *album = mp3splt_tags_get(tags, SPLT_TAGS_ALBUM);
+  cut_assert_equal_string("album", album);
+  free(album);
+  char *comment = mp3splt_tags_get(tags, SPLT_TAGS_COMMENT);
+  cut_assert_equal_string("comment", comment);
+  free(comment);
+  char *year = mp3splt_tags_get(tags, SPLT_TAGS_YEAR);
+  cut_assert_equal_string("2007", year);
+  free(year);
+  char *track = mp3splt_tags_get(tags, SPLT_TAGS_TRACK);
+  cut_assert_equal_string("2", track);
+  free(track);
+  char *genre = mp3splt_tags_get(tags, SPLT_TAGS_GENRE);
+  cut_assert_equal_string("Slow Rock", genre);
+  free(genre);
 }
 
 void test_all_fields_to_first_uppercase()
@@ -114,13 +153,27 @@
 
   cut_assert_equal_int(SPLT_REGEX_OK, error);
 
-  cut_assert_equal_string("ArTist good", tags->artist);
-  cut_assert_equal_string("GEEK", tags->title);
-  cut_assert_equal_string("AlBum", tags->album);
-  cut_assert_equal_string("CoMMent", tags->comment);
-  cut_assert_equal_string("2007", tags->year);
-  cut_assert_equal_int(2, tags->track);
-  cut_assert_equal_string("Tango", tags->genre);
+  char *artist = mp3splt_tags_get(tags, SPLT_TAGS_ARTIST);
+  cut_assert_equal_string("ArTist good", artist);
+  free(artist);
+  char *title = mp3splt_tags_get(tags, SPLT_TAGS_TITLE);
+  cut_assert_equal_string("GEEK", title);
+  free(title);
+  char *album = mp3splt_tags_get(tags, SPLT_TAGS_ALBUM);
+  cut_assert_equal_string("AlBum", album);
+  free(album);
+  char *comment = mp3splt_tags_get(tags, SPLT_TAGS_COMMENT);
+  cut_assert_equal_string("CoMMent", comment);
+  free(comment);
+  char *year = mp3splt_tags_get(tags, SPLT_TAGS_YEAR);
+  cut_assert_equal_string("2007", year);
+  free(year);
+  char *track = mp3splt_tags_get(tags, SPLT_TAGS_TRACK);
+  cut_assert_equal_string("2", track);
+  free(track);
+  char *genre = mp3splt_tags_get(tags, SPLT_TAGS_GENRE);
+  cut_assert_equal_string("Tango", genre);
+  free(genre);
   //tags->total_tracks
 }
 
@@ -138,13 +191,27 @@
 
   cut_assert_equal_int(SPLT_REGEX_OK, error);
 
-  cut_assert_equal_string("ArTist Good", tags->artist);
-  cut_assert_equal_string("GEEK Y", tags->title);
-  cut_assert_equal_string("AlBum Second", tags->album);
-  cut_assert_equal_string("CoMMent This", tags->comment);
-  cut_assert_equal_string("2007", tags->year);
-  cut_assert_equal_int(2, tags->track);
-  cut_assert_equal_string("Tango", tags->genre);
+  char *artist = mp3splt_tags_get(tags, SPLT_TAGS_ARTIST);
+  cut_assert_equal_string("ArTist Good", artist);
+  free(artist);
+  char *title = mp3splt_tags_get(tags, SPLT_TAGS_TITLE);
+  cut_assert_equal_string("GEEK Y", title);
+  free(title);
+  char *album = mp3splt_tags_get(tags, SPLT_TAGS_ALBUM);
+  cut_assert_equal_string("AlBum Second", album);
+  free(album);
+  char *comment = mp3splt_tags_get(tags, SPLT_TAGS_COMMENT);
+  cut_assert_equal_string("CoMMent This", comment);
+  free(comment);
+  char *year = mp3splt_tags_get(tags, SPLT_TAGS_YEAR);
+  cut_assert_equal_string("2007", year);
+  free(year);
+  char *track = mp3splt_tags_get(tags, SPLT_TAGS_TRACK);
+  cut_assert_equal_string("2", track);
+  free(track);
+  char *genre = mp3splt_tags_get(tags, SPLT_TAGS_GENRE);
+  cut_assert_equal_string("Tango", genre);
+  free(genre);
   //tags->total_tracks
 }
 
@@ -174,40 +241,52 @@
       NO_DEFAULT_COMMENT, NO_DEFAULT_GENRE, &error);
 
   cut_assert_equal_int(SPLT_REGEX_OK, error);
-  cut_assert_equal_string("Track 3 of 6", tags->title);
-  cut_assert_equal_int(3, tags->track);
-  //tags->total_tracks
+
+  char *title = mp3splt_tags_get(tags, SPLT_TAGS_TITLE);
+  cut_assert_equal_string("Track 3 of 6", title);
+  free(title);
+  char *track = mp3splt_tags_get(tags, SPLT_TAGS_TRACK);
+  cut_assert_equal_string("3", track);

libmp3splt-0.7.3.tar.gz/test/test_minimum_track_join.c -> libmp3splt-0.8.2.tar.gz/test/test_minimum_track_join.c Changed

@@ -18,7 +18,7 @@
 
 void cut_teardown()
 {
-  mp3splt_free_state(state, NULL);
+  mp3splt_free_state(state);
 }
 
 void test_find_intervals_with_no_splitpoint()
@@ -381,15 +381,19 @@
 
   cut_assert_equal_int(SPLT_OK, error);
 
-  int splitpoints_number;
-  const splt_point *points = mp3splt_get_splitpoints(state, &splitpoints_number, &error);
+  splt_points *points = mp3splt_get_splitpoints(state, &error);
 
   cut_assert_equal_int(SPLT_OK, error);
 
-  cut_assert_equal_int(2, splitpoints_number);
+  mp3splt_points_init_iterator(points);
 
-  cut_assert_equal_int(0, points0.value);
-  cut_assert_equal_int(4, points1.value);
+  const splt_point *point = mp3splt_points_next(points);
+  cut_assert_equal_int(0, mp3splt_point_get_value(point));
+
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(4, mp3splt_point_get_value(point));
+
+  cut_assert_null(mp3splt_points_next(points));
 }
 
 void test_join_tracks_with_only_big_segments()
@@ -406,18 +410,28 @@
 
   cut_assert_equal_int(SPLT_OK, error);
 
-  int splitpoints_number;
-  const splt_point *points = mp3splt_get_splitpoints(state, &splitpoints_number, &error);
+  splt_points *points = mp3splt_get_splitpoints(state, &error);
 
   cut_assert_equal_int(SPLT_OK, error);
 
-  cut_assert_equal_int(5, splitpoints_number);
+  mp3splt_points_init_iterator(points);
+
+  const splt_point *point = mp3splt_points_next(points);
+  cut_assert_equal_int(0, mp3splt_point_get_value(point));
+
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(10, mp3splt_point_get_value(point));
+
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(20, mp3splt_point_get_value(point));
 
-  cut_assert_equal_int(0, points0.value);
-  cut_assert_equal_int(10, points1.value);
-  cut_assert_equal_int(20, points2.value);
-  cut_assert_equal_int(30, points3.value);
-  cut_assert_equal_int(40, points4.value);
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(30, mp3splt_point_get_value(point));
+
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(40, mp3splt_point_get_value(point));
+
+  cut_assert_null(mp3splt_points_next(points));
 }
 
 void test_join_tracks_with_small_segments_at_start()
@@ -437,16 +451,22 @@
 
   cut_assert_equal_int(SPLT_OK, error);
 
-  int splitpoints_number;
-  const splt_point *points = mp3splt_get_splitpoints(state, &splitpoints_number, &error);
+  splt_points *points = mp3splt_get_splitpoints(state, &error);
 
   cut_assert_equal_int(SPLT_OK, error);
 
-  cut_assert_equal_int(3, splitpoints_number);
+  mp3splt_points_init_iterator(points);
+
+  const splt_point *point = mp3splt_points_next(points);
+  cut_assert_equal_int(0, mp3splt_point_get_value(point));
+
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(30, mp3splt_point_get_value(point));
 
-  cut_assert_equal_int(0, points0.value);
-  cut_assert_equal_int(30, points1.value);
-  cut_assert_equal_int(40, points2.value);
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(40, mp3splt_point_get_value(point));
+
+  cut_assert_null(mp3splt_points_next(points));
 }
 
 void test_join_tracks_with_small_segments_in_the_middle()
@@ -468,18 +488,28 @@
 
   cut_assert_equal_int(SPLT_OK, error);
 
-  int splitpoints_number;
-  const splt_point *points = mp3splt_get_splitpoints(state, &splitpoints_number, &error);
+  splt_points *points = mp3splt_get_splitpoints(state, &error);
 
   cut_assert_equal_int(SPLT_OK, error);
 
-  cut_assert_equal_int(5, splitpoints_number);
+  mp3splt_points_init_iterator(points);
+
+  const splt_point *point = mp3splt_points_next(points);
+  cut_assert_equal_int(0, mp3splt_point_get_value(point));
+
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(10, mp3splt_point_get_value(point));
+
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(21, mp3splt_point_get_value(point));
+
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(30, mp3splt_point_get_value(point));
 
-  cut_assert_equal_int(0, points0.value);
-  cut_assert_equal_int(10, points1.value);
-  cut_assert_equal_int(21, points2.value);
-  cut_assert_equal_int(30, points3.value);
-  cut_assert_equal_int(40, points4.value);
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(40, mp3splt_point_get_value(point));
+
+  cut_assert_null(mp3splt_points_next(points));
 }
 
 void test_join_tracks_complex()
@@ -507,19 +537,31 @@
 
   cut_assert_equal_int(SPLT_OK, error);
 
-  int splitpoints_number;
-  const splt_point *points = mp3splt_get_splitpoints(state, &splitpoints_number, &error);
+  splt_points *points = mp3splt_get_splitpoints(state, &error);
 
   cut_assert_equal_int(SPLT_OK, error);
 
-  cut_assert_equal_int(6, splitpoints_number);
+  mp3splt_points_init_iterator(points);
+
+  const splt_point *point = mp3splt_points_next(points);
+  cut_assert_equal_int(0, mp3splt_point_get_value(point));
+
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(10, mp3splt_point_get_value(point));
+
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(21, mp3splt_point_get_value(point));
 
-  cut_assert_equal_int(0, points0.value);
-  cut_assert_equal_int(10, points1.value);
-  cut_assert_equal_int(21, points2.value);
-  cut_assert_equal_int(30, points3.value);
-  cut_assert_equal_int(40, points4.value);
-  cut_assert_equal_int(50, points5.value);
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(30, mp3splt_point_get_value(point));
+
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(40, mp3splt_point_get_value(point));
+
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(50, mp3splt_point_get_value(point));
+
+  cut_assert_null(mp3splt_points_next(points));
 }
 
 void test_join_tracks_even_more_complex()
@@ -558,19 +600,31 @@
 
   cut_assert_equal_int(SPLT_OK, error);
 
-  int splitpoints_number;
-  const splt_point *points = mp3splt_get_splitpoints(state, &splitpoints_number, &error);
+  splt_points *points = mp3splt_get_splitpoints(state, &error);
 
   cut_assert_equal_int(SPLT_OK, error);
 
-  cut_assert_equal_int(6, splitpoints_number);
+  mp3splt_points_init_iterator(points);
+
+  const splt_point *point = mp3splt_points_next(points);
+  cut_assert_equal_int(0, mp3splt_point_get_value(point));
+
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(10, mp3splt_point_get_value(point));
+
+  point = mp3splt_points_next(points);
+  cut_assert_equal_int(21, mp3splt_point_get_value(point));
+

libmp3splt-0.7.3.tar.gz/test/test_socket_manager.c -> libmp3splt-0.8.2.tar.gz/test/test_socket_manager.c Changed

@@ -1,5 +1,7 @@
 #include <cutter.h>
 
+#include <stdio.h>
+
 #include "libmp3splt/mp3splt.h"
 #include "socket_manager.h"
 
@@ -22,7 +24,7 @@
 
 void cut_teardown()
 {
-  mp3splt_free_state(state, NULL);
+  mp3splt_free_state(state);
 }
 
 void test_sm_receive_and_process()
@@ -32,7 +34,12 @@
   splt_socket_handler *sh = splt_sm_socket_handler_new(&error);
   cut_assert_equal_int(SPLT_OK, error);
 
-  splt_sm_receive_and_process_with_recv(sh, state, &recv_without_headers, &process_functor, NULL);
+  char *first_line = 
+    splt_sm_receive_and_process_with_recv(sh, state, &recv_without_headers, &process_functor, NULL);
+
+  cut_assert_equal_string("x", first_line);
+
+  free(first_line);
 
   splt_sm_socket_handler_free(&sh);
 }
@@ -44,8 +51,9 @@
   splt_socket_handler *sh = splt_sm_socket_handler_new(&error);
   cut_assert_equal_int(SPLT_OK, error);
 
-  splt_sm_receive_and_process_without_headers_with_recv(sh, state, &recv_with_headers,
+  char *first_line = splt_sm_receive_and_process_without_headers_with_recv(sh, state, &recv_with_headers,
       &process_functor_with_skip_line, NULL, 1); 
+  free(first_line);
 
   splt_sm_socket_handler_free(&sh);
 }
@@ -55,8 +63,9 @@
   splt_socket_handler *sh = splt_sm_socket_handler_new(&error);
   cut_assert_equal_int(SPLT_OK, error);
 
-  splt_sm_receive_and_process_without_headers_with_recv(sh, state, &recv_with_headers,
+  char *first_line = splt_sm_receive_and_process_without_headers_with_recv(sh, state, &recv_with_headers,
       &processor_with_continue_false, NULL, 1); 
+  free(first_line);
 
   splt_sm_socket_handler_free(&sh);
 }
@@ -98,7 +107,7 @@
   if (counter == 11)
   {
     cut_assert_equal_int(1, line_number);
-    cut_assert_equal_string("", received_line);
+    cut_assert_equal_string("x", received_line);
   }
   if (counter == 21)
   {
@@ -165,7 +174,14 @@
   }
   else
   {
-    snprintf(buffer, buffer_size, "\n");
+    if (counter == 10)
+    {
+      snprintf(buffer, buffer_size, "x\n");
+    }
+    else
+    {
+      snprintf(buffer, buffer_size, "\n");
+    }
   }
 
   counter++;

libmp3splt-0.8.2.tar.gz/test/test_splitpoints_handling.c Added

@@ -0,0 +1,110 @@
+#include <cutter.h>
+
+#include "libmp3splt/mp3splt.h"
+
+static splt_state *state = NULL;
+static int error = SPLT_OK;
+
+void cut_setup()
+{
+  state = mp3splt_new_state(NULL);
+  error = SPLT_OK;
+}
+
+void cut_teardown()
+{
+  mp3splt_free_state(state);
+}
+
+void test_initial_splitpoints()
+{
+  splt_points *points = mp3splt_get_splitpoints(state, &error);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  cut_assert_null(points);
+
+  mp3splt_points_init_iterator(points);
+  cut_assert_null(mp3splt_points_next(points));
+  cut_assert_null(mp3splt_points_next(points));
+}
+
+void test_initial_erase_all_splitpoints()
+{
+  error = mp3splt_erase_all_splitpoints(state);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  splt_points *points = mp3splt_get_splitpoints(state, &error);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  cut_assert_null(points);
+}
+
+void test_append_and_return_splitpoints()
+{
+  //first splitpoint
+  splt_point *point1 = mp3splt_point_new(1 * 60 * 100, &error);
+  cut_assert_equal_int(SPLT_OK, error);
+  error = mp3splt_point_set_name(point1, "first_point_name");
+  cut_assert_equal_int(SPLT_OK, error);
+  error = mp3splt_point_set_type(point1, SPLT_SPLITPOINT);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  //append first splitpoint
+  error = mp3splt_append_splitpoint(state, point1);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  //second splitpoint
+  splt_point *point2 = mp3splt_point_new(4 * 60 * 100, &error);
+  cut_assert_equal_int(SPLT_OK, error);
+  error = mp3splt_point_set_name(point2, "second_point_name");
+  cut_assert_equal_int(SPLT_OK, error);
+  error = mp3splt_point_set_type(point2, SPLT_SKIPPOINT);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  //append second splitpoint
+  error = mp3splt_append_splitpoint(state, point2);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  splt_points *points = mp3splt_get_splitpoints(state, &error);
+  cut_assert_equal_int(SPLT_OK, error);
+  mp3splt_points_init_iterator(points);
+
+  //check first splitpoint
+  const splt_point *check_point1 = mp3splt_points_next(points);
+  cut_assert_equal_int(1 * 60 * 100, mp3splt_point_get_value(check_point1));
+  cut_assert_equal_int(SPLT_SPLITPOINT, mp3splt_point_get_type(check_point1));
+  char *name1 = mp3splt_point_get_name(check_point1);
+  cut_assert_equal_string("first_point_name", name1);
+  free(name1);
+
+  //check second splitpoint
+  const splt_point *check_point2 = mp3splt_points_next(points);
+  cut_assert_equal_int(4 * 60 * 100, mp3splt_point_get_value(check_point2));
+  cut_assert_equal_int(SPLT_SKIPPOINT, mp3splt_point_get_type(check_point2));
+  char *name2 = mp3splt_point_get_name(check_point2);
+  cut_assert_equal_string("second_point_name", name2);
+  free(name2);
+
+  cut_assert_null(mp3splt_points_next(points));
+}
+
+void test_append_and_erase_all_splitpoints()
+{
+  splt_point *point1 = mp3splt_point_new(1 * 60 * 100, &error);
+  cut_assert_equal_int(SPLT_OK, error);
+  error = mp3splt_point_set_name(point1, "first_point_name");
+  cut_assert_equal_int(SPLT_OK, error);
+  error = mp3splt_point_set_type(point1, SPLT_SPLITPOINT);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  //append splitpoint
+  error = mp3splt_append_splitpoint(state, point1);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  error = mp3splt_erase_all_splitpoints(state);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  splt_points *points = mp3splt_get_splitpoints(state, &error);
+  cut_assert_null(points);
+}
+

libmp3splt-0.7.3.tar.gz/test/test_string_utils.c -> libmp3splt-0.8.2.tar.gz/test/test_string_utils.c Changed

libmp3splt-0.8.2.tar.gz/test/test_tags_handling.c Added

@@ -0,0 +1,137 @@
+#include <cutter.h>
+
+#include "libmp3splt/mp3splt.h"
+
+static int error = SPLT_OK;
+static splt_state *state = NULL;
+
+void cut_setup()
+{
+  state = mp3splt_new_state(NULL);
+  error = SPLT_OK;
+}
+
+void cut_teardown()
+{
+  mp3splt_free_state(state);
+}
+
+void test_initial_tags()
+{
+  splt_tags_group *tags_group = mp3splt_get_tags_group(state, &error);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  cut_assert_null(tags_group);
+
+  mp3splt_tags_group_init_iterator(tags_group);
+  cut_assert_null(mp3splt_tags_group_next(tags_group));
+  cut_assert_null(mp3splt_tags_group_next(tags_group));
+}
+
+void test_initial_erase_all_tags()
+{
+  error = mp3splt_erase_all_tags(state);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  splt_tags_group *tags_group = mp3splt_get_tags_group(state, &error);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  cut_assert_null(tags_group);
+}
+
+void test_append_and_return_tags()
+{
+  //first tags
+  splt_tags *tags1 = mp3splt_tags_new(&error);
+  cut_assert_equal_int(SPLT_OK, error);
+  error = mp3splt_tags_set(tags1,
+      SPLT_TAGS_ARTIST, "artist1",
+      SPLT_TAGS_ALBUM, "album1",
+      SPLT_TAGS_GENRE, "other1",
+      SPLT_TAGS_TRACK, "10",
+      0);
+  cut_assert_equal_int(SPLT_OK, error);
+ 
+  //append first tags 
+  error = mp3splt_append_tags(state, tags1);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  //second tags
+  splt_tags *tags2 = mp3splt_tags_new(&error);
+  cut_assert_equal_int(SPLT_OK, error);
+  error = mp3splt_tags_set(tags2,
+      SPLT_TAGS_ARTIST, "artist2",
+      SPLT_TAGS_ALBUM, "album2",
+      SPLT_TAGS_GENRE, "other2",
+      SPLT_TAGS_TRACK, "20",
+      0);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  //append second tags 
+  error = mp3splt_append_tags(state, tags2);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  splt_tags_group *tags_group = mp3splt_get_tags_group(state, &error);
+  cut_assert_equal_int(SPLT_OK, error);
+  mp3splt_tags_group_init_iterator(tags_group);
+
+  //check first tags
+  splt_tags *check_tags1 = mp3splt_tags_group_next(tags_group);
+  char *artist1 = mp3splt_tags_get(check_tags1, SPLT_TAGS_ARTIST);
+  cut_assert_equal_string("artist1", artist1);
+  free(artist1);
+  char *album1 = mp3splt_tags_get(check_tags1, SPLT_TAGS_ALBUM);
+  cut_assert_equal_string("album1", album1);
+  free(album1);
+  char *genre1 = mp3splt_tags_get(check_tags1, SPLT_TAGS_GENRE);
+  cut_assert_equal_string("other1", genre1);
+  free(genre1);
+  char *track1 = mp3splt_tags_get(check_tags1, SPLT_TAGS_TRACK);
+  cut_assert_equal_string("10", track1);
+  free(track1);
+  char *title1 = mp3splt_tags_get(check_tags1, SPLT_TAGS_TITLE);
+  cut_assert_null(title1);
+
+  //check second tags
+  splt_tags *check_tags2 = mp3splt_tags_group_next(tags_group);
+  char *artist2 = mp3splt_tags_get(check_tags2, SPLT_TAGS_ARTIST);
+  cut_assert_equal_string("artist2", artist2);
+  free(artist2);
+  char *album2 = mp3splt_tags_get(check_tags2, SPLT_TAGS_ALBUM);
+  cut_assert_equal_string("album2", album2);
+  free(album2);
+  char *genre2 = mp3splt_tags_get(check_tags2, SPLT_TAGS_GENRE);
+  cut_assert_equal_string("other2", genre2);
+  free(genre2);
+  char *track2 = mp3splt_tags_get(check_tags2, SPLT_TAGS_TRACK);
+  cut_assert_equal_string("20", track2);
+  free(track2);
+  char *title2 = mp3splt_tags_get(check_tags2, SPLT_TAGS_TITLE);
+  cut_assert_null(title2);
+
+  cut_assert_null(mp3splt_tags_group_next(tags_group));
+}
+
+void test_append_and_erase_all_tags()
+{
+  splt_tags *tags1 = mp3splt_tags_new(&error);
+  cut_assert_equal_int(SPLT_OK, error);
+  error = mp3splt_tags_set(tags1,
+      SPLT_TAGS_ARTIST, "artist1",
+      SPLT_TAGS_ALBUM, "album1",
+      SPLT_TAGS_GENRE, "other1",
+      SPLT_TAGS_TRACK, "10",
+      0);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  //append tags 
+  error = mp3splt_append_tags(state, tags1);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  error = mp3splt_erase_all_tags(state);
+  cut_assert_equal_int(SPLT_OK, error);
+
+  splt_tags_group *tags_group = mp3splt_get_tags_group(state, &error);
+  cut_assert_null(tags_group);
+}
+

Changes of Revision 7