Changeset 505
- Timestamp:
- 09/27/07 02:14:18 (1 year ago)
- Files:
-
- sweep/branches/sweep-jack-testing/ChangeLog (modified) (1 diff)
- sweep/branches/sweep-jack-testing/Makefile.am (modified) (1 diff)
- sweep/branches/sweep-jack-testing/NEWS (modified) (1 diff)
- sweep/branches/sweep-jack-testing/README (modified) (1 diff)
- sweep/branches/sweep-jack-testing/README.ALSA (modified) (1 diff)
- sweep/branches/sweep-jack-testing/README.OSS (copied) (copied from sweep/trunk/README.OSS)
- sweep/branches/sweep-jack-testing/TODO (modified) (2 diffs)
- sweep/branches/sweep-jack-testing/acconfig.h (deleted)
- sweep/branches/sweep-jack-testing/acinclude.m4 (modified) (1 diff)
- sweep/branches/sweep-jack-testing/configure.ac (modified) (11 diffs)
- sweep/branches/sweep-jack-testing/doc/Makefile.am (modified) (1 diff)
- sweep/branches/sweep-jack-testing/doc/sweep.1 (deleted)
- sweep/branches/sweep-jack-testing/doc/sweep.1.in (copied) (copied from sweep/trunk/doc/sweep.1.in)
- sweep/branches/sweep-jack-testing/include/sweep/sweep_selection.h (modified) (1 diff)
- sweep/branches/sweep-jack-testing/include/sweep/sweep_types.h (modified) (1 diff)
- sweep/branches/sweep-jack-testing/intl/localcharset.c (modified) (2 diffs)
- sweep/branches/sweep-jack-testing/intl/printf.c (modified) (1 diff)
- sweep/branches/sweep-jack-testing/intl/vasnprintf.c (modified) (7 diffs)
- sweep/branches/sweep-jack-testing/m4/speex.m4 (modified) (1 diff)
- sweep/branches/sweep-jack-testing/pixmaps/cursor-closedhand.xbm (copied) (copied from sweep/trunk/pixmaps/cursor-closedhand.xbm)
- sweep/branches/sweep-jack-testing/pixmaps/cursor-closedhand_mask.xbm (copied) (copied from sweep/trunk/pixmaps/cursor-closedhand_mask.xbm)
- sweep/branches/sweep-jack-testing/pixmaps/cursor-openhand.xbm (copied) (copied from sweep/trunk/pixmaps/cursor-openhand.xbm)
- sweep/branches/sweep-jack-testing/pixmaps/cursor-openhand_mask.xbm (copied) (copied from sweep/trunk/pixmaps/cursor-openhand_mask.xbm)
- sweep/branches/sweep-jack-testing/pixmaps/hand.xpm (copied) (copied from sweep/trunk/pixmaps/hand.xpm)
- sweep/branches/sweep-jack-testing/plugins/byenergy/Makefile.am (modified) (1 diff)
- sweep/branches/sweep-jack-testing/plugins/echo/Makefile.am (modified) (1 diff)
- sweep/branches/sweep-jack-testing/plugins/fade/Makefile.am (modified) (1 diff)
- sweep/branches/sweep-jack-testing/plugins/ladspa/Makefile.am (modified) (1 diff)
- sweep/branches/sweep-jack-testing/plugins/normalise/Makefile.am (modified) (1 diff)
- sweep/branches/sweep-jack-testing/plugins/reverse/Makefile.am (modified) (1 diff)
- sweep/branches/sweep-jack-testing/release_notes/sweep-0.9.2.txt (copied) (copied from sweep/trunk/release_notes/sweep-0.9.2.txt)
- sweep/branches/sweep-jack-testing/src/Makefile.am (modified) (1 diff)
- sweep/branches/sweep-jack-testing/src/about_dialog.c (modified) (1 diff)
- sweep/branches/sweep-jack-testing/src/cursors.c (modified) (6 diffs)
- sweep/branches/sweep-jack-testing/src/cursors.h (modified) (1 diff)
- sweep/branches/sweep-jack-testing/src/driver.c (modified) (6 diffs)
- sweep/branches/sweep-jack-testing/src/driver.h (modified) (1 diff)
- sweep/branches/sweep-jack-testing/src/driver_alsa.c (modified) (4 diffs)
- sweep/branches/sweep-jack-testing/src/driver_oss.c (modified) (1 diff)
- sweep/branches/sweep-jack-testing/src/driver_solaris.c (modified) (1 diff)
- sweep/branches/sweep-jack-testing/src/file_dialogs.c (modified) (2 diffs)
- sweep/branches/sweep-jack-testing/src/file_mad.c (modified) (1 diff)
- sweep/branches/sweep-jack-testing/src/file_sndfile0.c (deleted)
- sweep/branches/sweep-jack-testing/src/file_speex.c (modified) (3 diffs)
- sweep/branches/sweep-jack-testing/src/interface.c (modified) (1 diff)
- sweep/branches/sweep-jack-testing/src/interface.h (modified) (1 diff)
- sweep/branches/sweep-jack-testing/src/main.c (modified) (6 diffs)
- sweep/branches/sweep-jack-testing/src/notes.c (modified) (4 diffs)
- sweep/branches/sweep-jack-testing/src/pcmio.h (modified) (1 diff)
- sweep/branches/sweep-jack-testing/src/play.c (modified) (4 diffs)
- sweep/branches/sweep-jack-testing/src/play.h (modified) (2 diffs)
- sweep/branches/sweep-jack-testing/src/preferences.c (modified) (2 diffs)
- sweep/branches/sweep-jack-testing/src/question_dialogs.c (modified) (3 diffs)
- sweep/branches/sweep-jack-testing/src/record.c (modified) (2 diffs)
- sweep/branches/sweep-jack-testing/src/sample-display.c (modified) (11 diffs)
- sweep/branches/sweep-jack-testing/src/sample-display.h (modified) (1 diff)
- sweep/branches/sweep-jack-testing/src/sample.c (deleted)
- sweep/branches/sweep-jack-testing/src/samplerate.c (modified) (2 diffs)
- sweep/branches/sweep-jack-testing/src/sweep_app.h (modified) (2 diffs)
- sweep/branches/sweep-jack-testing/src/sweep_selection.c (modified) (1 diff)
- sweep/branches/sweep-jack-testing/src/sweep_sounddata.c (modified) (4 diffs)
- sweep/branches/sweep-jack-testing/src/tdb/tdb.h (modified) (1 diff)
- sweep/branches/sweep-jack-testing/src/time_ruler.c (modified) (5 diffs)
- sweep/branches/sweep-jack-testing/src/view.c (modified) (41 diffs)
- sweep/branches/sweep-jack-testing/src/view_pixmaps.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
sweep/branches/sweep-jack-testing/ChangeLog
r355 r505 1 Tue Jan 30 00:00:00 GMT 2007 Peter Shorthose <kickback@users.sourceforge.net> 2 3 * ALSA is now the default driver. see README.OSS for oss 4 * minimum supported gtk version raised to 2.4 5 * added the "hand tool" for panning the display with inertia 6 (Radoslaw Korzeniewski) 7 * can now open multiple files via the gtk file selector 8 * implemented accel editing via the usual gtk method 9 * added tdb lock override (Takashi Iwai) 10 * remove support for libsndfile0 (Erik de Castro Lopo) 11 * remove direct flac support as it's supported by libsndfile now 12 (Erik de Castro Lopo) 13 * added a new splash screen (Pascal Klein) 14 * fix segfault when closing windows while others were still loading 15 * other bugs addressed and changes made. run "svn log" on a copy of svn 16 trunk for details, or check http://trac.metadecks.org/timeline 17 * released 0.9.2 18 1 19 Mon Jan 30 23:58:00 GMT 2006 Peter Shorthose <kickback@users.sourceforge.net> 2 20 sweep/branches/sweep-jack-testing/Makefile.am
r355 r505 14 14 15 15 EXTRA_DIST = config.rpath mkinstalldirs $(desktop_DATA) $(pkgdata_DATA) $(pixmap_DATA) \ 16 sweep.spec README.Solaris README.ALSA README.i18n acconfig.hTODO16 sweep.spec README.Solaris README.ALSA README.i18n TODO 17 17 18 18 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \ sweep/branches/sweep-jack-testing/NEWS
r355 r505 1 Tue Jan 30 2007 -- Version 0.9.2 2 -------------------------------- 3 4 New in this release: 5 6 * ALSA is now the default driver. see README.OSS for oss 7 * minimum supported gtk version raised to 2.4 8 * added the "hand tool" for panning the display with inertia 9 (Radoslaw Korzeniewski) 10 * can now open multiple files via the gtk file selector 11 * implemented accel editing via the usual gtk method 12 * added tdb lock override (Takashi Iwai) 13 * remove support for libsndfile0 (Erik de Castro Lopo) 14 * remove direct flac support as it's supported by libsndfile now 15 (Erik de Castro Lopo) 16 * added a new splash screen (Pascal Klein) 17 * fix segfault when closing windows while others were still loading 18 * other bugs addressed and changes made. run "svn log" on a copy of svn 19 trunk for details, or check http://trac.metadecks.org/timeline 20 * released 0.9.2 21 22 1 23 Mon Jan 30 2006 -- Version 0.9.1 2 24 -------------------------------- sweep/branches/sweep-jack-testing/README
r287 r505 34 34 REQUIRED: 35 35 36 * GTK+ 2.0, (version 2. 2.0 or higher) standard in most36 * GTK+ 2.0, (version 2.4.0 or higher) standard in most 37 37 distributions and available from: 38 38 sweep/branches/sweep-jack-testing/README.ALSA
r124 r505 1 Sun Jun 25 2006 2 --------------- 3 4 the default driver is now the ALSA driver. see README.OSS for 5 information on using the OSS driver instead. 6 1 7 Wed Apr 30 2003 2 8 --------------- sweep/branches/sweep-jack-testing/TODO
r355 r505 3 3 4 4 * JACK support 5 * FLAC support6 5 * caching of undo data on disk 7 6 * sample bank management … … 11 10 * LADSPA browser 12 11 * modular drivers 13 14 Done15 ----16 17 * ALSA 0.9 support18 * Ogg Vorbis support19 * MP3 support (read-only)20 * GTK2 portsweep/branches/sweep-jack-testing/acinclude.m4
r62 r505 10 10 dnl Test for AUDIOFILE, and define AUDIOFILE_CFLAGS and AUDIOFILE_LIBS 11 11 dnl 12 AC_DEFUN( AM_PATH_AUDIOFILE,12 AC_DEFUN([AM_PATH_AUDIOFILE], 13 13 [dnl 14 14 dnl Get the cflags and libraries from the audiofile-config script sweep/branches/sweep-jack-testing/configure.ac
r355 r505 1 1 dnl Process this file with autoconf to produce a configure script. 2 2 3 dnl Require minimum autoconf version 4 AC_PREREQ(2.50) 5 3 6 AC_INIT(configure.ac) 4 AM_INIT_AUTOMAKE(sweep, 0.9. 1)7 AM_INIT_AUTOMAKE(sweep, 0.9.2) 5 8 AM_CONFIG_HEADER(config.h) 6 9 … … 64 67 dnl 65 68 66 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2. 2.0, HAVE_GTK="yes", sweep_config_ok="no")69 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4.0, HAVE_GTK="yes", sweep_config_ok="no") 67 70 AC_SUBST(GTK_CFLAGS) 68 71 AC_SUBST(GTK_LIBS) … … 89 92 dnl 90 93 91 LIBSNDFILE_VERSION="???"92 93 # !!! libsndfile0 backport94 95 ac_enable_libsndfile0=no96 AC_ARG_ENABLE(libsndfile0,97 [ --enable-libsndfile0 enable building against libsndfile version 0],98 [ ac_enable_libsndfile0=yes ])99 100 if test "x${ac_enable_libsndfile0}" != xno ; then101 102 HAVE_LIBSNDFILE1="ignore"103 104 AC_CHECK_LIB(sndfile, sf_open_read, HAVE_LIBSNDFILE0="yes")105 AC_CHECK_LIB(sndfile, sf_command, HAVE_LIBSNDFILE0="yes")106 107 if test "x$HAVE_LIBSNDFILE0" = xyes ; then108 SNDFILE_LIBS="-lsndfile"109 AC_SUBST(SNDFILE_LIBS)110 LIBSNDFILE_VERSION="0"111 else112 AC_MSG_ERROR([113 ***114 *** You have explicitly enabled to build against libsndfile version 0,115 *** but there is no compatible version of libsndfile version 0 installed.116 ***117 *** To continue this build, you must first install libsndfile version118 *** 0.27.0 or 0.28.0.119 ***120 *** Note that unless you are building against an older system distribution,121 *** it is highly recommended that you install and build against122 *** libsndfile version 1.123 ***124 ])125 fi126 127 else # !!!128 129 94 PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.0, 130 95 HAVE_LIBSNDFILE1="yes", HAVE_LIBSNDFILE1="no") … … 133 98 AC_DEFINE([HAVE_LIBSNDFILE1], [], [Define if we have libsndfile1.]) 134 99 AC_SUBST(SNDFILE_LIBS) 135 LIBSNDFILE_VERSION="1"136 100 else 137 101 sweep_config_ok="no" 138 102 AC_CHECK_LIB(sndfile, sf_open, HAVE_LIBSNDFILE1="maybe") 139 AC_CHECK_LIB(sndfile, sf_open_read, HAVE_LIBSNDFILE0="yes")140 103 fi 141 104 … … 161 124 fi 162 125 fi 163 164 fi # !!! libsndfile0 backport165 126 166 127 AC_CHECK_SIZEOF(off_t,1) … … 362 323 363 324 364 ac_enable_alsa= no325 ac_enable_alsa=yes 365 326 AC_ARG_ENABLE(alsa, 366 [ -- enable-alsa enable use of ALSA, and disable use of OSS],367 [ ac_enable_alsa= yes])327 [ --disable-alsa Disable ALSA, and enable use of OSS], 328 [ ac_enable_alsa=no ]) 368 329 369 330 if test "x${ac_enable_alsa}" != xno ; then … … 387 348 [ ac_enable_jack_playback=yes ]) 388 349 389 if test "x${ac_enable_jack_playback}" = xyes && test "x${ac_enable_alsa}" = xyes ; then 390 AC_MSG_ERROR([ 391 *** 392 *** You cannot supply both --enable-alsa and --enable-jack-playback 393 *** together. you must choose one or the other. 394 *** 395 ]) 396 fi 397 398 if test "x${ac_enable_jack_playback}" = xyes && test "x${ac_enable_alsa}" != xyes ; then 350 351 if test "x${ac_enable_jack_playback}" = xyes; then 399 352 400 353 PKG_CHECK_MODULES(JACK, jack >= 0.100.0,, [AC_MSG_ERROR([ … … 470 423 471 424 425 AC_ARG_ENABLE(gcc-werror, 426 AC_HELP_STRING([--enable-gcc-werror], [enable -Werror in all Makefiles])) 427 472 428 dnl Use -Wall if we have gcc. 473 429 dnl changequote(,)dnl 474 430 if test "x$ac_cv_prog_gcc" = xyes ; then 475 431 CFLAGS="$CFLAGS -Wall" 432 433 if test x$enable_gcc_werror = "xyes" ; then 434 CFLAGS="$CFLAGS -Werror" 435 fi 436 476 437 fi 477 438 dnl changequote([,])dnl … … 571 532 ]) 572 533 fi 573 if test "x$HAVE_LIBSNDFILE0" = xyes ; then574 AC_MSG_RESULT([575 Development files missing: Your system appears to have an old576 version of libsndfile (below 1.0.0) installed.577 ])578 fi579 534 580 535 if test "x$HAVE_ALSA" = xmaybe ; then … … 669 624 intl/Makefile 670 625 po/Makefile.in 626 doc/sweep.1 671 627 ]) 672 628 … … 679 635 ** Experimental code: ....... ${ac_enable_experimental} 680 636 ** Audio device handling: ... $sweep_config_driver 681 ** PCM: libsndfile version .. $LIBSNDFILE_VERSION637 ** PCM: libsndfile .......... $HAVE_LIBSNDFILE1 682 638 ** Ogg Vorbis support: ...... $HAVE_VORBIS 683 639 ** MPEG (MP3) loading: ...... $HAVE_MAD sweep/branches/sweep-jack-testing/doc/Makefile.am
r85 r505 3 3 man_MANS = sweep.1 4 4 5 EXTRA_DIST = $(man_MANS) plugin_writers_guide.txt5 EXTRA_DIST = $(man_MANS) sweep.1.in plugin_writers_guide.txt 6 6 sweep/branches/sweep-jack-testing/include/sweep/sweep_selection.h
r124 r505 24 24 sw_sel * 25 25 sel_new (sw_framecount_t start, sw_framecount_t end); 26 27 void 28 sel_free (sw_sel * sel); 26 29 27 30 sw_sel * sweep/branches/sweep-jack-testing/include/sweep/sweep_types.h
r124 r505 112 112 113 113 gpointer data; 114 114 GMutex * data_mutex; /* Mutex for access to sample data */ 115 115 116 GList * sels; /* selection: list of sw_sels */ 116 117 GMutex * sels_mutex; /* Mutex for access to sels */ sweep/branches/sweep-jack-testing/intl/localcharset.c
r183 r505 327 327 328 328 /* Woe32 has a function returning the locale's codepage as a number. */ 329 s printf (buf, "CP%u", GetACP ());329 snprintf (buf, sizeof (buf), "CP%u", GetACP ()); 330 330 codeset = buf; 331 331 … … 378 378 else 379 379 { 380 s printf (buf, "CP%u", cp[0]);380 snprintf (buf, sizeof (buf), "CP%u", cp[0]); 381 381 codeset = buf; 382 382 } sweep/branches/sweep-jack-testing/intl/printf.c
r183 r505 126 126 va_start (args, format); 127 127 retval = libintl_vprintf (format, args); 128 va_end (args);129 return retval;130 }131 132 DLL_EXPORTED133 int134 libintl_vsprintf (char *resultbuf, const char *format, va_list args)135 {136 if (strchr (format, '$') == NULL)137 return vsprintf (resultbuf, format, args);138 else139 {140 size_t length = (size_t) ~0 / (4 * sizeof (char));141 char *result = libintl_vasnprintf (resultbuf, &length, format, args);142 if (result != resultbuf)143 {144 free (result);145 return -1;146 }147 else148 return length;149 }150 }151 152 DLL_EXPORTED153 int154 libintl_sprintf (char *resultbuf, const char *format, ...)155 {156 va_list args;157 int retval;158 159 va_start (args, format);160 retval = libintl_vsprintf (resultbuf, format, args);161 128 va_end (args); 162 129 return retval; sweep/branches/sweep-jack-testing/intl/vasnprintf.c
r183 r505 1 /* v sprintf with automatic memory allocation.1 /* vasnprintf with automatic memory allocation. 2 2 Copyright (C) 1999, 2002-2005 Free Software Foundation, Inc. 3 3 … … 38 38 #endif 39 39 40 #include <stdio.h> /* snprintf() , sprintf()*/40 #include <stdio.h> /* snprintf() */ 41 41 #include <stdlib.h> /* abort(), malloc(), realloc(), free() */ 42 42 #include <string.h> /* memcpy(), strlen() */ … … 149 149 150 150 /* Allocate a small buffer that will hold a directive passed to 151 s printf or snprintf. */151 snprintf. */ 152 152 buf_neededlength = 153 153 xsum4 (7, d.max_width_length, d.max_precision_length, 6); … … 272 272 unsigned int prefix_count; 273 273 int prefixes[2]; 274 #if !USE_SNPRINTF 275 size_t tmp_length; 276 CHAR_T tmpbuf[700]; 277 CHAR_T *tmp; 278 279 /* Allocate a temporary buffer of sufficient size for calling 280 sprintf. */ 281 { 282 size_t width; 283 size_t precision; 284 285 width = 0; 286 if (dp->width_start != dp->width_end) 287 { 288 if (dp->width_arg_index != ARG_NONE) 289 { 290 int arg; 291 292 if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) 293 abort (); 294 arg = a.arg[dp->width_arg_index].a.a_int; 295 width = (arg < 0 ? (unsigned int) (-arg) : arg); 296 } 297 else 298 { 299 const CHAR_T *digitp = dp->width_start; 300 301 do 302 width = xsum (xtimes (width, 10), *digitp++ - '0'); 303 while (digitp != dp->width_end); 304 } 305 } 306 307 precision = 6; 308 if (dp->precision_start != dp->precision_end) 309 { 310 if (dp->precision_arg_index != ARG_NONE) 311 { 312 int arg; 313 314 if (!(a.arg[dp->precision_arg_index].type == TYPE_INT)) 315 abort (); 316 arg = a.arg[dp->precision_arg_index].a.a_int; 317 precision = (arg < 0 ? 0 : arg); 318 } 319 else 320 { 321 const CHAR_T *digitp = dp->precision_start + 1; 322 323 precision = 0; 324 while (digitp != dp->precision_end) 325 precision = xsum (xtimes (precision, 10), *digitp++ - '0'); 326 } 327 } 328 329 switch (dp->conversion) 330 { 331 332 case 'd': case 'i': case 'u': 333 # ifdef HAVE_LONG_LONG 334 if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) 335 tmp_length = 336 (unsigned int) (sizeof (unsigned long long) * CHAR_BIT 337 * 0.30103 /* binary -> decimal */ 338 * 2 /* estimate for FLAG_GROUP */ 339 ) 340 + 1 /* turn floor into ceil */ 341 + 1; /* account for leading sign */ 342 else 343 # endif 344 if (type == TYPE_LONGINT || type == TYPE_ULONGINT) 345 tmp_length = 346 (unsigned int) (sizeof (unsigned long) * CHAR_BIT 347 * 0.30103 /* binary -> decimal */ 348 * 2 /* estimate for FLAG_GROUP */ 349 ) 350 + 1 /* turn floor into ceil */ 351 + 1; /* account for leading sign */ 352 else 353 tmp_length = 354 (unsigned int) (sizeof (unsigned int) * CHAR_BIT 355 * 0.30103 /* binary -> decimal */ 356 * 2 /* estimate for FLAG_GROUP */ 357 ) 358 + 1 /* turn floor into ceil */ 359 + 1; /* account for leading sign */ 360 break; 361 362 case 'o': 363 # ifdef HAVE_LONG_LONG 364 if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) 365 tmp_length = 366 (unsigned int) (sizeof (unsigned long long) * CHAR_BIT 367 * 0.333334 /* binary -> octal */ 368 ) 369 + 1 /* turn floor into ceil */ 370 + 1; /* account for leading sign */ 371 else 372 # endif 373 if (type == TYPE_LONGINT || type == TYPE_ULONGINT) 374 tmp_length = 375 (unsigned int) (sizeof (unsigned long) * CHAR_BIT 376 * 0.333334 /* binary -> octal */ 377 ) 378 + 1 /* turn floor into ceil */ 379 + 1; /* account for leading sign */ 380 else 381 tmp_length = 382 (unsigned int) (sizeof (unsigned int) * CHAR_BIT 383 * 0.333334 /* binary -> octal */ 384 ) 385 + 1 /* turn floor into ceil */ 386 + 1; /* account for leading sign */ 387 break; 388 389 case 'x': case 'X': 390 # ifdef HAVE_LONG_LONG 391 if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) 392 tmp_length = 393 (unsigned int) (sizeof (unsigned long long) * CHAR_BIT 394 * 0.25 /* binary -> hexadecimal */ 395 ) 396 + 1 /* turn floor into ceil */ 397 + 2; /* account for leading sign or alternate form */ 398 else 399 # endif 400 if (type == TYPE_LONGINT || type == TYPE_ULONGINT) 401 tmp_length = 402 (unsigned int) (sizeof (unsigned long) * CHAR_BIT 403 * 0.25 /* binary -> hexadecimal */ 404 ) 405 + 1 /* turn floor into ceil */ 406 + 2; /* account for leading sign or alternate form */ 407 else 408 tmp_length = 409 (unsigned int) (sizeof (unsigned int) * CHAR_BIT 410 * 0.25 /* binary -> hexadecimal */ 411 ) 412 + 1 /* turn floor into ceil */ 413 + 2; /* account for leading sign or alternate form */ 414 break; 415 416 case 'f': case 'F': 417 # ifdef HAVE_LONG_DOUBLE 418 if (type == TYPE_LONGDOUBLE) 419 tmp_length = 420 (unsigned int) (LDBL_MAX_EXP 421 * 0.30103 /* binary -> decimal */ 422 * 2 /* estimate for FLAG_GROUP */ 423 ) 424 + 1 /* turn floor into ceil */ 425 + 10; /* sign, decimal point etc. */ 426 else 427 # endif 428 tmp_length = 429 (unsigned int) (DBL_MAX_EXP 430 * 0.30103 /* binary -> decimal */ 431 * 2 /* estimate for FLAG_GROUP */ 432 ) 433 + 1 /* turn floor into ceil */ 434 + 10; /* sign, decimal point etc. */ 435 tmp_length = xsum (tmp_length, precision); 436 break; 437 438 case 'e': case 'E': case 'g': case 'G': 439 case 'a': case 'A': 440 tmp_length = 441 12; /* sign, decimal point, exponent etc. */ 442 tmp_length = xsum (tmp_length, precision); 443 break; 444 445 case 'c': 446 # if defined HAVE_WINT_T && !WIDE_CHAR_VERSION 447 if (type == TYPE_WIDE_CHAR) 448 tmp_length = MB_CUR_MAX; 449 else 450 # endif 451 tmp_length = 1; 452 break; 453 454 case 's': 455 # ifdef HAVE_WCHAR_T 456 if (type == TYPE_WIDE_STRING) 457 { 458 tmp_length = 459 local_wcslen (a.arg[dp->arg_index].a.a_wide_string); 460 461 # if !WIDE_CHAR_VERSION 462 tmp_length = xtimes (tmp_length, MB_CUR_MAX); 463 # endif 464 } 465 else 466 # endif 467 tmp_length = strlen (a.arg[dp->arg_index].a.a_string); 468 break; 469 470 case 'p': 471 tmp_length = 472 (unsigned int) (sizeof (void *) * CHAR_BIT 473 * 0.25 /* binary -> hexadecimal */ 474 ) 475 + 1 /* turn floor into ceil */ 476 + 2; /* account for leading 0x */ 477 break; 478 479 default: 480 abort (); 481 } 482 483 if (tmp_length < width) 484 tmp_length = width; 485 486 tmp_length = xsum (tmp_length, 1); /* account for trailing NUL */ 487 } 488 489 if (tmp_length <= sizeof (tmpbuf) / sizeof (CHAR_T)) 490 tmp = tmpbuf; 491 else 492 { 493 size_t tmp_memsize = xtimes (tmp_length, sizeof (CHAR_T)); 494 495 if (size_overflow_p (tmp_memsize)) 496 /* Overflow, would lead to out of memory. */ 497 goto out_of_memory; 498 tmp = (CHAR_T *) malloc (tmp_memsize); 499 if (tmp == NULL) 500 /* Out of memory. */ 501 goto out_of_memory; 502 } 503 #endif 504 505 /* Construct the format string for calling snprintf or 506 sprintf. */ 274 275 /* Construct the format string for calling snprintf. */ 507 276 p = buf; 508 277 *p++ = '%'; … … 567 336 #endif 568 337 569 /* Construct the arguments for calling snprintf or sprintf. */338 /* Construct the arguments for calling snprintf. */ 570 339 prefix_count = 0; 571 340 if (dp->width_arg_index != ARG_NONE) … … 615 384 prefixes[0], prefixes[1], arg, \ 616 385 &count); \ 617 break; \618 default: \619 abort (); \620 }621 #else622 # define SNPRINTF_BUF(arg) \623 switch (prefix_count) \624 { \625 case 0: \626 count = sprintf (tmp, buf, arg); \627 break; \628 case 1: \629 count = sprintf (tmp, buf, prefixes[0], arg); \630 break; \631 case 2: \632 count = sprintf (tmp, buf, prefixes[0], prefixes[1],\633 arg); \634 386 break; \ 635 387 default: \ … … 835 587 } 836 588 837 #if USE_SNPRINTF838 /* The snprintf() result did fit. */839 #else840 /* Append the sprintf() result. */841 memcpy (result + length, tmp, count * sizeof (CHAR_T));842 if (tmp != tmpbuf)843 free (tmp);844 #endif845 846 589 length += count; 847 590 break; sweep/branches/sweep-jack-testing/m4/speex.m4
r148 r505 8 8 dnl Test for libspeex, and define SPEEX_CFLAGS and SPEEX_LIBS 9 9 dnl 10 AC_DEFUN( XIPH_PATH_SPEEX,10 AC_DEFUN([XIPH_PATH_SPEEX], 11 11 [dnl 12 12 dnl Get the cflags and libraries sweep/branches/sweep-jack-testing/plugins/byenergy/Makefile.am
r355 r505 15 15 mkdir -p $(DESTDIR)/$(libdir) 16 16 $(INSTALL_PROGRAM) .libs/libbyenergy.so $(DESTDIR)/$(libdir); 17 18 uninstall: 19 rm -f $(DESTDIR)/$(libdir)/libbyenergy.so sweep/branches/sweep-jack-testing/plugins/echo/Makefile.am
r355 r505 15 15 mkdir -p $(DESTDIR)/$(libdir) 16 16 $(INSTALL_PROGRAM) .libs/libecho.so $(DESTDIR)/$(libdir); 17 18 uninstall: 19 rm -f $(DESTDIR)/$(libdir)/libecho.so sweep/branches/sweep-jack-testing/plugins/fade/Makefile.am
r355 r505 14 14 mkdir -p $(DESTDIR)/$(libdir) 15 15 $(INSTALL_PROGRAM) .libs/libfade.so $(DESTDIR)/$(libdir); 16 17 uninstall: 18 rm -f $(DESTDIR)/$(libdir)/libfade.so 19 sweep/branches/sweep-jack-testing/plugins/ladspa/Makefile.am
r355 r505 15 15 mkdir -p $(DESTDIR)/$(libdir) 16 16 $(INSTALL_PROGRAM) .libs/libladspameta.so $(DESTDIR)/$(libdir); 17 18 uninstall: 19 rm -f $(DESTDIR)/$(libdir)/libladspameta.so sweep/branches/sweep-jack-testing/plugins/normalise/Makefile.am
r355 r505 14 14 mkdir -p $(DESTDIR)/$(libdir) 15 15 $(INSTALL_PROGRAM) .libs/libnormalise.so $(DESTDIR)/$(libdir); 16 17 uninstall: 18 rm -f $(DESTDIR)/$(libdir)/libnormalise.so sweep/branches/sweep-jack-testing/plugins/reverse/Makefile.am
