diff -urN soundtracker-0.5.2/ChangeLog soundtracker-0.5.3/ChangeLog --- soundtracker-0.5.2/ChangeLog Mon Mar 27 12:43:28 2000 +++ soundtracker-0.5.3/ChangeLog Wed Mar 29 20:05:50 2000 @@ -1,4 +1,47 @@ +2000-03-29 Michael Krause + + * Released v0.5.3 + + * app/mixers/kb-x86.c (kb_x86_stopnote): Rewrote sample-change + declicking to use a virtual second channel for each logical + channel. See comments in the source code. + (kb_x86_mix_sub): Disabled sample-end exponential declicking, + because it sounds like shit on white-noise samples + (i.e. hi-hats). See comments in kb-x86.c for why. + + * configure.in: Changed the autoconf stuff in order to check for + gasp and disable build of the kb_x86 mixer if it's not available. + We should now build on non-i386 platforms again. + + * app/mixers/kb-x86-asm.S: Fix for newer gasp (remove \(.data) and + use .section .data instead). (kbasm_declick_postproc): Fix an + assembler warning only issued by newer binutils than mine (there + is no faddp %st(1),%st; only faddp %st,%st(1)). + (kbasm_mix): Fixed the other related warning (changed call %ebp to + call *%ebp, whatever sense that has). + +2000-03-28 Michael Krause + + * app/mixers/kb-x86.c: Added linear ramp declicking upon sample + change on channel (not only when the sample ends, but also when a + new one is started immediately). Also making use of the asm + routines' volume ramping functions to smoothen volume changes. + Using 1ms ramps. Seems to be okay for all the mods I've listened + to so far. + + * app/mixers/kb-x86.c (kb_x86_mix_sub): Reordered some 64bit + calculations to optimize gcc output. Also fixed a typo bug in + pingpong handling. + + * po: Updated ja.po + 2000-03-27 Michael Krause + + * app/mixers/integer32.c: Fix non-i386 code (declare some + variables properly). + + * app/sample-editor.c: Removed #include (hint by + Nicolas Leveille) * Released v0.5.2 diff -urN soundtracker-0.5.2/Makefile.in soundtracker-0.5.3/Makefile.in --- soundtracker-0.5.2/Makefile.in Mon Mar 27 12:45:00 2000 +++ soundtracker-0.5.3/Makefile.in Wed Mar 29 20:07:58 2000 @@ -68,6 +68,7 @@ ESD_CFLAGS = @ESD_CFLAGS@ ESD_CONFIG = @ESD_CONFIG@ ESD_LIBS = @ESD_LIBS@ +GASPPATH = @GASPPATH@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -urN soundtracker-0.5.2/NEWS soundtracker-0.5.3/NEWS --- soundtracker-0.5.2/NEWS Mon Mar 27 12:43:28 2000 +++ soundtracker-0.5.3/NEWS Wed Mar 29 20:06:20 2000 @@ -4,6 +4,11 @@ responsible for having coded a particular feature (full names in AUTHORS file). +What is new in soundtracker-0.5.3 (29-Mar-2000): + +* The HQ mixer is now click-free +* Compiles on non-i386 platforms again + What is new in soundtracker-0.5.2 (27-Mar-2000): * Simple MIDI input support for ALSA (ltanguay) diff -urN soundtracker-0.5.2/README soundtracker-0.5.3/README --- soundtracker-0.5.2/README Mon Mar 27 12:43:30 2000 +++ soundtracker-0.5.3/README Wed Mar 29 20:05:51 2000 @@ -4,7 +4,7 @@ http://www.soundtracker.org/ -------------------------------------------------------------- - v0.5.2 --- THIS IS A DEVELOPMENT VERSION! + v0.5.3 --- THIS IS A DEVELOPMENT VERSION! Written and (C) 1998-2000 by Michael Krause [ raw style / lego ] @@ -60,7 +60,6 @@ Right Ctrl Play Song Right Alt Play Pattern Right WinMenu Key Just play current pattern row -Right Shift Record (Play Pattern & Edit On) -- not yet! Space Stop Playing; edit mode on/off Escape Edit mode on/off without stopping playing Shift - Space Toggle "jazz edit" mode diff -urN soundtracker-0.5.2/TODO soundtracker-0.5.3/TODO --- soundtracker-0.5.2/TODO Mon Mar 27 12:24:11 2000 +++ soundtracker-0.5.3/TODO Wed Mar 29 18:59:04 2000 @@ -1,6 +1,23 @@ things to do and known bugs (in no particular order) ------------------------------------------------------- +remove end-of-note declicking + +nach modul optimieren müssen die playlist-widgets neu gesetzt werden! + +create mixers with volramping and without! + +do filter handling correctly in mixer code... is reso really reset for every filter +or does xm-player set it every time again? + +bei tab und return aus entry-widgets muß "active widget" im fenster +resettet werden. + +right-shift: start playing and editing, with scrolling +enabled. optional quantization. + +write script to send mails and create distribution automatically + > press CAPSLOCK or something, to enter "hex chooser mode" > type A3 or B0 or 45 or whatever the 2-digit hex code is for your sample > program automatically leaves hexmode and functions return to normal. @@ -210,14 +227,8 @@ ====== MIXER ====== -mix channels with low volume first, in order to reduce arithmetic error - combine C parts of old and new mixers -bei dem thema in sta-gene knackt's aber ganz ordentlich... - -use volume ramping to reduce clicking on wild envelopes! - global filter headphone-balancing... das echt zu hart sonst @@ -227,8 +238,6 @@ st_mixer_info->data should be a gint16*! rewrite all void* arithmetic.. remove current_word_length - -wenn ein neues sample ein altes ablöst, das alte declicken! diff -urN soundtracker-0.5.2/acconfig.h soundtracker-0.5.3/acconfig.h --- soundtracker-0.5.2/acconfig.h Wed Jan 12 20:28:51 2000 +++ soundtracker-0.5.3/acconfig.h Wed Mar 29 18:30:07 2000 @@ -7,6 +7,7 @@ #undef DRIVER_ESD #undef USE_GNOME #undef NO_AUDIOFILE +#undef NO_GASP #undef ENABLE_NLS #undef HAVE_CATGETS diff -urN soundtracker-0.5.2/aclocal.m4 soundtracker-0.5.3/aclocal.m4 --- soundtracker-0.5.2/aclocal.m4 Mon Mar 27 12:44:18 2000 +++ soundtracker-0.5.3/aclocal.m4 Wed Mar 29 18:58:14 2000 @@ -127,6 +127,19 @@ done<<>>dnl>>) changequote([,]))]) +# Define a conditional. + +AC_DEFUN(AM_CONDITIONAL, +[AC_SUBST($1_TRUE) +AC_SUBST($1_FALSE) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi]) + # Macro to add for using GNU gettext. # Ulrich Drepper , 1995. # @@ -705,19 +718,6 @@ AC_SUBST(GTK_LIBS) rm -f conf.gtktest ]) - -# Define a conditional. - -AC_DEFUN(AM_CONDITIONAL, -[AC_SUBST($1_TRUE) -AC_SUBST($1_FALSE) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi]) # Configure paths for AUDIOFILE # Bertrand Guiheneuf 98-10-21 diff -urN soundtracker-0.5.2/app/Makefile.in soundtracker-0.5.3/app/Makefile.in --- soundtracker-0.5.2/app/Makefile.in Mon Mar 27 12:45:07 2000 +++ soundtracker-0.5.3/app/Makefile.in Wed Mar 29 20:08:03 2000 @@ -68,6 +68,7 @@ ESD_CFLAGS = @ESD_CFLAGS@ ESD_CONFIG = @ESD_CONFIG@ ESD_LIBS = @ESD_LIBS@ +GASPPATH = @GASPPATH@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -urN soundtracker-0.5.2/app/drivers/Makefile.in soundtracker-0.5.3/app/drivers/Makefile.in --- soundtracker-0.5.2/app/drivers/Makefile.in Mon Mar 27 12:45:11 2000 +++ soundtracker-0.5.3/app/drivers/Makefile.in Wed Mar 29 20:08:05 2000 @@ -68,6 +68,7 @@ ESD_CFLAGS = @ESD_CFLAGS@ ESD_CONFIG = @ESD_CONFIG@ ESD_LIBS = @ESD_LIBS@ +GASPPATH = @GASPPATH@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -urN soundtracker-0.5.2/app/main.c soundtracker-0.5.3/app/main.c --- soundtracker-0.5.2/app/main.c Mon Mar 27 12:22:24 2000 +++ soundtracker-0.5.3/app/main.c Wed Mar 29 18:48:44 2000 @@ -64,7 +64,7 @@ #if 0 driver_out_test, #endif -#if defined(__i386__) +#if defined(__i386__) && !defined(NO_GASP) mixer_kb_x86, #endif mixer_integer32; @@ -96,7 +96,7 @@ audio_ctlpipe = pipea[1]; audio_backpipe = pipeb[0]; -#if defined(__i386__) +#if defined(__i386__) && !defined(NO_GASP) mixers = g_list_append(mixers, &mixer_kb_x86); #endif diff -urN soundtracker-0.5.2/app/mixers/Makefile.am soundtracker-0.5.3/app/mixers/Makefile.am --- soundtracker-0.5.2/app/mixers/Makefile.am Sat Mar 25 10:46:17 2000 +++ soundtracker-0.5.3/app/mixers/Makefile.am Wed Mar 29 18:56:06 2000 @@ -6,9 +6,16 @@ noinst_LIBRARIES = libmixers.a -libmixers_a_SOURCES = \ +if GASP_IS_THERE +MIXERSOURCES = \ integer32.c integer32-asm.S integer32-asm.h \ kb-x86.c kb-x86-asm-built.S kb-x86-asm.h +else +MIXERSOURCES = \ + integer32.c integer32-asm.S integer32-asm.h +endif + +libmixers_a_SOURCES = $(MIXERSOURCES) INCLUDES = -I.. diff -urN soundtracker-0.5.2/app/mixers/Makefile.in soundtracker-0.5.3/app/mixers/Makefile.in --- soundtracker-0.5.2/app/mixers/Makefile.in Mon Mar 27 12:45:13 2000 +++ soundtracker-0.5.3/app/mixers/Makefile.in Wed Mar 29 20:08:07 2000 @@ -68,6 +68,7 @@ ESD_CFLAGS = @ESD_CFLAGS@ ESD_CONFIG = @ESD_CONFIG@ ESD_LIBS = @ESD_LIBS@ +GASPPATH = @GASPPATH@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -98,9 +99,10 @@ EXTRA_DIST = kb-x86-asm.S noinst_LIBRARIES = libmixers.a +@GASP_IS_THERE_TRUE@MIXERSOURCES = integer32.c integer32-asm.S integer32-asm.h kb-x86.c kb-x86-asm-built.S kb-x86-asm.h +@GASP_IS_THERE_FALSE@MIXERSOURCES = integer32.c integer32-asm.S integer32-asm.h -libmixers_a_SOURCES = integer32.c integer32-asm.S integer32-asm.h kb-x86.c kb-x86-asm-built.S kb-x86-asm.h - +libmixers_a_SOURCES = $(MIXERSOURCES) INCLUDES = -I.. mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -114,8 +116,9 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libmixers_a_LIBADD = -libmixers_a_OBJECTS = integer32.o integer32-asm.o kb-x86.o \ -kb-x86-asm-built.o +@GASP_IS_THERE_TRUE@libmixers_a_OBJECTS = integer32.o integer32-asm.o \ +@GASP_IS_THERE_TRUE@kb-x86.o kb-x86-asm-built.o +@GASP_IS_THERE_FALSE@libmixers_a_OBJECTS = integer32.o integer32-asm.o AR = ar CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff -urN soundtracker-0.5.2/app/mixers/integer32.c soundtracker-0.5.3/app/mixers/integer32.c --- soundtracker-0.5.2/app/mixers/integer32.c Mon Mar 13 12:40:49 2000 +++ soundtracker-0.5.3/app/mixers/integer32.c Mon Mar 27 14:06:36 2000 @@ -27,7 +27,10 @@ #include #include "mixer.h" + +#if defined(__i386__) #include "integer32-asm.h" +#endif static int num_channels, mixfreq, amp = 8; static gint32 *mixbuf = NULL; @@ -228,6 +231,9 @@ int vl = 0; int vr = 0; gint16 *data; +#if !defined(__i386__) + int s, val; +#endif if((stereo + 1) * count > mixbufsize) { g_free(mixbuf); diff -urN soundtracker-0.5.2/app/mixers/kb-x86-asm.S soundtracker-0.5.3/app/mixers/kb-x86-asm.S --- soundtracker-0.5.2/app/mixers/kb-x86-asm.S Sun Mar 19 17:23:59 2000 +++ soundtracker-0.5.3/app/mixers/kb-x86-asm.S Wed Mar 29 18:24:40 2000 @@ -24,7 +24,7 @@ #if defined(__i386__) -\(.data) +.section .data .align 4 _fadeleft: .long 0 @@ -262,8 +262,7 @@ movl 64(%ebp),%ebp addl $kbasm_mixers,%ebp movl (%ebp),%ebp -#warning Please ignore the following warning. - call %ebp + call *%ebp // Update changed values movl ebpstore,%ebp @@ -447,7 +446,7 @@ fmul %st(2),%st !! (val*vr) (val) (vr) (vl) fld %st(1) !! (val) (val*vr) (val) (vr) (vl) fmul %st(4),%st !! (val*vl) (val*vr) (val) (vr) (vl) - faddp %st(1),%st !! (val*vl + val*vr) (val) (vr) (vl) + faddp %st,%st(1) !! (val*vl + val*vr) (val) (vr) (vl) fistp (%esp) !! (val) (vr) (vl) lea 2(%esp),%esp .AENDI @@ -501,7 +500,7 @@ kbasm_mix_cubic_scopes_filtered_backward: CUBICMIXER 1 1 1 -\(.data) +.section .data .globl kbasm_mixers kbasm_mixers: .long kbasm_mix_cubic_noscopes_unfiltered_forward diff -urN soundtracker-0.5.2/app/mixers/kb-x86.c soundtracker-0.5.3/app/mixers/kb-x86.c --- soundtracker-0.5.2/app/mixers/kb-x86.c Sun Mar 19 17:13:52 2000 +++ soundtracker-0.5.3/app/mixers/kb-x86.c Wed Mar 29 20:02:10 2000 @@ -61,10 +61,14 @@ float panning; // 0.0 ... 1.0 int direction; // +1 for forward, -1 for backward - float volleft; // float: left volume (1.0=normal) - float volright; // float: rite volume (1.0=normal) - float rampleft; // float: left volramp (dvol/sample) [yet unused] - float rampright; // float: rite volramp (dvol/sample) [yet unused] + float volleft; // left volume (1.0 = no change) + float volright; // rite volume (1.0 = no change) + + guint32 ramp_num_samples; // number of mixer output samples during which ramping is active + float rampleft; // left volramp (delta_vol per sample) + float rampright; // rite volramp (delta_vol per sample) + float rampdestleft; // ramp destination volume left + float rampdestright; // ramp destination volume right guint32 positionw; // current sample position (whole part of 32.32) guint32 positionf; // current sample position (fractional part of 32.32) @@ -82,13 +86,18 @@ #define KB_X86_FLAG_LOOP_UNIDIRECTIONAL 1 #define KB_X86_FLAG_LOOP_BIDIRECTIONAL 2 #define KB_X86_FLAG_SAMPLE_RUNNING 4 -#define KB_X86_FLAG_STOP_SAMPLE 8 +#define KB_X86_FLAG_JUST_STARTED 8 +#define KB_X86_FLAG_UPPER_ACTIVE 16 +#define KB_X86_FLAG_STOP_AFTER_VOLRAMP 32 // The asm code can theoretically handle 256 voices -static kb_x86_channel channels[32]; +static kb_x86_channel channels[2 * 32]; #define KB_X86_SAMPLE_PADDING 3 // number of samples the mixer needs after the one pointed to by smpposw +// A ramp from 32768 to 0 should take RAMP_MAX_DURATION seconds +#define RAMP_MAX_DURATION 0.001 + static void kb_x86_setnumch (int n) { @@ -97,13 +106,44 @@ num_channels = n; } +/* This is just a quick hack to implement sample-change declicking + without coding full virtual channel support. But this will come + sooner or later so that hack is only temporary. + + It works like this: When a sample is stopped and a new one is + immediately started, there usually results a little click. In order + to avoid it, we let the old sample continue, but start a quick + volume downramp on it towards 0 (so that the click gets a linear + ramp and it's not that disturbing). It's obvious that for the time + of the volume ramp, we need to store the kb_x86_channel data blocks + of both the old channel and the new channel. Because of this, our + channels[] array is twice as large, and in the lower copy, the + KB_X86_FLAG_UPPER_ACTIVE flag is active when the upper copy is the + one with the currently running main sample and the lower copy is + only the fading out old sample. + + Alle Klarheiten beseitigt? :-) As I said before, full + virtual-channel support will make this superfluous. +*/ +static kb_x86_channel * +kb_x86_get_channel_struct (int channel) +{ + kb_x86_channel *c = &channels[channel]; + + if(c->flags & KB_X86_FLAG_UPPER_ACTIVE) { + c = &channels[channel + 32]; + } + + return c; +} + static void kb_x86_updatesample (st_mixer_sample_info *si) { int i; kb_x86_channel *c; - for(i = 0; i < 32; i++) { + for(i = 0; i < 2 * 32; i++) { c = &channels[i]; if(c->sample != si || !(c->flags & KB_X86_FLAG_SAMPLE_RUNNING)) { @@ -192,10 +232,10 @@ kb_x86_startnote (int channel, st_mixer_sample_info *s) { - kb_x86_channel *c = &channels[channel]; - - c->flags = 0; + kb_x86_channel *c = kb_x86_get_channel_struct(channel); + c->flags &= KB_X86_FLAG_UPPER_ACTIVE; + c->sample = s; // The following three for update_sample() @@ -211,34 +251,49 @@ c->flags |= KB_X86_FLAG_LOOP_BIDIRECTIONAL; } c->direction = 1; - c->rampleft = 0.0; - c->rampleft = 0.0; + c->ramp_num_samples = 0; c->lastl = 0.0; c->lastr = 0.0; c->freso = 0.0; c->ffreq = 1.0; c->fl1 = 0.0; c->fb1 = 0.0; - c->flags |= KB_X86_FLAG_SAMPLE_RUNNING; + c->flags |= KB_X86_FLAG_SAMPLE_RUNNING | KB_X86_FLAG_JUST_STARTED; } static void kb_x86_stopnote (int channel) { kb_x86_channel *c = &channels[channel]; + kb_x86_channel *current_used_chan = kb_x86_get_channel_struct(channel); -#if 0 - c->flags |= KB_X86_FLAG_STOP_SAMPLE; -#else - c->flags = 0; -#endif + if(current_used_chan->flags & KB_X86_FLAG_SAMPLE_RUNNING) { + if(current_used_chan != c) { + c->flags &= ~KB_X86_FLAG_UPPER_ACTIVE; + } else { + c->flags |= KB_X86_FLAG_UPPER_ACTIVE; + } + + c = current_used_chan; + + c->flags |= KB_X86_FLAG_STOP_AFTER_VOLRAMP; + + c->ramp_num_samples = RAMP_MAX_DURATION * mixfreq; + if(c->ramp_num_samples == 0) { + c->ramp_num_samples = 1; + } + c->rampdestleft = 0; + c->rampdestright = 0; + c->rampleft = (c->rampdestleft - c->volleft) / c->ramp_num_samples; + c->rampright = (c->rampdestright - c->volright) / c->ramp_num_samples; + } } static void kb_x86_setsmplpos (int channel, guint32 offset) { - kb_x86_channel *c = &channels[channel]; + kb_x86_channel *c = kb_x86_get_channel_struct(channel); if(c->sample && c->flags != 0) { if(offset < c->sample->length) { @@ -246,7 +301,7 @@ c->positionf = 0; c->direction = 1; } else { - c->flags = 0; + c->flags &= KB_X86_FLAG_UPPER_ACTIVE; } } } @@ -255,7 +310,7 @@ kb_x86_setfreq (int channel, float frequency) { - kb_x86_channel *c = &channels[channel]; + kb_x86_channel *c = kb_x86_get_channel_struct(channel); frequency /= mixfreq; @@ -266,17 +321,29 @@ static void kb_x86_redo_vol_fields (kb_x86_channel *c) { - c->volleft = c->volume * (1.0 - c->panning); - c->volright = c->volume * c->panning; - g_assert(c->volleft >= 0.0 && c->volleft <= 1.0); - g_assert(c->volright >= 0.0 && c->volright <= 1.0); + c->rampdestleft = c->volume * (1.0 - c->panning); + c->rampdestright = c->volume * c->panning; + g_assert(c->rampdestleft >= 0.0 && c->rampdestleft <= 1.0); + g_assert(c->rampdestright >= 0.0 && c->rampdestright <= 1.0); + + if(c->flags & KB_X86_FLAG_JUST_STARTED) { + c->volleft = c->rampdestleft; + c->volright = c->rampdestright; + } else { + c->ramp_num_samples = RAMP_MAX_DURATION * mixfreq; + if(c->ramp_num_samples == 0) { + c->ramp_num_samples = 1; + } + c->rampleft = (c->rampdestleft - c->volleft) / c->ramp_num_samples; + c->rampright = (c->rampdestright - c->volright) / c->ramp_num_samples; + } } static void kb_x86_setvolume (int channel, float volume) { - kb_x86_channel *c = &channels[channel]; + kb_x86_channel *c = kb_x86_get_channel_struct(channel); c->volume = volume; kb_x86_redo_vol_fields(c); @@ -286,7 +353,7 @@ kb_x86_setpanning (int channel, float panning) { - kb_x86_channel *c = &channels[channel]; + kb_x86_channel *c = kb_x86_get_channel_struct(channel); c->panning = 0.5 * (panning + 1.0); kb_x86_redo_vol_fields(c); @@ -296,7 +363,7 @@ kb_x86_setchcutoff (int channel, float freq) { - kb_x86_channel *c = &channels[channel]; + kb_x86_channel *c = kb_x86_get_channel_struct(channel); if(freq < 0.0) { c->ffreq = 1.0; @@ -313,7 +380,7 @@ kb_x86_setchreso (int channel, float reso) { - kb_x86_channel *c = &channels[channel]; + kb_x86_channel *c = kb_x86_get_channel_struct(channel); g_assert(0.0 <= reso); g_assert(reso <= 1.0); @@ -365,11 +432,27 @@ } #endif +static void +kb_x86_call_mixer (kb_x86_channel *ch, + kb_x86_mixer_data *md, + gboolean forward) +{ + kb_x86_mix_handle_last_mixed_pre(ch, md); + if(!forward) { + md->flags |= KB_X86_MIXER_FLAGS_BACKWARD; + } + kbasm_mix(md); + kb_x86_mix_handle_last_mixed_post(ch, md); + ch->volleft = md->volleft; + ch->volright = md->volright; +} + static guint32 kb_x86_mix_sub (kb_x86_channel *ch, gboolean loopit, gboolean gonnapingpong, - guint32 num_samples_left) + guint32 num_samples_left, + gboolean volramping) { kb_x86_mixer_data md; @@ -378,7 +461,12 @@ 32 bits only and thus be faster. It still contains a lot of assertions that make it even slower. But the running time of this routine is only relevant for short loops where it is - called very often. */ + called very often. + + As far as the 64bits arithmetic is concerned, gcc actually + compiles this quite well for the i386. The only real drawback + is the 64bits division, since gcc has to call external library + routines for this. */ const gint32 ende = loopit ? ch->sample->loopend : ch->sample->length; const gint64 ende64 = (guint64)ende << 32; @@ -392,8 +480,13 @@ /* Initalize the data array for the assembly subroutines. */ md.volleft = ch->volleft; md.volright = ch->volright; - md.volrampl = 0; - md.volrampr = 0; + if(!volramping) { + md.volrampl = 0; + md.volrampr = 0; + } else { + md.volrampl = ch->rampleft; + md.volrampr = ch->rampright; + } md.positionf = ch->positionf; if(ch->direction == 1) { md.freqi = ch->freqw; @@ -440,21 +533,21 @@ account extremely short loops with extremly high frequencies. */ gboolean touched = FALSE; - gint64 pos64_ = ((guint64)(ch->positionw) << 32) + (guint64)ch->positionf; + gint64 mypos64 = ((guint64)(ch->positionw) << 32) + (guint64)ch->positionf; gint64 lend64 = (((guint64)ch->sample->loopend) << 32) - 1; while(1) { - if(ch->direction == 1 && pos64_ >= lend64) { + if(ch->direction == 1 && mypos64 >= lend64) { ch->direction = -1; - pos64_ -= lend64; - pos64_ *= -1; - pos64_ += lend64; + mypos64 -= lend64; + mypos64 *= -1; + mypos64 += lend64; touched = TRUE; - } else if(ch->direction == -1 && pos64 < lstart64) { + } else if(ch->direction == -1 && mypos64 < lstart64) { ch->direction = +1; - pos64_ -= lstart64; - pos64_ *= -1; - pos64_ += lstart64; + mypos64 -= lstart64; + mypos64 *= -1; + mypos64 += lstart64; touched = TRUE; } else { break; @@ -463,8 +556,8 @@ if(touched) { /* We've been really out of bounds. Start all over. */ - ch->positionw = pos64_ >> 32; - ch->positionf = (guint32)(pos64_ & 0xffffffff); + ch->positionf = (guint32)(mypos64 & 0xffffffff); /* just the lower 32 bits */ + ch->positionw = (guint32)(mypos64 >> 32); /* just the upper 32 bits */ return 0; } } else if(loopit) { @@ -484,10 +577,27 @@ } else { if(ch->positionw >= ende) { /* A sample without loop has just ended. */ +#if 0 +/* Disabled sample-end exponential declicking, because hi-hats and + other white-noise samples get ugly clicks. Some autoregressive + prediction code could be of help here, but that's a lot of code - + on the other hand not having clean sample ends is really the + composer's problem. + + My theory for the reason of these clicks: a hi-hat is essentially a + purely stochastic process - adding a linear declick here actually + introduces a click, because there is no deterministic signal (mean + value) to be declicked. + + If you want to hear this yourself, enable this block by changing + #if 0 to if #1 up there, then load some loud hi-hat, cut it in the + middle and play it. Listen to the sample end. +*/ md.numsamples = num_samples_left; md.lastl = ch->lastl; kbasm_declick_postproc(&md); - ch->flags = 0; +#endif + ch->flags &= KB_X86_FLAG_UPPER_ACTIVE; return num_samples_left; } } @@ -535,24 +645,17 @@ } } -#if defined(DEBUG_BUFFER) - kb_x86_debug_dump_buffer(buffer, sizeof(buffer) / sizeof(buffer[0])); -#endif num_samples = 1; md.numsamples = 1; if(ch->direction == 1) { md.positioni = buffer; - kb_x86_mix_handle_last_mixed_pre(ch, &md); - kbasm_mix(&md); + kb_x86_call_mixer(ch, &md, TRUE); ch->positionw = md.positioni - buffer + pos; } else { md.positioni = buffer + ((sizeof(buffer) / sizeof(buffer[0])) - 1); - kb_x86_mix_handle_last_mixed_pre(ch, &md); - md.flags |= KB_X86_MIXER_FLAGS_BACKWARD; - kbasm_mix(&md); + kb_x86_call_mixer(ch, &md, FALSE); ch->positionw = md.positioni - (buffer + ((sizeof(buffer) / sizeof(buffer[0])) - 1)) + pos; } - kb_x86_mix_handle_last_mixed_post(ch, &md); ch->positionf = md.positionf; ch->volleft = md.volleft; @@ -592,9 +695,7 @@ md.positioni = (gint16*)ch->sample->data + pos; md.numsamples = num_samples; - kb_x86_mix_handle_last_mixed_pre(ch, &md); - kbasm_mix(&md); - kb_x86_mix_handle_last_mixed_post(ch, &md); + kb_x86_call_mixer(ch, &md, TRUE); } else { /* The same stuff, only for backwards direction */ const gint64 wieweit64 = pos64 - freq64 * num_samples_left; @@ -612,10 +713,7 @@ md.positioni = (gint16*)ch->sample->data + pos; md.numsamples = num_samples; - kb_x86_mix_handle_last_mixed_pre(ch, &md); - md.flags |= KB_X86_MIXER_FLAGS_BACKWARD; - kbasm_mix(&md); - kb_x86_mix_handle_last_mixed_post(ch, &md); + kb_x86_call_mixer(ch, &md, FALSE); } ch->positionw = md.positioni - (gint16*)ch->sample->data; @@ -646,14 +744,17 @@ kb_x86_nsamples = count; kbasm_pre_mixing(); - for(chnr = 0; chnr < num_channels; chnr++) { + for(chnr = 0; chnr < 2 * 32; chnr++) { kb_x86_channel *ch = channels + chnr; guint32 *tempbuf = kb_x86_tempbuf; int num_samples_left = count; gint16 *scopedata = NULL; - if(scopebufs) { - scopedata = scopebufs[chnr] + scopebuf_offset; + if((chnr & 31) >= num_channels) + continue; + + if(scopebufs && (chnr < 32 || (channels[chnr - 32].flags & KB_X86_FLAG_UPPER_ACTIVE))) { + scopedata = scopebufs[chnr & 31] + scopebuf_offset; } if(!(ch->flags & KB_X86_FLAG_SAMPLE_RUNNING)) { @@ -663,6 +764,8 @@ continue; } + ch->flags &= ~KB_X86_FLAG_JUST_STARTED; + kb_x86_scopebuf = scopedata; g_assert(ch->sample->lock); @@ -670,31 +773,28 @@ while(num_samples_left && (ch->flags & KB_X86_FLAG_SAMPLE_RUNNING)) { int num_samples = 0; + gboolean vol_ramping = (ch->ramp_num_samples != 0); + int max_samples_this_time = vol_ramping ? MIN(ch->ramp_num_samples, num_samples_left) : num_samples_left; - /* Check how much of the sample we can fill in one run */ -#if 0 - if(ch->flags & KB_X86_FLAG_STOP_SAMPLE) { - /* Stop sample, declick. */ - kb_x86_mixer_data md; - printf("stopping... & declicking\n"); - md.volleft = ch->volleft; - md.volright = ch->volright; - md.volrampl = 0; - md.volrampr = 0; - md.mixbuffer = (float*)kb_x86_tempbuf; - md.numsamples = num_samples_left; - md.lastl = ch->lastl; - kbasm_declick_postproc(&md); - ch->flags = 0; - break; - } -#endif if(ch->flags & KB_X86_FLAG_LOOP_UNIDIRECTIONAL) { - num_samples = kb_x86_mix_sub(ch, TRUE, FALSE, num_samples_left); + num_samples = kb_x86_mix_sub(ch, TRUE, FALSE, max_samples_this_time, vol_ramping); } else if(ch->flags & KB_X86_FLAG_LOOP_BIDIRECTIONAL) { - num_samples = kb_x86_mix_sub(ch, TRUE, TRUE, num_samples_left); + num_samples = kb_x86_mix_sub(ch, TRUE, TRUE, max_samples_this_time, vol_ramping); } else /* no loop */ { - num_samples = kb_x86_mix_sub(ch, FALSE, FALSE, num_samples_left); + num_samples = kb_x86_mix_sub(ch, FALSE, FALSE, max_samples_this_time, vol_ramping); + } + + if(vol_ramping) { + ch->ramp_num_samples -= num_samples; + if(ch->ramp_num_samples == 0) { + /* Volume ramping finished. */ + ch->volleft = ch->rampdestleft; + ch->volright = ch->rampdestright; + if(ch->flags & KB_X86_FLAG_STOP_AFTER_VOLRAMP) { + /* This was only a declicking channel. Stop sample. */ + ch->flags &= KB_X86_FLAG_UPPER_ACTIVE; + } + } } num_samples_left -= num_samples; @@ -723,13 +823,15 @@ gint32 pos; for(i = 0; i < 32; i++) { - if(channels[i].flags & KB_X86_FLAG_SAMPLE_RUNNING) { - array[i].current_sample = channels[i].sample; - pos = channels[i].positionw; + kb_x86_channel *c = kb_x86_get_channel_struct(i); + + if(c->flags & KB_X86_FLAG_SAMPLE_RUNNING) { + array[i].current_sample = c->sample; + pos = c->positionw; if(pos < 0) { pos = 0; - } else if(pos >= channels[i].sample->length) { - pos = channels[i].sample->length - 1; + } else if(pos >= c->sample->length) { + pos = c->sample->length - 1; } array[i].current_position = pos; } else { diff -urN soundtracker-0.5.2/app/sample-editor.c soundtracker-0.5.3/app/sample-editor.c --- soundtracker-0.5.2/app/sample-editor.c Sun Mar 26 13:30:48 2000 +++ soundtracker-0.5.3/app/sample-editor.c Mon Mar 27 14:01:31 2000 @@ -26,7 +26,6 @@ #include #include #include -#include #include #ifndef NO_AUDIOFILE diff -urN soundtracker-0.5.2/config.h.in soundtracker-0.5.3/config.h.in --- soundtracker-0.5.2/config.h.in Wed Jan 12 20:29:29 2000 +++ soundtracker-0.5.3/config.h.in Wed Mar 29 18:30:27 2000 @@ -53,6 +53,7 @@ #undef DRIVER_ESD #undef USE_GNOME #undef NO_AUDIOFILE +#undef NO_GASP #undef ENABLE_NLS #undef HAVE_CATGETS diff -urN soundtracker-0.5.2/configure soundtracker-0.5.3/configure --- soundtracker-0.5.2/configure Mon Mar 27 12:44:20 2000 +++ soundtracker-0.5.3/configure Wed Mar 29 18:58:15 2000 @@ -722,7 +722,7 @@ PACKAGE=soundtracker -VERSION=0.5.2 +VERSION=0.5.3 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1066,18 +1066,70 @@ echo "$ac_t""no" 1>&6 fi +# Extract the first word of "gasp", so it can be a program name with args. +set dummy gasp; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1073: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_GASPPATH'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$GASPPATH" in + /*) + ac_cv_path_GASPPATH="$GASPPATH" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_GASPPATH="$GASPPATH" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_GASPPATH="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +GASPPATH="$ac_cv_path_GASPPATH" +if test -n "$GASPPATH"; then + echo "$ac_t""$GASPPATH" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + if test $GCC != yes; then echo "Fatal error: Need gcc" exit 1 fi +if test ! -n "$GASPPATH"; then + cat >> confdefs.h <<\EOF +#define NO_GASP 1 +EOF + +fi + + + +if test -n "$GASPPATH"; then + GASP_IS_THERE_TRUE= + GASP_IS_THERE_FALSE='#' +else + GASP_IS_THERE_TRUE='#' + GASP_IS_THERE_FALSE= +fi + CFLAGS="$CFLAGS -Wall" # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1081: checking for $ac_word" >&5 +echo "configure:1133: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1108,7 +1160,7 @@ HAVE_POLL="no" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1112: checking how to run the C preprocessor" >&5 +echo "configure:1164: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1123,13 +1175,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1140,13 +1192,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1157,13 +1209,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1191,17 +1243,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1195: checking for $ac_hdr" >&5 +echo "configure:1247: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1224,12 +1276,12 @@ for ac_func in poll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1228: checking for $ac_func" >&5 +echo "configure:1280: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1286,12 +1338,12 @@ for ac_func in select do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1290: checking for $ac_func" >&5 +echo "configure:1342: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1344,7 +1396,7 @@ ALL_LINGUAS="de es fr it pl ja ru" echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1348: checking for POSIXized ISC" >&5 +echo "configure:1400: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1365,12 +1417,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1369: checking for ANSI C header files" >&5 +echo "configure:1421: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1378,7 +1430,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1395,7 +1447,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1413,7 +1465,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1434,7 +1486,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1445,7 +1497,7 @@ exit (0); } EOF -if { (eval echo configure:1449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1469,12 +1521,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1473: checking for working const" >&5 +echo "configure:1525: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1544,21 +1596,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1548: checking for inline" >&5 +echo "configure:1600: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1584,12 +1636,12 @@ esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1588: checking for off_t" >&5 +echo "configure:1640: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1617,12 +1669,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1621: checking for size_t" >&5 +echo "configure:1673: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1652,19 +1704,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1656: checking for working alloca.h" >&5 +echo "configure:1708: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1685,12 +1737,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1689: checking for alloca" >&5 +echo "configure:1741: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1750,12 +1802,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1754: checking whether alloca needs Cray hooks" >&5 +echo "configure:1806: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:1784: checking for $ac_func" >&5 +echo "configure:1836: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1835,7 +1887,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1839: checking stack direction for C alloca" >&5 +echo "configure:1891: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1843,7 +1895,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -1887,17 +1939,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1891: checking for $ac_hdr" >&5 +echo "configure:1943: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1926,12 +1978,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1930: checking for $ac_func" >&5 +echo "configure:1982: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1979,7 +2031,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:1983: checking for working mmap" >&5 +echo "configure:2035: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1987,7 +2039,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2155,17 +2207,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2159: checking for $ac_hdr" >&5 +echo "configure:2211: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2195,12 +2247,12 @@ strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2199: checking for $ac_func" >&5 +echo "configure:2251: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2252,12 +2304,12 @@ for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2256: checking for $ac_func" >&5 +echo "configure:2308: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2314,19 +2366,19 @@ if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:2318: checking for LC_MESSAGES" >&5 +echo "configure:2370: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:2330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -2347,7 +2399,7 @@ fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2351: checking whether NLS is requested" >&5 +echo "configure:2403: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -2367,7 +2419,7 @@ EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:2371: checking whether included gettext is requested" >&5 +echo "configure:2423: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -2386,17 +2438,17 @@ ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:2390: checking for libintl.h" >&5 +echo "configure:2442: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2413,19 +2465,19 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:2417: checking for gettext in libc" >&5 +echo "configure:2469: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:2429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -2441,7 +2493,7 @@ if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:2445: checking for bindtextdomain in -lintl" >&5 +echo "configure:2497: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2449,7 +2501,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2476,12 +2528,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:2480: checking for gettext in libintl" >&5 +echo "configure:2532: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:2485: checking for gettext in -lintl" >&5 +echo "configure:2537: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2489,7 +2541,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2539,7 +2591,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2543: checking for $ac_word" >&5 +echo "configure:2595: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2573,12 +2625,12 @@ for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2577: checking for $ac_func" >&5 +echo "configure:2629: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2628,7 +2680,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2632: checking for $ac_word" >&5 +echo "configure:2684: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2664,7 +2716,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2668: checking for $ac_word" >&5 +echo "configure:2720: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2696,7 +2748,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -2727,7 +2779,7 @@ if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:2731: checking whether catgets can be used" >&5 +echo "configure:2783: checking whether catgets can be used" >&5 # Check whether --with-catgets or --without-catgets was given. if test "${with_catgets+set}" = set; then withval="$with_catgets" @@ -2740,7 +2792,7 @@ if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:2744: checking for main in -li" >&5 +echo "configure:2796: checking for main in -li" >&5 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2748,14 +2800,14 @@ ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2783,12 +2835,12 @@ fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:2787: checking for catgets" >&5 +echo "configure:2839: checking for catgets" >&5 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -2833,7 +2885,7 @@ # Extract the first word of "gencat", so it can be a program name with args. set dummy gencat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2837: checking for $ac_word" >&5 +echo "configure:2889: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2869,7 +2921,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2873: checking for $ac_word" >&5 +echo "configure:2925: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2906,7 +2958,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2910: checking for $ac_word" >&5 +echo "configure:2962: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2941,7 +2993,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2945: checking for $ac_word" >&5 +echo "configure:2997: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2999,7 +3051,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3003: checking for $ac_word" >&5 +echo "configure:3055: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3033,7 +3085,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3037: checking for $ac_word" >&5 +echo "configure:3089: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3069,7 +3121,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3073: checking for $ac_word" >&5 +echo "configure:3125: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3162,7 +3214,7 @@ LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:3166: checking for catalogs to be installed" >&5 +echo "configure:3218: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -3190,17 +3242,17 @@ if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:3194: checking for linux/version.h" >&5 +echo "configure:3246: checking for linux/version.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3316,7 +3368,7 @@ # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3320: checking for $ac_word" >&5 +echo "configure:3372: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3351,7 +3403,7 @@ min_gtk_version=1.2.2 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:3355: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:3407: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -3374,7 +3426,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -3452,7 +3504,7 @@ } EOF -if { (eval echo configure:3456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3486,7 +3538,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -3496,7 +3548,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:3500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -3549,7 +3601,7 @@ # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3553: checking for $ac_word" >&5 +echo "configure:3605: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_gnomepath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3582,7 +3634,7 @@ fi echo $ac_n "checking for Gnome compile flags""... $ac_c" 1>&6 -echo "configure:3586: checking for Gnome compile flags" >&5 +echo "configure:3638: checking for Gnome compile flags" >&5 GNOME_CFLAGS=`$gnomepath gnomeui --cflags 2>/dev/null` GNOME_VER=`$gnomepath --version |$sedpath 's/gnome-libs //'` GNOME_MAJOR=`echo $GNOME_VER |$sedpath 's/\([0-9]**\).\([0-9]**\).\([0-9]**\)/\1/'` @@ -3664,7 +3716,7 @@ # Extract the first word of "audiofile-config", so it can be a program name with args. set dummy audiofile-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3668: checking for $ac_word" >&5 +echo "configure:3720: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AUDIOFILE_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3699,7 +3751,7 @@ min_audiofile_version=0.1.5 echo $ac_n "checking for AUDIOFILE - version >= $min_audiofile_version""... $ac_c" 1>&6 -echo "configure:3703: checking for AUDIOFILE - version >= $min_audiofile_version" >&5 +echo "configure:3755: checking for AUDIOFILE - version >= $min_audiofile_version" >&5 no_audiofile="" if test "$AUDIOFILE_CONFIG" = "no" ; then no_audiofile=yes @@ -3722,7 +3774,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -3780,7 +3832,7 @@ EOF -if { (eval echo configure:3784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3815,7 +3867,7 @@ CFLAGS="$CFLAGS $AUDIOFILE_CFLAGS" LIBS="$LIBS $AUDIOFILE_LIBS" cat > conftest.$ac_ext < @@ -3825,7 +3877,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:3829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding AUDIOFILE or finding the wrong" @@ -3865,12 +3917,12 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3869: checking for ANSI C header files" >&5 +echo "configure:3921: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3878,7 +3930,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3895,7 +3947,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3913,7 +3965,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3934,7 +3986,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3945,7 +3997,7 @@ exit (0); } EOF -if { (eval echo configure:3949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3974,17 +4026,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3978: checking for $ac_hdr" >&5 +echo "configure:4030: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4028,7 +4080,7 @@ if test x$alsa_support != xno; then echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6 -echo "configure:4032: checking for snd_cards in -lasound" >&5 +echo "configure:4084: checking for snd_cards in -lasound" >&5 ac_lib_var=`echo asound'_'snd_cards | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4036,7 +4088,7 @@ ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4072,7 +4124,7 @@ LIBS="$LIBS -lasound" fi echo $ac_n "checking for snd_pcm_capture_params in -lasound""... $ac_c" 1>&6 -echo "configure:4076: checking for snd_pcm_capture_params in -lasound" >&5 +echo "configure:4128: checking for snd_pcm_capture_params in -lasound" >&5 ac_lib_var=`echo asound'_'snd_pcm_capture_params | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4080,7 +4132,7 @@ ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4124,7 +4176,7 @@ fi echo $ac_n "checking for snd_pcm_channel_params in -lasound""... $ac_c" 1>&6 -echo "configure:4128: checking for snd_pcm_channel_params in -lasound" >&5 +echo "configure:4180: checking for snd_pcm_channel_params in -lasound" >&5 ac_lib_var=`echo asound'_'snd_pcm_channel_params | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4132,7 +4184,7 @@ ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4227,7 +4279,7 @@ # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4231: checking for $ac_word" >&5 +echo "configure:4283: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4262,7 +4314,7 @@ min_esd_version=0.2.8 echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6 -echo "configure:4266: checking for ESD - version >= $min_esd_version" >&5 +echo "configure:4318: checking for ESD - version >= $min_esd_version" >&5 no_esd="" if test "$ESD_CONFIG" = "no" ; then no_esd=yes @@ -4286,7 +4338,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -4344,7 +4396,7 @@ EOF -if { (eval echo configure:4348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4378,7 +4430,7 @@ CFLAGS="$CFLAGS $ESD_CFLAGS" LIBS="$LIBS $ESD_LIBS" cat > conftest.$ac_ext < @@ -4388,7 +4440,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:4392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding ESD or finding the wrong" @@ -4424,12 +4476,12 @@ for ac_func in esd_play_stream do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4428: checking for $ac_func" >&5 +echo "configure:4480: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4497,14 +4549,14 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4501: checking whether byte ordering is bigendian" >&5 +echo "configure:4553: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -4515,11 +4567,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:4519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -4530,7 +4582,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:4534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4550,7 +4602,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -4587,6 +4639,11 @@ fi +if test ! -n "$GASPPATH"; then + echo "*** The GNU assembler preprocessor (gasp) couldn't be found on your machine:" + echo " * The high-quality kb_x86 mixer will not be built." +fi + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -4741,6 +4798,9 @@ s%@SET_MAKE@%$SET_MAKE%g s%@CC@%$CC%g s%@sedpath@%$sedpath%g +s%@GASPPATH@%$GASPPATH%g +s%@GASP_IS_THERE_TRUE@%$GASP_IS_THERE_TRUE%g +s%@GASP_IS_THERE_FALSE@%$GASP_IS_THERE_FALSE%g s%@RANLIB@%$RANLIB%g s%@CPP@%$CPP%g s%@ALLOCA@%$ALLOCA%g diff -urN soundtracker-0.5.2/configure.in soundtracker-0.5.3/configure.in --- soundtracker-0.5.2/configure.in Mon Mar 27 12:43:30 2000 +++ soundtracker-0.5.3/configure.in Wed Mar 29 18:58:12 2000 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(app/endian-conv.h) -AM_INIT_AUTOMAKE(soundtracker, 0.5.2) +AM_INIT_AUTOMAKE(soundtracker, 0.5.3) AM_CONFIG_HEADER(config.h) dnl ----------------------------------------------------------------------- @@ -10,12 +10,19 @@ AC_PROG_CC AC_PATH_PROG(sedpath, sed) +AC_PATH_PROG(GASPPATH, gasp) if test $GCC != yes; then echo "Fatal error: Need gcc" exit 1 fi +if test ! -n "$GASPPATH"; then + AC_DEFINE(NO_GASP) +fi + +AM_CONDITIONAL(GASP_IS_THERE, test -n "$GASPPATH") + CFLAGS="$CFLAGS -Wall" AC_PROG_RANLIB @@ -154,6 +161,11 @@ AC_C_BIGENDIAN + +if test ! -n "$GASPPATH"; then + echo "*** The GNU assembler preprocessor (gasp) couldn't be found on your machine:" + echo " * The high-quality kb_x86 mixer will not be built." +fi AC_OUTPUT([ Makefile diff -urN soundtracker-0.5.2/doc/Makefile.in soundtracker-0.5.3/doc/Makefile.in --- soundtracker-0.5.2/doc/Makefile.in Mon Mar 27 12:45:02 2000 +++ soundtracker-0.5.3/doc/Makefile.in Wed Mar 29 20:08:00 2000 @@ -68,6 +68,7 @@ ESD_CFLAGS = @ESD_CFLAGS@ ESD_CONFIG = @ESD_CONFIG@ ESD_LIBS = @ESD_LIBS@ +GASPPATH = @GASPPATH@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ Binary files soundtracker-0.5.2/po/de.gmo and soundtracker-0.5.3/po/de.gmo differ diff -urN soundtracker-0.5.2/po/de.po soundtracker-0.5.3/po/de.po --- soundtracker-0.5.2/po/de.po Mon Mar 27 12:45:00 2000 +++ soundtracker-0.5.3/po/de.po Wed Mar 29 20:07:58 2000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: soundtracker-0.3.3\n" -"POT-Creation-Date: 2000-03-27 12:44+0200\n" +"POT-Creation-Date: 2000-03-29 18:49+0200\n" "PO-Revision-Date: 1999-09-21 23:00+02:00\n" "Last-Translator: Colin Marquardt \n" "Language-Team: German \n" @@ -53,7 +53,7 @@ msgid "Mixers" msgstr "Modifizierer:" -#: app/audioconfig.c:320 app/gui-settings.c:377 app/sample-editor.c:1613 +#: app/audioconfig.c:320 app/gui-settings.c:377 app/sample-editor.c:1612 #: app/tips-dialog.c:165 app/transposition.c:313 msgid "Close" msgstr "Schließen" @@ -150,7 +150,7 @@ msgid "no settings (yet), sorry!" msgstr "Keine Einstellungen (zur Zeit), sorry!" -#: app/drivers/file-output.c:161 app/sample-editor.c:1316 +#: app/drivers/file-output.c:161 app/sample-editor.c:1315 msgid "Can't open file for writing." msgstr "Kann Datei nicht zum Schreiben öffnen." @@ -227,11 +227,11 @@ msgid "Loop" msgstr "Loop" -#: app/envelope-box.c:1000 app/sample-editor.c:225 +#: app/envelope-box.c:1000 app/sample-editor.c:224 msgid "Start" msgstr "Anfang" -#: app/envelope-box.c:1001 app/sample-editor.c:226 +#: app/envelope-box.c:1001 app/sample-editor.c:225 msgid "End" msgstr "Ende" @@ -249,7 +249,7 @@ msgid "Render WAV" msgstr "" -#: app/file-operations.c:153 app/sample-editor.c:325 +#: app/file-operations.c:153 app/sample-editor.c:324 msgid "Load Sample" msgstr "Lade Sample" @@ -413,8 +413,8 @@ msgid "Question" msgstr "Frage" -#: app/gui-subs.c:480 app/keys.c:702 app/sample-editor.c:1227 -#: app/sample-editor.c:1418 +#: app/gui-subs.c:480 app/keys.c:702 app/sample-editor.c:1226 +#: app/sample-editor.c:1417 msgid "Cancel" msgstr "Abbrechen" @@ -1163,7 +1163,7 @@ msgid "Linear" msgstr "Linear" -#: app/module-info.c:118 app/sample-editor.c:185 +#: app/module-info.c:118 app/sample-editor.c:184 msgid "Amiga" msgstr "Amiga" @@ -1203,153 +1203,153 @@ "Ein Verzeichnis namens '.soundtracker' wurde in Ihrem Home-Verzeichnis \n" "angelegt, um Konfigurationsdateien darin zu speichern.\n" -#: app/sample-editor.c:184 +#: app/sample-editor.c:183 msgid "No loop" msgstr "Keine Loop" -#: app/sample-editor.c:186 +#: app/sample-editor.c:185 msgid "PingPong" msgstr "PingPong" -#: app/sample-editor.c:190 +#: app/sample-editor.c:189 msgid "8 bits" msgstr "8 Bits" -#: app/sample-editor.c:191 +#: app/sample-editor.c:190 msgid "16 bits" msgstr "16 Bits" -#: app/sample-editor.c:197 +#: app/sample-editor.c:196 msgid "Sample Editor" msgstr "Sample-Editor" -#: app/sample-editor.c:237 +#: app/sample-editor.c:236 msgid "Volume" msgstr "Lautstärke" -#: app/sample-editor.c:238 +#: app/sample-editor.c:237 msgid "Panning" msgstr "Balance" -#: app/sample-editor.c:239 +#: app/sample-editor.c:238 msgid "Finetune" msgstr "Feineinstellung" -#: app/sample-editor.c:259 +#: app/sample-editor.c:258 #, fuzzy msgid "Selection:" msgstr "_Auswahl" -#: app/sample-editor.c:263 app/track-editor.c:168 app/track-editor.c:178 +#: app/sample-editor.c:262 app/track-editor.c:168 app/track-editor.c:178 #, fuzzy msgid "None" msgstr "Note:" -#: app/sample-editor.c:269 +#: app/sample-editor.c:268 msgid "All" msgstr "" -#: app/sample-editor.c:290 +#: app/sample-editor.c:289 #, fuzzy msgid "Length:" msgstr "Länge" -#: app/sample-editor.c:306 +#: app/sample-editor.c:305 msgid "RelNote" msgstr "RelNote" -#: app/sample-editor.c:317 +#: app/sample-editor.c:316 #, fuzzy msgid "Load Sample..." msgstr "Lade Sample..." -#: app/sample-editor.c:319 +#: app/sample-editor.c:318 #, fuzzy msgid "Save WAV..." msgstr "Speichere WAV..." -#: app/sample-editor.c:321 +#: app/sample-editor.c:320 #, fuzzy msgid "Save region as WAV..." msgstr "Speichere WAV..." -#: app/sample-editor.c:334 +#: app/sample-editor.c:333 msgid "Save WAV" msgstr "Speichere WAV" -#: app/sample-editor.c:344 +#: app/sample-editor.c:343 msgid "Save Region" msgstr "" -#: app/sample-editor.c:355 +#: app/sample-editor.c:354 msgid "Monitor" msgstr "Monitor" -#: app/sample-editor.c:361 +#: app/sample-editor.c:360 msgid "Volume Ramp" msgstr "Lautstärke" -#: app/sample-editor.c:371 +#: app/sample-editor.c:370 msgid "Zoom to selection" msgstr "Zoom in Auswahl" -#: app/sample-editor.c:377 +#: app/sample-editor.c:376 msgid "Show all" msgstr "Zeige alles" -#: app/sample-editor.c:383 +#: app/sample-editor.c:382 msgid "Zoom in (+50%)" msgstr "Zoom in (+50%)" -#: app/sample-editor.c:389 +#: app/sample-editor.c:388 msgid "Zoom out (-50%)" msgstr "Zoom out (-50%)" -#: app/sample-editor.c:395 +#: app/sample-editor.c:394 #, fuzzy msgid "Reverse" msgstr "Entfernen" -#: app/sample-editor.c:405 +#: app/sample-editor.c:404 msgid "Cut" msgstr "Ausschneiden" -#: app/sample-editor.c:411 +#: app/sample-editor.c:410 msgid "Remove" msgstr "Entfernen" -#: app/sample-editor.c:417 +#: app/sample-editor.c:416 msgid "Copy" msgstr "Kopieren" -#: app/sample-editor.c:423 +#: app/sample-editor.c:422 msgid "Paste" msgstr "Einfügen" -#: app/sample-editor.c:429 +#: app/sample-editor.c:428 #, fuzzy msgid "Clear Sample" msgstr "Lade Sample" -#: app/sample-editor.c:467 +#: app/sample-editor.c:466 #, fuzzy msgid "(no selection)" msgstr "Zoom in Auswahl" -#: app/sample-editor.c:999 +#: app/sample-editor.c:998 msgid "" msgstr "" -#: app/sample-editor.c:1075 +#: app/sample-editor.c:1074 msgid "Read error." msgstr "Lesefehler." -#: app/sample-editor.c:1183 +#: app/sample-editor.c:1182 #, fuzzy msgid "Load stereo sample" msgstr "Lade Sample" -#: app/sample-editor.c:1191 +#: app/sample-editor.c:1190 msgid "" "You have selected a stereo sample!\n" "(SoundTracker can only handle mono samples!)\n" @@ -1357,80 +1357,80 @@ "Please choose which channel to load:" msgstr "" -#: app/sample-editor.c:1202 +#: app/sample-editor.c:1201 #, fuzzy msgid "Left" msgstr "Links [%]:" -#: app/sample-editor.c:1208 +#: app/sample-editor.c:1207 msgid "Mix" msgstr "" -#: app/sample-editor.c:1214 +#: app/sample-editor.c:1213 #, fuzzy msgid "Right" msgstr "Rechts [%]:" -#: app/sample-editor.c:1253 +#: app/sample-editor.c:1252 msgid "Can't read sample" msgstr "Kann Sample nicht lesen" -#: app/sample-editor.c:1259 +#: app/sample-editor.c:1258 msgid "Sample is too long for current mixer module. Loading anyway." msgstr "Sample ist zu lang für aktuelles Mixer-Modul. Lade trotzdem." -#: app/sample-editor.c:1273 +#: app/sample-editor.c:1272 #, fuzzy msgid "Can only handle 8 and 16 bit samples with up to 2 channels" msgstr "Kann nur mono- 8 und 16 Bit Samples verarbeiten" -#: app/sample-editor.c:1376 +#: app/sample-editor.c:1375 msgid "Nothing to save." msgstr "" -#: app/sample-editor.c:1403 +#: app/sample-editor.c:1402 msgid "OK" msgstr "OK" -#: app/sample-editor.c:1411 +#: app/sample-editor.c:1410 msgid "Start sampling" msgstr "Starte Sampling" -#: app/sample-editor.c:1446 app/sample-editor.c:1449 +#: app/sample-editor.c:1445 app/sample-editor.c:1448 msgid "Sampling Window" msgstr "Sampling-Fenster" -#: app/sample-editor.c:1549 +#: app/sample-editor.c:1548 msgid "" msgstr "" -#: app/sample-editor.c:1579 +#: app/sample-editor.c:1578 msgid "Recorded sample is too long for current mixer module. Using it anyway." msgstr "" "Aufgezeichnetes Sample ist zu lang für aktuelles Mixer-Modul. Verwende es " "trotzdem." -#: app/sample-editor.c:1611 +#: app/sample-editor.c:1610 msgid "Normalize" msgstr "Normalisieren" -#: app/sample-editor.c:1612 +#: app/sample-editor.c:1611 msgid "Execute" msgstr "Ausführen" -#: app/sample-editor.c:1622 app/sample-editor.c:1625 +#: app/sample-editor.c:1621 app/sample-editor.c:1624 msgid "Volume Ramping" msgstr "Lautstärke-Anpassung" -#: app/sample-editor.c:1642 +#: app/sample-editor.c:1641 msgid "Perform linear volume fade on Selection" msgstr "Lineare Lautstärkenverringerung auf Markierung" -#: app/sample-editor.c:1654 +#: app/sample-editor.c:1653 msgid "Left [%]:" msgstr "Links [%]:" -#: app/sample-editor.c:1659 +#: app/sample-editor.c:1658 msgid "Right [%]:" msgstr "Rechts [%]:" Binary files soundtracker-0.5.2/po/ja.gmo and soundtracker-0.5.3/po/ja.gmo differ diff -urN soundtracker-0.5.2/po/ja.po soundtracker-0.5.3/po/ja.po --- soundtracker-0.5.2/po/ja.po Mon Mar 27 12:37:24 2000 +++ soundtracker-0.5.3/po/ja.po Tue Mar 28 11:06:38 2000 @@ -1,4 +1,4 @@ -# ja.po(0.5.1-0) for SoundTracker +# ja.po(0.5.2-0) for SoundTracker # Copyright (C) 1998-2000 Michael Krause . # Translators: Atsushi Yamagata , 1999, 2000. # Yuuki NINOMIYA , 1999, 2000. @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: SoundTracker 0.3.10\n" -"POT-Creation-Date: 2000-03-25 11:24+0100\n" -"PO-Revision-Date: 2000-03-27 11:02+09:00\n" +"POT-Creation-Date: 2000-03-27 12:44+0200\n" +"PO-Revision-Date: 2000-03-28 09:51+09:00\n" "Last-Translator: Atsushi Yamagata \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-JP\n" @@ -178,31 +178,31 @@ "¥µ¥¦¥ó¥É½ÐÎϤËÂФ·¤Æ/dev/dsp¤¬³«¤±¤Þ¤»¤ó¤Ç¤·¤¿:\n" "%s" -#: app/envelope-box.c:740 +#: app/envelope-box.c:863 msgid "Length" msgstr "Ťµ" -#: app/envelope-box.c:741 +#: app/envelope-box.c:864 msgid "Current" msgstr "¥«¥ì¥ó¥È" -#: app/envelope-box.c:742 +#: app/envelope-box.c:865 msgid "Offset" msgstr "¥ª¥Õ¥»¥Ã¥È" -#: app/envelope-box.c:743 +#: app/envelope-box.c:866 msgid "Value" msgstr "ÃÍ" -#: app/envelope-box.c:749 app/playlist.c:301 +#: app/envelope-box.c:872 app/playlist.c:301 msgid "Insert" msgstr "ÁÞÆþ" -#: app/envelope-box.c:755 app/playlist.c:307 +#: app/envelope-box.c:878 app/playlist.c:307 msgid "Delete" msgstr "ºï½ü" -#: app/envelope-box.c:843 +#: app/envelope-box.c:967 msgid "" "Graphical\n" "Envelope\n" @@ -216,23 +216,23 @@ "¥¨¥ó¥Ù¥í¡¼¥×\n" "ÊÔ½¸¤Ç¤¹" -#: app/envelope-box.c:858 +#: app/envelope-box.c:982 msgid "Sustain" msgstr "¥µ¥¹¥Æ¥£¡¼¥ó" -#: app/envelope-box.c:866 +#: app/envelope-box.c:990 msgid "Point" msgstr "¥Ý¥¤¥ó¥È" -#: app/envelope-box.c:868 +#: app/envelope-box.c:992 msgid "Loop" msgstr "¥ë¡¼¥×" -#: app/envelope-box.c:876 app/sample-editor.c:225 +#: app/envelope-box.c:1000 app/sample-editor.c:225 msgid "Start" msgstr "³«»Ï" -#: app/envelope-box.c:877 app/sample-editor.c:226 +#: app/envelope-box.c:1001 app/sample-editor.c:226 msgid "End" msgstr "½ªÎ»" @@ -346,7 +346,7 @@ #: app/gui-subs.c:36 msgid "Module loaded." -msgstr "" +msgstr "¥â¥¸¥å¡¼¥ë¤¬¥í¡¼¥É¤µ¤ì¤Þ¤·¤¿¡£" #: app/gui-subs.c:37 msgid "Saving module..." @@ -354,7 +354,7 @@ #: app/gui-subs.c:38 msgid "Module saved." -msgstr "" +msgstr "¥â¥¸¥å¡¼¥ë¤¬Êݸ¤µ¤ì¤Þ¤·¤¿¡£" #: app/gui-subs.c:39 msgid "Loading sample..." @@ -362,7 +362,7 @@ #: app/gui-subs.c:40 msgid "Sample loaded." -msgstr "" +msgstr "¥µ¥ó¥×¥ë¤¬¥í¡¼¥É¤µ¤ì¤Þ¤·¤¿¡£" #: app/gui-subs.c:41 msgid "Saving sample..." @@ -370,7 +370,7 @@ #: app/gui-subs.c:42 msgid "Sample saved." -msgstr "" +msgstr "¥µ¥ó¥×¥ë¤¬Êݸ¤µ¤ì¤Þ¤·¤¿¡£" #: app/gui-subs.c:43 msgid "Loading instrument..." @@ -378,7 +378,7 @@ #: app/gui-subs.c:44 msgid "Instrument loaded." -msgstr "" +msgstr "³Ú´ï¤¬¥í¡¼¥É¤µ¤ì¤Þ¤·¤¿¡£" #: app/gui-subs.c:45 msgid "Saving instrument..." @@ -386,22 +386,22 @@ #: app/gui-subs.c:46 msgid "Instrument saved." -msgstr "" +msgstr "³Ú´ï¤¬Êݸ¤µ¤ì¤Þ¤·¤¿¡£" -#: app/gui-subs.c:459 +#: app/gui-subs.c:463 msgid "Question" msgstr "¼ÁÌä" -#: app/gui-subs.c:476 app/keys.c:702 app/sample-editor.c:1227 +#: app/gui-subs.c:480 app/keys.c:702 app/sample-editor.c:1227 #: app/sample-editor.c:1418 msgid "Cancel" msgstr "¼è¾Ã" -#: app/gui-subs.c:494 +#: app/gui-subs.c:498 msgid "Warning" msgstr "·Ù¹ð" -#: app/gui-subs.c:520 +#: app/gui-subs.c:524 msgid "Error!" msgstr "¥¨¥é¡¼!" @@ -421,59 +421,59 @@ msgid "Are you sure you want to overwrite the file?" msgstr "¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤·¤¿¤¤¤Î¤Ï³Î¤«¤Ç¤¹¤«?" -#: app/gui.c:1167 +#: app/gui.c:1176 msgid "Load XM..." msgstr "XM¥í¡¼¥É..." -#: app/gui.c:1169 +#: app/gui.c:1178 msgid "Save XM..." msgstr "XMÊݸ..." -#: app/gui.c:1172 +#: app/gui.c:1181 msgid "Render module as WAV..." msgstr "WAV¤È¤·¤Æ¥â¥¸¥å¡¼¥ë¤ò¥ì¥ó¥À¥ê¥ó¥°¤¹¤ë..." -#: app/gui.c:1224 +#: app/gui.c:1233 msgid "Play Song" msgstr "¶Ê±éÁÕ" -#: app/gui.c:1230 +#: app/gui.c:1239 msgid "Play Pattern" msgstr "¥Ñ¥¿¡¼¥ó±éÁÕ" -#: app/gui.c:1236 +#: app/gui.c:1245 msgid "Stop" msgstr "Ää»ß" -#: app/gui.c:1255 +#: app/gui.c:1264 msgid "Number of Channels:" msgstr "¥Á¥ã¥ó¥Í¥ë¿ô:" -#: app/gui.c:1271 app/playlist.c:294 +#: app/gui.c:1280 app/playlist.c:294 msgid "Pattern" msgstr "¥Ñ¥¿¡¼¥ó" -#: app/gui.c:1287 +#: app/gui.c:1296 msgid "PatLength" msgstr "¥Ñ¥¿¡¼¥óĹ" -#: app/gui.c:1379 +#: app/gui.c:1388 msgid "Octave" msgstr "¥ª¥¯¥¿¡¼¥Ö" -#: app/gui.c:1387 +#: app/gui.c:1396 msgid "Jump" msgstr "¥¸¥ã¥ó¥×" -#: app/gui.c:1395 +#: app/gui.c:1404 msgid "Instr" msgstr "³Ú´ï" -#: app/gui.c:1410 +#: app/gui.c:1419 msgid "Sample" msgstr "¥µ¥ó¥×¥ë" -#: app/gui.c:1448 +#: app/gui.c:1482 msgid "%M:%S" msgstr "" diff -urN soundtracker-0.5.2/po/soundtracker.pot soundtracker-0.5.3/po/soundtracker.pot --- soundtracker-0.5.2/po/soundtracker.pot Mon Mar 27 12:44:34 2000 +++ soundtracker-0.5.3/po/soundtracker.pot Wed Mar 29 18:49:57 2000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-03-27 12:44+0200\n" +"POT-Creation-Date: 2000-03-29 18:49+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -50,7 +50,7 @@ msgid "Mixers" msgstr "" -#: app/audioconfig.c:320 app/gui-settings.c:377 app/sample-editor.c:1613 +#: app/audioconfig.c:320 app/gui-settings.c:377 app/sample-editor.c:1612 #: app/tips-dialog.c:165 app/transposition.c:313 msgid "Close" msgstr "" @@ -141,7 +141,7 @@ msgid "no settings (yet), sorry!" msgstr "" -#: app/drivers/file-output.c:161 app/sample-editor.c:1316 +#: app/drivers/file-output.c:161 app/sample-editor.c:1315 msgid "Can't open file for writing." msgstr "" @@ -209,11 +209,11 @@ msgid "Loop" msgstr "" -#: app/envelope-box.c:1000 app/sample-editor.c:225 +#: app/envelope-box.c:1000 app/sample-editor.c:224 msgid "Start" msgstr "" -#: app/envelope-box.c:1001 app/sample-editor.c:226 +#: app/envelope-box.c:1001 app/sample-editor.c:225 msgid "End" msgstr "" @@ -229,7 +229,7 @@ msgid "Render WAV" msgstr "" -#: app/file-operations.c:153 app/sample-editor.c:325 +#: app/file-operations.c:153 app/sample-editor.c:324 msgid "Load Sample" msgstr "" @@ -373,8 +373,8 @@ msgid "Question" msgstr "" -#: app/gui-subs.c:480 app/keys.c:702 app/sample-editor.c:1227 -#: app/sample-editor.c:1418 +#: app/gui-subs.c:480 app/keys.c:702 app/sample-editor.c:1226 +#: app/sample-editor.c:1417 msgid "Cancel" msgstr "" @@ -1061,7 +1061,7 @@ msgid "Linear" msgstr "" -#: app/module-info.c:118 app/sample-editor.c:185 +#: app/module-info.c:118 app/sample-editor.c:184 msgid "Amiga" msgstr "" @@ -1099,143 +1099,143 @@ "home directory to store configuration files.\n" msgstr "" -#: app/sample-editor.c:184 +#: app/sample-editor.c:183 msgid "No loop" msgstr "" -#: app/sample-editor.c:186 +#: app/sample-editor.c:185 msgid "PingPong" msgstr "" -#: app/sample-editor.c:190 +#: app/sample-editor.c:189 msgid "8 bits" msgstr "" -#: app/sample-editor.c:191 +#: app/sample-editor.c:190 msgid "16 bits" msgstr "" -#: app/sample-editor.c:197 +#: app/sample-editor.c:196 msgid "Sample Editor" msgstr "" -#: app/sample-editor.c:237 +#: app/sample-editor.c:236 msgid "Volume" msgstr "" -#: app/sample-editor.c:238 +#: app/sample-editor.c:237 msgid "Panning" msgstr "" -#: app/sample-editor.c:239 +#: app/sample-editor.c:238 msgid "Finetune" msgstr "" -#: app/sample-editor.c:259 +#: app/sample-editor.c:258 msgid "Selection:" msgstr "" -#: app/sample-editor.c:263 app/track-editor.c:168 app/track-editor.c:178 +#: app/sample-editor.c:262 app/track-editor.c:168 app/track-editor.c:178 msgid "None" msgstr "" -#: app/sample-editor.c:269 +#: app/sample-editor.c:268 msgid "All" msgstr "" -#: app/sample-editor.c:290 +#: app/sample-editor.c:289 msgid "Length:" msgstr "" -#: app/sample-editor.c:306 +#: app/sample-editor.c:305 msgid "RelNote" msgstr "" -#: app/sample-editor.c:317 +#: app/sample-editor.c:316 msgid "Load Sample..." msgstr "" -#: app/sample-editor.c:319 +#: app/sample-editor.c:318 msgid "Save WAV..." msgstr "" -#: app/sample-editor.c:321 +#: app/sample-editor.c:320 msgid "Save region as WAV..." msgstr "" -#: app/sample-editor.c:334 +#: app/sample-editor.c:333 msgid "Save WAV" msgstr "" -#: app/sample-editor.c:344 +#: app/sample-editor.c:343 msgid "Save Region" msgstr "" -#: app/sample-editor.c:355 +#: app/sample-editor.c:354 msgid "Monitor" msgstr "" -#: app/sample-editor.c:361 +#: app/sample-editor.c:360 msgid "Volume Ramp" msgstr "" -#: app/sample-editor.c:371 +#: app/sample-editor.c:370 msgid "Zoom to selection" msgstr "" -#: app/sample-editor.c:377 +#: app/sample-editor.c:376 msgid "Show all" msgstr "" -#: app/sample-editor.c:383 +#: app/sample-editor.c:382 msgid "Zoom in (+50%)" msgstr "" -#: app/sample-editor.c:389 +#: app/sample-editor.c:388 msgid "Zoom out (-50%)" msgstr "" -#: app/sample-editor.c:395 +#: app/sample-editor.c:394 msgid "Reverse" msgstr "" -#: app/sample-editor.c:405 +#: app/sample-editor.c:404 msgid "Cut" msgstr "" -#: app/sample-editor.c:411 +#: app/sample-editor.c:410 msgid "Remove" msgstr "" -#: app/sample-editor.c:417 +#: app/sample-editor.c:416 msgid "Copy" msgstr "" -#: app/sample-editor.c:423 +#: app/sample-editor.c:422 msgid "Paste" msgstr "" -#: app/sample-editor.c:429 +#: app/sample-editor.c:428 msgid "Clear Sample" msgstr "" -#: app/sample-editor.c:467 +#: app/sample-editor.c:466 msgid "(no selection)" msgstr "" -#: app/sample-editor.c:999 +#: app/sample-editor.c:998 msgid "" msgstr "" -#: app/sample-editor.c:1075 +#: app/sample-editor.c:1074 msgid "Read error." msgstr "" -#: app/sample-editor.c:1183 +#: app/sample-editor.c:1182 msgid "Load stereo sample" msgstr "" -#: app/sample-editor.c:1191 +#: app/sample-editor.c:1190 msgid "" "You have selected a stereo sample!\n" "(SoundTracker can only handle mono samples!)\n" @@ -1243,75 +1243,75 @@ "Please choose which channel to load:" msgstr "" -#: app/sample-editor.c:1202 +#: app/sample-editor.c:1201 msgid "Left" msgstr "" -#: app/sample-editor.c:1208 +#: app/sample-editor.c:1207 msgid "Mix" msgstr "" -#: app/sample-editor.c:1214 +#: app/sample-editor.c:1213 msgid "Right" msgstr "" -#: app/sample-editor.c:1253 +#: app/sample-editor.c:1252 msgid "Can't read sample" msgstr "" -#: app/sample-editor.c:1259 +#: app/sample-editor.c:1258 msgid "Sample is too long for current mixer module. Loading anyway." msgstr "" -#: app/sample-editor.c:1273 +#: app/sample-editor.c:1272 msgid "Can only handle 8 and 16 bit samples with up to 2 channels" msgstr "" -#: app/sample-editor.c:1376 +#: app/sample-editor.c:1375 msgid "Nothing to save." msgstr "" -#: app/sample-editor.c:1403 +#: app/sample-editor.c:1402 msgid "OK" msgstr "" -#: app/sample-editor.c:1411 +#: app/sample-editor.c:1410 msgid "Start sampling" msgstr "" -#: app/sample-editor.c:1446 app/sample-editor.c:1449 +#: app/sample-editor.c:1445 app/sample-editor.c:1448 msgid "Sampling Window" msgstr "" -#: app/sample-editor.c:1549 +#: app/sample-editor.c:1548 msgid "" msgstr "" -#: app/sample-editor.c:1579 +#: app/sample-editor.c:1578 msgid "Recorded sample is too long for current mixer module. Using it anyway." msgstr "" -#: app/sample-editor.c:1611 +#: app/sample-editor.c:1610 msgid "Normalize" msgstr "" -#: app/sample-editor.c:1612 +#: app/sample-editor.c:1611 msgid "Execute" msgstr "" -#: app/sample-editor.c:1622 app/sample-editor.c:1625 +#: app/sample-editor.c:1621 app/sample-editor.c:1624 msgid "Volume Ramping" msgstr "" -#: app/sample-editor.c:1642 +#: app/sample-editor.c:1641 msgid "Perform linear volume fade on Selection" msgstr "" -#: app/sample-editor.c:1654 +#: app/sample-editor.c:1653 msgid "Left [%]:" msgstr "" -#: app/sample-editor.c:1659 +#: app/sample-editor.c:1658 msgid "Right [%]:" msgstr "" diff -urN soundtracker-0.5.2/soundtracker.spec soundtracker-0.5.3/soundtracker.spec --- soundtracker-0.5.2/soundtracker.spec Mon Mar 27 12:43:29 2000 +++ soundtracker-0.5.3/soundtracker.spec Wed Mar 29 20:05:51 2000 @@ -1,6 +1,6 @@ %define name soundtracker -%define version 0.5.2 -%define release 14 +%define version 0.5.3 +%define release 15 %define prefix /usr Summary: Sound modules editor/player