diff -urN soundtracker-0.3.5/ChangeLog soundtracker-0.3.6/ChangeLog --- soundtracker-0.3.5/ChangeLog Fri Oct 8 16:32:34 1999 +++ soundtracker-0.3.6/ChangeLog Sun Nov 14 15:28:59 1999 @@ -1,3 +1,60 @@ +1999-11-14 Michael Krause + + * Released v0.3.6 + + * app/xm-player.c: Added "player_looped" variable which indicates + to the audio renderer that the song has either looped, the "Bxx" + command has been used to jump to another pattern or the "F00" + command has been issued in order to stop the song. Should prevent + endless saving loops. + +1999-11-13 Michael Krause + + * app/audio.c (audio_ctlpipe_render_song_to_file): This is a + special version of audio_ctlpipe_play_song(), which always uses + the file driver, hacks in the desired filename and does the + priority juggling (we don't want to run the rendering at nice + -14). + + * app/drivers/file-output.c: This driver uses libaudiofile to + render a WAV file. It's not directly accessible from the audio + config, use the special menu item in the "File" menu instead. + + * app/scope-group.c (scope_group_timeout): Return immediately if + current_driver is NULL. Fixes a crash. + +1999-10-30 Michael Krause + + * app/audio.c: Begun work on code to render modules into a WAV + file. + + * app/main.c: Initialize effective group ID as well. + + * configure.in: Moved poll()/select() check in front of the + library checks. + + * po: Updated it.po and ja.po. + + * app/track-editor.c (track_editor_paste_pattern): Fix pasting of + short patterns into long ones (reported by Martin Andersson); also + update pattern length spinbutton in that case. + + * app/transposition.c (transposition_transpose_notes_sub): Don't + transpose KEYOFF note (reported by Martin Andersson). + +1999-10-16 Kai Vehmanen + + * app/drivers/alsa-output.c: Changed default soundcard id to 0. + +1999-10-09 Michael Krause + + * app/drivers/esd-output.c: Quick and dirty implementation of an + ESD driver. Note that this will not be supported because of its + latency. + + * configure.in: Added ESD check, updated ALSA check to handle + --disable-alsa correctly. + 1999-10-08 Michael Krause * Released v0.3.5 diff -urN soundtracker-0.3.5/Makefile.am soundtracker-0.3.6/Makefile.am --- soundtracker-0.3.5/Makefile.am Fri Oct 8 16:32:13 1999 +++ soundtracker-0.3.6/Makefile.am Sat Oct 9 18:22:02 1999 @@ -17,7 +17,7 @@ # soundtracker_tips.txt bindist: - ./configure --disable-gnome --disable-nls + ./configure --disable-gnome --disable-nls --disable-alsa --disable-esd make rm -rf soundtracker-$(VERSION)-bin mkdir soundtracker-$(VERSION)-bin diff -urN soundtracker-0.3.5/Makefile.in soundtracker-0.3.6/Makefile.in --- soundtracker-0.3.5/Makefile.in Fri Oct 8 16:33:08 1999 +++ soundtracker-0.3.6/Makefile.in Sun Nov 14 15:30:04 1999 @@ -65,6 +65,9 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_CONFIG = @ESD_CONFIG@ +ESD_LIBS = @ESD_LIBS@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -406,7 +409,7 @@ # soundtracker_tips.txt bindist: - ./configure --disable-gnome --disable-nls + ./configure --disable-gnome --disable-nls --disable-alsa --disable-esd make rm -rf soundtracker-$(VERSION)-bin mkdir soundtracker-$(VERSION)-bin diff -urN soundtracker-0.3.5/NEWS soundtracker-0.3.6/NEWS --- soundtracker-0.3.5/NEWS Fri Oct 8 16:30:31 1999 +++ soundtracker-0.3.6/NEWS Sun Nov 14 15:28:59 1999 @@ -2,6 +2,12 @@ (This file lists only major user-visible changes; the ChangeLog file contains more details) +What is new in soundtracker-0.3.6 (14-Nov-1999): + +* Can render modules into WAV files +* Quick and dirty ESD driver +* Some bug fixes + What is new in soundtracker-0.3.5 (08-Oct-1999): * Multi-track copy and paste diff -urN soundtracker-0.3.5/README soundtracker-0.3.6/README --- soundtracker-0.3.5/README Fri Oct 8 16:30:33 1999 +++ soundtracker-0.3.6/README Sun Nov 14 15:29:00 1999 @@ -4,7 +4,7 @@ http://www.soundtracker.org/ -------------------------------------------------------------- - v0.3.5 --- THIS IS A DEVELOPMENT VERSION! + v0.3.6 --- THIS IS A DEVELOPMENT VERSION! Written and (C) 1998-1999 by Michael Krause [ raw style / lego ] diff -urN soundtracker-0.3.5/TODO soundtracker-0.3.6/TODO --- soundtracker-0.3.5/TODO Fri Oct 8 16:30:34 1999 +++ soundtracker-0.3.6/TODO Sun Nov 14 15:20:50 1999 @@ -1,8 +1,50 @@ things to do and known bugs (in no particular order) ------------------------------------------------------- +MAIN WINDOW "CONTROL PANEL": the scopes must be able to be replaced by +an instrument list or something similarly useful in case you don't +want the scopes there. the scopes could be put into their own window +or to the pre-0.1.1 position then. + +stereo-loading + +save wav disablen, wenn audiofile nicht da + +edX-bug (-> kb) + +space-bar auch ins menü + + + +toni-mixer: +----------- + +o Die Samples knacken irgendwie, wenn sie umschalten oder +stoppen. (aber auch in meinem Mixer) + +o Was soll das mit den linear frequencies? + +o Sollte das Mono-Downmixing im Mixer passieren oder hinterher in +audio.c? Im Mixer ist natürlich besser, weil der Puffer nur einmal +angefasst wird. + +o The code to handle unlimited length samples is clever. + +o Limitation to 16bit samples only is to be discussed. Can conversion +to 32bit or float formats be avoided? + +o My volume and shifting code is quite stupid. + +o The initialization (loop handling) and exit (mixbuffer downgrading) +code should be shared. + + +nic leveille's post vom 10 oct 1999 + ====== GUI ========= +SAMPLE LIST: like in good old MED + TRACKER WIDGET: should work with arbitrary note types, effects, and so on. should support per-cell background/foreground colors, fonts should be configurable etc. extend xmnote. @@ -13,11 +55,6 @@ is consistent (this is not easy, will have to copy gtkspinbutton.c and change that). -MAIN WINDOW "CONTROL PANEL": the scopes must be able to be replaced by -an instrument list or something similarly useful in case you don't -want the scopes there. the scopes could be put into their own window -or to the pre-0.1.1 position then. - SAMPLE EDITOR: "play selection" button. (don't loop the sample then) GUI / MIXER: when window is hidden, deactivate the scopes computation @@ -104,6 +141,9 @@ some kind of undo, especially for block operations +sample loader dialog: preview-button (preHEAR) :) + + ====== PLAYER / LOADER ======== LOADER: support loading from archives @@ -130,8 +170,6 @@ ====== DRIVERS ======= - -DRIVER: write an esd driver OSS-OUTPUT.C: make preferences come in effect immediately, without having to restart the song. diff -urN soundtracker-0.3.5/acconfig.h soundtracker-0.3.6/acconfig.h --- soundtracker-0.3.5/acconfig.h Fri Sep 3 15:33:54 1999 +++ soundtracker-0.3.6/acconfig.h Sat Oct 9 18:06:55 1999 @@ -3,6 +3,7 @@ #undef DRIVER_OSS #undef DRIVER_ALSA +#undef DRIVER_ESD #undef USE_GNOME #undef NO_AUDIOFILE diff -urN soundtracker-0.3.5/aclocal.m4 soundtracker-0.3.6/aclocal.m4 --- soundtracker-0.3.5/aclocal.m4 Wed Oct 6 13:35:50 1999 +++ soundtracker-0.3.6/aclocal.m4 Sat Oct 30 19:09:49 1999 @@ -885,3 +885,168 @@ rm -f conf.audiofiletest ]) +# Configure paths for ESD +# Manish Singh 98-9-30 +# stolen back from Frank Belew +# stolen from Manish Singh +# Shamelessly stolen from Owen Taylor + +dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS +dnl +AC_DEFUN(AM_PATH_ESD, +[dnl +dnl Get the cflags and libraries from the esd-config script +dnl +AC_ARG_WITH(esd-prefix,[ --with-esd-prefix=PFX Prefix where ESD is installed (optional)], + esd_prefix="$withval", esd_prefix="") +AC_ARG_WITH(esd-exec-prefix,[ --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)], + esd_exec_prefix="$withval", esd_exec_prefix="") +AC_ARG_ENABLE(esdtest, [ --disable-esdtest Do not try to compile and run a test ESD program], + , enable_esdtest=yes) + + if test x$esd_exec_prefix != x ; then + esd_args="$esd_args --exec-prefix=$esd_exec_prefix" + if test x${ESD_CONFIG+set} != xset ; then + ESD_CONFIG=$esd_exec_prefix/bin/esd-config + fi + fi + if test x$esd_prefix != x ; then + esd_args="$esd_args --prefix=$esd_prefix" + if test x${ESD_CONFIG+set} != xset ; then + ESD_CONFIG=$esd_prefix/bin/esd-config + fi + fi + + AC_PATH_PROG(ESD_CONFIG, esd-config, no) + min_esd_version=ifelse([$1], ,0.2.7,$1) + AC_MSG_CHECKING(for ESD - version >= $min_esd_version) + no_esd="" + if test "$ESD_CONFIG" = "no" ; then + no_esd=yes + else + ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags` + ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs` + + esd_major_version=`$ESD_CONFIG $esd_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + esd_minor_version=`$ESD_CONFIG $esd_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_esdtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $ESD_CFLAGS" + LIBS="$LIBS $ESD_LIBS" +dnl +dnl Now check if the installed ESD is sufficiently new. (Also sanity +dnl checks the results of esd-config to some extent +dnl + rm -f conf.esdtest + AC_TRY_RUN([ +#include +#include +#include +#include + +char* +my_strdup (char *str) +{ + char *new_str; + + if (str) + { + new_str = malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } + else + new_str = NULL; + + return new_str; +} + +int main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.esdtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = my_strdup("$min_esd_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_esd_version"); + exit(1); + } + + if (($esd_major_version > major) || + (($esd_major_version == major) && ($esd_minor_version > minor)) || + (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version); + printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n"); + printf("*** to point to the correct copy of esd-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + return 1; + } +} + +],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_esd" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$ESD_CONFIG" = "no" ; then + echo "*** The esd-config script installed by ESD could not be found" + echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the ESD_CONFIG environment variable to the" + echo "*** full path to esd-config." + else + if test -f conf.esdtest ; then + : + else + echo "*** Could not run ESD test program, checking why..." + CFLAGS="$CFLAGS $ESD_CFLAGS" + LIBS="$LIBS $ESD_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return 0; ], + [ 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" + echo "*** version of ESD. If it is not finding ESD, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means ESD was incorrectly installed" + echo "*** or that you have moved ESD since it was installed. In the latter case, you" + echo "*** may want to edit the esd-config script: $ESD_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + ESD_CFLAGS="" + ESD_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(ESD_CFLAGS) + AC_SUBST(ESD_LIBS) + rm -f conf.esdtest +]) + diff -urN soundtracker-0.3.5/app/Makefile.in soundtracker-0.3.6/app/Makefile.in --- soundtracker-0.3.5/app/Makefile.in Fri Oct 8 16:33:12 1999 +++ soundtracker-0.3.6/app/Makefile.in Sun Nov 14 15:30:09 1999 @@ -65,6 +65,9 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_CONFIG = @ESD_CONFIG@ +ESD_LIBS = @ESD_LIBS@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -314,7 +317,7 @@ audioconfig.o: audioconfig.c ../config.h i18n.h audioconfig.h gui-subs.h \ audio.h mixer.h driver-out.h driver.h time-buffer.h \ sample-editor.h xm.h driver-in.h preferences.h gui.h -audio.o: audio.c ../config.h poll.h audio.h mixer.h driver-out.h \ +audio.o: audio.c ../config.h poll.h i18n.h audio.h mixer.h driver-out.h \ driver.h time-buffer.h main.h xm.h xm-player.h endian-conv.h \ scope-group.h sample-display.h errors.h gui-settings.h cheat-sheet.o: cheat-sheet.c ../config.h i18n.h diff -urN soundtracker-0.3.5/app/audio.c soundtracker-0.3.6/app/audio.c --- soundtracker-0.3.5/app/audio.c Fri Sep 10 13:18:21 1999 +++ soundtracker-0.3.6/app/audio.c Sun Nov 14 15:09:54 1999 @@ -38,6 +38,7 @@ #include +#include "i18n.h" #include "audio.h" #include "mixer.h" #include "driver-out.h" @@ -56,6 +57,7 @@ void *playback_driver_object = NULL; void *editing_driver_object = NULL; void *current_driver_object = NULL; +void *file_driver_object = NULL; int audio_ctlpipe, audio_backpipe; gint8 player_mute_channels[32]; @@ -68,9 +70,12 @@ /* Internal variables */ +static int nice_value = 0; static int ctlpipe, backpipe; static pthread_t threadid; + static int playing = 0; +static gboolean playing_noloop; // --- for audio_mix() "main loop": @@ -111,6 +116,34 @@ void audio_prepare_for_playing (void); +static void +audio_raise_priority (void) +{ +// The RT code tends to crash my kernel :-( +#if defined(_POSIX_PRIORITY_SCHEDULING) && 0 + struct sched_param sp; + sp.sched_priority = 40; + + if(sched_setscheduler(0, SCHED_FIFO, &sp) == 0) { + printf(">> running as realtime process now\n"); + } else { + fprintf(stderr,"WARNING: Can't get realtime priority (try running as root)!\n"); + } +#else + if(nice_value == 0) { + if(!nice(-14)) { + nice_value = -14; + } + } +#endif +} + +static void +audio_restore_priority (void) +{ + nice(- nice_value); + nice_value = 0; +} static void audio_ctlpipe_init_player (void) @@ -134,7 +167,6 @@ if(playback_driver->common.open(playback_driver_object)) { current_driver_object = playback_driver_object; current_driver = playback_driver; - playing = 1; audio_prepare_for_playing(); xmplayer_init_play_song(songpos, patpos); a = AUDIO_BACKPIPE_PLAYING_STARTED; @@ -146,6 +178,38 @@ } static void +audio_ctlpipe_render_song_to_file (gchar *filename) +{ + audio_backpipe_id a = AUDIO_BACKPIPE_DRIVER_OPEN_FAILED; + extern st_out_driver driver_out_file; + + g_assert(playback_driver != NULL); + g_assert(mixer != NULL); + g_assert(xm != NULL); + g_assert(!playing); + +#ifndef NO_AUDIOFILE + if(file_driver_object != NULL) { + driver_out_file.common.destroy(file_driver_object); + } + file_driver_object = driver_out_file.common.new(); + *((gchar**)file_driver_object) = g_strdup(filename); + + if(driver_out_file.common.open(file_driver_object)) { + current_driver_object = file_driver_object; + current_driver = &driver_out_file; + audio_prepare_for_playing(); + playing_noloop = TRUE; + xmplayer_init_play_song(0, 0); + a = AUDIO_BACKPIPE_PLAYING_STARTED; + audio_restore_priority(); + } +#endif + + write(backpipe, &a, sizeof(a)); +} + +static void audio_ctlpipe_play_pattern (int pattern, int patpos) { @@ -159,7 +223,6 @@ if(playback_driver->common.open(playback_driver_object)) { current_driver_object = playback_driver_object; current_driver = playback_driver; - playing = 1; audio_prepare_for_playing(); xmplayer_init_play_pattern(pattern, patpos); a = AUDIO_BACKPIPE_PLAYING_PATTERN_STARTED; @@ -181,7 +244,6 @@ if(editing_driver->common.open(editing_driver_object)) { current_driver_object = editing_driver_object; current_driver = editing_driver; - playing = 1; audio_prepare_for_playing(); } else { a = AUDIO_BACKPIPE_DRIVER_OPEN_FAILED; @@ -208,7 +270,6 @@ if(editing_driver->common.open(editing_driver_object)) { current_driver_object = editing_driver_object; current_driver = editing_driver; - playing = 1; audio_prepare_for_playing(); } else { a = AUDIO_BACKPIPE_DRIVER_OPEN_FAILED; @@ -248,6 +309,8 @@ g_assert(set_songpos_wait_for == -1); write(backpipe, &a, sizeof(a)); + + audio_raise_priority(); } static void @@ -305,24 +368,6 @@ } static void -audio_raise_priority (void) -{ -// The RT code tends to crash my kernel :-( -#if defined(_POSIX_PRIORITY_SCHEDULING) && 0 - struct sched_param sp; - sp.sched_priority = 40; - - if(sched_setscheduler(0, SCHED_FIFO, &sp) == 0) { - printf(">> running as realtime process now\n"); - } else { - fprintf(stderr,"WARNING: Can't get realtime priority (try running as root)!\n"); - } -#else - nice(-14); -#endif -} - -static void audio_thread (void) { struct pollfd pfd[5] = { @@ -335,6 +380,9 @@ void *b; float af; + static char *msgbuf = NULL; + static int msgbuflen = 0; + audio_raise_priority(); loop: @@ -392,6 +440,16 @@ case AUDIO_CTLPIPE_STOP_PLAYING: audio_ctlpipe_stop_playing(); break; + case AUDIO_CTLPIPE_RENDER_SONG_TO_FILE: + readpipe(ctlpipe, a, sizeof(a[0])); + if(msgbuflen < a[0] + 1) { + g_free(msgbuf); + msgbuf = g_new(char, a[0] + 1); + msgbuflen = a[0] + 1; + } + readpipe(ctlpipe, msgbuf, a[0] + 1); + audio_ctlpipe_render_song_to_file(msgbuf); + break; case AUDIO_CTLPIPE_SET_SONGPOS: read(ctlpipe, a, 1 * sizeof(a[0])); audio_ctlpipe_set_songpos(a[0]); @@ -426,6 +484,14 @@ if(pfd[i].revents & POLLOUT) x |= GDK_INPUT_WRITE; pi->function(pi->data, pi->fd, x); + + if(playing_noloop & player_looped) { + // "noloop" mode for file renderer -- need to flush output buffer + // and then stop playing + printf("stopping.\n"); + pi->function(pi->data, pi->fd, x); + audio_ctlpipe_stop_playing(); + } } } @@ -546,6 +612,9 @@ mixfmt_req = -666; pitchbend = pitchbend_req; + playing = 1; + playing_noloop = FALSE; + audio_next_tick_time_bent = 0.0; audio_next_tick_time_unbent = 0.0; audio_current_playback_time_bent = 0.0; @@ -846,7 +915,12 @@ nonewtick = TRUE; } - dest = mixer_mix(dest, samples_left); + if(playing_noloop && player_looped) { + // "noloop" mode for file renderer -- make rest of buffer silent + memset(dest, 0, samples_left * ((mixfmt & MIXFMT_16) + 1) + ((mixfmt & MIXFMT_STEREO) + 1)); + } else { + dest = mixer_mix(dest, samples_left); + } count -= samples_left; audio_current_playback_time_bent += (double) samples_left / mixfreq; @@ -889,4 +963,3 @@ } } } - diff -urN soundtracker-0.3.5/app/audio.h soundtracker-0.3.6/app/audio.h --- soundtracker-0.3.5/app/audio.h Fri Sep 10 13:18:21 1999 +++ soundtracker-0.3.6/app/audio.h Sat Nov 13 14:22:03 1999 @@ -35,6 +35,7 @@ typedef enum audio_ctlpipe_id { AUDIO_CTLPIPE_INIT_PLAYER=2000, /* void */ + AUDIO_CTLPIPE_RENDER_SONG_TO_FILE, /* int len, string (len+1 bytes) */ AUDIO_CTLPIPE_PLAY_SONG, /* int songpos, int patpos */ AUDIO_CTLPIPE_PLAY_PATTERN, /* int pattern, int patpos */ AUDIO_CTLPIPE_PLAY_NOTE, /* int channel, int note, int instrument */ diff -urN soundtracker-0.3.5/app/drivers/Makefile.am soundtracker-0.3.6/app/drivers/Makefile.am --- soundtracker-0.3.5/app/drivers/Makefile.am Fri Sep 10 13:21:06 1999 +++ soundtracker-0.3.6/app/drivers/Makefile.am Sat Nov 13 14:36:30 1999 @@ -5,6 +5,8 @@ oss-output.c \ oss-input.c \ alsa-output.c \ - alsa-input.c + alsa-input.c \ + esd-output.c \ + file-output.c INCLUDES = -I.. diff -urN soundtracker-0.3.5/app/drivers/Makefile.in soundtracker-0.3.6/app/drivers/Makefile.in --- soundtracker-0.3.5/app/drivers/Makefile.in Fri Oct 8 16:33:14 1999 +++ soundtracker-0.3.6/app/drivers/Makefile.in Sun Nov 14 15:30:10 1999 @@ -65,6 +65,9 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_CONFIG = @ESD_CONFIG@ +ESD_LIBS = @ESD_LIBS@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -94,7 +97,7 @@ noinst_LIBRARIES = libdrivers.a -libdrivers_a_SOURCES = oss-output.c oss-input.c alsa-output.c alsa-input.c +libdrivers_a_SOURCES = oss-output.c oss-input.c alsa-output.c alsa-input.c esd-output.c file-output.c INCLUDES = -I.. @@ -110,7 +113,7 @@ LIBS = @LIBS@ libdrivers_a_LIBADD = libdrivers_a_OBJECTS = oss-output.o oss-input.o alsa-output.o \ -alsa-input.o +alsa-input.o esd-output.o file-output.o AR = ar CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -216,6 +219,12 @@ done alsa-input.o: alsa-input.c ../../config.h alsa-output.o: alsa-output.c ../../config.h +esd-output.o: esd-output.c ../../config.h ../i18n.h ../driver-out.h \ + ../driver.h ../mixer.h ../errors.h ../gui-subs.h \ + ../preferences.h +file-output.o: file-output.c ../../config.h ../i18n.h ../driver-out.h \ + ../driver.h ../mixer.h ../errors.h ../gui-subs.h \ + ../preferences.h oss-input.o: oss-input.c ../../config.h ../i18n.h ../driver-in.h \ ../driver.h ../mixer.h ../errors.h ../gui-subs.h oss-output.o: oss-output.c ../../config.h ../i18n.h ../driver-out.h \ diff -urN soundtracker-0.3.5/app/drivers/alsa-output.c soundtracker-0.3.6/app/drivers/alsa-output.c --- soundtracker-0.3.5/app/drivers/alsa-output.c Tue Sep 7 16:26:46 1999 +++ soundtracker-0.3.6/app/drivers/alsa-output.c Sat Oct 16 17:26:19 1999 @@ -314,7 +314,7 @@ { alsa_driver *d = g_new(alsa_driver, 1); - d->card_number = 1; + d->card_number = 0; d->device_number = 0; d->p_mixfreq = 44100; diff -urN soundtracker-0.3.5/app/drivers/esd-output.c soundtracker-0.3.6/app/drivers/esd-output.c --- soundtracker-0.3.5/app/drivers/esd-output.c Thu Jan 1 01:00:00 1970 +++ soundtracker-0.3.6/app/drivers/esd-output.c Sat Oct 9 18:59:19 1999 @@ -0,0 +1,235 @@ + +/* + * The Real SoundTracker - ESD (output) driver. + * + * Copyright (C) 1999 Michael Krause + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include + +#if DRIVER_ESD + +#include +#include + +#include +#include + +#include +#include +#include + +#include "i18n.h" +#include "driver-out.h" +#include "mixer.h" +#include "errors.h" +#include "gui-subs.h" +#include "preferences.h" + + +typedef struct esd_driver { + GtkWidget *configwidget; + + int out_sock, out_bits, out_channels, out_rate; + int samples_per_frame; + int mf; + + void *sndbuf; + gpointer polltag; + int firstpoll; + + double outtime; + double playtime; +} esd_driver; + +static void +esd_poll_ready_playing (gpointer data, + gint source, + GdkInputCondition condition) +{ + esd_driver * const d = data; + int w; + struct timeval tv; + + if(!d->firstpoll) { + if((w = write(d->out_sock, d->sndbuf, ESD_BUF_SIZE) != ESD_BUF_SIZE)) { + if(w == -1) { + fprintf(stderr, "driver_esd: write() returned -1.\n"); + } else { + fprintf(stderr, "driver_esd: write not completely done.\n"); + } + } + + gettimeofday(&tv, NULL); + d->outtime = tv.tv_sec + tv.tv_usec / 1e6; + d->playtime += (double) d->samples_per_frame / d->out_rate; + } + + d->firstpoll = FALSE; + + audio_mix(d->sndbuf, d->samples_per_frame, d->out_rate, d->mf); +} + +static void +esd_make_config_widgets (esd_driver *d) +{ + GtkWidget *thing, *mainbox; + + d->configwidget = mainbox = gtk_vbox_new(FALSE, 2); + + thing = gtk_label_new(_("Note that the ESD output is unusable in\ninteractive mode because of the latency added\nby ESD. Use the OSS or ALSA output plug-ins\nfor serious work.")); + gtk_box_pack_start(GTK_BOX(mainbox), thing, FALSE, TRUE, 0); + gtk_widget_show(thing); +} + +static GtkWidget * +esd_getwidget (void *dp) +{ + esd_driver * const d = dp; + + return d->configwidget; +} + +static void * +esd_new (void) +{ + esd_driver *d = g_new(esd_driver, 1); + + d->out_bits = ESD_BITS16; + d->out_rate = 44100; + d->out_channels = ESD_STEREO; + + esd_make_config_widgets(d); + + return d; +} + +static void +esd_destroy (void *dp) +{ + esd_driver * const d = dp; + + gtk_widget_destroy(d->configwidget); + + g_free(dp); +} + +static void +esd_release (void *dp) +{ + esd_driver * const d = dp; + + free(d->sndbuf); + d->sndbuf = NULL; + + audio_poll_remove(d->polltag); + d->polltag = NULL; + + if(d->out_sock >= 0) { + esd_close(d->out_sock); + d->out_sock = -1; + } +} + +static gboolean +esd_open (void *dp) +{ + esd_driver * const d = dp; + int out_format; + + out_format = d->out_bits | d->out_channels | ESD_STREAM | ESD_PLAY; + + d->out_sock = esd_play_stream_fallback(out_format, d->out_rate, NULL, "SoundTracker ESD Output"); + if(d->out_sock <= 0) { + char buf[256]; + sprintf(buf, _("Couldn't connect to ESD for sound output:\n%s"), strerror(errno)); + error_error(buf); + return FALSE; + } + +#ifdef WORDS_BIGENDIAN + d->mf = ST_MIXER_FORMAT_S16_BE; +#else + d->mf = ST_MIXER_FORMAT_S16_LE; +#endif + + d->mf |= ST_MIXER_FORMAT_STEREO; + + d->samples_per_frame = ESD_BUF_SIZE; + if(d->out_bits == ESD_BITS16) + d->samples_per_frame /= 2; + if(d->out_channels == ESD_STEREO) + d->samples_per_frame /= 2; + + d->sndbuf = calloc(1, ESD_BUF_SIZE); + + d->polltag = audio_poll_add(d->out_sock, GDK_INPUT_WRITE, esd_poll_ready_playing, d); + d->firstpoll = TRUE; + d->playtime = 0; + + return TRUE; +} + +static double +esd_get_play_time (void *dp) +{ + esd_driver * const d = dp; + struct timeval tv; + double curtime; + + gettimeofday(&tv, NULL); + curtime = tv.tv_sec + tv.tv_usec / 1e6; + + return d->playtime + curtime - d->outtime - 24 * ((double)d->samples_per_frame / d->out_rate); +} + +static gboolean +esd_loadsettings (void *dp, + FILE *f) +{ +// esd_driver * const d = dp; + + return TRUE; +} + +static gboolean +esd_savesettings (void *dp, + FILE *f) +{ +// esd_driver * const d = dp; + + return TRUE; +} + +st_out_driver driver_out_esd = { + { "ESD Output", + + esd_new, + esd_destroy, + + esd_open, + esd_release, + + esd_getwidget, + esd_loadsettings, + esd_savesettings, + }, + + esd_get_play_time, +}; + +#endif /* DRIVER_ESD */ diff -urN soundtracker-0.3.5/app/drivers/file-output.c soundtracker-0.3.6/app/drivers/file-output.c --- soundtracker-0.3.5/app/drivers/file-output.c Thu Jan 1 01:00:00 1970 +++ soundtracker-0.3.6/app/drivers/file-output.c Sun Nov 14 15:19:07 1999 @@ -0,0 +1,229 @@ + +/* + * The Real SoundTracker - File (output) driver. + * + * Copyright (C) 1999 Michael Krause + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include + +#ifndef NO_AUDIOFILE + +#include +#include +#include +#include + +#include +#include + +#include + +#include "i18n.h" +#include "driver-out.h" +#include "mixer.h" +#include "errors.h" +#include "gui-subs.h" +#include "preferences.h" + +typedef struct file_driver { + gchar *filename; /* must be the first entry. is altered by audio.c (hack, hack) */ + + AFfilehandle outfile; + int pipe[2]; + gpointer polltag; + int firstpoll; + + gint16 *sndbuf; + int sndbuf_size; + double playtime; + + int p_resolution; + int p_channels; + int p_mixfreq; + + GtkWidget *configwidget; +} file_driver; + +static void +file_poll_ready_playing (gpointer data, + gint source, + GdkInputCondition condition) +{ + file_driver * const d = data; + + if(!d->firstpoll) { + afWriteFrames(d->outfile, AF_DEFAULT_TRACK, d->sndbuf, d->sndbuf_size / 4); + d->playtime += (double)(d->sndbuf_size) / 4 / d->p_mixfreq; + } + + d->firstpoll = FALSE; + + audio_mix(d->sndbuf, d->sndbuf_size / 4, d->p_mixfreq, ST_MIXER_FORMAT_S16_LE | ST_MIXER_FORMAT_STEREO); +} + +static void +file_make_config_widgets (file_driver *d) +{ + GtkWidget *thing, *mainbox; + + d->configwidget = mainbox = gtk_vbox_new(FALSE, 2); + + thing = gtk_label_new(_("no settings (yet), sorry!")); + gtk_box_pack_start(GTK_BOX(mainbox), thing, FALSE, TRUE, 0); + gtk_widget_show(thing); +} + +static GtkWidget * +file_getwidget (void *dp) +{ + file_driver * const d = dp; + + return d->configwidget; +} + +static void * +file_new (void) +{ + file_driver *d = g_new(file_driver, 1); + + d->p_mixfreq = 44100; + d->p_channels = 2; + d->p_resolution = 16; + + file_make_config_widgets(d); + + pipe(d->pipe); + + return d; +} + +static void +file_destroy (void *dp) +{ + file_driver * const d = dp; + + close(d->pipe[0]); + close(d->pipe[1]); + + gtk_widget_destroy(d->configwidget); + + g_free(d->filename); + + g_free(dp); +} + +static void +file_release (void *dp) +{ + file_driver * const d = dp; + + free(d->sndbuf); + d->sndbuf = NULL; + + audio_poll_remove(d->polltag); + d->polltag = NULL; + + if(d->outfile != 0) { + afCloseFile(d->outfile); + d->outfile = 0; + } +} + +static gboolean +file_open (void *dp) +{ + file_driver * const d = dp; + AFfilesetup outfilesetup; + + outfilesetup = afNewFileSetup(); + afInitFileFormat(outfilesetup, AF_FILE_WAVE); + afInitChannels(outfilesetup, AF_DEFAULT_TRACK, 2); + afInitSampleFormat(outfilesetup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16); + d->outfile = afOpenFile(d->filename, "w", outfilesetup); + afFreeFileSetup(outfilesetup); + + if(!d->outfile) { + error_error(_("Can't open file for writing.")); + goto out; + } + + // In case we're running setuid root... + chown(d->filename, getuid(), getgid()); + + d->sndbuf_size = 16384; + d->sndbuf = malloc(d->sndbuf_size); + if(!d->sndbuf) { + error_error("Can't allocate mix buffer."); + goto out; + } + + d->polltag = audio_poll_add(d->pipe[1], GDK_INPUT_WRITE, file_poll_ready_playing, d); + d->firstpoll = TRUE; + d->playtime = 0.0; + + return TRUE; + + out: + file_release(dp); + return FALSE; +} + +static double +file_get_play_time (void *dp) +{ + file_driver * const d = dp; + + return d->playtime; +} + +static gboolean +file_loadsettings (void *dp, + FILE *f) +{ +// file_driver * const d = dp; + + return TRUE; +} + +static gboolean +file_savesettings (void *dp, + FILE *f) +{ +// file_driver * const d = dp; + + return TRUE; +} + +st_out_driver driver_out_file = { + { "WAV Rendering Output", + + file_new, + file_destroy, + + file_open, + file_release, + + file_getwidget, + file_loadsettings, + file_savesettings, + }, + + file_get_play_time, +}; + +#endif /* NO_AUDIOFILE */ diff -urN soundtracker-0.3.5/app/gui.c soundtracker-0.3.6/app/gui.c --- soundtracker-0.3.5/app/gui.c Wed Oct 6 12:34:59 1999 +++ soundtracker-0.3.6/app/gui.c Sat Nov 13 14:14:47 1999 @@ -60,7 +60,7 @@ int gui_playing_mode = 0; GtkWidget *editing_toggle; GtkWidget *gui_curins_name, *gui_cursmpl_name; -GtkWidget *mainwindow, *gui_loadwindow, *gui_savewindow; +GtkWidget *mainwindow, *gui_loadwindow, *gui_savewindow, *gui_savewindow_wav; ScopeGroup *scopegroup; static GSList *text_entries; @@ -135,16 +135,6 @@ static void programlist_create(GtkWidget *destbox); static void -gui_mixer_play_song (int sp, - int pp) -{ - audio_ctlpipe_id i = AUDIO_CTLPIPE_PLAY_SONG; - write(audio_ctlpipe, &i, sizeof(i)); - write(audio_ctlpipe, &sp, sizeof(sp)); - write(audio_ctlpipe, &pp, sizeof(pp)); -} - -static void gui_mixer_play_pattern (int p, int pp) { @@ -197,6 +187,25 @@ } static void +gui_save_wav_callback (gint reply, + gpointer data) +{ + if(reply == 0) { + int l = strlen(data); + audio_ctlpipe_id i = AUDIO_CTLPIPE_RENDER_SONG_TO_FILE; + + gui_play_stop(); + + write(audio_ctlpipe, &i, sizeof(i)); + write(audio_ctlpipe, &l, sizeof(l)); + write(audio_ctlpipe, data, l + 1); + + gui_set_current_pattern(xm->pattern_order_table[0]); + wait_for_player(); + } +} + +static void file_selected (GtkWidget *w, GtkFileSelection *fs) { @@ -214,7 +223,7 @@ } else { gui_load_callback(0, fn); } - } else { + } else if(fs == GTK_FILE_SELECTION(gui_savewindow)) { FILE *f = fopen(fn, "r"); file_selection_save_path(fn, gui_settings.savemod_path); @@ -228,6 +237,18 @@ } else { gui_save_callback(0, fn); } + } else { + FILE *f = fopen(fn, "r"); + + if(f != NULL) { + fclose(f); + gnome_app_ok_cancel_modal(GNOME_APP(mainwindow), + _("Are you sure you want to overwrite the file?"), + gui_save_wav_callback, + fn); + } else { + gui_save_wav_callback(0, fn); + } } } @@ -743,9 +764,17 @@ static void play_song (void) { + int sp = songpos; + int pp = 0; + audio_ctlpipe_id i = AUDIO_CTLPIPE_PLAY_SONG; + gui_play_stop(); - gui_mixer_play_song(songpos, 0); - gui_set_current_pattern(xm->pattern_order_table[songpos]); + + write(audio_ctlpipe, &i, sizeof(i)); + write(audio_ctlpipe, &sp, sizeof(sp)); + write(audio_ctlpipe, &pp, sizeof(pp)); + + gui_set_current_pattern(xm->pattern_order_table[sp]); wait_for_player(); } @@ -889,13 +918,21 @@ editing_pat = p; tracker_set_pattern(tracker, &xm->patterns[p]); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin_patlen), xm->patterns[p].length); gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin_editpat), p); + gui_update_pattern_data(); if(!GUI_ENABLED) gui_mixer_set_pattern(p); xm_set_modified(m); } +void +gui_update_pattern_data (void) +{ + int p = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin_editpat)); + + gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin_patlen), xm->patterns[p].length); +} + int gui_get_current_pattern (void) { @@ -1141,6 +1178,7 @@ gtk_file_selection_set_filename(GTK_FILE_SELECTION(gui_loadwindow), gui_settings.loadmod_path); gui_savewindow = file_selection_create(_("Save XM..."), file_selected); gtk_file_selection_set_filename(GTK_FILE_SELECTION(gui_savewindow), gui_settings.savemod_path); + gui_savewindow_wav = file_selection_create(_("Render module as WAV..."), file_selected); mainvbox0 = gtk_vbox_new(FALSE, 0); gtk_container_border_width(GTK_CONTAINER(mainvbox0), 0); diff -urN soundtracker-0.3.5/app/gui.h soundtracker-0.3.6/app/gui.h --- soundtracker-0.3.5/app/gui.h Fri Aug 13 13:51:01 1999 +++ soundtracker-0.3.6/app/gui.h Sat Oct 30 19:25:37 1999 @@ -40,7 +40,7 @@ extern GtkWidget *editing_toggle; extern GtkWidget *gui_curins_name, *gui_cursmpl_name; -extern GtkWidget *mainwindow, *gui_loadwindow, *gui_savewindow; +extern GtkWidget *mainwindow, *gui_loadwindow, *gui_savewindow, *gui_savewindow_wav; int gui_init (int argc, char *argv[]); @@ -63,6 +63,7 @@ void gui_set_current_instrument (int); void gui_set_current_sample (int); void gui_set_current_pattern (int); +void gui_update_pattern_data (void); int gui_get_current_instrument (void); int gui_get_current_sample (void); diff -urN soundtracker-0.3.5/app/main.c soundtracker-0.3.6/app/main.c --- soundtracker-0.3.5/app/main.c Wed Oct 6 15:57:47 1999 +++ soundtracker-0.3.6/app/main.c Sat Nov 13 15:06:11 1999 @@ -51,6 +51,12 @@ #ifdef DRIVER_ALSA driver_out_alsa, driver_in_alsa, #endif +#ifdef DRIVER_ESD + driver_out_esd, +#endif +#ifndef NO_AUDIOFILE +// driver_out_file, +#endif #if 0 driver_out_test, #endif @@ -71,6 +77,7 @@ /* In case we run setuid root, the main thread must not have root privileges -- it must be set back to the calling user ID! */ seteuid(getuid()); + setegid(getgid()); #if ENABLE_NLS gtk_set_locale(); @@ -101,6 +108,21 @@ &driver_out_alsa); drivers[DRIVER_INPUT] = g_list_append(drivers[DRIVER_INPUT], &driver_in_alsa); +#endif + +#ifdef DRIVER_ESD + drivers[DRIVER_OUTPUT] = g_list_append(drivers[DRIVER_OUTPUT], + &driver_out_esd); +#endif + +#ifndef NO_AUDIOFILE +/* drivers[DRIVER_OUTPUT] = g_list_append(drivers[DRIVER_OUTPUT], + &driver_out_file); + + This driver is not being added to the list because it's rather special + in that it takes a filename argument each time it's called.. need to + think about better integration perhaps. +*/ #endif g_assert(g_list_length(drivers[DRIVER_OUTPUT]) >= 1 diff -urN soundtracker-0.3.5/app/menubar.c soundtracker-0.3.6/app/menubar.c --- soundtracker-0.3.5/app/menubar.c Wed Oct 6 16:13:18 1999 +++ soundtracker-0.3.6/app/menubar.c Sun Nov 14 14:54:20 1999 @@ -231,6 +231,11 @@ GNOMEUIINFO_SEPARATOR, + { GNOME_APP_UI_ITEM, N_("Save Module as _WAV..."), NULL, menubar_load_save, &gui_savewindow_wav, NULL, + GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SAVE_AS, 0, 0, NULL }, + + GNOMEUIINFO_SEPARATOR, + { GNOME_APP_UI_ITEM, N_("_Quit"), NULL, menubar_quit_requested, NULL, NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_QUIT, 'Q', GDK_CONTROL_MASK, NULL }, @@ -411,6 +416,8 @@ { N_("/_File"), NULL, NULL, 0, "" }, { N_("/File/_Open..."), "O", menubar_load_save, (guint)&gui_loadwindow }, { N_("/File/Save _as..."), "A", menubar_load_save, (guint)&gui_savewindow }, + { N_("/File/-"), NULL, NULL, 0, "" }, + { N_("/File/Save Module as _WAV..."), NULL, menubar_load_save, (guint)&gui_savewindow_wav }, { N_("/File/-"), NULL, NULL, 0, "" }, { N_("/File/_Quit"), "Q", menubar_quit_requested, 0 }, { N_("/_Module"), NULL, NULL, 0, "" }, diff -urN soundtracker-0.3.5/app/mixers/Makefile.in soundtracker-0.3.6/app/mixers/Makefile.in --- soundtracker-0.3.5/app/mixers/Makefile.in Fri Oct 8 16:33:15 1999 +++ soundtracker-0.3.6/app/mixers/Makefile.in Sun Nov 14 15:30:11 1999 @@ -65,6 +65,9 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_CONFIG = @ESD_CONFIG@ +ESD_LIBS = @ESD_LIBS@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -urN soundtracker-0.3.5/app/scope-group.c soundtracker-0.3.6/app/scope-group.c --- soundtracker-0.3.5/app/scope-group.c Fri Oct 8 13:13:21 1999 +++ soundtracker-0.3.6/app/scope-group.c Sat Nov 13 14:56:39 1999 @@ -93,7 +93,7 @@ int o1, o2; ScopeGroup *s = data; - if(!s->scopes_on || !scopebuf_ready) + if(!s->scopes_on || !scopebuf_ready || !current_driver) return TRUE; time1 = current_driver->get_play_time(current_driver_object); diff -urN soundtracker-0.3.5/app/track-editor.c soundtracker-0.3.6/app/track-editor.c --- soundtracker-0.3.5/app/track-editor.c Fri Oct 8 16:09:58 1999 +++ soundtracker-0.3.6/app/track-editor.c Sat Oct 30 18:44:28 1999 @@ -405,8 +405,10 @@ free(p->channels[i]); p->channels[i] = st_dup_track(pattern_buffer->channels[i], pattern_buffer->length); } + p->alloc_length = pattern_buffer->length; if(p->length != pattern_buffer->length) { p->length = pattern_buffer->length; + gui_update_pattern_data(); tracker_reset(t); } else { tracker_redraw(t); diff -urN soundtracker-0.3.5/app/transposition.c soundtracker-0.3.6/app/transposition.c --- soundtracker-0.3.5/app/transposition.c Sun Aug 29 11:49:29 1999 +++ soundtracker-0.3.6/app/transposition.c Sat Oct 30 12:27:02 1999 @@ -87,7 +87,8 @@ int current_instrument = gui_get_current_instrument(); while(patlen--) { - if(track->note != 0 && (all_instruments || current_instrument == track->instrument)) { + if(track->note != 0 && track->note != 97 + && (all_instruments || current_instrument == track->instrument)) { track->note = CLAMP(track->note + add, 1, 96); } track++; diff -urN soundtracker-0.3.5/app/xm-player.c soundtracker-0.3.6/app/xm-player.c --- soundtracker-0.3.5/app/xm-player.c Fri Oct 8 14:46:06 1999 +++ soundtracker-0.3.6/app/xm-player.c Sun Nov 14 15:10:56 1999 @@ -38,6 +38,7 @@ #include "audio.h" int player_songpos, player_patpos; +gboolean player_looped; static double current_time; static int xmplayer_playmode; @@ -240,6 +241,7 @@ static int jumptoord; static int jumptorow; static int patdelay; +static gboolean player_will_loop; static guint8 procnot; static guint8 procins; @@ -796,6 +798,11 @@ if (curtick>=curtempo) curtick=0; + if(player_will_loop) { + player_looped = TRUE; + player_will_loop = FALSE; + } + if (!curtick&&patdelay) { if (jumptoord!=-1) { if (jumptoord!=curord) @@ -807,6 +814,7 @@ if (jumptoord>=nord) { jumptoord=loopord; + player_looped = TRUE; } if(xmplayer_playmode == PLAYING_SONG) { @@ -836,8 +844,10 @@ ch->chPatLoopStart=0; } - if (jumptoord>=nord) + if (jumptoord>=nord) { jumptoord=loopord; + player_looped = TRUE; + } if(xmplayer_playmode == PLAYING_SONG) { curord=jumptoord; @@ -959,6 +969,7 @@ if (!patdelay) { jumptoord=procdat; jumptorow=0; + player_will_loop = TRUE; } break; case xmpCmdVolume: @@ -975,6 +986,7 @@ if (!procdat) { jumptoord=procdat; jumptorow=0; + player_will_loop = TRUE; break; } if (procdat>=0x20) { @@ -1420,6 +1432,8 @@ currow = patpos; jumptoord = songpos; curord = songpos; + player_will_loop = FALSE; + player_looped = FALSE; xmplayer_playmode = PLAYING_SONG; if(songpos == 0) diff -urN soundtracker-0.3.5/app/xm-player.h soundtracker-0.3.6/app/xm-player.h --- soundtracker-0.3.5/app/xm-player.h Fri Aug 13 13:51:01 1999 +++ soundtracker-0.3.6/app/xm-player.h Sat Oct 30 19:35:26 1999 @@ -27,6 +27,7 @@ #include "xm.h" extern int player_songpos, player_patpos; +extern gboolean player_looped; void xmplayer_init_module (void); gboolean xmplayer_init_play_song (int songpos, int patpos); diff -urN soundtracker-0.3.5/config.h.in soundtracker-0.3.6/config.h.in --- soundtracker-0.3.5/config.h.in Fri Sep 3 15:34:06 1999 +++ soundtracker-0.3.6/config.h.in Sat Oct 9 18:08:49 1999 @@ -49,6 +49,7 @@ #undef DRIVER_OSS #undef DRIVER_ALSA +#undef DRIVER_ESD #undef USE_GNOME #undef NO_AUDIOFILE @@ -69,6 +70,9 @@ /* Define if you have the dcgettext function. */ #undef HAVE_DCGETTEXT + +/* Define if you have the esd_play_stream function. */ +#undef HAVE_ESD_PLAY_STREAM /* Define if you have the getcwd function. */ #undef HAVE_GETCWD diff -urN soundtracker-0.3.5/configure soundtracker-0.3.6/configure --- soundtracker-0.3.5/configure Wed Oct 6 13:37:09 1999 +++ soundtracker-0.3.6/configure Sat Oct 30 19:09:51 1999 @@ -33,6 +33,14 @@ --disable-audiofiletest Do not try to compile and run a test AUDIOFILE program" ac_help="$ac_help --disable-alsa Disable ALSA (default = no)" +ac_help="$ac_help + --disable-esd Disable ESD (default = no)" +ac_help="$ac_help + --with-esd-prefix=PFX Prefix where ESD is installed (optional)" +ac_help="$ac_help + --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)" +ac_help="$ac_help + --disable-esdtest Do not try to compile and run a test ESD program" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -574,7 +582,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:578: checking for a BSD compatible install" >&5 +echo "configure:586: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -627,7 +635,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:631: checking whether build environment is sane" >&5 +echo "configure:639: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -684,7 +692,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:696: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -714,7 +722,7 @@ PACKAGE=soundtracker -VERSION=0.3.5 +VERSION=0.3.6 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; } @@ -731,7 +739,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:735: checking for working aclocal" >&5 +echo "configure:743: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -744,7 +752,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:748: checking for working autoconf" >&5 +echo "configure:756: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -757,7 +765,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:761: checking for working automake" >&5 +echo "configure:769: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -770,7 +778,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:774: checking for working autoheader" >&5 +echo "configure:782: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -783,7 +791,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:787: checking for working makeinfo" >&5 +echo "configure:795: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -801,91 +809,10 @@ -ALL_LINGUAS="de es it pl ja" -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:807: checking how to run the C preprocessor" >&5 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" - # 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:828: \"$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 - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - 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:845: \"$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 - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - 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:862: \"$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 - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp -fi -rm -f conftest* -fi -rm -f conftest* -fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" -fi - CPP="$ac_cv_prog_CPP" -else - ac_cv_prog_CPP="$CPP" -fi -echo "$ac_t""$CPP" 1>&6 - # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:889: checking for $ac_word" >&5 +echo "configure:816: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -915,7 +842,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:919: checking for $ac_word" >&5 +echo "configure:846: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -966,7 +893,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:970: checking for $ac_word" >&5 +echo "configure:897: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -998,7 +925,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1002: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:929: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1009,12 +936,12 @@ cat > conftest.$ac_ext << EOF -#line 1013 "configure" +#line 940 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1040,12 +967,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1044: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:971: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1049: checking whether we are using GNU C" >&5 +echo "configure:976: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1054,7 +981,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1073,7 +1000,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1077: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1004: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1104,10 +1031,53 @@ fi fi +# Extract the first word of "sed", so it can be a program name with args. +set dummy sed; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1038: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_sedpath'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$sedpath" in + /*) + ac_cv_path_sedpath="$sedpath" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_sedpath="$sedpath" # 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_sedpath="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +sedpath="$ac_cv_path_sedpath" +if test -n "$sedpath"; then + echo "$ac_t""$sedpath" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + +if test $GCC != yes; then + echo "Fatal error: Need gcc" + exit 1 +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:1111: checking for $ac_word" >&5 +echo "configure:1081: 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 @@ -1134,138 +1104,377 @@ echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1139: 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 - echo "$ac_t""yes" 1>&6 - ISC=yes # If later tests want to check for ISC. - cat >> confdefs.h <<\EOF -#define _POSIX_SOURCE 1 -EOF - if test "$GCC" = yes; then - CC="$CC -posix" - else - CC="$CC -Xp" - fi -else - echo "$ac_t""no" 1>&6 - ISC= -fi -echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1160: checking for ANSI C header files" >&5 -if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then +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 +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else + # This must be in double quotes, not single quotes, because CPP may get + # substituted into the Makefile and "${CC-cc}" will confuse make. + CPP="${CC-cc} -E" + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. cat > conftest.$ac_ext < -#include -#include -#include +#include +Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1133: \"$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* - ac_cv_header_stdc=yes + : else echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_header_stdc=no -fi -rm -f conftest* - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -cat > conftest.$ac_ext < conftest.$ac_ext < +#include +Syntax Error EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then +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; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then : else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -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 < conftest.$ac_ext < +#include +Syntax Error EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then +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; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then : else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_header_stdc=no + CPP=/lib/cpp fi rm -f conftest* - fi +rm -f conftest* +fi +rm -f conftest* + ac_cv_prog_CPP="$CPP" +fi + CPP="$ac_cv_prog_CPP" +else + ac_cv_prog_CPP="$CPP" +fi +echo "$ac_t""$CPP" 1>&6 -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -if test "$cross_compiling" = yes; then - : +for ac_hdr in sys/poll.h +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 +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 < -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int main () { int i; for (i = 0; i < 256; i++) -if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); -exit (0); } - +#include <$ac_hdr> EOF -if { (eval echo configure:1240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - : +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; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" else + echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_header_stdc=no -fi -rm -fr conftest* -fi - + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi +rm -f conftest* fi - -echo "$ac_t""$ac_cv_header_stdc" 1>&6 -if test $ac_cv_header_stdc = yes; then - cat >> confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF - +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +echo "configure:1228: 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 < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1256: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + +else + echo "$ac_t""no" 1>&6 +fi +done + + +if test $HAVE_POLL != yes; then + 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 +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 < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1318: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +{ echo "configure: error: no poll and no select?!?" 1>&2; exit 1; } +fi +done + +fi + + +ALL_LINGUAS="de es it pl ja" +echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 +echo "configure:1348: 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 + echo "$ac_t""yes" 1>&6 + ISC=yes # If later tests want to check for ISC. + cat >> confdefs.h <<\EOF +#define _POSIX_SOURCE 1 +EOF + + if test "$GCC" = yes; then + CC="$CC -posix" + else + CC="$CC -Xp" + fi +else + echo "$ac_t""no" 1>&6 + ISC= +fi + +echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +echo "configure:1369: 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 +#include +#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; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + ac_cv_header_stdc=yes +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_header_stdc=no +fi +rm -f conftest* + +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 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "memchr" >/dev/null 2>&1; then + : +else + rm -rf conftest* + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +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 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "free" >/dev/null 2>&1; then + : +else + rm -rf conftest* + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +if test "$cross_compiling" = yes; then + : +else + cat > conftest.$ac_ext < +#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int main () { int i; for (i = 0; i < 256; i++) +if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); +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 +then + : +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_header_stdc=no +fi +rm -fr conftest* +fi + +fi +fi + +echo "$ac_t""$ac_cv_header_stdc" 1>&6 +if test $ac_cv_header_stdc = yes; then + cat >> confdefs.h <<\EOF +#define STDC_HEADERS 1 +EOF + fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1264: checking for working const" >&5 +echo "configure:1473: 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:1527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1335,21 +1544,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1339: checking for inline" >&5 +echo "configure:1548: 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:1562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1375,12 +1584,12 @@ esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1379: checking for off_t" >&5 +echo "configure:1588: 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 @@ -1408,12 +1617,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1412: checking for size_t" >&5 +echo "configure:1621: 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 @@ -1443,19 +1652,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:1447: checking for working alloca.h" >&5 +echo "configure:1656: 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:1459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1668: \"$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 @@ -1476,12 +1685,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1480: checking for alloca" >&5 +echo "configure:1689: 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:1722: \"$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 @@ -1541,12 +1750,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1545: checking whether alloca needs Cray hooks" >&5 +echo "configure:1754: 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:1575: checking for $ac_func" >&5 +echo "configure:1784: 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:1812: \"$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 @@ -1626,7 +1835,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1630: checking stack direction for C alloca" >&5 +echo "configure:1839: 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 @@ -1634,7 +1843,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:1866: \"$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 @@ -1678,17 +1887,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1682: checking for $ac_hdr" >&5 +echo "configure:1891: 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:1692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1901: \"$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* @@ -1717,12 +1926,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1721: checking for $ac_func" >&5 +echo "configure:1930: 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:1958: \"$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 @@ -1770,7 +1979,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:1774: checking for working mmap" >&5 +echo "configure:1983: 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 @@ -1778,7 +1987,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:2131: \"$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 @@ -1946,17 +2155,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1950: checking for $ac_hdr" >&5 +echo "configure:2159: 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:1960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2169: \"$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* @@ -1986,12 +2195,12 @@ strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1990: checking for $ac_func" >&5 +echo "configure:2199: 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:2227: \"$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 @@ -2043,12 +2252,12 @@ for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2047: checking for $ac_func" >&5 +echo "configure:2256: 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:2284: \"$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 @@ -2105,19 +2314,19 @@ if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:2109: checking for LC_MESSAGES" >&5 +echo "configure:2318: 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:2121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2330: \"$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 @@ -2138,7 +2347,7 @@ fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2142: checking whether NLS is requested" >&5 +echo "configure:2351: 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" @@ -2158,7 +2367,7 @@ EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:2162: checking whether included gettext is requested" >&5 +echo "configure:2371: 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" @@ -2177,17 +2386,17 @@ ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:2181: checking for libintl.h" >&5 +echo "configure:2390: 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:2191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2400: \"$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* @@ -2204,19 +2413,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:2208: checking for gettext in libc" >&5 +echo "configure:2417: 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:2220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2429: \"$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 @@ -2232,7 +2441,7 @@ if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:2236: checking for bindtextdomain in -lintl" >&5 +echo "configure:2445: 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 @@ -2240,7 +2449,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:2464: \"$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 @@ -2267,12 +2476,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:2271: checking for gettext in libintl" >&5 +echo "configure:2480: 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:2276: checking for gettext in -lintl" >&5 +echo "configure:2485: 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 @@ -2280,7 +2489,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:2504: \"$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 @@ -2330,7 +2539,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:2334: checking for $ac_word" >&5 +echo "configure:2543: 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 @@ -2364,12 +2573,12 @@ for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2368: checking for $ac_func" >&5 +echo "configure:2577: 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:2605: \"$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 @@ -2419,7 +2628,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:2423: checking for $ac_word" >&5 +echo "configure:2632: 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 @@ -2455,7 +2664,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:2459: checking for $ac_word" >&5 +echo "configure:2668: 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 @@ -2487,7 +2696,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -2518,7 +2727,7 @@ if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:2522: checking whether catgets can be used" >&5 +echo "configure:2731: 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" @@ -2531,7 +2740,7 @@ if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:2535: checking for main in -li" >&5 +echo "configure:2744: 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 @@ -2539,14 +2748,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:2759: \"$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 @@ -2574,12 +2783,12 @@ fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:2578: checking for catgets" >&5 +echo "configure:2787: 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:2815: \"$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 @@ -2624,7 +2833,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:2628: checking for $ac_word" >&5 +echo "configure:2837: 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 @@ -2660,7 +2869,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:2664: checking for $ac_word" >&5 +echo "configure:2873: 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 @@ -2697,7 +2906,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:2701: checking for $ac_word" >&5 +echo "configure:2910: 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 @@ -2732,7 +2941,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:2736: checking for $ac_word" >&5 +echo "configure:2945: 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 @@ -2790,7 +2999,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:2794: checking for $ac_word" >&5 +echo "configure:3003: 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 @@ -2824,7 +3033,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:2828: checking for $ac_word" >&5 +echo "configure:3037: 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 @@ -2860,7 +3069,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:2864: checking for $ac_word" >&5 +echo "configure:3073: 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 @@ -2953,7 +3162,7 @@ LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:2957: checking for catalogs to be installed" >&5 +echo "configure:3166: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -2981,17 +3190,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:2985: checking for linux/version.h" >&5 +echo "configure:3194: 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:2995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3204: \"$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* @@ -3025,333 +3234,36 @@ else GT_NO= GT_YES="#YES#" - fi - - - - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - - - l= - - - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - - - -# Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3064: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - 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_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3094: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - set dummy "$ac_dir/$ac_word" "$@" - shift - ac_cv_prog_CC="$@" - fi -fi -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # Extract the first word of "cl", so it can be a program name with args. -set dummy cl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3145: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - 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_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - ;; - esac - fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } -fi - -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:3177: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -cat > conftest.$ac_ext << EOF - -#line 3188 "configure" -#include "confdefs.h" - -main(){return(0);} -EOF -if { (eval echo configure:3193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cc_cross=no - else - ac_cv_prog_cc_cross=yes - fi -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cc_works=no -fi -rm -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } -fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:3219: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -cross_compiling=$ac_cv_prog_cc_cross - -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:3224: checking whether we are using GNU C" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes -else - ac_cv_prog_gcc=no -fi -fi - -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - -if test $ac_cv_prog_gcc = yes; then - GCC=yes -else - GCC= -fi - -ac_test_CFLAGS="${CFLAGS+set}" -ac_save_CFLAGS="$CFLAGS" -CFLAGS= -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:3252: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_cc_g=yes -else - ac_cv_prog_cc_g=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi - -# Extract the first word of "sed", so it can be a program name with args. -set dummy sed; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3286: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_sedpath'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$sedpath" in - /*) - ac_cv_path_sedpath="$sedpath" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_sedpath="$sedpath" # 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_sedpath="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -sedpath="$ac_cv_path_sedpath" -if test -n "$sedpath"; then - echo "$ac_t""$sedpath" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - -if test $GCC != yes; then - echo "Fatal error: Need gcc" - exit 1 -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:3329: 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 - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - 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_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" -fi -fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi + fi + + + + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + + l= + + + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + # Check whether --with-gtk-prefix or --without-gtk-prefix was given. @@ -3404,7 +3316,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:3408: checking for $ac_word" >&5 +echo "configure:3320: 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 @@ -3439,7 +3351,7 @@ min_gtk_version=1.2.2 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:3443: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:3355: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -3462,7 +3374,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -3540,7 +3452,7 @@ } EOF -if { (eval echo configure:3544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3574,7 +3486,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -3584,7 +3496,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:3588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3500: \"$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" @@ -3637,7 +3549,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:3641: checking for $ac_word" >&5 +echo "configure:3553: 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 @@ -3670,7 +3582,7 @@ fi echo $ac_n "checking for Gnome compile flags""... $ac_c" 1>&6 -echo "configure:3674: checking for Gnome compile flags" >&5 +echo "configure:3586: 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/'` @@ -3752,7 +3664,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:3756: checking for $ac_word" >&5 +echo "configure:3668: 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 @@ -3787,7 +3699,7 @@ min_audiofile_version=0.1.5 echo $ac_n "checking for AUDIOFILE - version >= $min_audiofile_version""... $ac_c" 1>&6 -echo "configure:3791: checking for AUDIOFILE - version >= $min_audiofile_version" >&5 +echo "configure:3703: checking for AUDIOFILE - version >= $min_audiofile_version" >&5 no_audiofile="" if test "$AUDIOFILE_CONFIG" = "no" ; then no_audiofile=yes @@ -3810,7 +3722,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -3868,7 +3780,7 @@ EOF -if { (eval echo configure:3872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3903,7 +3815,7 @@ CFLAGS="$CFLAGS $AUDIOFILE_CFLAGS" LIBS="$LIBS $AUDIOFILE_LIBS" cat > conftest.$ac_ext < @@ -3913,7 +3825,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:3917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3829: \"$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" @@ -3953,12 +3865,12 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3957: checking for ANSI C header files" >&5 +echo "configure:3869: 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 @@ -3966,7 +3878,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3882: \"$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* @@ -3983,7 +3895,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 @@ -4001,7 +3913,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 @@ -4022,7 +3934,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -4033,7 +3945,7 @@ exit (0); } EOF -if { (eval echo configure:4037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4062,17 +3974,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4066: checking for $ac_hdr" >&5 +echo "configure:3978: 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:4076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3988: \"$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* @@ -4107,8 +4019,16 @@ fi -echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6 -echo "configure:4112: checking for snd_cards in -lasound" >&5 +# Check whether --enable-alsa or --disable-alsa was given. +if test "${enable_alsa+set}" = set; then + enableval="$enable_alsa" + alsa_support=no +fi + + +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 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 @@ -4116,7 +4036,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:4051: \"$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 @@ -4148,13 +4068,7 @@ alsa_support=no fi -# Check whether --enable-alsa or --disable-alsa was given. -if test "${enable_alsa+set}" = set; then - enableval="$enable_alsa" - alsa_support=no -fi - - + if test x$alsa_support = xyes; then DRIVER_ALSA_TRUE= @@ -4163,121 +4077,268 @@ DRIVER_ALSA_TRUE='#' DRIVER_ALSA_FALSE= fi -if test x$alsa_support = xyes; then -cat >> confdefs.h <<\EOF + if test x$alsa_support = xyes; then + cat >> confdefs.h <<\EOF #define DRIVER_ALSA 1 EOF -LIBS="$LIBS -lasound" + LIBS="$LIBS -lasound" + fi fi -HAVE_POLL="no" -for ac_hdr in sys/poll.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4181: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +# Check whether --enable-esd or --disable-esd was given. +if test "${enable_esd+set}" = set; then + enableval="$enable_esd" + esd_support=no +fi + + +if test x$esd_support != xno; then + # Check whether --with-esd-prefix or --without-esd-prefix was given. +if test "${with_esd_prefix+set}" = set; then + withval="$with_esd_prefix" + esd_prefix="$withval" +else + esd_prefix="" +fi + +# Check whether --with-esd-exec-prefix or --without-esd-exec-prefix was given. +if test "${with_esd_exec_prefix+set}" = set; then + withval="$with_esd_exec_prefix" + esd_exec_prefix="$withval" +else + esd_exec_prefix="" +fi + +# Check whether --enable-esdtest or --disable-esdtest was given. +if test "${enable_esdtest+set}" = set; then + enableval="$enable_esdtest" + : +else + enable_esdtest=yes +fi + + + if test x$esd_exec_prefix != x ; then + esd_args="$esd_args --exec-prefix=$esd_exec_prefix" + if test x${ESD_CONFIG+set} != xset ; then + ESD_CONFIG=$esd_exec_prefix/bin/esd-config + fi + fi + if test x$esd_prefix != x ; then + esd_args="$esd_args --prefix=$esd_prefix" + if test x${ESD_CONFIG+set} != xset ; then + ESD_CONFIG=$esd_prefix/bin/esd-config + fi + fi + + # 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:4140: 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 + case "$ESD_CONFIG" in + /*) + ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # 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_ESD_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_ESD_CONFIG" && ac_cv_path_ESD_CONFIG="no" + ;; +esac +fi +ESD_CONFIG="$ac_cv_path_ESD_CONFIG" +if test -n "$ESD_CONFIG"; then + echo "$ac_t""$ESD_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + min_esd_version=0.2.8 + echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6 +echo "configure:4175: checking for ESD - version >= $min_esd_version" >&5 + no_esd="" + if test "$ESD_CONFIG" = "no" ; then + no_esd=yes + else + ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags` + ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs` + + esd_major_version=`$ESD_CONFIG $esd_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + esd_minor_version=`$ESD_CONFIG $esd_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + if test "x$enable_esdtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $ESD_CFLAGS" + LIBS="$LIBS $ESD_LIBS" + rm -f conf.esdtest + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" +else cat > conftest.$ac_ext < + +#include +#include +#include +#include + +char* +my_strdup (char *str) +{ + char *new_str; + + if (str) + { + new_str = malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } + else + new_str = NULL; + + return new_str; +} + +int main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.esdtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = my_strdup("$min_esd_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_esd_version"); + exit(1); + } + + if (($esd_major_version > major) || + (($esd_major_version == major) && ($esd_minor_version > minor)) || + (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version); + printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n"); + printf("*** to point to the correct copy of esd-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + return 1; + } +} + + EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4191: \"$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* - eval "ac_cv_header_$ac_safe=yes" +if { (eval echo configure:4257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + : else - echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + rm -fr conftest* + no_esd=yes fi -rm -f conftest* +rm -fr conftest* fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -echo "configure:4214: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); -int main() { + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_esd" = x ; then + echo "$ac_t""yes" 1>&6 + have_esd=yes + else + echo "$ac_t""no" 1>&6 + if test "$ESD_CONFIG" = "no" ; then + echo "*** The esd-config script installed by ESD could not be found" + echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the ESD_CONFIG environment variable to the" + echo "*** full path to esd-config." + else + if test -f conf.esdtest ; then + : + else + echo "*** Could not run ESD test program, checking why..." + CFLAGS="$CFLAGS $ESD_CFLAGS" + LIBS="$LIBS $ESD_LIBS" + cat > conftest.$ac_ext < +#include +int main() { + return 0; ; return 0; } EOF -if { (eval echo configure:4242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4301: \"$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" + 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" + echo "*** version of ESD. If it is not finding ESD, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means ESD was incorrectly installed" + echo "*** or that you have moved ESD since it was installed. In the latter case, you" + echo "*** may want to edit the esd-config script: $ESD_CONFIG" fi rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -fi -done - -else - echo "$ac_t""no" 1>&6 -fi -done - + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + ESD_CFLAGS="" + ESD_LIBS="" + have_esd=no + fi + + + rm -f conf.esdtest -if test $HAVE_POLL != yes; then - for ac_func in select + for ac_func in esd_play_stream do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4276: checking for $ac_func" >&5 +echo "configure:4337: 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:4365: \"$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 @@ -4321,22 +4382,38 @@ else echo "$ac_t""no" 1>&6 -{ echo "configure: error: no poll and no select?!?" 1>&2; exit 1; } fi done + + +if test x$have_esd = xyes; then + DRIVER_ESD_TRUE= + DRIVER_ESD_FALSE='#' +else + DRIVER_ESD_TRUE='#' + DRIVER_ESD_FALSE= +fi + if test x$have_esd = xyes; then + cat >> confdefs.h <<\EOF +#define DRIVER_ESD 1 +EOF + + CFLAGS="$CFLAGS $ESD_CFLAGS" + LIBS="$LIBS $ESD_LIBS" + fi fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4333: checking whether byte ordering is bigendian" >&5 +echo "configure:4410: 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 @@ -4347,11 +4424,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:4351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4428: \"$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 @@ -4362,7 +4439,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:4366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4382,7 +4459,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:4476: \"$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 @@ -4572,6 +4649,7 @@ s%@MAKEINFO@%$MAKEINFO%g s%@SET_MAKE@%$SET_MAKE%g s%@CC@%$CC%g +s%@sedpath@%$sedpath%g s%@RANLIB@%$RANLIB%g s%@CPP@%$CPP%g s%@ALLOCA@%$ALLOCA%g @@ -4596,7 +4674,6 @@ s%@GT_YES@%$GT_YES%g s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g s%@l@%$l%g -s%@sedpath@%$sedpath%g s%@GTK_CONFIG@%$GTK_CONFIG%g s%@GTK_CFLAGS@%$GTK_CFLAGS%g s%@GTK_LIBS@%$GTK_LIBS%g @@ -4608,6 +4685,11 @@ s%@AUDIOFILE_LIBS@%$AUDIOFILE_LIBS%g s%@DRIVER_ALSA_TRUE@%$DRIVER_ALSA_TRUE%g s%@DRIVER_ALSA_FALSE@%$DRIVER_ALSA_FALSE%g +s%@ESD_CONFIG@%$ESD_CONFIG%g +s%@ESD_CFLAGS@%$ESD_CFLAGS%g +s%@ESD_LIBS@%$ESD_LIBS%g +s%@DRIVER_ESD_TRUE@%$DRIVER_ESD_TRUE%g +s%@DRIVER_ESD_FALSE@%$DRIVER_ESD_FALSE%g CEOF EOF diff -urN soundtracker-0.3.5/configure.in soundtracker-0.3.6/configure.in --- soundtracker-0.3.5/configure.in Wed Oct 6 13:35:49 1999 +++ soundtracker-0.3.6/configure.in Sat Oct 30 19:09:48 1999 @@ -1,18 +1,10 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(app/endian-conv.h) -AM_INIT_AUTOMAKE(soundtracker, 0.3.5) +AM_INIT_AUTOMAKE(soundtracker, 0.3.6) AM_CONFIG_HEADER(config.h) dnl ----------------------------------------------------------------------- -dnl Initialize NLS -dnl ----------------------------------------------------------------------- - -dnl Also add new catalogs to soundtracker.spec (%build)! -ALL_LINGUAS="de es it pl ja" -AM_GNU_GETTEXT - -dnl ----------------------------------------------------------------------- dnl Test for GCC dnl ----------------------------------------------------------------------- @@ -29,6 +21,25 @@ AC_PROG_RANLIB dnl ----------------------------------------------------------------------- +dnl Test for poll() +dnl ----------------------------------------------------------------------- + +HAVE_POLL="no" +AC_CHECK_HEADERS(sys/poll.h, AC_CHECK_FUNCS(poll, HAVE_POLL="yes")) + +if test $HAVE_POLL != yes; then + AC_CHECK_FUNCS(select,, AC_MSG_ERROR(no poll and no select?!?)) +fi + +dnl ----------------------------------------------------------------------- +dnl Initialize NLS +dnl ----------------------------------------------------------------------- + +dnl Also add new catalogs to soundtracker.spec (%build)! +ALL_LINGUAS="de es it pl ja" +AM_GNU_GETTEXT + +dnl ----------------------------------------------------------------------- dnl Test for GTK+ / GNOME dnl ----------------------------------------------------------------------- @@ -105,25 +116,36 @@ dnl Test for ALSA-lib dnl ----------------------------------------------------------------------- -AC_CHECK_LIB(asound,snd_cards,alsa_support=yes,alsa_support=no) AC_ARG_ENABLE(alsa, [ --disable-alsa Disable ALSA (default = no)], alsa_support=no) -AM_CONDITIONAL(DRIVER_ALSA, test x$alsa_support = xyes) -if test x$alsa_support = xyes; then -AC_DEFINE(DRIVER_ALSA) -LIBS="$LIBS -lasound" + +if test x$alsa_support != xno; then + AC_CHECK_LIB(asound,snd_cards,alsa_support=yes,alsa_support=no) + AM_CONDITIONAL(DRIVER_ALSA, test x$alsa_support = xyes) + if test x$alsa_support = xyes; then + AC_DEFINE(DRIVER_ALSA) + LIBS="$LIBS -lasound" + fi fi dnl ----------------------------------------------------------------------- -dnl Test for poll() +dnl Test for ESD dnl ----------------------------------------------------------------------- -HAVE_POLL="no" -AC_CHECK_HEADERS(sys/poll.h, AC_CHECK_FUNCS(poll, HAVE_POLL="yes")) - -if test $HAVE_POLL != yes; then - AC_CHECK_FUNCS(select,, AC_MSG_ERROR(no poll and no select?!?)) +AC_ARG_ENABLE(esd, +[ --disable-esd Disable ESD (default = no)], +esd_support=no) + +if test x$esd_support != xno; then + AM_PATH_ESD(0.2.8, have_esd=yes, have_esd=no) + AC_CHECK_FUNCS(esd_play_stream) + AM_CONDITIONAL(DRIVER_ESD, test x$have_esd = xyes) + if test x$have_esd = xyes; then + AC_DEFINE(DRIVER_ESD) + CFLAGS="$CFLAGS $ESD_CFLAGS" + LIBS="$LIBS $ESD_LIBS" + fi fi diff -urN soundtracker-0.3.5/doc/Makefile.am soundtracker-0.3.6/doc/Makefile.am --- soundtracker-0.3.5/doc/Makefile.am Wed Oct 6 13:48:42 1999 +++ soundtracker-0.3.6/doc/Makefile.am Sun Nov 14 15:30:02 1999 @@ -2,6 +2,7 @@ EXTRA_DIST = hacking.texi hacking.html hacking.txt dist-hook: +hacking.html: texi2html -monolithic hacking.texi makeinfo --no-headers hacking.texi > hacking.txt diff -urN soundtracker-0.3.5/doc/Makefile.in soundtracker-0.3.6/doc/Makefile.in --- soundtracker-0.3.5/doc/Makefile.in Fri Oct 8 16:33:10 1999 +++ soundtracker-0.3.6/doc/Makefile.in Sun Nov 14 15:30:07 1999 @@ -65,6 +65,9 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_CONFIG = @ESD_CONFIG@ +ESD_LIBS = @ESD_LIBS@ GENCAT = @GENCAT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -194,6 +197,7 @@ dist-hook: +hacking.html: texi2html -monolithic hacking.texi makeinfo --no-headers hacking.texi > hacking.txt diff -urN soundtracker-0.3.5/doc/hacking.html soundtracker-0.3.6/doc/hacking.html --- soundtracker-0.3.5/doc/hacking.html Fri Oct 8 16:33:10 1999 +++ soundtracker-0.3.6/doc/hacking.html Sun Nov 14 15:30:06 1999 @@ -1,6 +1,6 @@ - + SoundTracker internals @@ -288,7 +288,7 @@

-This document was generated on 8 October 1999 using +This document was generated on 14 November 1999 using texi2html 1.56k. diff -urN soundtracker-0.3.5/po/POTFILES.in soundtracker-0.3.6/po/POTFILES.in --- soundtracker-0.3.5/po/POTFILES.in Sun Sep 26 17:57:41 1999 +++ soundtracker-0.3.6/po/POTFILES.in Sat Nov 13 14:36:29 1999 @@ -3,6 +3,8 @@ app/clavier.c app/drivers/alsa-input.c app/drivers/alsa-output.c +app/drivers/esd-output.c +app/drivers/file-output.c app/drivers/oss-input.c app/drivers/oss-output.c app/effectsconfig.c diff -urN soundtracker-0.3.5/po/cat-id-tbl.c soundtracker-0.3.6/po/cat-id-tbl.c --- soundtracker-0.3.5/po/cat-id-tbl.c Wed Oct 6 16:20:11 1999 +++ soundtracker-0.3.6/po/cat-id-tbl.c Sun Nov 14 15:19:15 1999 @@ -30,336 +30,347 @@ {"\ Couldn't open ALSA device for sound output (card:%d, device:%d):\n\ %s", 19}, - {"no settings (yet), sorry!", 20}, {"\ -Couldn't open /dev/dsp for sampling:\n\ +Note that the ESD output is unusable in\n\ +interactive mode because of the latency added\n\ +by ESD. Use the OSS or ALSA output plug-ins\n\ +for serious work.", 20}, + {"\ +Couldn't connect to ESD for sound output:\n\ %s", 21}, - {"(%d samples)", 22}, + {"no settings (yet), sorry!", 22}, + {"Can't open file for writing.", 23}, + {"\ +Couldn't open /dev/dsp for sampling:\n\ +%s", 24}, + {"(%d samples)", 25}, {"\ Couldn't open /dev/dsp for sound output:\n\ -%s", 23}, - {"Master Reverb", 24}, - {"Playback Effects Configuration", 25}, - {"Length", 26}, - {"Current", 27}, - {"Offset", 28}, - {"Value", 29}, - {"Insert", 30}, - {"Delete", 31}, +%s", 26}, + {"Master Reverb", 27}, + {"Playback Effects Configuration", 28}, + {"Length", 29}, + {"Current", 30}, + {"Offset", 31}, + {"Value", 32}, + {"Insert", 33}, + {"Delete", 34}, {"\ Graphical\n\ Envelope\n\ Editor\n\ only in\n\ -GNOME Version", 32}, - {"Sustain", 33}, - {"Point", 34}, - {"Loop", 35}, - {"Start", 36}, - {"End", 37}, - {"Scopes Frequency", 38}, - {"Tracker Frequency", 39}, - {"GUI Configuration", 40}, - {"Use Hexadecimal Numbers", 41}, - {"Advance Cursor in FX Columns", 42}, - {"Use anti-aliased envelope editor", 43}, - {"You need to restart SoundTracker for this change to come into effect.", 44}, - {"Scopes buffer size [MB]", 45}, - {"Highlight rows:", 46}, - {"`Save XM' saves all non-empty patterns", 47}, - {"Question", 48}, - {"Cancel", 49}, - {"Warning", 50}, - {"Error!", 51}, - {"Tempo", 52}, +GNOME Version", 35}, + {"Sustain", 36}, + {"Point", 37}, + {"Loop", 38}, + {"Start", 39}, + {"End", 40}, + {"Scopes Frequency", 41}, + {"Tracker Frequency", 42}, + {"GUI Configuration", 43}, + {"Use Hexadecimal Numbers", 44}, + {"Advance Cursor in FX Columns", 45}, + {"Use anti-aliased envelope editor", 46}, + {"You need to restart SoundTracker for this change to come into effect.", 47}, + {"Scopes buffer size [MB]", 48}, + {"Highlight rows:", 49}, + {"`Save XM' saves all non-empty patterns", 50}, + {"Question", 51}, + {"Cancel", 52}, + {"Warning", 53}, + {"Error!", 54}, + {"Tempo", 55}, {"\ Are you sure you want to free the current project?\n\ -All changes will be lost!", 53}, - {"Are you sure you want to overwrite the file?", 54}, - {"Song length", 55}, - {"Current pos", 56}, - {"Pattern", 57}, - {"Restart pos", 58}, - {"Load XM...", 59}, - {"Save XM...", 60}, - {"Play Song", 61}, - {"Play Pattern", 62}, - {"Stop", 63}, - {"Number of Channels:", 64}, - {"PatLength", 65}, - {"Octave", 66}, - {"Jump", 67}, - {"Instr", 68}, - {"Sample", 69}, - {"VolFade", 70}, - {"VibSpeed", 71}, - {"VibDepth", 72}, - {"VibSweep", 73}, - {"Can't open file.", 74}, - {"Saving Instruments not yet supported.", 75}, - {"Sine", 76}, - {"Square", 77}, - {"Saw Down", 78}, - {"Saw Up", 79}, - {"Instrument Editor", 80}, - {"Volume envelope", 81}, - {"Panning envelope", 82}, - {"Load Instrument..", 83}, - {"Save Instrument..", 84}, - {"Load XI", 85}, - {"Save XI", 86}, - {"Vibrato Type:", 87}, - {"Note:", 88}, - {"Initialize", 89}, - {"The key that inserts the special keyoff note for FastTracker modules.", 90}, - {"Upper Octave Keys..", 91}, +All changes will be lost!", 56}, + {"Are you sure you want to overwrite the file?", 57}, + {"Song length", 58}, + {"Current pos", 59}, + {"Pattern", 60}, + {"Restart pos", 61}, + {"Load XM...", 62}, + {"Save XM...", 63}, + {"Render module as WAV...", 64}, + {"Play Song", 65}, + {"Play Pattern", 66}, + {"Stop", 67}, + {"Number of Channels:", 68}, + {"PatLength", 69}, + {"Octave", 70}, + {"Jump", 71}, + {"Instr", 72}, + {"Sample", 73}, + {"VolFade", 74}, + {"VibSpeed", 75}, + {"VibDepth", 76}, + {"VibSweep", 77}, + {"Can't open file.", 78}, + {"Saving Instruments not yet supported.", 79}, + {"Sine", 80}, + {"Square", 81}, + {"Saw Down", 82}, + {"Saw Up", 83}, + {"Instrument Editor", 84}, + {"Volume envelope", 85}, + {"Panning envelope", 86}, + {"Load Instrument..", 87}, + {"Save Instrument..", 88}, + {"Load XI", 89}, + {"Save XI", 90}, + {"Vibrato Type:", 91}, + {"Note:", 92}, + {"Initialize", 93}, + {"The key that inserts the special keyoff note for FastTracker modules.", 94}, + {"Upper Octave Keys..", 95}, {"\ These are the keys on the upper half of the keyboard. The c key is normally \ the key to the right of the TAB key. The rest of the keys should be ordered \ -in a piano keyboard fashion, including the number keys row above.", 92}, - {"Lower Octave Keys..", 93}, +in a piano keyboard fashion, including the number keys row above.", 96}, + {"Lower Octave Keys..", 97}, {"\ These are the keys on the lower half of the keyboard. The c key is normally \ the first character key to the right of the left Shift key. The rest of the \ -keys should be ordered in a piano keyboard fashion, including the row above.", 94}, - {"Other Keys..", 95}, - {"Various other keys", 96}, - {"Function", 97}, - {"Assignment", 98}, - {"Keyboard Configuration", 99}, - {"Key Group Explanation", 100}, - {"Key Explanation", 101}, - {"Modifiers:", 102}, - {"Learn selected key", 103}, - {"Learn all keys", 104}, +keys should be ordered in a piano keyboard fashion, including the row above.", 98}, + {"Other Keys..", 99}, + {"Various other keys", 100}, + {"Function", 101}, + {"Assignment", 102}, + {"Keyboard Configuration", 103}, + {"Key Group Explanation", 104}, + {"Key Explanation", 105}, + {"Modifiers:", 106}, + {"Learn selected key", 107}, + {"Learn all keys", 108}, {"\ Please press the desired key combination!\n\ -Click into left list to cancel", 105}, +Click into left list to cancel", 109}, {"\ The keyboard configuration file is defective.\n\ -Please use the Keyboard Configuration dialog.", 106}, +Please use the Keyboard Configuration dialog.", 110}, {"\ Automatic key configuration unsuccessful.\n\ Please use the Keyboard Configuration dialog\n\ -in the Settings menu.", 107}, - {"Ok", 108}, +in the Settings menu.", 111}, + {"Ok", 112}, {"\ Are you sure you want to do this?\n\ -All changes will be lost!", 109}, +All changes will be lost!", 113}, {"\ Are you sure you want to quit?\n\ -All changes will be lost!", 110}, - {"_Open...", 111}, - {"Save _as...", 112}, - {"_Quit", 113}, - {"Clear _All", 114}, - {"Clear _Patterns Only", 115}, - {"_Optimize Module", 116}, - {"C_ut", 117}, - {"_Copy", 118}, - {"_Paste", 119}, - {"_Insert", 120}, - {"_Delete", 121}, - {"_Mark", 122}, - {"_Jazz Edit Mode", 123}, - {"Transp_osition...", 124}, - {"_Pattern", 125}, - {"_Track", 126}, - {"_Selection", 127}, - {"_Find Unused Pattern", 128}, - {"_Copy Current to Unused Pattern", 129}, - {"C_lear Unused Patterns", 130}, - {"_Pack Patterns", 131}, - {"_Load XI...", 132}, - {"_Delete Unused Instruments", 133}, - {"Display _Oscilloscopes", 134}, - {"Use _Backing Store", 135}, - {"_Keyboard Configuration...", 136}, - {"_Audio Configuration...", 137}, - {"_Playback Effects...", 138}, - {"_GUI Configuration...", 139}, - {"_Save Settings now", 140}, - {"Save Settings on _Exit", 141}, - {"_About...", 142}, - {"Show _Tips...", 143}, - {"_XM Effects...", 144}, - {"_File", 145}, - {"_Module", 146}, - {"_Edit", 147}, - {"_Instrument", 148}, - {"_Settings", 149}, - {"_Help", 150}, - {"/_File", 151}, - {"/File/_Open...", 152}, - {"/File/Save _as...", 153}, - {"/File/-", 154}, - {"/File/_Quit", 155}, - {"/_Module", 156}, - {"/Module/Clear _All", 157}, - {"/Module/Clear _Patterns Only", 158}, - {"/Module/_Optimize Module", 159}, - {"/_Edit", 160}, - {"/Edit/_Jazz Edit Mode", 161}, - {"/Edit/-", 162}, - {"/Edit/_Transposition...", 163}, - {"/Edit/_Pattern", 164}, - {"/Edit/Pattern/C_ut", 165}, - {"/Edit/Pattern/_Copy", 166}, - {"/Edit/Pattern/_Paste", 167}, - {"/Edit/_Track", 168}, - {"/Edit/Track/C_ut", 169}, - {"/Edit/Track/_Copy", 170}, - {"/Edit/Track/_Paste", 171}, - {"/Edit/Track/_Insert", 172}, - {"/Edit/Track/_Delete", 173}, - {"/Edit/_Selection", 174}, - {"/Edit/Selection/_Mark", 175}, - {"/Edit/Selection/C_ut", 176}, - {"/Edit/Selection/_Copy", 177}, - {"/Edit/Selection/_Paste", 178}, - {"/_Pattern", 179}, - {"/Pattern/_Find Unused Pattern", 180}, - {"/Pattern/_Copy Current to Unused Pattern", 181}, - {"/Pattern/C_lear Unused Patterns", 182}, - {"/Pattern/_Pack Patterns", 183}, - {"/_Instrument", 184}, - {"/Instrument/_Load XI...", 185}, - {"/Instrument/-", 186}, - {"/Instrument/_Delete Unused Instruments", 187}, - {"/_Settings", 188}, - {"/Settings/Display _Oscilloscopes", 189}, - {"/Settings/Use _Backing Store", 190}, - {"/Settings/-", 191}, - {"/Settings/_Keyboard Configuration...", 192}, - {"/Settings/_Audio Configuration...", 193}, - {"/Settings/_Playback Effects...", 194}, - {"/Settings/_GUI Configuration...", 195}, - {"/Settings/_Save Settings now", 196}, - {"/Settings/Save Settings on _Exit", 197}, - {"/_Help", 198}, - {"/Help/_About...", 199}, - {"/Help/-", 200}, - {"/Help/Show _Tips...", 201}, - {"/Help/_XM Effects...", 202}, - {"/Settings/Display Oscilloscopes", 203}, - {"/Settings/Use Backing Store", 204}, - {"/Settings/Save Settings on Exit", 205}, - {"Instrument Name", 206}, - {"#smpl", 207}, - {"Sample Name", 208}, - {"Linear", 209}, - {"Amiga", 210}, - {"Module Info", 211}, - {"Songname:", 212}, - {"Frequencies:", 213}, - {"ProTracker Mode", 214}, +All changes will be lost!", 114}, + {"_Open...", 115}, + {"Save _as...", 116}, + {"Save Module as _WAV...", 117}, + {"_Quit", 118}, + {"Clear _All", 119}, + {"Clear _Patterns Only", 120}, + {"_Optimize Module", 121}, + {"C_ut", 122}, + {"_Copy", 123}, + {"_Paste", 124}, + {"_Insert", 125}, + {"_Delete", 126}, + {"_Mark", 127}, + {"_Jazz Edit Mode", 128}, + {"Transp_osition...", 129}, + {"_Pattern", 130}, + {"_Track", 131}, + {"_Selection", 132}, + {"_Find Unused Pattern", 133}, + {"_Copy Current to Unused Pattern", 134}, + {"C_lear Unused Patterns", 135}, + {"_Pack Patterns", 136}, + {"_Load XI...", 137}, + {"_Delete Unused Instruments", 138}, + {"Display _Oscilloscopes", 139}, + {"Use _Backing Store", 140}, + {"_Keyboard Configuration...", 141}, + {"_Audio Configuration...", 142}, + {"_Playback Effects...", 143}, + {"_GUI Configuration...", 144}, + {"_Save Settings now", 145}, + {"Save Settings on _Exit", 146}, + {"_About...", 147}, + {"Show _Tips...", 148}, + {"_XM Effects...", 149}, + {"_File", 150}, + {"_Module", 151}, + {"_Edit", 152}, + {"_Instrument", 153}, + {"_Settings", 154}, + {"_Help", 155}, + {"/_File", 156}, + {"/File/_Open...", 157}, + {"/File/Save _as...", 158}, + {"/File/-", 159}, + {"/File/Save Module as _WAV...", 160}, + {"/File/_Quit", 161}, + {"/_Module", 162}, + {"/Module/Clear _All", 163}, + {"/Module/Clear _Patterns Only", 164}, + {"/Module/_Optimize Module", 165}, + {"/_Edit", 166}, + {"/Edit/_Jazz Edit Mode", 167}, + {"/Edit/-", 168}, + {"/Edit/_Transposition...", 169}, + {"/Edit/_Pattern", 170}, + {"/Edit/Pattern/C_ut", 171}, + {"/Edit/Pattern/_Copy", 172}, + {"/Edit/Pattern/_Paste", 173}, + {"/Edit/_Track", 174}, + {"/Edit/Track/C_ut", 175}, + {"/Edit/Track/_Copy", 176}, + {"/Edit/Track/_Paste", 177}, + {"/Edit/Track/_Insert", 178}, + {"/Edit/Track/_Delete", 179}, + {"/Edit/_Selection", 180}, + {"/Edit/Selection/_Mark", 181}, + {"/Edit/Selection/C_ut", 182}, + {"/Edit/Selection/_Copy", 183}, + {"/Edit/Selection/_Paste", 184}, + {"/_Pattern", 185}, + {"/Pattern/_Find Unused Pattern", 186}, + {"/Pattern/_Copy Current to Unused Pattern", 187}, + {"/Pattern/C_lear Unused Patterns", 188}, + {"/Pattern/_Pack Patterns", 189}, + {"/_Instrument", 190}, + {"/Instrument/_Load XI...", 191}, + {"/Instrument/-", 192}, + {"/Instrument/_Delete Unused Instruments", 193}, + {"/_Settings", 194}, + {"/Settings/Display _Oscilloscopes", 195}, + {"/Settings/Use _Backing Store", 196}, + {"/Settings/-", 197}, + {"/Settings/_Keyboard Configuration...", 198}, + {"/Settings/_Audio Configuration...", 199}, + {"/Settings/_Playback Effects...", 200}, + {"/Settings/_GUI Configuration...", 201}, + {"/Settings/_Save Settings now", 202}, + {"/Settings/Save Settings on _Exit", 203}, + {"/_Help", 204}, + {"/Help/_About...", 205}, + {"/Help/-", 206}, + {"/Help/Show _Tips...", 207}, + {"/Help/_XM Effects...", 208}, + {"/Settings/Display Oscilloscopes", 209}, + {"/Settings/Use Backing Store", 210}, + {"/Settings/Save Settings on Exit", 211}, + {"Instrument Name", 212}, + {"#smpl", 213}, + {"Sample Name", 214}, + {"Linear", 215}, + {"Amiga", 216}, + {"Module Info", 217}, + {"Songname:", 218}, + {"Frequencies:", 219}, + {"ProTracker Mode", 220}, {"\ A directory called '.soundtracker' has been created in your\n\ -home directory to store configuration files.\n", 215}, - {"No loop", 216}, - {"PingPong", 217}, - {"8 bits", 218}, - {"16 bits", 219}, - {"Sample Editor", 220}, - {"Volume", 221}, - {"Panning", 222}, - {"Finetune", 223}, - {"SelStart", 224}, - {"SelEnd", 225}, - {"Reset Sel", 226}, - {"RelNote", 227}, - {"Length: 0", 228}, - {"Load Sample..", 229}, - {"Save WAV..", 230}, - {"Load Sample", 231}, - {"Save WAV", 232}, - {"Clear", 233}, - {"Monitor", 234}, - {"Volume Ramp", 235}, - {"Zoom to selection", 236}, - {"Show all", 237}, - {"Zoom in (+50%)", 238}, - {"Zoom out (-50%)", 239}, - {"Resample", 240}, - {"Cut", 241}, - {"Remove", 242}, - {"Copy", 243}, - {"Paste", 244}, - {"Filter", 245}, - {"Length: %d", 246}, - {"", 247}, - {"Can't read sample", 248}, - {"Sample is too long for current mixer module. Loading anyway.", 249}, - {"Can only handle mono 8 and 16 bit samples", 250}, - {"Read error.", 251}, - {"Can't open file for writing.", 252}, - {"OK", 253}, - {"Start sampling", 254}, - {"Sampling Window", 255}, - {"", 256}, - {"Recorded sample is too long for current mixer module. Using it anyway.", 257}, - {"Normalize", 258}, - {"Execute", 259}, - {"Close", 260}, - {"Volume Ramping", 261}, - {"Perform linear volume fade on Selection", 262}, - {"Left [%]:", 263}, - {"Right [%]:", 264}, - {"SoundTracker Tip of the day", 265}, - {"Previous Tip", 266}, - {"Next Tip", 267}, - {"Show tip next time", 268}, +home directory to store configuration files.\n", 221}, + {"No loop", 222}, + {"PingPong", 223}, + {"8 bits", 224}, + {"16 bits", 225}, + {"Sample Editor", 226}, + {"Volume", 227}, + {"Panning", 228}, + {"Finetune", 229}, + {"SelStart", 230}, + {"SelEnd", 231}, + {"Reset Sel", 232}, + {"RelNote", 233}, + {"Length: 0", 234}, + {"Load Sample..", 235}, + {"Save WAV..", 236}, + {"Load Sample", 237}, + {"Save WAV", 238}, + {"Clear", 239}, + {"Monitor", 240}, + {"Volume Ramp", 241}, + {"Zoom to selection", 242}, + {"Show all", 243}, + {"Zoom in (+50%)", 244}, + {"Zoom out (-50%)", 245}, + {"Resample", 246}, + {"Cut", 247}, + {"Remove", 248}, + {"Copy", 249}, + {"Paste", 250}, + {"Filter", 251}, + {"Length: %d", 252}, + {"", 253}, + {"Can't read sample", 254}, + {"Sample is too long for current mixer module. Loading anyway.", 255}, + {"Can only handle mono 8 and 16 bit samples", 256}, + {"Read error.", 257}, + {"OK", 258}, + {"Start sampling", 259}, + {"Sampling Window", 260}, + {"", 261}, + {"Recorded sample is too long for current mixer module. Using it anyway.", 262}, + {"Normalize", 263}, + {"Execute", 264}, + {"Close", 265}, + {"Volume Ramping", 266}, + {"Perform linear volume fade on Selection", 267}, + {"Left [%]:", 268}, + {"Right [%]:", 269}, + {"SoundTracker Tip of the day", 270}, + {"Previous Tip", 271}, + {"Next Tip", 272}, + {"Show tip next time", 273}, {"\ Welcome to SoundTracker!\n\ \n\ If you are new to this type of program, you will want to get hold of\n\ -some XM or MOD files first and play with them.", 269}, +some XM or MOD files first and play with them.", 274}, {"\ You can make SoundTracker's edit mode more responsive to keyboard\n\ input by decreasing the mixing buffer size of the \"Editing\" object in\n\ -the Audio Configuration.", 270}, +the Audio Configuration.", 275}, {"\ You can adjust the loop points in the sample editor by holding Shift\n\ -and using the left and right mousebuttons.\n", 271}, +and using the left and right mousebuttons.\n", 276}, {"\ If you want to know more about tracking, and how the various commands\n\ -work, have a look at http://www.united-trackers.org/", 272}, +work, have a look at http://www.united-trackers.org/", 277}, {"\ You can assign samples of an instrument to the individual keys by\n\ activating its sample and then clicking on the keyboard in the\n\ -instrument editor page.", 273}, - {"Jazz Edit:", 274}, - {"Whole Song", 275}, - {"All Patterns", 276}, - {"Current Pattern", 277}, - {"Current Track", 278}, - {"Current Instrument", 279}, - {"All Instruments", 280}, - {"Half note up", 281}, - {"Half note down", 282}, - {"Octave up", 283}, - {"Octave down", 284}, - {"Exchange 1 <-> 2", 285}, - {"Change 1 -> 2", 286}, - {"Transposition Tools", 287}, - {"Scope of the operation:", 288}, - {"Note Transposition", 289}, - {"Instrument Changing", 290}, - {"Instrument 1:", 291}, - {"Current instrument", 292}, - {"Instrument 2:", 293}, - {"Pattern length out of range: %d.\n", 294}, - {"Invalid vibtype %d, using Sine.\n", 295}, - {"File is no XI instrument.", 296}, - {"Unknown XI version 0x%x\n", 297}, - {"No FastTracker XM and no supported MOD format!", 298}, - {"Error while loading patterns.", 299}, - {"Can't open file", 300}, - {"XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n", 301}, - {"Error while loading instruments.", 302}, +instrument editor page.", 278}, + {"Jazz Edit:", 279}, + {"Whole Song", 280}, + {"All Patterns", 281}, + {"Current Pattern", 282}, + {"Current Track", 283}, + {"Current Instrument", 284}, + {"All Instruments", 285}, + {"Half note up", 286}, + {"Half note down", 287}, + {"Octave up", 288}, + {"Octave down", 289}, + {"Exchange 1 <-> 2", 290}, + {"Change 1 -> 2", 291}, + {"Transposition Tools", 292}, + {"Scope of the operation:", 293}, + {"Note Transposition", 294}, + {"Instrument Changing", 295}, + {"Instrument 1:", 296}, + {"Current instrument", 297}, + {"Instrument 2:", 298}, + {"Pattern length out of range: %d.\n", 299}, + {"Invalid vibtype %d, using Sine.\n", 300}, + {"File is no XI instrument.", 301}, + {"Unknown XI version 0x%x\n", 302}, + {"No FastTracker XM and no supported MOD format!", 303}, + {"Error while loading patterns.", 304}, + {"Can't open file", 305}, + {"XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n", 306}, + {"Error while loading instruments.", 307}, {"\ Module contains sample(s) that are too long for the current mixer.\n\ -Maximum sample length is %d.", 303}, +Maximum sample length is %d.", 308}, }; -int _msg_tbl_length = 303; +int _msg_tbl_length = 308; Binary files soundtracker-0.3.5/po/de.gmo and soundtracker-0.3.6/po/de.gmo differ diff -urN soundtracker-0.3.5/po/de.po soundtracker-0.3.6/po/de.po --- soundtracker-0.3.5/po/de.po Fri Oct 8 16:33:09 1999 +++ soundtracker-0.3.6/po/de.po Sun Nov 14 15:30:04 1999 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: soundtracker-0.3.3\n" -"POT-Creation-Date: 1999-10-08 16:31+0200\n" +"POT-Creation-Date: 1999-11-14 15:19+0100\n" "PO-Revision-Date: 1999-09-21 23:00+02:00\n" "Last-Translator: Colin Marquardt \n" "Language-Team: German \n" @@ -104,10 +104,31 @@ "Konnte ALSA-Gerät nicht für Soundausgabe öffnen (Karte:%d, Gerät:%d):\n" "%s" -#: app/drivers/oss-input.c:90 +#: app/drivers/esd-output.c:94 +msgid "" +"Note that the ESD output is unusable in\n" +"interactive mode because of the latency added\n" +"by ESD. Use the OSS or ALSA output plug-ins\n" +"for serious work." +msgstr "" + +#: app/drivers/esd-output.c:159 +#, fuzzy, c-format +msgid "" +"Couldn't connect to ESD for sound output:\n" +"%s" +msgstr "" +"Konnte /dev/dsp nicht zur Soundausgabe öffnen:\n" +"%s" + +#: app/drivers/file-output.c:86 app/drivers/oss-input.c:90 msgid "no settings (yet), sorry!" msgstr "Keine Einstellungen (zur Zeit), sorry!" +#: app/drivers/file-output.c:161 app/sample-editor.c:1120 +msgid "Can't open file for writing." +msgstr "Kann Datei nicht zum Schreiben öffnen." + #: app/drivers/oss-input.c:188 #, c-format msgid "" @@ -155,11 +176,11 @@ msgid "Value" msgstr "Wert" -#: app/envelope-box.c:749 app/gui.c:1078 +#: app/envelope-box.c:749 app/gui.c:1115 msgid "Insert" msgstr "Einfügen" -#: app/envelope-box.c:755 app/gui.c:1085 +#: app/envelope-box.c:755 app/gui.c:1122 msgid "Delete" msgstr "Löschen" @@ -258,7 +279,7 @@ msgid "Tempo" msgstr "Tempo" -#: app/gui.c:211 +#: app/gui.c:220 msgid "" "Are you sure you want to free the current project?\n" "All changes will be lost!" @@ -266,67 +287,71 @@ "Sind Sie sicher, daß Sie das aktuelle Projekt schließen wollen?\n" "Alle Änderungen gehen verloren!" -#: app/gui.c:225 +#: app/gui.c:234 app/gui.c:246 msgid "Are you sure you want to overwrite the file?" msgstr "Sind sie sicher, daß Sie die Datei überschreiben wollen?" -#: app/gui.c:1069 +#: app/gui.c:1106 msgid "Song length" msgstr "Song-Länge" -#: app/gui.c:1070 +#: app/gui.c:1107 msgid "Current pos" msgstr "Aktuelle Pos" -#: app/gui.c:1071 app/gui.c:1228 +#: app/gui.c:1108 app/gui.c:1266 msgid "Pattern" msgstr "Pattern" -#: app/gui.c:1072 +#: app/gui.c:1109 msgid "Restart pos" msgstr "Restart-Pos" -#: app/gui.c:1140 +#: app/gui.c:1177 msgid "Load XM..." msgstr "Lade XM..." -#: app/gui.c:1142 +#: app/gui.c:1179 msgid "Save XM..." msgstr "Speichere XM..." #: app/gui.c:1181 +msgid "Render module as WAV..." +msgstr "" + +#: app/gui.c:1219 msgid "Play Song" msgstr "Spiele Song" -#: app/gui.c:1187 +#: app/gui.c:1225 msgid "Play Pattern" msgstr "Spiele Pattern" -#: app/gui.c:1193 +#: app/gui.c:1231 msgid "Stop" msgstr "Stop" -#: app/gui.c:1212 +#: app/gui.c:1250 msgid "Number of Channels:" msgstr "Anzahl der Kanäle:" -#: app/gui.c:1244 +#: app/gui.c:1282 msgid "PatLength" msgstr "PatLänge" -#: app/gui.c:1336 +#: app/gui.c:1374 msgid "Octave" msgstr "Oktave" -#: app/gui.c:1344 +#: app/gui.c:1382 msgid "Jump" msgstr "Springe" -#: app/gui.c:1352 +#: app/gui.c:1390 msgid "Instr" msgstr "Instr" -#: app/gui.c:1367 +#: app/gui.c:1405 msgid "Sample" msgstr "Sample" @@ -541,398 +566,408 @@ msgstr "Speichern _unter..." #: app/menubar.c:234 +#, fuzzy +msgid "Save Module as _WAV..." +msgstr "Speichere WAV..." + +#: app/menubar.c:239 msgid "_Quit" msgstr "_Beenden" -#: app/menubar.c:241 +#: app/menubar.c:246 msgid "Clear _All" msgstr "_Alles löschen" -#: app/menubar.c:243 +#: app/menubar.c:248 msgid "Clear _Patterns Only" msgstr "Nur _Pattern löschen" -#: app/menubar.c:245 +#: app/menubar.c:250 msgid "_Optimize Module" msgstr "Modul _optimieren" -#: app/menubar.c:252 app/menubar.c:263 app/menubar.c:281 +#: app/menubar.c:257 app/menubar.c:268 app/menubar.c:286 msgid "C_ut" msgstr "_Ausschneiden" -#: app/menubar.c:254 app/menubar.c:265 app/menubar.c:283 +#: app/menubar.c:259 app/menubar.c:270 app/menubar.c:288 msgid "_Copy" msgstr "_Kopieren" -#: app/menubar.c:256 app/menubar.c:267 app/menubar.c:285 +#: app/menubar.c:261 app/menubar.c:272 app/menubar.c:290 msgid "_Paste" msgstr "E_infügen" -#: app/menubar.c:269 +#: app/menubar.c:274 #, fuzzy msgid "_Insert" msgstr "Einfügen" -#: app/menubar.c:271 +#: app/menubar.c:276 #, fuzzy msgid "_Delete" msgstr "Löschen" -#: app/menubar.c:279 +#: app/menubar.c:284 msgid "_Mark" msgstr "_Markieren" -#: app/menubar.c:292 +#: app/menubar.c:297 msgid "_Jazz Edit Mode" msgstr "_Jazz-Edit-Modus" -#: app/menubar.c:297 +#: app/menubar.c:302 #, fuzzy msgid "Transp_osition..." msgstr "_Transposition..." -#: app/menubar.c:302 app/menubar.c:380 +#: app/menubar.c:307 app/menubar.c:385 msgid "_Pattern" msgstr "_Pattern" -#: app/menubar.c:303 +#: app/menubar.c:308 msgid "_Track" msgstr "_Track" -#: app/menubar.c:304 +#: app/menubar.c:309 msgid "_Selection" msgstr "_Auswahl" -#: app/menubar.c:310 +#: app/menubar.c:315 msgid "_Find Unused Pattern" msgstr "_Finde unbenutztes Pattern" -#: app/menubar.c:312 +#: app/menubar.c:317 msgid "_Copy Current to Unused Pattern" msgstr "_Kopiere aktuelles zu unbenutztem Pattern" -#: app/menubar.c:314 +#: app/menubar.c:319 msgid "C_lear Unused Patterns" msgstr "_Lösche unbenutzte Pattern" -#: app/menubar.c:316 +#: app/menubar.c:321 msgid "_Pack Patterns" msgstr "_Packe Pattern" -#: app/menubar.c:323 +#: app/menubar.c:328 #, fuzzy msgid "_Load XI..." msgstr "_Lade XI..." -#: app/menubar.c:328 +#: app/menubar.c:333 msgid "_Delete Unused Instruments" msgstr "Lösche unbenutzte _Instrumente" -#: app/menubar.c:336 +#: app/menubar.c:341 msgid "Display _Oscilloscopes" msgstr "Zeige _Oszilloskope" -#: app/menubar.c:338 +#: app/menubar.c:343 msgid "Use _Backing Store" msgstr "Verwende _Backing Store" -#: app/menubar.c:343 +#: app/menubar.c:348 #, fuzzy msgid "_Keyboard Configuration..." msgstr "_Tastatur-Konfiguration..." -#: app/menubar.c:345 +#: app/menubar.c:350 #, fuzzy msgid "_Audio Configuration..." msgstr "_Audio-Konfiguration..." -#: app/menubar.c:347 +#: app/menubar.c:352 #, fuzzy msgid "_Playback Effects..." msgstr "_Playback-Effekte..." -#: app/menubar.c:349 +#: app/menubar.c:354 #, fuzzy msgid "_GUI Configuration..." msgstr "_GUI-Konfiguration..." -#: app/menubar.c:354 +#: app/menubar.c:359 msgid "_Save Settings now" msgstr "_Speichere Einstellungen jetzt" -#: app/menubar.c:356 +#: app/menubar.c:361 msgid "Save Settings on _Exit" msgstr "Speichere Einstellungen beim _Verlassen" -#: app/menubar.c:363 +#: app/menubar.c:368 #, fuzzy msgid "_About..." msgstr "Ü_ber..." -#: app/menubar.c:368 +#: app/menubar.c:373 #, fuzzy msgid "Show _Tips..." msgstr "Zeige _Tips..." -#: app/menubar.c:370 +#: app/menubar.c:375 #, fuzzy msgid "_XM Effects..." msgstr "_XM-Effekte..." -#: app/menubar.c:377 +#: app/menubar.c:382 msgid "_File" msgstr "_Datei" -#: app/menubar.c:378 +#: app/menubar.c:383 msgid "_Module" msgstr "_Modul" -#: app/menubar.c:379 +#: app/menubar.c:384 msgid "_Edit" msgstr "_Bearbeiten" -#: app/menubar.c:381 +#: app/menubar.c:386 msgid "_Instrument" msgstr "_Instrument" -#: app/menubar.c:382 +#: app/menubar.c:387 msgid "_Settings" msgstr "_Einstellungen" -#: app/menubar.c:383 +#: app/menubar.c:388 msgid "_Help" msgstr "_Hilfe" -#: app/menubar.c:411 +#: app/menubar.c:416 msgid "/_File" msgstr "/_Datei" -#: app/menubar.c:412 +#: app/menubar.c:417 #, fuzzy msgid "/File/_Open..." msgstr "/Datei/Ö_ffnen..." -#: app/menubar.c:413 +#: app/menubar.c:418 #, fuzzy msgid "/File/Save _as..." msgstr "/Datei/Speichern _unter..." -#: app/menubar.c:414 +#: app/menubar.c:419 app/menubar.c:421 msgid "/File/-" msgstr "/Datei/-" -#: app/menubar.c:415 +#: app/menubar.c:420 +#, fuzzy +msgid "/File/Save Module as _WAV..." +msgstr "/Datei/Speichern _unter..." + +#: app/menubar.c:422 msgid "/File/_Quit" msgstr "/Datei/_Beenden" -#: app/menubar.c:416 +#: app/menubar.c:423 msgid "/_Module" msgstr "/_Modul" -#: app/menubar.c:417 +#: app/menubar.c:424 msgid "/Module/Clear _All" msgstr "/Modul/Lösche _alle" -#: app/menubar.c:418 +#: app/menubar.c:425 msgid "/Module/Clear _Patterns Only" msgstr "/Modul/Lösche nur _Pattern" -#: app/menubar.c:419 +#: app/menubar.c:426 msgid "/Module/_Optimize Module" msgstr "/Modul/_Optimiere Modul" -#: app/menubar.c:420 +#: app/menubar.c:427 msgid "/_Edit" msgstr "/_Bearbeiten" -#: app/menubar.c:421 +#: app/menubar.c:428 msgid "/Edit/_Jazz Edit Mode" msgstr "/Bearbeiten/_Jazz-Edit-Mode" -#: app/menubar.c:422 app/menubar.c:424 +#: app/menubar.c:429 app/menubar.c:431 msgid "/Edit/-" msgstr "/Bearbeiten/-" -#: app/menubar.c:423 +#: app/menubar.c:430 #, fuzzy msgid "/Edit/_Transposition..." msgstr "/Bearbeiten/_Transposition..." -#: app/menubar.c:425 +#: app/menubar.c:432 msgid "/Edit/_Pattern" msgstr "/Bearbeiten/_Pattern" -#: app/menubar.c:426 +#: app/menubar.c:433 msgid "/Edit/Pattern/C_ut" msgstr "/Bearbeiten/Pattern/_Ausschneiden" -#: app/menubar.c:427 +#: app/menubar.c:434 msgid "/Edit/Pattern/_Copy" msgstr "/Bearbeiten/Pattern/_Kopieren" -#: app/menubar.c:428 +#: app/menubar.c:435 msgid "/Edit/Pattern/_Paste" msgstr "/Bearbeiten/Pattern/E_infügen" -#: app/menubar.c:429 +#: app/menubar.c:436 msgid "/Edit/_Track" msgstr "/Bearbeiten/_Track" -#: app/menubar.c:430 +#: app/menubar.c:437 msgid "/Edit/Track/C_ut" msgstr "/Bearbeiten/Track/_Ausschneiden" -#: app/menubar.c:431 +#: app/menubar.c:438 msgid "/Edit/Track/_Copy" msgstr "/Bearbeiten/Track/_Kopieren" -#: app/menubar.c:432 +#: app/menubar.c:439 msgid "/Edit/Track/_Paste" msgstr "/Bearbeiten/Track/E_infügen" -#: app/menubar.c:433 +#: app/menubar.c:440 #, fuzzy msgid "/Edit/Track/_Insert" msgstr "/Bearbeiten/Track/E_infügen" -#: app/menubar.c:434 +#: app/menubar.c:441 #, fuzzy msgid "/Edit/Track/_Delete" msgstr "/Bearbeiten/Track/E_infügen" -#: app/menubar.c:435 +#: app/menubar.c:442 msgid "/Edit/_Selection" msgstr "/Bearbeiten/_Auswahl" -#: app/menubar.c:436 +#: app/menubar.c:443 msgid "/Edit/Selection/_Mark" msgstr "/Bearbeiten/Auswahl/_Markieren" -#: app/menubar.c:437 +#: app/menubar.c:444 msgid "/Edit/Selection/C_ut" msgstr "/Bearbeiten/Auswahl/_Ausschneiden" -#: app/menubar.c:438 +#: app/menubar.c:445 msgid "/Edit/Selection/_Copy" msgstr "/Bearbeiten/Auswahl/_Kopieren" -#: app/menubar.c:439 +#: app/menubar.c:446 msgid "/Edit/Selection/_Paste" msgstr "/Bearbeiten/Auswahl/E_infügen" -#: app/menubar.c:440 +#: app/menubar.c:447 msgid "/_Pattern" msgstr "/_Pattern" -#: app/menubar.c:441 +#: app/menubar.c:448 msgid "/Pattern/_Find Unused Pattern" msgstr "/Pattern/_Finde unbenutztes Pattern" -#: app/menubar.c:442 +#: app/menubar.c:449 msgid "/Pattern/_Copy Current to Unused Pattern" msgstr "/Pattern/_Kopiere aktuelles zu unbenutztem Pattern" -#: app/menubar.c:443 +#: app/menubar.c:450 msgid "/Pattern/C_lear Unused Patterns" msgstr "/Pattern/_Lösche unbenutzte Pattern" -#: app/menubar.c:444 +#: app/menubar.c:451 msgid "/Pattern/_Pack Patterns" msgstr "/Pattern/_Packe Pattern" -#: app/menubar.c:445 +#: app/menubar.c:452 msgid "/_Instrument" msgstr "/_Instrument" -#: app/menubar.c:446 +#: app/menubar.c:453 #, fuzzy msgid "/Instrument/_Load XI..." msgstr "/Instrument/_Lade XI..." -#: app/menubar.c:447 +#: app/menubar.c:454 msgid "/Instrument/-" msgstr "/Instrument/-" -#: app/menubar.c:448 +#: app/menubar.c:455 msgid "/Instrument/_Delete Unused Instruments" msgstr "/Instrument/_Lösche unbenutzte Instrumente" -#: app/menubar.c:449 +#: app/menubar.c:456 msgid "/_Settings" msgstr "/_Einstellungen" -#: app/menubar.c:450 +#: app/menubar.c:457 msgid "/Settings/Display _Oscilloscopes" msgstr "/Einstellungen/Zeige _Oszilloskope" -#: app/menubar.c:451 +#: app/menubar.c:458 msgid "/Settings/Use _Backing Store" msgstr "/Einstellungen/Verwende _Backing Store" -#: app/menubar.c:452 app/menubar.c:457 +#: app/menubar.c:459 app/menubar.c:464 msgid "/Settings/-" msgstr "/Einstellungen/-" -#: app/menubar.c:453 +#: app/menubar.c:460 #, fuzzy msgid "/Settings/_Keyboard Configuration..." msgstr "/Einstellungen/_Tastatur-Konfiguration..." -#: app/menubar.c:454 +#: app/menubar.c:461 #, fuzzy msgid "/Settings/_Audio Configuration..." msgstr "/Einstellungen/_Audio-Konfiguration..." -#: app/menubar.c:455 +#: app/menubar.c:462 #, fuzzy msgid "/Settings/_Playback Effects..." msgstr "/Einstellungen/_Playback-Effekte..." -#: app/menubar.c:456 +#: app/menubar.c:463 #, fuzzy msgid "/Settings/_GUI Configuration..." msgstr "/Einstellungen/_GUI-Konfiguration..." -#: app/menubar.c:458 +#: app/menubar.c:465 msgid "/Settings/_Save Settings now" msgstr "/Einstellungen/_Speichere Einstellungen jetzt" -#: app/menubar.c:459 +#: app/menubar.c:466 msgid "/Settings/Save Settings on _Exit" msgstr "/Einstellungen/Speichere Einstellungen beim _Verlassen" -#: app/menubar.c:460 +#: app/menubar.c:467 msgid "/_Help" msgstr "/_Hilfe" -#: app/menubar.c:461 +#: app/menubar.c:468 #, fuzzy msgid "/Help/_About..." msgstr "/Hilfe/Ü_ber..." -#: app/menubar.c:462 +#: app/menubar.c:469 msgid "/Help/-" msgstr "/Hilfe/-" -#: app/menubar.c:463 +#: app/menubar.c:470 #, fuzzy msgid "/Help/Show _Tips..." msgstr "/Hilfe/Zeige _Tips..." -#: app/menubar.c:464 +#: app/menubar.c:471 #, fuzzy msgid "/Help/_XM Effects..." msgstr "/Hilfe/_XM-Effekte..." -#: app/menubar.c:478 +#: app/menubar.c:485 msgid "/Settings/Display Oscilloscopes" msgstr "/Einstellungen/Zeige Oszilloskope" -#: app/menubar.c:480 +#: app/menubar.c:487 msgid "/Settings/Use Backing Store" msgstr "/Einstellungen/Verwende Backing Store" -#: app/menubar.c:482 +#: app/menubar.c:489 msgid "/Settings/Save Settings on Exit" msgstr "/Einstellungen/Speichere Einstellungen beim Verlassen" @@ -1125,10 +1160,6 @@ msgid "Read error." msgstr "Lesefehler." -#: app/sample-editor.c:1120 -msgid "Can't open file for writing." -msgstr "Kann Datei nicht zum Schreiben öffnen." - #: app/sample-editor.c:1157 msgid "OK" msgstr "OK" @@ -1251,79 +1282,79 @@ msgid "Jazz Edit:" msgstr "Jazz-Edit:" -#: app/transposition.c:165 +#: app/transposition.c:166 msgid "Whole Song" msgstr "Ganzer Song" -#: app/transposition.c:166 +#: app/transposition.c:167 msgid "All Patterns" msgstr "Alle Pattern" -#: app/transposition.c:167 +#: app/transposition.c:168 msgid "Current Pattern" msgstr "Aktuelles Pattern" -#: app/transposition.c:168 +#: app/transposition.c:169 msgid "Current Track" msgstr "Aktueller Track" -#: app/transposition.c:172 +#: app/transposition.c:173 msgid "Current Instrument" msgstr "Aktuelles Instrument" -#: app/transposition.c:173 +#: app/transposition.c:174 msgid "All Instruments" msgstr "Alle Instrumente" -#: app/transposition.c:177 +#: app/transposition.c:178 msgid "Half note up" msgstr "Halbe Note hoch" -#: app/transposition.c:178 +#: app/transposition.c:179 msgid "Half note down" msgstr "Halbe Note runter" -#: app/transposition.c:179 +#: app/transposition.c:180 msgid "Octave up" msgstr "Oktave hoch" -#: app/transposition.c:180 +#: app/transposition.c:181 msgid "Octave down" msgstr "Oktave runter" -#: app/transposition.c:183 +#: app/transposition.c:184 msgid "Exchange 1 <-> 2" msgstr "Tausche 1 <-> 2" -#: app/transposition.c:184 +#: app/transposition.c:185 msgid "Change 1 -> 2" msgstr "Ändere 1 -> 2" -#: app/transposition.c:193 app/transposition.c:196 +#: app/transposition.c:194 app/transposition.c:197 msgid "Transposition Tools" msgstr "Transpositions-Werkzeuge" -#: app/transposition.c:216 +#: app/transposition.c:217 msgid "Scope of the operation:" msgstr "Bereich der Anwendung:" -#: app/transposition.c:223 +#: app/transposition.c:224 msgid "Note Transposition" msgstr "Noten-Transposition" -#: app/transposition.c:253 +#: app/transposition.c:254 msgid "Instrument Changing" msgstr "Instrumentenwechsel" -#: app/transposition.c:268 +#: app/transposition.c:269 msgid "Instrument 1:" msgstr "Instrument 1:" -#: app/transposition.c:270 app/transposition.c:280 +#: app/transposition.c:271 app/transposition.c:281 msgid "Current instrument" msgstr "Aktuelles Instrument" -#: app/transposition.c:278 +#: app/transposition.c:279 msgid "Instrument 2:" msgstr "Instrument 2:" Binary files soundtracker-0.3.5/po/it.gmo and soundtracker-0.3.6/po/it.gmo differ diff -urN soundtracker-0.3.5/po/it.po soundtracker-0.3.6/po/it.po --- soundtracker-0.3.5/po/it.po Wed Oct 6 11:49:06 1999 +++ soundtracker-0.3.6/po/it.po Sat Oct 30 18:52:47 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: soundtracker-0.3.4\n" -"POT-Creation-Date: 1999-09-25 17:25+0200\n" +"POT-Creation-Date: 1999-10-08 16:31+0200\n" "PO-Revision-Date: 1999-09-25 19:19+01:00\n" "Last-Translator: Yuri Bongiorno \n" "Language-Team: Italian \n" @@ -26,11 +26,11 @@ msgid "Sampling" msgstr "Campionamento" -#: app/audioconfig.c:179 +#: app/audioconfig.c:178 msgid "Driver Module" msgstr "Modulo del Driver" -#: app/audioconfig.c:187 app/audioconfig.c:190 +#: app/audioconfig.c:186 app/audioconfig.c:189 msgid "Audio Configuration" msgstr "Configurazione dell'Audio" @@ -40,33 +40,33 @@ msgstr "(%d byte)" #: app/drivers/alsa-input.c:128 app/drivers/alsa-output.c:138 -#: app/drivers/oss-output.c:136 +#: app/drivers/oss-output.c:139 #, c-format msgid "Estimated audio delay: %f microseconds" msgstr "Ritardo stimato dell'audio: %f microsecondi" #: app/drivers/alsa-input.c:193 app/drivers/alsa-output.c:200 -#: app/drivers/oss-output.c:185 +#: app/drivers/oss-output.c:188 msgid "These changes won't take effect until you restart playing." msgstr "Questi cambiamenti avranno effetto alla prossima riproduzione." #: app/drivers/alsa-input.c:205 app/drivers/alsa-output.c:212 -#: app/drivers/oss-output.c:197 +#: app/drivers/oss-output.c:200 msgid "Resolution:" msgstr "Risoluzione:" #: app/drivers/alsa-input.c:215 app/drivers/alsa-output.c:222 -#: app/drivers/oss-output.c:207 +#: app/drivers/oss-output.c:210 msgid "Channels:" msgstr "Canali:" #: app/drivers/alsa-input.c:225 app/drivers/alsa-output.c:232 -#: app/drivers/oss-output.c:217 +#: app/drivers/oss-output.c:220 msgid "Frequency [Hz]:" msgstr "Frequenza [Hz]:" #: app/drivers/alsa-input.c:235 app/drivers/alsa-output.c:242 -#: app/drivers/oss-output.c:227 +#: app/drivers/oss-output.c:230 msgid "Buffer Size:" msgstr "Dimensione del Buffer:" @@ -89,7 +89,7 @@ "%s" #: app/drivers/alsa-input.c:426 app/drivers/alsa-output.c:427 -#: app/drivers/oss-input.c:221 app/drivers/oss-output.c:387 +#: app/drivers/oss-input.c:221 app/drivers/oss-output.c:390 msgid "Required sound output format not supported.\n" msgstr "Il formato sonoro d'uscita richiesto non è supportato.\n" @@ -120,12 +120,12 @@ "Impossibile aprire /dev/dsp per il campionamento:\n" "%s" -#: app/drivers/oss-output.c:170 +#: app/drivers/oss-output.c:173 #, c-format msgid "(%d samples)" msgstr "(%d campioni)" -#: app/drivers/oss-output.c:354 +#: app/drivers/oss-output.c:357 #, c-format msgid "" "Couldn't open /dev/dsp for sound output:\n" @@ -158,11 +158,11 @@ msgid "Value" msgstr "Valore" -#: app/envelope-box.c:749 app/gui.c:1074 +#: app/envelope-box.c:749 app/gui.c:1078 msgid "Insert" msgstr "Inserisce" -#: app/envelope-box.c:755 app/gui.c:1081 +#: app/envelope-box.c:755 app/gui.c:1085 msgid "Delete" msgstr "Cancella" @@ -200,67 +200,67 @@ msgid "End" msgstr "Fine" -#: app/gui-settings.c:69 +#: app/gui-settings.c:75 msgid "Scopes Frequency" msgstr "Frequenza degli Oscilloscopi" -#: app/gui-settings.c:72 +#: app/gui-settings.c:78 msgid "Tracker Frequency" msgstr "Frequenza del Tracker" -#: app/gui-settings.c:155 app/gui-settings.c:158 +#: app/gui-settings.c:161 app/gui-settings.c:164 msgid "GUI Configuration" msgstr "Configurazione della GUI" -#: app/gui-settings.c:183 +#: app/gui-settings.c:189 msgid "Use Hexadecimal Numbers" msgstr "Usa Numeri Esadecimali" -#: app/gui-settings.c:190 +#: app/gui-settings.c:196 msgid "Advance Cursor in FX Columns" msgstr "Fa avanzare il Cursore nelle Colonne FX" -#: app/gui-settings.c:197 +#: app/gui-settings.c:203 msgid "Use anti-aliased envelope editor" msgstr "Usa l'editor di inviluppo anti-aliased" -#: app/gui-settings.c:203 +#: app/gui-settings.c:209 msgid "You need to restart SoundTracker for this change to come into effect." msgstr "Devi riavviare SoundTracker affinchè questo cambiamento abbia effetto." -#: app/gui-settings.c:212 +#: app/gui-settings.c:218 msgid "Scopes buffer size [MB]" msgstr "Dimensione del buffer degli oscilloscopi [MB]" -#: app/gui-settings.c:231 +#: app/gui-settings.c:237 msgid "Highlight rows:" msgstr "Righe evidenziate:" -#: app/gui-settings.c:249 +#: app/gui-settings.c:255 msgid "`Save XM' saves all non-empty patterns" msgstr "`Salva XM' salva tutti i pattern non vuoti" -#: app/gui-subs.c:374 +#: app/gui-subs.c:386 msgid "Question" msgstr "Domanda" -#: app/gui-subs.c:391 app/sample-editor.c:1172 +#: app/gui-subs.c:403 app/sample-editor.c:1172 msgid "Cancel" msgstr "Annulla" -#: app/gui-subs.c:409 +#: app/gui-subs.c:421 msgid "Warning" msgstr "Attenzione" -#: app/gui-subs.c:435 +#: app/gui-subs.c:447 msgid "Error!" msgstr "Errore!" -#: app/gui.c:81 +#: app/gui.c:82 msgid "Tempo" msgstr "Tempo" -#: app/gui.c:209 +#: app/gui.c:211 msgid "" "Are you sure you want to free the current project?\n" "All changes will be lost!" @@ -268,147 +268,147 @@ "Sei sicuro di volerti liberare dell'attuale progetto?\n" "Tutti i cambiamenti andranno persi!" -#: app/gui.c:221 +#: app/gui.c:225 msgid "Are you sure you want to overwrite the file?" msgstr "Sei sicuro di voler sovrascrivere il file?" -#: app/gui.c:1065 +#: app/gui.c:1069 msgid "Song length" msgstr "Lunghezza del brano" -#: app/gui.c:1066 +#: app/gui.c:1070 msgid "Current pos" msgstr "Posizione attuale" -#: app/gui.c:1067 app/gui.c:1222 +#: app/gui.c:1071 app/gui.c:1228 msgid "Pattern" msgstr "Pattern" -#: app/gui.c:1068 +#: app/gui.c:1072 msgid "Restart pos" msgstr "Ricomincia dalla posizione" -#: app/gui.c:1136 +#: app/gui.c:1140 msgid "Load XM..." msgstr "Carica XM..." -#: app/gui.c:1137 +#: app/gui.c:1142 msgid "Save XM..." msgstr "Salva XM..." -#: app/gui.c:1175 +#: app/gui.c:1181 msgid "Play Song" msgstr "Suona il brano" -#: app/gui.c:1181 +#: app/gui.c:1187 msgid "Play Pattern" msgstr "Suona il Pattern" -#: app/gui.c:1187 +#: app/gui.c:1193 msgid "Stop" msgstr "Stop" -#: app/gui.c:1206 +#: app/gui.c:1212 msgid "Number of Channels:" msgstr "Numero di Canali:" -#: app/gui.c:1238 +#: app/gui.c:1244 msgid "PatLength" msgstr "Lunghezza del Pattern" -#: app/gui.c:1330 +#: app/gui.c:1336 msgid "Octave" msgstr "Ottava" -#: app/gui.c:1338 +#: app/gui.c:1344 msgid "Jump" msgstr "Passo" -#: app/gui.c:1346 +#: app/gui.c:1352 msgid "Instr" msgstr "Strumento" -#: app/gui.c:1361 +#: app/gui.c:1367 msgid "Sample" msgstr "Campione" -#: app/instrument-editor.c:74 +#: app/instrument-editor.c:75 msgid "VolFade" msgstr "Dissolvenza" -#: app/instrument-editor.c:75 +#: app/instrument-editor.c:76 msgid "VibSpeed" msgstr "Velocità del vibrato" -#: app/instrument-editor.c:76 +#: app/instrument-editor.c:77 msgid "VibDepth" msgstr "Profondità del vibrato" -#: app/instrument-editor.c:77 +#: app/instrument-editor.c:78 msgid "VibSweep" msgstr "Sweep del vibrato" -#: app/instrument-editor.c:153 +#: app/instrument-editor.c:154 msgid "Can't open file." msgstr "Impossibile aprire il file." -#: app/instrument-editor.c:172 +#: app/instrument-editor.c:174 msgid "Saving Instruments not yet supported." msgstr "Il salvataggio degli Strumenti non è ancora supportato." -#: app/instrument-editor.c:180 +#: app/instrument-editor.c:182 msgid "Sine" msgstr "Sinusoidale" -#: app/instrument-editor.c:180 +#: app/instrument-editor.c:182 msgid "Square" msgstr "Quadro" -#: app/instrument-editor.c:180 +#: app/instrument-editor.c:182 msgid "Saw Down" msgstr "Sega giù" -#: app/instrument-editor.c:180 +#: app/instrument-editor.c:182 msgid "Saw Up" msgstr "Sega su" -#: app/instrument-editor.c:184 +#: app/instrument-editor.c:186 msgid "Instrument Editor" msgstr "Editor dello strumento" -#: app/instrument-editor.c:193 +#: app/instrument-editor.c:195 msgid "Volume envelope" msgstr "Inviluppo del volume" -#: app/instrument-editor.c:201 +#: app/instrument-editor.c:203 msgid "Panning envelope" msgstr "Inviluppo del panning" -#: app/instrument-editor.c:218 +#: app/instrument-editor.c:220 msgid "Load Instrument.." msgstr "Carica lo strumento.." -#: app/instrument-editor.c:219 +#: app/instrument-editor.c:222 msgid "Save Instrument.." msgstr "Salva lo strumento.." -#: app/instrument-editor.c:221 +#: app/instrument-editor.c:224 msgid "Load XI" msgstr "Carica XI" -#: app/instrument-editor.c:227 +#: app/instrument-editor.c:230 msgid "Save XI" msgstr "Salva XI" -#: app/instrument-editor.c:247 +#: app/instrument-editor.c:250 msgid "Vibrato Type:" msgstr "Tipo di vibrato:" -#: app/instrument-editor.c:319 +#: app/instrument-editor.c:322 msgid "Note:" msgstr "Nota:" -#: app/instrument-editor.c:337 +#: app/instrument-editor.c:340 msgid "Initialize" msgstr "Inizializza" @@ -533,367 +533,383 @@ "Sei sicuro di voler abbandonare?\n" "Tutti i cambiamenti andranno persi!" -#: app/menubar.c:225 -msgid "_Open.." -msgstr "_Apri.." - #: app/menubar.c:227 -msgid "Save _as.." -msgstr "Salva _come.." +msgid "_Open..." +msgstr "_Apri..." + +#: app/menubar.c:229 +msgid "Save _as..." +msgstr "Salva _come..." -#: app/menubar.c:232 +#: app/menubar.c:234 msgid "_Quit" msgstr "_Esci" -#: app/menubar.c:239 +#: app/menubar.c:241 msgid "Clear _All" msgstr "Cancella _Tutto" -#: app/menubar.c:241 +#: app/menubar.c:243 msgid "Clear _Patterns Only" msgstr "Cancella solamente i _Pattern" -#: app/menubar.c:243 +#: app/menubar.c:245 msgid "_Optimize Module" msgstr "_Ottimizza il Modulo" -#: app/menubar.c:250 app/menubar.c:261 app/menubar.c:274 +#: app/menubar.c:252 app/menubar.c:263 app/menubar.c:281 msgid "C_ut" msgstr "_Taglia" -#: app/menubar.c:252 app/menubar.c:263 app/menubar.c:276 +#: app/menubar.c:254 app/menubar.c:265 app/menubar.c:283 msgid "_Copy" msgstr "_Copia" -#: app/menubar.c:254 app/menubar.c:265 app/menubar.c:278 +#: app/menubar.c:256 app/menubar.c:267 app/menubar.c:285 msgid "_Paste" msgstr "_Incolla" -#: app/menubar.c:272 +#: app/menubar.c:269 +msgid "_Insert" +msgstr "I_nserisce" + +#: app/menubar.c:271 +msgid "_Delete" +msgstr "C_ancella" + +#: app/menubar.c:279 msgid "_Mark" msgstr "_Marca" -#: app/menubar.c:285 +#: app/menubar.c:292 msgid "_Jazz Edit Mode" msgstr "Modalità _Jazz Edit" -#: app/menubar.c:290 -msgid "_Transposition.." -msgstr "Tr_asposizione.." +#: app/menubar.c:297 +msgid "Transp_osition..." +msgstr "Trasp_osizione..." -#: app/menubar.c:295 app/menubar.c:373 +#: app/menubar.c:302 app/menubar.c:380 msgid "_Pattern" msgstr "_Pattern" -#: app/menubar.c:296 +#: app/menubar.c:303 msgid "_Track" msgstr "T_raccia" -#: app/menubar.c:297 +#: app/menubar.c:304 msgid "_Selection" msgstr "_Selezione" -#: app/menubar.c:303 +#: app/menubar.c:310 msgid "_Find Unused Pattern" msgstr "_Trova i Pattern non usati" -#: app/menubar.c:305 +#: app/menubar.c:312 msgid "_Copy Current to Unused Pattern" msgstr "_Copia l'attuale in un Pattern non usato" -#: app/menubar.c:307 +#: app/menubar.c:314 msgid "C_lear Unused Patterns" msgstr "Cance_lla i Pattern non usati" -#: app/menubar.c:309 +#: app/menubar.c:316 msgid "_Pack Patterns" msgstr "Com_primi i Pattern" -#: app/menubar.c:316 -msgid "_Load XI.." -msgstr "_Carica XI.." +#: app/menubar.c:323 +msgid "_Load XI..." +msgstr "_Carica XI..." -#: app/menubar.c:321 +#: app/menubar.c:328 msgid "_Delete Unused Instruments" msgstr "_Elimina gli Strumenti non usati" -#: app/menubar.c:329 +#: app/menubar.c:336 msgid "Display _Oscilloscopes" msgstr "Mostra gli _Oscilloscopi" -#: app/menubar.c:331 +#: app/menubar.c:338 msgid "Use _Backing Store" msgstr "Usa il _Backing Store" -#: app/menubar.c:336 -msgid "_Keyboard Configuration.." -msgstr "_Configurazione della Tastiera.." +#: app/menubar.c:343 +msgid "_Keyboard Configuration..." +msgstr "_Configurazione della Tastiera..." + +#: app/menubar.c:345 +msgid "_Audio Configuration..." +msgstr "Configurazione dell'_Audio..." -#: app/menubar.c:338 -msgid "_Audio Configuration.." -msgstr "Configurazione dell'_Audio.." +#: app/menubar.c:347 +msgid "_Playback Effects..." +msgstr "Effetti di _Playback..." -#: app/menubar.c:340 -msgid "_Playback Effects.." -msgstr "Effetti di _Playback" - -#: app/menubar.c:342 -msgid "_GUI Configuration.." -msgstr "Configurazione della _GUI.." +#: app/menubar.c:349 +msgid "_GUI Configuration..." +msgstr "Configurazione della _GUI..." -#: app/menubar.c:347 +#: app/menubar.c:354 msgid "_Save Settings now" msgstr "_Salva le Impostazioni ora" -#: app/menubar.c:349 +#: app/menubar.c:356 msgid "Save Settings on _Exit" msgstr "Salva le Impostazioni all'_Uscita" -#: app/menubar.c:356 -msgid "_About.." -msgstr "_Informazioni su.." - -#: app/menubar.c:361 -msgid "Show _Tips.." -msgstr "Mostra i suggerimen_ti.." - #: app/menubar.c:363 -msgid "_XM Effects.." -msgstr "Effetti _XM.." +msgid "_About..." +msgstr "_Informazioni su..." + +#: app/menubar.c:368 +msgid "Show _Tips..." +msgstr "Mostra i suggerimen_ti..." #: app/menubar.c:370 +msgid "_XM Effects..." +msgstr "Effetti _XM..." + +#: app/menubar.c:377 msgid "_File" msgstr "_File" -#: app/menubar.c:371 +#: app/menubar.c:378 msgid "_Module" msgstr "_Modulo" -#: app/menubar.c:372 +#: app/menubar.c:379 msgid "_Edit" msgstr "_Edit" -#: app/menubar.c:374 +#: app/menubar.c:381 msgid "_Instrument" msgstr "_Strumento" -#: app/menubar.c:375 +#: app/menubar.c:382 msgid "_Settings" msgstr "_Impostazioni" -#: app/menubar.c:376 +#: app/menubar.c:383 msgid "_Help" msgstr "_Aiuto" -#: app/menubar.c:404 +#: app/menubar.c:411 msgid "/_File" msgstr "/_File" -#: app/menubar.c:405 -msgid "/File/_Open.." -msgstr "/File/_Apri.." - -#: app/menubar.c:406 -msgid "/File/Save _as.." -msgstr "/File/Salva _come.." +#: app/menubar.c:412 +msgid "/File/_Open..." +msgstr "/File/_Apri..." + +#: app/menubar.c:413 +msgid "/File/Save _as..." +msgstr "/File/Salva _come..." -#: app/menubar.c:407 +#: app/menubar.c:414 msgid "/File/-" msgstr "/File/-" -#: app/menubar.c:408 +#: app/menubar.c:415 msgid "/File/_Quit" msgstr "/File/_Esci" -#: app/menubar.c:409 +#: app/menubar.c:416 msgid "/_Module" msgstr "/_Modulo" -#: app/menubar.c:410 +#: app/menubar.c:417 msgid "/Module/Clear _All" msgstr "/Modulo/Cancella _Tutto" -#: app/menubar.c:411 +#: app/menubar.c:418 msgid "/Module/Clear _Patterns Only" msgstr "/Modulo/Cancella Solamente i _Pattern" -#: app/menubar.c:412 +#: app/menubar.c:419 msgid "/Module/_Optimize Module" msgstr "/Modulo/_Ottimizza il Modulo" -#: app/menubar.c:413 +#: app/menubar.c:420 msgid "/_Edit" msgstr "/_Edit" -#: app/menubar.c:414 +#: app/menubar.c:421 msgid "/Edit/_Jazz Edit Mode" msgstr "/Edit/Modalità _Jazz Edit" -#: app/menubar.c:415 app/menubar.c:417 +#: app/menubar.c:422 app/menubar.c:424 msgid "/Edit/-" msgstr "/Edit/-" -#: app/menubar.c:416 -msgid "/Edit/_Transposition.." -msgstr "/Edit/Tr_asposizione.." +#: app/menubar.c:423 +msgid "/Edit/_Transposition..." +msgstr "/Edit/Tr_asposizione..." -#: app/menubar.c:418 +#: app/menubar.c:425 msgid "/Edit/_Pattern" msgstr "/Edit/_Pattern" -#: app/menubar.c:419 +#: app/menubar.c:426 msgid "/Edit/Pattern/C_ut" msgstr "/Edit/Pattern/_Taglia" -#: app/menubar.c:420 +#: app/menubar.c:427 msgid "/Edit/Pattern/_Copy" msgstr "/Edit/Pattern/_Copia" -#: app/menubar.c:421 +#: app/menubar.c:428 msgid "/Edit/Pattern/_Paste" msgstr "/Edit/Pattern/_Incolla" -#: app/menubar.c:422 +#: app/menubar.c:429 msgid "/Edit/_Track" msgstr "/Edit/T_raccia" -#: app/menubar.c:423 +#: app/menubar.c:430 msgid "/Edit/Track/C_ut" msgstr "/Edit/Traccia/_Taglia" -#: app/menubar.c:424 +#: app/menubar.c:431 msgid "/Edit/Track/_Copy" msgstr "/Edit/Traccia/_Copia" -#: app/menubar.c:425 +#: app/menubar.c:432 msgid "/Edit/Track/_Paste" msgstr "/Edit/Traccia/_Incolla" -#: app/menubar.c:426 +#: app/menubar.c:433 +msgid "/Edit/Track/_Insert" +msgstr "/Edit/Traccia/I_nserisce" + +#: app/menubar.c:434 +msgid "/Edit/Track/_Delete" +msgstr "/Edit/Traccia/Ca_ncella" + +#: app/menubar.c:435 msgid "/Edit/_Selection" msgstr "/Edit/_Selezione" -#: app/menubar.c:427 +#: app/menubar.c:436 msgid "/Edit/Selection/_Mark" msgstr "/Edit/Selezione/_Marca" -#: app/menubar.c:428 +#: app/menubar.c:437 msgid "/Edit/Selection/C_ut" msgstr "/Edit/Selezione/_Taglia" -#: app/menubar.c:429 +#: app/menubar.c:438 msgid "/Edit/Selection/_Copy" msgstr "/Edit/Selezione/_Copia" -#: app/menubar.c:430 +#: app/menubar.c:439 msgid "/Edit/Selection/_Paste" msgstr "/Edit/Selezione/_Incolla" -#: app/menubar.c:431 app/track-editor.c:72 +#: app/menubar.c:440 msgid "/_Pattern" msgstr "/_Pattern" -#: app/menubar.c:432 +#: app/menubar.c:441 msgid "/Pattern/_Find Unused Pattern" msgstr "/Pattern/_Trova i Pattern non usati" -#: app/menubar.c:433 +#: app/menubar.c:442 msgid "/Pattern/_Copy Current to Unused Pattern" msgstr "/Pattern/_Copia l'attuale in un Pattern non usato" -#: app/menubar.c:434 +#: app/menubar.c:443 msgid "/Pattern/C_lear Unused Patterns" msgstr "/Pattern/Cance_lla i Pattern non usati" -#: app/menubar.c:435 +#: app/menubar.c:444 msgid "/Pattern/_Pack Patterns" msgstr "/Pattern/Com_primi i Pattern" -#: app/menubar.c:436 +#: app/menubar.c:445 msgid "/_Instrument" msgstr "/_Strumento" -#: app/menubar.c:437 -msgid "/Instrument/_Load XI.." -msgstr "/Strumento/_Carica XI.." +#: app/menubar.c:446 +msgid "/Instrument/_Load XI..." +msgstr "/Strumento/_Carica XI..." -#: app/menubar.c:438 +#: app/menubar.c:447 msgid "/Instrument/-" msgstr "/Strumento/-" -#: app/menubar.c:439 +#: app/menubar.c:448 msgid "/Instrument/_Delete Unused Instruments" msgstr "/Strumento/_Elimina gli Strumenti non usati" -#: app/menubar.c:440 +#: app/menubar.c:449 msgid "/_Settings" msgstr "/_Impostazioni" -#: app/menubar.c:441 +#: app/menubar.c:450 msgid "/Settings/Display _Oscilloscopes" msgstr "/Impostazioni/Mostra gli _Oscilloscopi" -#: app/menubar.c:442 +#: app/menubar.c:451 msgid "/Settings/Use _Backing Store" msgstr "/Impostazioni/Usa il _Backing Store" -#: app/menubar.c:443 app/menubar.c:448 +#: app/menubar.c:452 app/menubar.c:457 msgid "/Settings/-" msgstr "/Impostazioni/-" -#: app/menubar.c:444 -msgid "/Settings/_Keyboard Configuration.." -msgstr "/Impostazioni/_Configurazione della Tastiera.." +#: app/menubar.c:453 +msgid "/Settings/_Keyboard Configuration..." +msgstr "/Impostazioni/_Configurazione della Tastiera..." -#: app/menubar.c:445 -msgid "/Settings/_Audio Configuration.." -msgstr "/Impostazioni/Configurazione dell'_Audio.." +#: app/menubar.c:454 +msgid "/Settings/_Audio Configuration..." +msgstr "/Impostazioni/Configurazione dell'_Audio..." -#: app/menubar.c:446 -msgid "/Settings/_Playback Effects.." -msgstr "/Impostazioni/Effetti di _Playback" +#: app/menubar.c:455 +msgid "/Settings/_Playback Effects..." +msgstr "/Impostazioni/Effetti di _Playback..." -#: app/menubar.c:447 -msgid "/Settings/_GUI Configuration.." -msgstr "Impostazioni/Configurazione della _GUI.." +#: app/menubar.c:456 +msgid "/Settings/_GUI Configuration..." +msgstr "Impostazioni/Configurazione della _GUI..." -#: app/menubar.c:449 +#: app/menubar.c:458 msgid "/Settings/_Save Settings now" msgstr "/Impostazioni/_Salva le Impostazioni ora" -#: app/menubar.c:450 +#: app/menubar.c:459 msgid "/Settings/Save Settings on _Exit" msgstr "/Impostazioni/Salva le Impostazioni all'_Uscita" -#: app/menubar.c:451 +#: app/menubar.c:460 msgid "/_Help" msgstr "/_Aiuto" -#: app/menubar.c:452 -msgid "/Help/_About.." -msgstr "/Aiuto/_Informazioni su.." +#: app/menubar.c:461 +msgid "/Help/_About..." +msgstr "/Aiuto/_Informazioni su..." -#: app/menubar.c:453 +#: app/menubar.c:462 msgid "/Help/-" msgstr "/Aiuto/-" -#: app/menubar.c:454 -msgid "/Help/Show _Tips.." -msgstr "/Aiuto/Mostra i suggerimen_ti.." +#: app/menubar.c:463 +msgid "/Help/Show _Tips..." +msgstr "/Aiuto/Mostra i suggerimen_ti..." + +#: app/menubar.c:464 +msgid "/Help/_XM Effects..." +msgstr "/Aiuto/Effetti _XM..." -#: app/menubar.c:455 -msgid "/Help/_XM Effects.." -msgstr "/Aiuto/Effetti _XM.." - -#: app/menubar.c:469 +#: app/menubar.c:478 msgid "/Settings/Display Oscilloscopes" msgstr "/Impostazioni/Mostra gli Oscilloscopi" -#: app/menubar.c:471 +#: app/menubar.c:480 msgid "/Settings/Use Backing Store" msgstr "/Impostazioni/Usa il Backing Store" -#: app/menubar.c:473 +#: app/menubar.c:482 msgid "/Settings/Save Settings on Exit" msgstr "/Impostazioni/Salva le Impostazioni all'Uscita" @@ -1066,10 +1082,6 @@ msgid "Length: %d" msgstr "Lunghezza: %d" -#: app/sample-editor.c:865 -msgid "No memory for copybuffer.\n" -msgstr "Non c'è memoria per il copybuffer.\n" - #: app/sample-editor.c:957 msgid "" msgstr "" @@ -1086,10 +1098,6 @@ msgid "Can only handle mono 8 and 16 bit samples" msgstr "Può solo gestire campioni mono da 8 e 16 bit" -#: app/sample-editor.c:1060 -msgid "Out of memory for sample data." -msgstr "Memoria esaurita per i dati del campione." - #: app/sample-editor.c:1065 msgid "Read error." msgstr "Errore di lettura." @@ -1110,10 +1118,6 @@ msgid "Sampling Window" msgstr "Finestra di Campionamento" -#: app/sample-editor.c:1252 -msgid "out of memory while sampling..." -msgstr "memoria esaurita durante il campionamento..." - #: app/sample-editor.c:1303 msgid "" msgstr "" @@ -1215,19 +1219,7 @@ "il suo campione e poi cliccando sulla tastiera nella pagina dell'Editor\n" "di strumento." -#: app/track-editor.c:73 -msgid "/Pattern/_Cut" -msgstr "/Pattern/_Taglia" - -#: app/track-editor.c:74 -msgid "/Pattern/_Copy" -msgstr "/Pattern/_Copia" - -#: app/track-editor.c:75 -msgid "/Pattern/_Paste" -msgstr "/Pattern/_Incolla" - -#: app/track-editor.c:139 +#: app/track-editor.c:82 msgid "Jazz Edit:" msgstr "Jazz Edit:" @@ -1356,3 +1348,4 @@ msgstr "" "Il modulo contiene campioni che sono troppo lunghi per l'attuale mixer.\n" "La lunghezza massima del campione è %d." + Binary files soundtracker-0.3.5/po/ja.gmo and soundtracker-0.3.6/po/ja.gmo differ diff -urN soundtracker-0.3.5/po/ja.po soundtracker-0.3.6/po/ja.po --- soundtracker-0.3.5/po/ja.po Wed Oct 6 14:34:11 1999 +++ soundtracker-0.3.6/po/ja.po Sat Oct 30 18:52:43 1999 @@ -1,4 +1,4 @@ -# ja.po(0.3.4-0) for SoundTracker +# ja.po(0.3.5-0) for SoundTracker # Copyright (C) 1998-1999 Michael Krause . # Atsushi Yamagata , 1999. # Yuuki NINOMIYA , 1999. @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: SoundTracker 0.3.4\n" -"POT-Creation-Date: 1999-09-25 17:25+0200\n" +"Project-Id-Version: SoundTracker 0.3.5\n" +"POT-Creation-Date: 1999-10-08 16:31+0200\n" "PO-Revision-Date: 1999-09-27 10:06+09:00\n" "Last-Translator: Atsushi Yamagata \n" "Language-Team: Japanese \n" @@ -27,11 +27,11 @@ msgid "Sampling" msgstr "¥µ¥ó¥×¥ê¥ó¥°" -#: app/audioconfig.c:179 +#: app/audioconfig.c:178 msgid "Driver Module" msgstr "¥É¥é¥¤¥Ð¡¦¥â¥¸¥å¡¼¥ë" -#: app/audioconfig.c:187 app/audioconfig.c:190 +#: app/audioconfig.c:186 app/audioconfig.c:189 msgid "Audio Configuration" msgstr "¥ª¡¼¥Ç¥£¥ªÀßÄê" @@ -41,33 +41,33 @@ msgstr "(%d¥Ð¥¤¥È)" #: app/drivers/alsa-input.c:128 app/drivers/alsa-output.c:138 -#: app/drivers/oss-output.c:136 +#: app/drivers/oss-output.c:139 #, c-format msgid "Estimated audio delay: %f microseconds" msgstr "¿äÄꥪ¡¼¥Ç¥£¥ª¡¦¥Ç¥£¥ì¥¤: %f¥Þ¥¤¥¯¥íÉÃ" #: app/drivers/alsa-input.c:193 app/drivers/alsa-output.c:200 -#: app/drivers/oss-output.c:185 +#: app/drivers/oss-output.c:188 msgid "These changes won't take effect until you restart playing." msgstr "±éÁÕ¤òºÆ³«¤¹¤ë¤Þ¤Ç¤³¤ì¤é¤ÎÊѹ¹¤Ï¤Ê¤µ¤ì¤Þ¤»¤ó¡£" #: app/drivers/alsa-input.c:205 app/drivers/alsa-output.c:212 -#: app/drivers/oss-output.c:197 +#: app/drivers/oss-output.c:200 msgid "Resolution:" msgstr "²òÁüÅÙ:" #: app/drivers/alsa-input.c:215 app/drivers/alsa-output.c:222 -#: app/drivers/oss-output.c:207 +#: app/drivers/oss-output.c:210 msgid "Channels:" msgstr "¥Á¥ã¥ó¥Í¥ë:" #: app/drivers/alsa-input.c:225 app/drivers/alsa-output.c:232 -#: app/drivers/oss-output.c:217 +#: app/drivers/oss-output.c:220 msgid "Frequency [Hz]:" msgstr "¼þÇÈ¿ô [Hz]:" #: app/drivers/alsa-input.c:235 app/drivers/alsa-output.c:242 -#: app/drivers/oss-output.c:227 +#: app/drivers/oss-output.c:230 msgid "Buffer Size:" msgstr "¥Ð¥Ã¥Õ¥¡¡¦¥µ¥¤¥º:" @@ -89,7 +89,7 @@ "%s" #: app/drivers/alsa-input.c:426 app/drivers/alsa-output.c:427 -#: app/drivers/oss-input.c:221 app/drivers/oss-output.c:387 +#: app/drivers/oss-input.c:221 app/drivers/oss-output.c:390 msgid "Required sound output format not supported.\n" msgstr "Í׵ᤵ¤ì¤¿¥µ¥¦¥ó¥É½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" @@ -119,12 +119,12 @@ "¥µ¥ó¥×¥ê¥ó¥°¤¹¤ë¤Î¤Ë/dev/dsp¤¬³«¤±¤Þ¤»¤ó¤Ç¤·¤¿:\n" "%s" -#: app/drivers/oss-output.c:170 +#: app/drivers/oss-output.c:173 #, c-format msgid "(%d samples)" msgstr "(%d¥µ¥ó¥×¥ë)" -#: app/drivers/oss-output.c:354 +#: app/drivers/oss-output.c:357 #, c-format msgid "" "Couldn't open /dev/dsp for sound output:\n" @@ -157,11 +157,11 @@ msgid "Value" msgstr "ÃÍ" -#: app/envelope-box.c:749 app/gui.c:1074 +#: app/envelope-box.c:749 app/gui.c:1078 msgid "Insert" msgstr "ÁÞÆþ" -#: app/envelope-box.c:755 app/gui.c:1081 +#: app/envelope-box.c:755 app/gui.c:1085 msgid "Delete" msgstr "ºï½ü" @@ -199,67 +199,67 @@ msgid "End" msgstr "½ªÎ»" -#: app/gui-settings.c:69 +#: app/gui-settings.c:75 msgid "Scopes Frequency" msgstr "¥¹¥³¡¼¥×¼þÇÈ¿ô" -#: app/gui-settings.c:72 +#: app/gui-settings.c:78 msgid "Tracker Frequency" msgstr "¥È¥é¥Ã¥«¡¼¼þÇÈ¿ô" -#: app/gui-settings.c:155 app/gui-settings.c:158 +#: app/gui-settings.c:161 app/gui-settings.c:164 msgid "GUI Configuration" msgstr "GUIÀßÄê" -#: app/gui-settings.c:183 +#: app/gui-settings.c:189 msgid "Use Hexadecimal Numbers" msgstr "16¿Ê¿ô¤ò»ÈÍÑ" -#: app/gui-settings.c:190 +#: app/gui-settings.c:196 msgid "Advance Cursor in FX Columns" msgstr "FX¥«¥é¥à¤Ç¤Î¥¢¥É¥Ð¥ó¥¹¡¦¥«¡¼¥½¥ë" -#: app/gui-settings.c:197 +#: app/gui-settings.c:203 msgid "Use anti-aliased envelope editor" msgstr "¥¢¥ó¥Á¡¦¥¨¥¤¥ê¥¢¥¹¡¦¥¨¥ó¥Ù¥í¡¼¥×¡¦¥¨¥Ç¥£¥¿»ÈÍÑ" -#: app/gui-settings.c:203 +#: app/gui-settings.c:209 msgid "You need to restart SoundTracker for this change to come into effect." msgstr "¤³¤ÎÊѹ¹¤òÈ¿±Ç¤¹¤ë¤Ë¤ÏSoundTracker¤òºÆµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£" -#: app/gui-settings.c:212 +#: app/gui-settings.c:218 msgid "Scopes buffer size [MB]" msgstr "¥¹¥³¡¼¥×¡¦¥Ð¥Ã¥Õ¥¡¡¦¥µ¥¤¥º [MB]" -#: app/gui-settings.c:231 +#: app/gui-settings.c:237 msgid "Highlight rows:" msgstr "¹Ô¤Î¶¯Ä´:" -#: app/gui-settings.c:249 +#: app/gui-settings.c:255 msgid "`Save XM' saves all non-empty patterns" msgstr "`ÊݸXM'¤ÇÁ´¤Æ¤Î¶õ¤Ç¤Ê¤¤¥Ñ¥¿¡¼¥ó¤òÊݸ" -#: app/gui-subs.c:374 +#: app/gui-subs.c:386 msgid "Question" msgstr "¼ÁÌä" -#: app/gui-subs.c:391 app/sample-editor.c:1172 +#: app/gui-subs.c:403 app/sample-editor.c:1172 msgid "Cancel" msgstr "¼è¾Ã" -#: app/gui-subs.c:409 +#: app/gui-subs.c:421 msgid "Warning" msgstr "·Ù¹ð" -#: app/gui-subs.c:435 +#: app/gui-subs.c:447 msgid "Error!" msgstr "¥¨¥é¡¼!" -#: app/gui.c:81 +#: app/gui.c:82 msgid "Tempo" msgstr "¥Æ¥ó¥Ý" -#: app/gui.c:209 +#: app/gui.c:211 msgid "" "Are you sure you want to free the current project?\n" "All changes will be lost!" @@ -267,147 +267,147 @@ "¥«¥ì¥ó¥È¡¦¥×¥í¥¸¥§¥¯¥È¤ò²òÊü¤·¤¿¤¤¤Î¤Ï³Î¤«¤Ç¤¹¤«?\n" "Á´¤Æ¤ÎÊѹ¹¤¬¼º¤ï¤ì¤Þ¤¹!" -#: app/gui.c:221 +#: app/gui.c:225 msgid "Are you sure you want to overwrite the file?" msgstr "¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤·¤¿¤¤¤Î¤Ï³Î¤«¤Ç¤¹¤«?" -#: app/gui.c:1065 +#: app/gui.c:1069 msgid "Song length" msgstr "¶ÊĹ" -#: app/gui.c:1066 +#: app/gui.c:1070 msgid "Current pos" msgstr "¸½ºß°ÌÃÖ" -#: app/gui.c:1067 app/gui.c:1222 +#: app/gui.c:1071 app/gui.c:1228 msgid "Pattern" msgstr "¥Ñ¥¿¡¼¥ó" -#: app/gui.c:1068 +#: app/gui.c:1072 msgid "Restart pos" msgstr "ºÆ³«°ÌÃÖ" -#: app/gui.c:1136 +#: app/gui.c:1140 msgid "Load XM..." msgstr "XM¥í¡¼¥É..." -#: app/gui.c:1137 +#: app/gui.c:1142 msgid "Save XM..." msgstr "XMÊݸ..." -#: app/gui.c:1175 +#: app/gui.c:1181 msgid "Play Song" msgstr "¶Ê¤ÎºÆÀ¸" -#: app/gui.c:1181 +#: app/gui.c:1187 msgid "Play Pattern" msgstr "¥Ñ¥¿¡¼¥óºÆÀ¸" -#: app/gui.c:1187 +#: app/gui.c:1193 msgid "Stop" msgstr "Ää»ß" -#: app/gui.c:1206 +#: app/gui.c:1212 msgid "Number of Channels:" msgstr "¥Á¥ã¥ó¥Í¥ë¿ô:" -#: app/gui.c:1238 +#: app/gui.c:1244 msgid "PatLength" msgstr "¥Ñ¥¿¡¼¥óĹ" -#: app/gui.c:1330 +#: app/gui.c:1336 msgid "Octave" msgstr "¥ª¥¯¥¿¡¼¥Ö" -#: app/gui.c:1338 +#: app/gui.c:1344 msgid "Jump" msgstr "¥¸¥ã¥ó¥×" -#: app/gui.c:1346 +#: app/gui.c:1352 msgid "Instr" msgstr "³Ú´ï" -#: app/gui.c:1361 +#: app/gui.c:1367 msgid "Sample" msgstr "¥µ¥ó¥×¥ë" -#: app/instrument-editor.c:74 +#: app/instrument-editor.c:75 msgid "VolFade" msgstr "²»ÎÌ¥Õ¥§¡¼¥É" -#: app/instrument-editor.c:75 +#: app/instrument-editor.c:76 msgid "VibSpeed" msgstr "¥Ð¥¤¥Ö¥ì¡¼¥·¥ç¥ó®ÅÙ" -#: app/instrument-editor.c:76 +#: app/instrument-editor.c:77 msgid "VibDepth" msgstr "¥Ð¥¤¥Ö¥ì¡¼¥·¥ç¥ó¿¼ÅÙ" -#: app/instrument-editor.c:77 +#: app/instrument-editor.c:78 msgid "VibSweep" msgstr "¥Ð¥¤¥Ö¥ì¡¼¥·¥ç¥ó¡¦¥¹¥¤¡¼¥×" -#: app/instrument-editor.c:153 +#: app/instrument-editor.c:154 msgid "Can't open file." msgstr "¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¡£" -#: app/instrument-editor.c:172 +#: app/instrument-editor.c:174 msgid "Saving Instruments not yet supported." msgstr "Êݸ¤¹¤ë³Ú´ï¤Ï¤Þ¤À¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£" -#: app/instrument-editor.c:180 +#: app/instrument-editor.c:182 msgid "Sine" msgstr "Àµ¸¹ÇÈ" -#: app/instrument-editor.c:180 +#: app/instrument-editor.c:182 msgid "Square" msgstr "¶ë·ÁÇÈ" -#: app/instrument-editor.c:180 +#: app/instrument-editor.c:182 msgid "Saw Down" msgstr "²¼¸þµøÇÈ" -#: app/instrument-editor.c:180 +#: app/instrument-editor.c:182 msgid "Saw Up" msgstr "¾å¸þµøÇÈ" -#: app/instrument-editor.c:184 +#: app/instrument-editor.c:186 msgid "Instrument Editor" msgstr "³Ú´ïÊÔ½¸" -#: app/instrument-editor.c:193 +#: app/instrument-editor.c:195 msgid "Volume envelope" msgstr "²»ÎÌ¥¨¥ó¥Ù¥í¡¼¥×" -#: app/instrument-editor.c:201 +#: app/instrument-editor.c:203 msgid "Panning envelope" msgstr "¥Ñ¥ó¡¦¥¨¥ó¥Ù¥í¡¼¥×" -#: app/instrument-editor.c:218 +#: app/instrument-editor.c:220 msgid "Load Instrument.." msgstr "³Ú´ï¥í¡¼¥É.." -#: app/instrument-editor.c:219 +#: app/instrument-editor.c:222 msgid "Save Instrument.." msgstr "³Ú´ïÊݸ.." -#: app/instrument-editor.c:221 +#: app/instrument-editor.c:224 msgid "Load XI" msgstr "XI¥í¡¼¥É" -#: app/instrument-editor.c:227 +#: app/instrument-editor.c:230 msgid "Save XI" msgstr "XIÊݸ" -#: app/instrument-editor.c:247 +#: app/instrument-editor.c:250 msgid "Vibrato Type:" msgstr "¥Ó¥Ö¥é¡¼¥È·¿:" -#: app/instrument-editor.c:319 +#: app/instrument-editor.c:322 msgid "Note:" msgstr "²»Éä" -#: app/instrument-editor.c:337 +#: app/instrument-editor.c:340 msgid "Initialize" msgstr "½é´ü²½" @@ -527,367 +527,383 @@ "½ªÎ»¤·¤¿¤¤¤Î¤Ï³Î¤«¤Ç¤¹¤«?\n" "Á´¤Æ¤ÎÊѹ¹¤¬¼º¤ï¤ì¤Þ¤¹!" -#: app/menubar.c:225 -msgid "_Open.." -msgstr "³«¤¯(_O).." - #: app/menubar.c:227 -msgid "Save _as.." -msgstr "Êݸ(_A).." +msgid "_Open..." +msgstr "³«¤¯(_O)..." + +#: app/menubar.c:229 +msgid "Save _as..." +msgstr "Êݸ(_A)..." -#: app/menubar.c:232 +#: app/menubar.c:234 msgid "_Quit" msgstr "½ªÎ»(_Q)" -#: app/menubar.c:239 +#: app/menubar.c:241 msgid "Clear _All" msgstr "Á´¤Æ¾Ãµî(_A)" -#: app/menubar.c:241 +#: app/menubar.c:243 msgid "Clear _Patterns Only" msgstr "¥Ñ¥¿¡¼¥ó¤Î¤ß¾Ãµî(_P)" -#: app/menubar.c:243 +#: app/menubar.c:245 msgid "_Optimize Module" msgstr "¥â¥¸¥å¡¼¥ëºÇŬ²½(_O)" -#: app/menubar.c:250 app/menubar.c:261 app/menubar.c:274 +#: app/menubar.c:252 app/menubar.c:263 app/menubar.c:281 msgid "C_ut" msgstr "ÀÚ¼è(_u)" -#: app/menubar.c:252 app/menubar.c:263 app/menubar.c:276 +#: app/menubar.c:254 app/menubar.c:265 app/menubar.c:283 msgid "_Copy" msgstr "¥³¥Ô¡¼(_C)" -#: app/menubar.c:254 app/menubar.c:265 app/menubar.c:278 +#: app/menubar.c:256 app/menubar.c:267 app/menubar.c:285 msgid "_Paste" msgstr "ŽÉÕ(_P)" -#: app/menubar.c:272 +#: app/menubar.c:269 +msgid "_Insert" +msgstr "ÁÞÆþ(_I)" + +#: app/menubar.c:271 +msgid "_Delete" +msgstr "ºï½ü(_D)" + +#: app/menubar.c:279 msgid "_Mark" msgstr "¥Þ¡¼¥¯(_M)" -#: app/menubar.c:285 +#: app/menubar.c:292 msgid "_Jazz Edit Mode" msgstr "JazzÊÔ½¸¥â¡¼¥É(_J)" -#: app/menubar.c:290 -msgid "_Transposition.." -msgstr "°ÜÄ´(_T).." +#: app/menubar.c:297 +msgid "Transp_osition..." +msgstr "°ÜÄ´(_o)..." -#: app/menubar.c:295 app/menubar.c:373 +#: app/menubar.c:302 app/menubar.c:380 msgid "_Pattern" msgstr "¥Ñ¥¿¡¼¥ó(_P)" -#: app/menubar.c:296 +#: app/menubar.c:303 msgid "_Track" msgstr "¥È¥é¥Ã¥¯(_T)" -#: app/menubar.c:297 +#: app/menubar.c:304 msgid "_Selection" msgstr "ÁªÂò(_S)" -#: app/menubar.c:303 +#: app/menubar.c:310 msgid "_Find Unused Pattern" msgstr "̤»ÈÍѥѥ¿¡¼¥ó¸¡º÷(_F)" -#: app/menubar.c:305 +#: app/menubar.c:312 msgid "_Copy Current to Unused Pattern" msgstr "̤»ÈÍѥѥ¿¡¼¥ó¤Ë¥«¥ì¥ó¥È¤ò¥³¥Ô¡¼(_C)" -#: app/menubar.c:307 +#: app/menubar.c:314 msgid "C_lear Unused Patterns" msgstr "̤»ÈÍѥѥ¿¡¼¥ó¾Ãµî(_l)" -#: app/menubar.c:309 +#: app/menubar.c:316 msgid "_Pack Patterns" msgstr "¥Ñ¥¿¡¼¥ó¡¦¥Ñ¥Ã¥¯(_P)" -#: app/menubar.c:316 -msgid "_Load XI.." -msgstr "XI¥í¡¼¥É(_L).." +#: app/menubar.c:323 +msgid "_Load XI..." +msgstr "XI¥í¡¼¥É(_L)..." -#: app/menubar.c:321 +#: app/menubar.c:328 msgid "_Delete Unused Instruments" msgstr "̤»ÈÍѳڴïºï½ü(_D)" -#: app/menubar.c:329 +#: app/menubar.c:336 msgid "Display _Oscilloscopes" msgstr "¥ª¥·¥í¥¹¥³¡¼¥×ɽ¼¨(_O)" -#: app/menubar.c:331 +#: app/menubar.c:338 msgid "Use _Backing Store" msgstr "¥Ð¥Ã¥­¥ó¥°¡¦¥¹¥È¥¢»ÈÍÑ(_B)" -#: app/menubar.c:336 -msgid "_Keyboard Configuration.." -msgstr "¥­¡¼¥Ü¡¼¥ÉÀßÄê(_K).." +#: app/menubar.c:343 +msgid "_Keyboard Configuration..." +msgstr "¥­¡¼¥Ü¡¼¥ÉÀßÄê(_K)..." + +#: app/menubar.c:345 +msgid "_Audio Configuration..." +msgstr "¥ª¡¼¥Ç¥£¥ªÀßÄê(_A)..." -#: app/menubar.c:338 -msgid "_Audio Configuration.." -msgstr "¥ª¡¼¥Ç¥£¥ªÀßÄê(_A).." +#: app/menubar.c:347 +msgid "_Playback Effects..." +msgstr "ºÆÀ¸¸ú²Ì(_P)..." -#: app/menubar.c:340 -msgid "_Playback Effects.." -msgstr "ºÆÀ¸¸ú²Ì(_P).." - -#: app/menubar.c:342 -msgid "_GUI Configuration.." -msgstr "GUIÀßÄê(_G).." +#: app/menubar.c:349 +msgid "_GUI Configuration..." +msgstr "GUIÀßÄê(_G)..." -#: app/menubar.c:347 +#: app/menubar.c:354 msgid "_Save Settings now" msgstr "ÀßÄê¤òº£Êݸ(_S)" -#: app/menubar.c:349 +#: app/menubar.c:356 msgid "Save Settings on _Exit" msgstr "½ªÎ»»þ¤ËÀßÄê¤òÊݸ(_E)" -#: app/menubar.c:356 -msgid "_About.." -msgstr "¾ðÊó(_A).." - -#: app/menubar.c:361 -msgid "Show _Tips.." -msgstr "µ»¤Îɽ¼¨(_T).." - #: app/menubar.c:363 -msgid "_XM Effects.." -msgstr "_XM¸ú²Ì.." +msgid "_About..." +msgstr "¾ðÊó(_A)..." + +#: app/menubar.c:368 +msgid "Show _Tips..." +msgstr "µ»¤Îɽ¼¨(_T)..." #: app/menubar.c:370 +msgid "_XM Effects..." +msgstr "_XM¸ú²Ì..." + +#: app/menubar.c:377 msgid "_File" msgstr "¥Õ¥¡¥¤¥ë(_F)" -#: app/menubar.c:371 +#: app/menubar.c:378 msgid "_Module" msgstr "¥â¥¸¥å¡¼¥ë(_M)" -#: app/menubar.c:372 +#: app/menubar.c:379 msgid "_Edit" msgstr "ÊÔ½¸(_E)" -#: app/menubar.c:374 +#: app/menubar.c:381 msgid "_Instrument" msgstr "³Ú´ï(_I)" -#: app/menubar.c:375 +#: app/menubar.c:382 msgid "_Settings" msgstr "ÀßÄê(_S)" -#: app/menubar.c:376 +#: app/menubar.c:383 msgid "_Help" msgstr "¥Ø¥ë¥×(_H)" -#: app/menubar.c:404 +#: app/menubar.c:411 msgid "/_File" msgstr "/¥Õ¥¡¥¤¥ë" -#: app/menubar.c:405 -msgid "/File/_Open.." -msgstr "/¥Õ¥¡¥¤¥ë/³«¤¯(_O).." - -#: app/menubar.c:406 -msgid "/File/Save _as.." -msgstr "/¥Õ¥¡¥¤¥ë/Êݸ(_a).." +#: app/menubar.c:412 +msgid "/File/_Open..." +msgstr "/¥Õ¥¡¥¤¥ë/³«¤¯(_O)..." + +#: app/menubar.c:413 +msgid "/File/Save _as..." +msgstr "/¥Õ¥¡¥¤¥ë/Êݸ(_a)..." -#: app/menubar.c:407 +#: app/menubar.c:414 msgid "/File/-" msgstr "/¥Õ¥¡¥¤¥ë/-" -#: app/menubar.c:408 +#: app/menubar.c:415 msgid "/File/_Quit" msgstr "/¥Õ¥¡¥¤¥ë/½ªÎ»(_Q)" -#: app/menubar.c:409 +#: app/menubar.c:416 msgid "/_Module" msgstr "/¥â¥¸¥å¡¼¥ë" -#: app/menubar.c:410 +#: app/menubar.c:417 msgid "/Module/Clear _All" msgstr "/¥â¥¸¥å¡¼¥ë/Á´¤Æ¾Ãµî(_A)" -#: app/menubar.c:411 +#: app/menubar.c:418 msgid "/Module/Clear _Patterns Only" msgstr "/¥â¥¸¥å¡¼¥ë/¥Ñ¥¿¡¼¥ó¤Î¤ß¾Ãµî(_P)" -#: app/menubar.c:412 +#: app/menubar.c:419 msgid "/Module/_Optimize Module" msgstr "/¥â¥¸¥å¡¼¥ë/¥â¥¸¥å¡¼¥ëºÇŬ²½(_O)" -#: app/menubar.c:413 +#: app/menubar.c:420 msgid "/_Edit" msgstr "/ÊÔ½¸" -#: app/menubar.c:414 +#: app/menubar.c:421 msgid "/Edit/_Jazz Edit Mode" msgstr "/ÊÔ½¸/JazzÊÔ½¸¥â¡¼¥É(_J)" -#: app/menubar.c:415 app/menubar.c:417 +#: app/menubar.c:422 app/menubar.c:424 msgid "/Edit/-" msgstr "/ÊÔ½¸/-" -#: app/menubar.c:416 -msgid "/Edit/_Transposition.." -msgstr "/ÊÔ½¸/°ÜÄ´(_T).." +#: app/menubar.c:423 +msgid "/Edit/_Transposition..." +msgstr "/ÊÔ½¸/°ÜÄ´(_T)..." -#: app/menubar.c:418 +#: app/menubar.c:425 msgid "/Edit/_Pattern" msgstr "/ÊÔ½¸/¥Ñ¥¿¡¼¥ó" -#: app/menubar.c:419 +#: app/menubar.c:426 msgid "/Edit/Pattern/C_ut" msgstr "/ÊÔ½¸/¥Ñ¥¿¡¼¥ó/ÀÚ¼è(_u)" -#: app/menubar.c:420 +#: app/menubar.c:427 msgid "/Edit/Pattern/_Copy" msgstr "/ÊÔ½¸/¥Ñ¥¿¡¼¥ó/¥³¥Ô¡¼(_C)" -#: app/menubar.c:421 +#: app/menubar.c:428 msgid "/Edit/Pattern/_Paste" msgstr "/ÊÔ½¸/¥Ñ¥¿¡¼¥ó/ŽÉÕ(_P)" -#: app/menubar.c:422 +#: app/menubar.c:429 msgid "/Edit/_Track" msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯" -#: app/menubar.c:423 +#: app/menubar.c:430 msgid "/Edit/Track/C_ut" msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/ÀÚ¼è(_u)" -#: app/menubar.c:424 +#: app/menubar.c:431 msgid "/Edit/Track/_Copy" msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/¥³¥Ô¡¼(_C)" -#: app/menubar.c:425 +#: app/menubar.c:432 msgid "/Edit/Track/_Paste" msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/ŽÉÕ(_P)" -#: app/menubar.c:426 +#: app/menubar.c:433 +msgid "/Edit/Track/_Insert" +msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/ÁÞÆþ(_I)" + +#: app/menubar.c:434 +msgid "/Edit/Track/_Delete" +msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/ºï½ü(_D)" + +#: app/menubar.c:435 msgid "/Edit/_Selection" msgstr "/ÊÔ½¸/ÁªÂò" -#: app/menubar.c:427 +#: app/menubar.c:436 msgid "/Edit/Selection/_Mark" msgstr "/ÊÔ½¸/ÁªÂò/¥Þ¡¼¥¯(_M)" -#: app/menubar.c:428 +#: app/menubar.c:437 msgid "/Edit/Selection/C_ut" msgstr "/ÊÔ½¸/ÁªÂò/ÀÚ¼è(_u)" -#: app/menubar.c:429 +#: app/menubar.c:438 msgid "/Edit/Selection/_Copy" msgstr "/ÊÔ½¸/ÁªÂò/¥³¥Ô¡¼(_C)" -#: app/menubar.c:430 +#: app/menubar.c:439 msgid "/Edit/Selection/_Paste" msgstr "/ÊÔ½¸/ÁªÂò/ŽÉÕ(_P)" -#: app/menubar.c:431 app/track-editor.c:72 +#: app/menubar.c:440 msgid "/_Pattern" msgstr "/¥Ñ¥¿¡¼¥ó" -#: app/menubar.c:432 +#: app/menubar.c:441 msgid "/Pattern/_Find Unused Pattern" msgstr "/¥Ñ¥¿¡¼¥ó/̤»ÈÍѥѥ¿¡¼¥ó¸¡º÷(_F)" -#: app/menubar.c:433 +#: app/menubar.c:442 msgid "/Pattern/_Copy Current to Unused Pattern" msgstr "/¥Ñ¥¿¡¼¥ó/̤»ÈÍѥѥ¿¡¼¥ó¤Ë¥«¥ì¥ó¥È¤ò¥³¥Ô¡¼(_C)" -#: app/menubar.c:434 +#: app/menubar.c:443 msgid "/Pattern/C_lear Unused Patterns" msgstr "/¥Ñ¥¿¡¼¥ó/̤»ÈÍѥѥ¿¡¼¥ó¾Ãµî(_l)" -#: app/menubar.c:435 +#: app/menubar.c:444 msgid "/Pattern/_Pack Patterns" msgstr "/¥Ñ¥¿¡¼¥ó/¥Ñ¥¿¡¼¥ó¡¦¥Ñ¥Ã¥¯(_P)" -#: app/menubar.c:436 +#: app/menubar.c:445 msgid "/_Instrument" msgstr "/³Ú´ï" -#: app/menubar.c:437 -msgid "/Instrument/_Load XI.." -msgstr "/³Ú´ï/XI¥í¡¼¥É(_L).." +#: app/menubar.c:446 +msgid "/Instrument/_Load XI..." +msgstr "/³Ú´ï/XI¥í¡¼¥É(_L)..." -#: app/menubar.c:438 +#: app/menubar.c:447 msgid "/Instrument/-" msgstr "/³Ú´ï/-" -#: app/menubar.c:439 +#: app/menubar.c:448 msgid "/Instrument/_Delete Unused Instruments" msgstr "/³Ú´ï/̤»ÈÍѳڴïºï½ü(_D)" -#: app/menubar.c:440 +#: app/menubar.c:449 msgid "/_Settings" msgstr "/ÀßÄê" -#: app/menubar.c:441 +#: app/menubar.c:450 msgid "/Settings/Display _Oscilloscopes" msgstr "/ÀßÄê/¥ª¥·¥í¥¹¥³¡¼¥×ɽ¼¨(_O)" -#: app/menubar.c:442 +#: app/menubar.c:451 msgid "/Settings/Use _Backing Store" msgstr "/ÀßÄê/¥Ð¥Ã¥­¥ó¥°¡¦¥¹¥È¥¢»ÈÍÑ(_B)" -#: app/menubar.c:443 app/menubar.c:448 +#: app/menubar.c:452 app/menubar.c:457 msgid "/Settings/-" msgstr "/ÀßÄê/-" -#: app/menubar.c:444 -msgid "/Settings/_Keyboard Configuration.." -msgstr "/ÀßÄê/¥­¡¼¥Ü¡¼¥ÉÀßÄê(_K).." +#: app/menubar.c:453 +msgid "/Settings/_Keyboard Configuration..." +msgstr "/ÀßÄê/¥­¡¼¥Ü¡¼¥ÉÀßÄê(_K)..." -#: app/menubar.c:445 -msgid "/Settings/_Audio Configuration.." -msgstr "/ÀßÄê/¥ª¡¼¥Ç¥£¥ªÀßÄê(_A).." +#: app/menubar.c:454 +msgid "/Settings/_Audio Configuration..." +msgstr "/ÀßÄê/¥ª¡¼¥Ç¥£¥ªÀßÄê(_A)..." -#: app/menubar.c:446 -msgid "/Settings/_Playback Effects.." -msgstr "/ÀßÄê/ºÆÀ¸¸ú²Ì(_P).." +#: app/menubar.c:455 +msgid "/Settings/_Playback Effects..." +msgstr "/ÀßÄê/ºÆÀ¸¸ú²Ì(_P)..." -#: app/menubar.c:447 -msgid "/Settings/_GUI Configuration.." -msgstr "/ÀßÄê/GUIÀßÄê(_G).." +#: app/menubar.c:456 +msgid "/Settings/_GUI Configuration..." +msgstr "/ÀßÄê/GUIÀßÄê(_G)..." -#: app/menubar.c:449 +#: app/menubar.c:458 msgid "/Settings/_Save Settings now" msgstr "/ÀßÄê/ÀßÄê¤òº£Êݸ(_S)" -#: app/menubar.c:450 +#: app/menubar.c:459 msgid "/Settings/Save Settings on _Exit" msgstr "/ÀßÄê/½ªÎ»»þ¤ËÀßÄê¤òÊݸ(_E)" -#: app/menubar.c:451 +#: app/menubar.c:460 msgid "/_Help" msgstr "/¥Ø¥ë¥×" -#: app/menubar.c:452 -msgid "/Help/_About.." -msgstr "/¥Ø¥ë¥×/¾ðÊó(_A).." +#: app/menubar.c:461 +msgid "/Help/_About..." +msgstr "/¥Ø¥ë¥×/¾ðÊó(_A)..." -#: app/menubar.c:453 +#: app/menubar.c:462 msgid "/Help/-" msgstr "/¥Ø¥ë¥×/-" -#: app/menubar.c:454 -msgid "/Help/Show _Tips.." -msgstr "/¥Ø¥ë¥×/µ»¤Îɽ¼¨(_T).." +#: app/menubar.c:463 +msgid "/Help/Show _Tips..." +msgstr "/¥Ø¥ë¥×/µ»¤Îɽ¼¨(_T)..." + +#: app/menubar.c:464 +msgid "/Help/_XM Effects..." +msgstr "/¥Ø¥ë¥×/XM¸ú²Ì(_X)..." -#: app/menubar.c:455 -msgid "/Help/_XM Effects.." -msgstr "/¥Ø¥ë¥×/XM¸ú²Ì(_X).." - -#: app/menubar.c:469 +#: app/menubar.c:478 msgid "/Settings/Display Oscilloscopes" msgstr "/ÀßÄê/¥ª¥·¥í¥¹¥³¡¼¥×ɽ¼¨(O)" -#: app/menubar.c:471 +#: app/menubar.c:480 msgid "/Settings/Use Backing Store" msgstr "/ÀßÄê/¥Ð¥Ã¥­¥ó¥°¡¦¥¹¥È¥¢»ÈÍÑ(B)" -#: app/menubar.c:473 +#: app/menubar.c:482 msgid "/Settings/Save Settings on Exit" msgstr "/ÀßÄê/½ªÎ»»þ¤ËÀßÄê¤òÊݸ(E)" @@ -1060,10 +1076,6 @@ msgid "Length: %d" msgstr "Ťµ: %d" -#: app/sample-editor.c:865 -msgid "No memory for copybuffer.\n" -msgstr "¥³¥Ô¡¼¡¦¥Ð¥Ã¥Õ¥¡¤Ë¥á¥â¥êÉÔ­¤Ç¤¹¡£\n" - #: app/sample-editor.c:957 msgid "" msgstr "<º£Å½ÉÕ¤±¤µ¤ì¤Þ¤·¤¿>" @@ -1082,10 +1094,6 @@ msgid "Can only handle mono 8 and 16 bit samples" msgstr "¥â¥Î¥é¥ë¤Î 8¡¢16¥Ó¥Ã¥È¡¦¥µ¥ó¥×¥ë¤Î¤ß½èÍý¤Ç¤­¤Þ¤¹" -#: app/sample-editor.c:1060 -msgid "Out of memory for sample data." -msgstr "¥µ¥ó¥×¥ë¡¦¥Ç¡¼¥¿¤Ë¥á¥â¥êÉÔ­¤Ç¤¹¡£" - #: app/sample-editor.c:1065 msgid "Read error." msgstr "Æɤ߹þ¤ß¥¨¥é¡¼¡£" @@ -1106,10 +1114,6 @@ msgid "Sampling Window" msgstr "¥µ¥ó¥×¥ê¥ó¥°¡¦¥¦¥£¥ó¥É¥¦" -#: app/sample-editor.c:1252 -msgid "out of memory while sampling..." -msgstr "¥µ¥ó¥×¥ê¥ó¥°Ãæ¤Ë¥á¥â¥êÉÔ­¤Ë¤Ê¤ê¤Þ¤·¤¿..." - #: app/sample-editor.c:1303 msgid "" msgstr "<º£¥µ¥ó¥×¥ê¥ó¥°¤·¤Þ¤·¤¿>" @@ -1211,19 +1215,7 @@ "³Ú´ïÊÔ½¸¥Ú¡¼¥¸¤Ç¡¢¥µ¥ó¥×¥ë¤ò¥¢¥¯¥Æ¥£¥Ö¤Ë¤·¤Æ¤«¤é¥­¡¼¥Ü¡¼¥É¤ò¥¯¥ê¥Ã¥¯\n" "¤¹¤ë¤È¸Ä¡¹¤Î¥­¡¼¤Ë³Ú´ï¤Î¥µ¥ó¥×¥ë¤ò³äÅö¤Æ¤é¤ì¤ë¤è¡£" -#: app/track-editor.c:73 -msgid "/Pattern/_Cut" -msgstr "/¥Ñ¥¿¡¼¥ó/ÀÚ¼è(_C)" - -#: app/track-editor.c:74 -msgid "/Pattern/_Copy" -msgstr "/¥Ñ¥¿¡¼¥ó/¥³¥Ô¡¼(_C)" - -#: app/track-editor.c:75 -msgid "/Pattern/_Paste" -msgstr "/¥Ñ¥¿¡¼¥ó/ŽÉÕ(_P)" - -#: app/track-editor.c:139 +#: app/track-editor.c:82 msgid "Jazz Edit:" msgstr "JazzÊÔ½¸:" @@ -1353,3 +1345,4 @@ msgstr "" "¥â¥¸¥å¡¼¥ë¤¬¸½ºß¤Î¥ß¥­¥µ¡¦¥â¥¸¥å¡¼¥ë¤Ë¤ÏĹ²á¤®¤ë¥µ¥ó¥×¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£\n" "¥µ¥ó¥×¥ë¤ÎºÇÂçŤÏ%d¤Ç¤¹¡£" + diff -urN soundtracker-0.3.5/po/soundtracker.pot soundtracker-0.3.6/po/soundtracker.pot --- soundtracker-0.3.5/po/soundtracker.pot Fri Oct 8 16:31:24 1999 +++ soundtracker-0.3.6/po/soundtracker.pot Sun Nov 14 15:19:14 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-10-08 16:31+0200\n" +"POT-Creation-Date: 1999-11-14 15:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -101,10 +101,29 @@ "%s" msgstr "" -#: app/drivers/oss-input.c:90 +#: app/drivers/esd-output.c:94 +msgid "" +"Note that the ESD output is unusable in\n" +"interactive mode because of the latency added\n" +"by ESD. Use the OSS or ALSA output plug-ins\n" +"for serious work." +msgstr "" + +#: app/drivers/esd-output.c:159 +#, c-format +msgid "" +"Couldn't connect to ESD for sound output:\n" +"%s" +msgstr "" + +#: app/drivers/file-output.c:86 app/drivers/oss-input.c:90 msgid "no settings (yet), sorry!" msgstr "" +#: app/drivers/file-output.c:161 app/sample-editor.c:1120 +msgid "Can't open file for writing." +msgstr "" + #: app/drivers/oss-input.c:188 #, c-format msgid "" @@ -148,11 +167,11 @@ msgid "Value" msgstr "" -#: app/envelope-box.c:749 app/gui.c:1078 +#: app/envelope-box.c:749 app/gui.c:1115 msgid "Insert" msgstr "" -#: app/envelope-box.c:755 app/gui.c:1085 +#: app/envelope-box.c:755 app/gui.c:1122 msgid "Delete" msgstr "" @@ -245,73 +264,77 @@ msgid "Tempo" msgstr "" -#: app/gui.c:211 +#: app/gui.c:220 msgid "" "Are you sure you want to free the current project?\n" "All changes will be lost!" msgstr "" -#: app/gui.c:225 +#: app/gui.c:234 app/gui.c:246 msgid "Are you sure you want to overwrite the file?" msgstr "" -#: app/gui.c:1069 +#: app/gui.c:1106 msgid "Song length" msgstr "" -#: app/gui.c:1070 +#: app/gui.c:1107 msgid "Current pos" msgstr "" -#: app/gui.c:1071 app/gui.c:1228 +#: app/gui.c:1108 app/gui.c:1266 msgid "Pattern" msgstr "" -#: app/gui.c:1072 +#: app/gui.c:1109 msgid "Restart pos" msgstr "" -#: app/gui.c:1140 +#: app/gui.c:1177 msgid "Load XM..." msgstr "" -#: app/gui.c:1142 +#: app/gui.c:1179 msgid "Save XM..." msgstr "" #: app/gui.c:1181 +msgid "Render module as WAV..." +msgstr "" + +#: app/gui.c:1219 msgid "Play Song" msgstr "" -#: app/gui.c:1187 +#: app/gui.c:1225 msgid "Play Pattern" msgstr "" -#: app/gui.c:1193 +#: app/gui.c:1231 msgid "Stop" msgstr "" -#: app/gui.c:1212 +#: app/gui.c:1250 msgid "Number of Channels:" msgstr "" -#: app/gui.c:1244 +#: app/gui.c:1282 msgid "PatLength" msgstr "" -#: app/gui.c:1336 +#: app/gui.c:1374 msgid "Octave" msgstr "" -#: app/gui.c:1344 +#: app/gui.c:1382 msgid "Jump" msgstr "" -#: app/gui.c:1352 +#: app/gui.c:1390 msgid "Instr" msgstr "" -#: app/gui.c:1367 +#: app/gui.c:1405 msgid "Sample" msgstr "" @@ -505,374 +528,382 @@ msgstr "" #: app/menubar.c:234 +msgid "Save Module as _WAV..." +msgstr "" + +#: app/menubar.c:239 msgid "_Quit" msgstr "" -#: app/menubar.c:241 +#: app/menubar.c:246 msgid "Clear _All" msgstr "" -#: app/menubar.c:243 +#: app/menubar.c:248 msgid "Clear _Patterns Only" msgstr "" -#: app/menubar.c:245 +#: app/menubar.c:250 msgid "_Optimize Module" msgstr "" -#: app/menubar.c:252 app/menubar.c:263 app/menubar.c:281 +#: app/menubar.c:257 app/menubar.c:268 app/menubar.c:286 msgid "C_ut" msgstr "" -#: app/menubar.c:254 app/menubar.c:265 app/menubar.c:283 +#: app/menubar.c:259 app/menubar.c:270 app/menubar.c:288 msgid "_Copy" msgstr "" -#: app/menubar.c:256 app/menubar.c:267 app/menubar.c:285 +#: app/menubar.c:261 app/menubar.c:272 app/menubar.c:290 msgid "_Paste" msgstr "" -#: app/menubar.c:269 +#: app/menubar.c:274 msgid "_Insert" msgstr "" -#: app/menubar.c:271 +#: app/menubar.c:276 msgid "_Delete" msgstr "" -#: app/menubar.c:279 +#: app/menubar.c:284 msgid "_Mark" msgstr "" -#: app/menubar.c:292 +#: app/menubar.c:297 msgid "_Jazz Edit Mode" msgstr "" -#: app/menubar.c:297 +#: app/menubar.c:302 msgid "Transp_osition..." msgstr "" -#: app/menubar.c:302 app/menubar.c:380 +#: app/menubar.c:307 app/menubar.c:385 msgid "_Pattern" msgstr "" -#: app/menubar.c:303 +#: app/menubar.c:308 msgid "_Track" msgstr "" -#: app/menubar.c:304 +#: app/menubar.c:309 msgid "_Selection" msgstr "" -#: app/menubar.c:310 +#: app/menubar.c:315 msgid "_Find Unused Pattern" msgstr "" -#: app/menubar.c:312 +#: app/menubar.c:317 msgid "_Copy Current to Unused Pattern" msgstr "" -#: app/menubar.c:314 +#: app/menubar.c:319 msgid "C_lear Unused Patterns" msgstr "" -#: app/menubar.c:316 +#: app/menubar.c:321 msgid "_Pack Patterns" msgstr "" -#: app/menubar.c:323 +#: app/menubar.c:328 msgid "_Load XI..." msgstr "" -#: app/menubar.c:328 +#: app/menubar.c:333 msgid "_Delete Unused Instruments" msgstr "" -#: app/menubar.c:336 +#: app/menubar.c:341 msgid "Display _Oscilloscopes" msgstr "" -#: app/menubar.c:338 +#: app/menubar.c:343 msgid "Use _Backing Store" msgstr "" -#: app/menubar.c:343 +#: app/menubar.c:348 msgid "_Keyboard Configuration..." msgstr "" -#: app/menubar.c:345 +#: app/menubar.c:350 msgid "_Audio Configuration..." msgstr "" -#: app/menubar.c:347 +#: app/menubar.c:352 msgid "_Playback Effects..." msgstr "" -#: app/menubar.c:349 +#: app/menubar.c:354 msgid "_GUI Configuration..." msgstr "" -#: app/menubar.c:354 +#: app/menubar.c:359 msgid "_Save Settings now" msgstr "" -#: app/menubar.c:356 +#: app/menubar.c:361 msgid "Save Settings on _Exit" msgstr "" -#: app/menubar.c:363 +#: app/menubar.c:368 msgid "_About..." msgstr "" -#: app/menubar.c:368 +#: app/menubar.c:373 msgid "Show _Tips..." msgstr "" -#: app/menubar.c:370 +#: app/menubar.c:375 msgid "_XM Effects..." msgstr "" -#: app/menubar.c:377 +#: app/menubar.c:382 msgid "_File" msgstr "" -#: app/menubar.c:378 +#: app/menubar.c:383 msgid "_Module" msgstr "" -#: app/menubar.c:379 +#: app/menubar.c:384 msgid "_Edit" msgstr "" -#: app/menubar.c:381 +#: app/menubar.c:386 msgid "_Instrument" msgstr "" -#: app/menubar.c:382 +#: app/menubar.c:387 msgid "_Settings" msgstr "" -#: app/menubar.c:383 +#: app/menubar.c:388 msgid "_Help" msgstr "" -#: app/menubar.c:411 +#: app/menubar.c:416 msgid "/_File" msgstr "" -#: app/menubar.c:412 +#: app/menubar.c:417 msgid "/File/_Open..." msgstr "" -#: app/menubar.c:413 +#: app/menubar.c:418 msgid "/File/Save _as..." msgstr "" -#: app/menubar.c:414 +#: app/menubar.c:419 app/menubar.c:421 msgid "/File/-" msgstr "" -#: app/menubar.c:415 +#: app/menubar.c:420 +msgid "/File/Save Module as _WAV..." +msgstr "" + +#: app/menubar.c:422 msgid "/File/_Quit" msgstr "" -#: app/menubar.c:416 +#: app/menubar.c:423 msgid "/_Module" msgstr "" -#: app/menubar.c:417 +#: app/menubar.c:424 msgid "/Module/Clear _All" msgstr "" -#: app/menubar.c:418 +#: app/menubar.c:425 msgid "/Module/Clear _Patterns Only" msgstr "" -#: app/menubar.c:419 +#: app/menubar.c:426 msgid "/Module/_Optimize Module" msgstr "" -#: app/menubar.c:420 +#: app/menubar.c:427 msgid "/_Edit" msgstr "" -#: app/menubar.c:421 +#: app/menubar.c:428 msgid "/Edit/_Jazz Edit Mode" msgstr "" -#: app/menubar.c:422 app/menubar.c:424 +#: app/menubar.c:429 app/menubar.c:431 msgid "/Edit/-" msgstr "" -#: app/menubar.c:423 +#: app/menubar.c:430 msgid "/Edit/_Transposition..." msgstr "" -#: app/menubar.c:425 +#: app/menubar.c:432 msgid "/Edit/_Pattern" msgstr "" -#: app/menubar.c:426 +#: app/menubar.c:433 msgid "/Edit/Pattern/C_ut" msgstr "" -#: app/menubar.c:427 +#: app/menubar.c:434 msgid "/Edit/Pattern/_Copy" msgstr "" -#: app/menubar.c:428 +#: app/menubar.c:435 msgid "/Edit/Pattern/_Paste" msgstr "" -#: app/menubar.c:429 +#: app/menubar.c:436 msgid "/Edit/_Track" msgstr "" -#: app/menubar.c:430 +#: app/menubar.c:437 msgid "/Edit/Track/C_ut" msgstr "" -#: app/menubar.c:431 +#: app/menubar.c:438 msgid "/Edit/Track/_Copy" msgstr "" -#: app/menubar.c:432 +#: app/menubar.c:439 msgid "/Edit/Track/_Paste" msgstr "" -#: app/menubar.c:433 +#: app/menubar.c:440 msgid "/Edit/Track/_Insert" msgstr "" -#: app/menubar.c:434 +#: app/menubar.c:441 msgid "/Edit/Track/_Delete" msgstr "" -#: app/menubar.c:435 +#: app/menubar.c:442 msgid "/Edit/_Selection" msgstr "" -#: app/menubar.c:436 +#: app/menubar.c:443 msgid "/Edit/Selection/_Mark" msgstr "" -#: app/menubar.c:437 +#: app/menubar.c:444 msgid "/Edit/Selection/C_ut" msgstr "" -#: app/menubar.c:438 +#: app/menubar.c:445 msgid "/Edit/Selection/_Copy" msgstr "" -#: app/menubar.c:439 +#: app/menubar.c:446 msgid "/Edit/Selection/_Paste" msgstr "" -#: app/menubar.c:440 +#: app/menubar.c:447 msgid "/_Pattern" msgstr "" -#: app/menubar.c:441 +#: app/menubar.c:448 msgid "/Pattern/_Find Unused Pattern" msgstr "" -#: app/menubar.c:442 +#: app/menubar.c:449 msgid "/Pattern/_Copy Current to Unused Pattern" msgstr "" -#: app/menubar.c:443 +#: app/menubar.c:450 msgid "/Pattern/C_lear Unused Patterns" msgstr "" -#: app/menubar.c:444 +#: app/menubar.c:451 msgid "/Pattern/_Pack Patterns" msgstr "" -#: app/menubar.c:445 +#: app/menubar.c:452 msgid "/_Instrument" msgstr "" -#: app/menubar.c:446 +#: app/menubar.c:453 msgid "/Instrument/_Load XI..." msgstr "" -#: app/menubar.c:447 +#: app/menubar.c:454 msgid "/Instrument/-" msgstr "" -#: app/menubar.c:448 +#: app/menubar.c:455 msgid "/Instrument/_Delete Unused Instruments" msgstr "" -#: app/menubar.c:449 +#: app/menubar.c:456 msgid "/_Settings" msgstr "" -#: app/menubar.c:450 +#: app/menubar.c:457 msgid "/Settings/Display _Oscilloscopes" msgstr "" -#: app/menubar.c:451 +#: app/menubar.c:458 msgid "/Settings/Use _Backing Store" msgstr "" -#: app/menubar.c:452 app/menubar.c:457 +#: app/menubar.c:459 app/menubar.c:464 msgid "/Settings/-" msgstr "" -#: app/menubar.c:453 +#: app/menubar.c:460 msgid "/Settings/_Keyboard Configuration..." msgstr "" -#: app/menubar.c:454 +#: app/menubar.c:461 msgid "/Settings/_Audio Configuration..." msgstr "" -#: app/menubar.c:455 +#: app/menubar.c:462 msgid "/Settings/_Playback Effects..." msgstr "" -#: app/menubar.c:456 +#: app/menubar.c:463 msgid "/Settings/_GUI Configuration..." msgstr "" -#: app/menubar.c:458 +#: app/menubar.c:465 msgid "/Settings/_Save Settings now" msgstr "" -#: app/menubar.c:459 +#: app/menubar.c:466 msgid "/Settings/Save Settings on _Exit" msgstr "" -#: app/menubar.c:460 +#: app/menubar.c:467 msgid "/_Help" msgstr "" -#: app/menubar.c:461 +#: app/menubar.c:468 msgid "/Help/_About..." msgstr "" -#: app/menubar.c:462 +#: app/menubar.c:469 msgid "/Help/-" msgstr "" -#: app/menubar.c:463 +#: app/menubar.c:470 msgid "/Help/Show _Tips..." msgstr "" -#: app/menubar.c:464 +#: app/menubar.c:471 msgid "/Help/_XM Effects..." msgstr "" -#: app/menubar.c:478 +#: app/menubar.c:485 msgid "/Settings/Display Oscilloscopes" msgstr "" -#: app/menubar.c:480 +#: app/menubar.c:487 msgid "/Settings/Use Backing Store" msgstr "" -#: app/menubar.c:482 +#: app/menubar.c:489 msgid "/Settings/Save Settings on Exit" msgstr "" @@ -1063,10 +1094,6 @@ msgid "Read error." msgstr "" -#: app/sample-editor.c:1120 -msgid "Can't open file for writing." -msgstr "" - #: app/sample-editor.c:1157 msgid "OK" msgstr "" @@ -1169,79 +1196,79 @@ msgid "Jazz Edit:" msgstr "" -#: app/transposition.c:165 +#: app/transposition.c:166 msgid "Whole Song" msgstr "" -#: app/transposition.c:166 +#: app/transposition.c:167 msgid "All Patterns" msgstr "" -#: app/transposition.c:167 +#: app/transposition.c:168 msgid "Current Pattern" msgstr "" -#: app/transposition.c:168 +#: app/transposition.c:169 msgid "Current Track" msgstr "" -#: app/transposition.c:172 +#: app/transposition.c:173 msgid "Current Instrument" msgstr "" -#: app/transposition.c:173 +#: app/transposition.c:174 msgid "All Instruments" msgstr "" -#: app/transposition.c:177 +#: app/transposition.c:178 msgid "Half note up" msgstr "" -#: app/transposition.c:178 +#: app/transposition.c:179 msgid "Half note down" msgstr "" -#: app/transposition.c:179 +#: app/transposition.c:180 msgid "Octave up" msgstr "" -#: app/transposition.c:180 +#: app/transposition.c:181 msgid "Octave down" msgstr "" -#: app/transposition.c:183 +#: app/transposition.c:184 msgid "Exchange 1 <-> 2" msgstr "" -#: app/transposition.c:184 +#: app/transposition.c:185 msgid "Change 1 -> 2" msgstr "" -#: app/transposition.c:193 app/transposition.c:196 +#: app/transposition.c:194 app/transposition.c:197 msgid "Transposition Tools" msgstr "" -#: app/transposition.c:216 +#: app/transposition.c:217 msgid "Scope of the operation:" msgstr "" -#: app/transposition.c:223 +#: app/transposition.c:224 msgid "Note Transposition" msgstr "" -#: app/transposition.c:253 +#: app/transposition.c:254 msgid "Instrument Changing" msgstr "" -#: app/transposition.c:268 +#: app/transposition.c:269 msgid "Instrument 1:" msgstr "" -#: app/transposition.c:270 app/transposition.c:280 +#: app/transposition.c:271 app/transposition.c:281 msgid "Current instrument" msgstr "" -#: app/transposition.c:278 +#: app/transposition.c:279 msgid "Instrument 2:" msgstr "" diff -urN soundtracker-0.3.5/soundtracker.spec soundtracker-0.3.6/soundtracker.spec --- soundtracker-0.3.5/soundtracker.spec Fri Oct 8 16:30:32 1999 +++ soundtracker-0.3.6/soundtracker.spec Sun Nov 14 15:28:59 1999 @@ -1,6 +1,6 @@ %define name soundtracker -%define version 0.3.5 -%define release 6 +%define version 0.3.6 +%define release 7 %define prefix /usr Summary: Sound modules editor/player