diff -urN soundtracker-0.5.9/ChangeLog soundtracker-0.6.0/ChangeLog --- soundtracker-0.5.9/ChangeLog Mon Sep 25 14:58:33 2000 +++ soundtracker-0.6.0/ChangeLog Thu Sep 28 23:04:28 2000 @@ -1,3 +1,20 @@ +2000-09-28 Michael Krause + + * Released v0.6.0 -- the first officially stable version ever :) + + * po: Updated ja.po + +2000-09-27 Michael Krause + + * app/sample-editor.c, app/xm.c: Added various pointer arithmetic + changes due to the recent change of sample.data from void* to + gint16*. Fixes some crashes.. + +2000-09-26 Michael Krause + + * app/midi-settings.c (midi_load_config): Yet another compilation + fix :) + 2000-09-25 Michael Krause * Released v0.5.9 diff -urN soundtracker-0.5.9/NEWS soundtracker-0.6.0/NEWS --- soundtracker-0.5.9/NEWS Mon Sep 25 15:03:57 2000 +++ soundtracker-0.6.0/NEWS Thu Sep 28 23:05:48 2000 @@ -4,6 +4,12 @@ responsible for having coded a particular feature (full names in AUTHORS file). +What is new in soundtracker-0.6.0 (28-Sep-2000): + +* Fixed crash that occured when loading a MOD or doing + cut'n'paste in the sample editor +* MIDI really compiles again now + What is new in soundtracker-0.5.9 (25-Sep-2000): * MIDI compiles again diff -urN soundtracker-0.5.9/README soundtracker-0.6.0/README --- soundtracker-0.5.9/README Mon Sep 25 14:58:34 2000 +++ soundtracker-0.6.0/README Thu Sep 28 23:03:19 2000 @@ -4,7 +4,7 @@ http://www.soundtracker.org/ -------------------------------------------------------------- - v0.5.9 --- THIS IS A DEVELOPMENT VERSION! + v0.6.0 --- The first officially stable version :-) Written and (C) 1998-2000 by Michael Krause [ raw style / lego ] diff -urN soundtracker-0.5.9/TODO soundtracker-0.6.0/TODO --- soundtracker-0.5.9/TODO Mon Sep 25 14:54:24 2000 +++ soundtracker-0.6.0/TODO Thu Sep 28 23:03:22 2000 @@ -3,7 +3,6 @@ - === GTK+ / GNOME bugs ===== bug: start st, go to instrument page, go back to tracker page, hit diff -urN soundtracker-0.5.9/app/Makefile.in soundtracker-0.6.0/app/Makefile.in --- soundtracker-0.5.9/app/Makefile.in Mon Sep 25 15:07:56 2000 +++ soundtracker-0.6.0/app/Makefile.in Wed Sep 27 10:13:18 2000 @@ -316,112 +316,6 @@ || exit 1; \ fi; \ done -audio.o: audio.c ../config.h poll.h i18n.h audio.h mixer.h driver-out.h \ - driver.h preferences.h time-buffer.h event-waiter.h main.h xm.h \ - xm-player.h endian-conv.h scope-group.h sample-display.h \ - errors.h gui-settings.h -audioconfig.o: audioconfig.c ../config.h i18n.h audioconfig.h gui-subs.h \ - audio.h mixer.h driver-out.h driver.h preferences.h \ - time-buffer.h event-waiter.h sample-editor.h xm.h driver-in.h \ - gui.h -cheat-sheet.o: cheat-sheet.c ../config.h i18n.h -clavier.o: clavier.c clavier.h -endian-conv.o: endian-conv.c ../config.h endian-conv.h -envelope-box.o: envelope-box.c ../config.h i18n.h gui-subs.h \ - envelope-box.h xm.h mixer.h gui-settings.h -errors.o: errors.c audio.h mixer.h driver-out.h driver.h preferences.h \ - time-buffer.h event-waiter.h -event-waiter.o: event-waiter.c event-waiter.h -extspinbutton.o: extspinbutton.c extspinbutton.h -file-operations.o: file-operations.c ../config.h i18n.h \ - file-operations.h keys.h track-editor.h tracker.h xm.h mixer.h \ - tracker-settings.h gui-subs.h gui.h audio.h driver-out.h \ - driver.h preferences.h time-buffer.h event-waiter.h errors.h -gui-settings.o: gui-settings.c ../config.h i18n.h gui.h gui-subs.h \ - audio.h mixer.h driver-out.h driver.h preferences.h \ - time-buffer.h event-waiter.h gui-settings.h scope-group.h \ - sample-display.h track-editor.h tracker.h xm.h \ - tracker-settings.h extspinbutton.h -gui-subs.o: gui-subs.c ../config.h i18n.h gui.h gui-subs.h audio.h \ - mixer.h driver-out.h driver.h preferences.h time-buffer.h \ - event-waiter.h extspinbutton.h -gui.o: gui.c ../config.h poll.h i18n.h gui.h gui-subs.h audio.h mixer.h \ - driver-out.h driver.h preferences.h time-buffer.h \ - event-waiter.h xm.h st-subs.h xm-player.h tracker.h main.h \ - keys.h instrument-editor.h sample-editor.h driver-in.h \ - track-editor.h tracker-settings.h scope-group.h \ - sample-display.h module-info.h menubar.h tips-dialog.h \ - gui-settings.h file-operations.h playlist.h -instrument-editor.o: instrument-editor.c i18n.h ../config.h \ - instrument-editor.h xm.h mixer.h envelope-box.h st-subs.h gui.h \ - gui-subs.h audio.h driver-out.h driver.h preferences.h \ - time-buffer.h event-waiter.h keys.h track-editor.h tracker.h \ - tracker-settings.h clavier.h errors.h sample-editor.h \ - driver-in.h gui-settings.h module-info.h file-operations.h -keys.o: keys.c ../config.h i18n.h keys.h gui-subs.h gui.h audio.h \ - mixer.h driver-out.h driver.h preferences.h time-buffer.h \ - event-waiter.h menubar.h -main.o: main.c ../config.h i18n.h gui.h gui-subs.h audio.h mixer.h \ - driver-out.h driver.h preferences.h time-buffer.h \ - event-waiter.h xm.h keys.h gui-settings.h audioconfig.h \ - tips-dialog.h menubar.h track-editor.h tracker.h \ - tracker-settings.h midi.h midi-settings.h -menubar.o: menubar.c ../config.h i18n.h menubar.h gui.h gui-subs.h \ - audio.h mixer.h driver-out.h driver.h preferences.h \ - time-buffer.h event-waiter.h main.h xm.h st-subs.h keys.h \ - module-info.h scope-group.h sample-display.h track-editor.h \ - tracker.h tracker-settings.h audioconfig.h gui-settings.h \ - tips-dialog.h transposition.h cheat-sheet.h file-operations.h \ - instrument-editor.h midi-settings.h -midi-settings.o: midi-settings.c ../config.h -midi-utils.o: midi-utils.c ../config.h -midi.o: midi.c ../config.h -module-info.o: module-info.c i18n.h ../config.h module-info.h gui.h \ - gui-subs.h audio.h mixer.h driver-out.h driver.h preferences.h \ - time-buffer.h event-waiter.h xm.h st-subs.h main.h \ - sample-editor.h driver-in.h instrument-editor.h keys.h \ - track-editor.h tracker.h tracker-settings.h -playlist.o: playlist.c ../config.h i18n.h playlist.h gui-subs.h gui.h \ - audio.h mixer.h driver-out.h driver.h preferences.h \ - time-buffer.h event-waiter.h -poll.o: poll.c ../config.h -preferences.o: preferences.c ../config.h i18n.h gui-subs.h preferences.h \ - menubar.h scope-group.h sample-display.h track-editor.h \ - tracker.h xm.h mixer.h tracker-settings.h errors.h -recode.o: recode.c recode.h -sample-display.o: sample-display.c sample-display.h -sample-editor.o: sample-editor.c ../config.h i18n.h sample-editor.h xm.h \ - mixer.h driver-in.h driver.h preferences.h st-subs.h gui.h \ - gui-subs.h audio.h driver-out.h time-buffer.h event-waiter.h \ - instrument-editor.h sample-display.h endian-conv.h keys.h \ - track-editor.h tracker.h tracker-settings.h errors.h \ - module-info.h file-operations.h gui-settings.h -scope-group.o: scope-group.c ../config.h scope-group.h sample-display.h \ - audio.h mixer.h driver-out.h driver.h preferences.h \ - time-buffer.h event-waiter.h gui-subs.h gui-settings.h -st-subs.o: st-subs.c st-subs.h xm.h mixer.h gui-settings.h -time-buffer.o: time-buffer.c time-buffer.h -tips-dialog.o: tips-dialog.c ../config.h i18n.h tips-dialog.h \ - preferences.h -track-editor.o: track-editor.c i18n.h ../config.h track-editor.h \ - tracker.h xm.h mixer.h tracker-settings.h gui.h gui-subs.h \ - audio.h driver-out.h driver.h preferences.h time-buffer.h \ - event-waiter.h st-subs.h keys.h xm-player.h main.h \ - gui-settings.h menubar.h -tracker-settings.o: tracker-settings.c ../config.h tracker-settings.h \ - tracker.h xm.h mixer.h i18n.h gui-subs.h preferences.h -tracker.o: tracker.c tracker.h xm.h mixer.h main.h gui-settings.h -transposition.o: transposition.c i18n.h ../config.h transposition.h \ - main.h xm.h mixer.h gui-subs.h gui.h audio.h driver-out.h \ - driver.h preferences.h time-buffer.h event-waiter.h st-subs.h \ - track-editor.h tracker.h tracker-settings.h -xm-player.o: xm-player.c ../config.h i18n.h xm-player.h xm.h mixer.h \ - main.h audio.h driver-out.h driver.h preferences.h \ - time-buffer.h event-waiter.h -xm.o: xm.c i18n.h ../config.h gui-settings.h xm.h mixer.h xm-player.h \ - endian-conv.h st-subs.h recode.h errors.h audio.h driver-out.h \ - driver.h preferences.h time-buffer.h event-waiter.h - info-am: info: info-recursive dvi-am: diff -urN soundtracker-0.5.9/app/drivers/Makefile.in soundtracker-0.6.0/app/drivers/Makefile.in --- soundtracker-0.5.9/app/drivers/Makefile.in Mon Sep 25 15:07:58 2000 +++ soundtracker-0.6.0/app/drivers/Makefile.in Wed Sep 27 10:13:20 2000 @@ -218,25 +218,6 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -alsa-input.o: alsa-input.c ../../config.h -alsa-output.o: alsa-output.c ../../config.h -alsa2-input.o: alsa2-input.c ../../config.h -alsa2-output.o: alsa2-output.c ../../config.h -dsound-output.o: dsound-output.c ../../config.h -dummy-drivers.o: dummy-drivers.c ../../config.h ../i18n.h ../driver-in.h \ - ../driver.h ../preferences.h ../driver-out.h -esd-output.o: esd-output.c ../../config.h -file-output.o: file-output.c ../../config.h ../i18n.h ../driver-out.h \ - ../driver.h ../preferences.h ../mixer.h ../errors.h \ - ../gui-subs.h -irix-output.o: irix-output.c ../../config.h -oss-input.o: oss-input.c ../../config.h ../i18n.h ../driver-in.h \ - ../driver.h ../preferences.h ../mixer.h ../errors.h \ - ../gui-subs.h -oss-output.o: oss-output.c ../../config.h ../i18n.h ../driver-out.h \ - ../driver.h ../preferences.h ../mixer.h ../errors.h \ - ../gui-subs.h - info-am: info: info-am dvi-am: diff -urN soundtracker-0.5.9/app/midi-settings.c soundtracker-0.6.0/app/midi-settings.c --- soundtracker-0.5.9/app/midi-settings.c Sun Sep 24 18:29:24 2000 +++ soundtracker-0.6.0/app/midi-settings.c Tue Sep 26 13:47:46 2000 @@ -89,11 +89,8 @@ void midi_load_config (void) { - char buf[256]; prefs_node *f; - sprintf(buf, "%s/midi", prefs_get_prefsdir()); - f = prefs_open_read("midi"); if (f) { prefs_get_int(f, "input-client", @@ -117,7 +114,6 @@ void midi_save_config (void) { - char buf[256]; prefs_node *f; f = prefs_open_write("midi"); diff -urN soundtracker-0.5.9/app/mixers/Makefile.in soundtracker-0.6.0/app/mixers/Makefile.in --- soundtracker-0.5.9/app/mixers/Makefile.in Mon Sep 25 15:07:59 2000 +++ soundtracker-0.6.0/app/mixers/Makefile.in Wed Sep 27 10:13:33 2000 @@ -231,10 +231,6 @@ fi; \ done $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook -integer32.o: integer32.c ../../config.h ../mixer.h integer32-asm.h -kb-x86.o: kb-x86.c ../../config.h ../mixer.h kb-x86-asm.h -kbfloat-mix.o: kbfloat-mix.c ../../config.h kb-x86-asm.h - info-am: info: info-am dvi-am: diff -urN soundtracker-0.5.9/app/sample-editor.c soundtracker-0.6.0/app/sample-editor.c --- soundtracker-0.5.9/app/sample-editor.c Mon Sep 25 12:57:50 2000 +++ soundtracker-0.6.0/app/sample-editor.c Wed Sep 27 10:30:38 2000 @@ -948,7 +948,7 @@ gboolean spliceout) { int cutlen, newlen; - void *newsample; + gint16 *newsample; STSample *oldsample = current_sample; int ss = sampledisplay->sel_start, se; @@ -971,7 +971,7 @@ error_error("Out of memory for copybuffer.\n"); } else { memcpy(copybuffer, - oldsample->sample.data + ss * 2, + oldsample->sample.data + ss, cutlen * 2); } copybuffer_treat_as_8bit = oldsample->treat_as_8bit; @@ -994,8 +994,8 @@ memcpy(newsample, oldsample->sample.data, ss * 2); - memcpy(newsample + ss * 2, - oldsample->sample.data + se * 2, + memcpy(newsample + ss, + oldsample->sample.data + se, (oldsample->sample.length - se) * 2); free(oldsample->sample.data); @@ -1075,7 +1075,7 @@ static void sample_editor_paste_clicked (void) { - void *newsample; + gint16 *newsample; STSample *oldsample = current_sample; int ss = sampledisplay->sel_start, newlen; int update_ie = 0; @@ -1108,16 +1108,16 @@ oldsample->sample.data, ss * 2); st_convert_sample(copybuffer, - newsample + ss * 2, + newsample + ss, 16, 16, copybufferlen); if(oldsample->treat_as_8bit) { - st_sample_cutoff_lowest_8_bits(newsample + ss * 2, + st_sample_cutoff_lowest_8_bits(newsample + ss, copybufferlen); } - memcpy(newsample + (ss + copybufferlen) * 2, - oldsample->sample.data + ss * 2, + memcpy(newsample + (ss + copybufferlen), + oldsample->sample.data + ss, (oldsample->sample.length - ss) * 2); free(oldsample->sample.data); @@ -1642,7 +1642,7 @@ if(current_sample->treat_as_8bit) { void *buf = malloc(1 * length); g_assert(buf); - st_convert_sample(current_sample->sample.data + offset * 2, + st_convert_sample(current_sample->sample.data + offset, buf, 16, 8, @@ -1655,7 +1655,7 @@ free(buf); } else { afWriteFrames(outfile, AF_DEFAULT_TRACK, - current_sample->sample.data + offset * 2, + current_sample->sample.data + offset, length); } diff -urN soundtracker-0.5.9/app/xm.c soundtracker-0.6.0/app/xm.c --- soundtracker-0.5.9/app/xm.c Mon Sep 25 12:05:51 2000 +++ soundtracker-0.6.0/app/xm.c Wed Sep 27 10:30:38 2000 @@ -870,8 +870,11 @@ } s->sample.data = malloc(2 * s->sample.length); - fread(s->sample.data + s->sample.length, 1, s->sample.length, f); - st_convert_sample(s->sample.data + s->sample.length, + if(!s->sample.data) { + goto ende; + } + fread((char*)s->sample.data + s->sample.length, 1, s->sample.length, f); + st_convert_sample((char*)s->sample.data + s->sample.length, s->sample.data, 8, 16, diff -urN soundtracker-0.5.9/configure soundtracker-0.6.0/configure --- soundtracker-0.5.9/configure Sun Sep 24 15:04:37 2000 +++ soundtracker-0.6.0/configure Wed Sep 27 10:13:03 2000 @@ -727,7 +727,7 @@ PACKAGE=soundtracker -VERSION=0.5.9 +VERSION=0.6.0 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; } diff -urN soundtracker-0.5.9/configure.in soundtracker-0.6.0/configure.in --- soundtracker-0.5.9/configure.in Sun Sep 24 15:03:42 2000 +++ soundtracker-0.6.0/configure.in Wed Sep 27 10:11:13 2000 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(app/endian-conv.h) -AM_INIT_AUTOMAKE(soundtracker, 0.5.9) +AM_INIT_AUTOMAKE(soundtracker, 0.6.0) AM_CONFIG_HEADER(config.h) dnl ----------------------------------------------------------------------- Binary files soundtracker-0.5.9/po/de.gmo and soundtracker-0.6.0/po/de.gmo differ diff -urN soundtracker-0.5.9/po/de.po soundtracker-0.6.0/po/de.po --- soundtracker-0.5.9/po/de.po Mon Sep 25 15:07:50 2000 +++ soundtracker-0.6.0/po/de.po Thu Sep 28 23:06:46 2000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: soundtracker-0.3.3\n" -"POT-Creation-Date: 2000-09-25 14:53+0200\n" +"POT-Creation-Date: 2000-09-27 10:35+0200\n" "PO-Revision-Date: 1999-09-21 23:00+02:00\n" "Last-Translator: Colin Marquardt \n" "Language-Team: German \n" @@ -2010,24 +2010,24 @@ msgid "Invalid vibtype %d, using Sine.\n" msgstr "Ungültiger vibtype %d, verwende Sinus.\n" -#: app/xm.c:838 app/xm.c:955 +#: app/xm.c:838 app/xm.c:958 msgid "Error while loading patterns." msgstr "Fehler beim Laden der Pattern." -#: app/xm.c:903 +#: app/xm.c:906 msgid "Can't open file" msgstr "Kann Datei nicht öffnen" -#: app/xm.c:917 +#: app/xm.c:920 msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" msgstr "" "XM-Header-Länge != 276. Vielleicht ein pre-0.0.12 SoundTracker-Modul? :-)\n" -#: app/xm.c:961 +#: app/xm.c:964 msgid "Error while loading instruments." msgstr "Fehler beim Laden der Instrumente." -#: app/xm.c:972 +#: app/xm.c:975 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" @@ -2036,7 +2036,7 @@ "Modul enthält Sample(s), die zu lang für den aktuellen Mixer sind..\n" "Maximale Sample-Länge ist %d." -#: app/xm.c:1296 +#: app/xm.c:1299 msgid "No FastTracker XM and no supported MOD format!" msgstr "Kein FastTracker XM und kein unterstütztes MOD-Format!" diff -urN soundtracker-0.5.9/po/es.po soundtracker-0.6.0/po/es.po --- soundtracker-0.5.9/po/es.po Mon Sep 25 15:07:51 2000 +++ soundtracker-0.6.0/po/es.po Thu Sep 28 23:06:46 2000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-09-25 14:53+0200\n" +"POT-Creation-Date: 2000-09-27 10:35+0200\n" "PO-Revision-Date: 1999-10-02 23:58+0200\n" "Last-Translator: German Gomez >\n" "Language-Team: Spanish \n" @@ -1922,30 +1922,30 @@ msgid "Invalid vibtype %d, using Sine.\n" msgstr "" -#: app/xm.c:838 app/xm.c:955 +#: app/xm.c:838 app/xm.c:958 msgid "Error while loading patterns." msgstr "" -#: app/xm.c:903 +#: app/xm.c:906 msgid "Can't open file" msgstr "" -#: app/xm.c:917 +#: app/xm.c:920 msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" msgstr "" -#: app/xm.c:961 +#: app/xm.c:964 msgid "Error while loading instruments." msgstr "" -#: app/xm.c:972 +#: app/xm.c:975 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" "Maximum sample length is %d." msgstr "" -#: app/xm.c:1296 +#: app/xm.c:1299 msgid "No FastTracker XM and no supported MOD format!" msgstr "" diff -urN soundtracker-0.5.9/po/fr.po soundtracker-0.6.0/po/fr.po --- soundtracker-0.5.9/po/fr.po Mon Sep 25 15:07:51 2000 +++ soundtracker-0.6.0/po/fr.po Thu Sep 28 23:06:46 2000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: soundtracker-0.5.0\n" -"POT-Creation-Date: 2000-09-25 14:53+0200\n" +"POT-Creation-Date: 2000-09-27 10:35+0200\n" "PO-Revision-Date: 2000-03-21 19:19+01:00\n" "Last-Translator: Saïd Bougribate \n" "Language-Team: French \n" @@ -1984,25 +1984,25 @@ msgid "Invalid vibtype %d, using Sine.\n" msgstr "Tipe de vibrato %d invalide, utilise le Sinus.\n" -#: app/xm.c:838 app/xm.c:955 +#: app/xm.c:838 app/xm.c:958 msgid "Error while loading patterns." msgstr "Erreur lors de la lecture des patterns." -#: app/xm.c:903 +#: app/xm.c:906 msgid "Can't open file" msgstr "Ne peut ouvrir le fichier" -#: app/xm.c:917 +#: app/xm.c:920 msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" msgstr "" "La longueur de l'entête du XM est != 276. Il se peut que ce soit un module\n" "de la pré-version 0.0.12 de SoundTracker? :-)\n" -#: app/xm.c:961 +#: app/xm.c:964 msgid "Error while loading instruments." msgstr "Erreur lors de la lecture des instruments." -#: app/xm.c:972 +#: app/xm.c:975 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" @@ -2011,7 +2011,7 @@ "Le module contient de(s) sample(s) qui sont trop long pour le mixer.\n" "La taille maximum est de %d." -#: app/xm.c:1296 +#: app/xm.c:1299 msgid "No FastTracker XM and no supported MOD format!" msgstr "Il n'y a pas de XM FastTracker et de format MOD supporté!" diff -urN soundtracker-0.5.9/po/it.po soundtracker-0.6.0/po/it.po --- soundtracker-0.5.9/po/it.po Mon Sep 25 15:07:51 2000 +++ soundtracker-0.6.0/po/it.po Thu Sep 28 23:06:46 2000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: soundtracker-0.5.7\n" -"POT-Creation-Date: 2000-09-25 14:53+0200\n" +"POT-Creation-Date: 2000-09-27 10:35+0200\n" "PO-Revision-Date: 2000-09-02 19:19+01:00\n" "Last-Translator: Yuri Bongiorno \n" "Language-Team: Italian \n" @@ -1905,25 +1905,25 @@ msgid "Invalid vibtype %d, using Sine.\n" msgstr "Tipo di vibrato %d non valido, uso il seno.\n" -#: app/xm.c:838 app/xm.c:955 +#: app/xm.c:838 app/xm.c:958 msgid "Error while loading patterns." msgstr "Errore durante il caricamento dei pattern." -#: app/xm.c:903 +#: app/xm.c:906 msgid "Can't open file" msgstr "Impossibile aprire il file" -#: app/xm.c:917 +#: app/xm.c:920 msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" msgstr "" "La lunghezza dell'header è != 276. Forse il modulo appartiene a una versione " "di Soundtracker precedente alla 0.0.12? :-)\n" -#: app/xm.c:961 +#: app/xm.c:964 msgid "Error while loading instruments." msgstr "Errore durante il caricamento degli strumenti." -#: app/xm.c:972 +#: app/xm.c:975 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" @@ -1932,6 +1932,6 @@ "Il modulo contiene campioni che sono troppo lunghi per l'attuale mixer.\n" "La lunghezza massima del campione è %d." -#: app/xm.c:1296 +#: app/xm.c:1299 msgid "No FastTracker XM and no supported MOD format!" msgstr "Non è un XM di FastTracker nè un formato MOD supportato!" Binary files soundtracker-0.5.9/po/ja.gmo and soundtracker-0.6.0/po/ja.gmo differ diff -urN soundtracker-0.5.9/po/ja.po soundtracker-0.6.0/po/ja.po --- soundtracker-0.5.9/po/ja.po Mon Sep 25 15:07:51 2000 +++ soundtracker-0.6.0/po/ja.po Thu Sep 28 23:06:46 2000 @@ -1,4 +1,4 @@ -# ja.po(0.5.5-0) for SoundTracker +# ja.po(0.5.9-0) for SoundTracker # Copyright (C) 1998-2000 Michael Krause . # Translators: Atsushi Yamagata , 1999, 2000. # Yuuki NINOMIYA , 1999, 2000. @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: SoundTracker 0.3.10\n" -"POT-Creation-Date: 2000-09-25 14:53+0200\n" -"PO-Revision-Date: 2000-06-06 15:08+09:00\n" +"POT-Creation-Date: 2000-09-27 10:35+0200\n" +"PO-Revision-Date: 2000-09-26 13:37+09:00\n" "Last-Translator: Atsushi Yamagata \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-JP\n" @@ -293,9 +293,8 @@ msgstr "GUIÀßÄê" #: app/gui-settings.c:353 -#, fuzzy msgid "Hexadecimal row numbers" -msgstr "16¿Ê¿ô¤ò»ÈÍÑ" +msgstr "16¿Ê¹Ô¿ô" #: app/gui-settings.c:360 msgid "Use upper case letters for hex numbers" @@ -303,7 +302,7 @@ #: app/gui-settings.c:367 msgid "Advance cursor horizontally in effect columns" -msgstr "" +msgstr "¥¨¥Õ¥§¥¯¥ÈÎó¤Ç¥«¡¼¥½¥ë¤ò¿åÊ¿¤Ë¿Ê¤á¤ë" #: app/gui-settings.c:374 msgid "Asynchronous Editing" @@ -319,7 +318,7 @@ #: app/gui-settings.c:395 msgid "Auto switch" -msgstr "" +msgstr "¼«Æ°Àڤ괹¤¨" #: app/gui-settings.c:402 msgid "Use anti-aliased envelope editor" @@ -335,11 +334,11 @@ #: app/gui-settings.c:436 msgid "Highlight rows:" -msgstr "" +msgstr "¹Ô¤ò¥Ï¥¤¥é¥¤¥È:" #: app/gui-settings.c:460 msgid "Track line format:" -msgstr "" +msgstr "¥È¥é¥Ã¥¯¹Ô½ñ¼°" #: app/gui-settings.c:512 msgid "`Save XM' saves all non-empty patterns" @@ -715,9 +714,8 @@ msgstr "_WAV¤È¤·¤Æ¥â¥¸¥å¡¼¥ë¤òÊݸ..." #: app/menubar.c:290 -#, fuzzy msgid "Save XM without samples..." -msgstr "¥µ¥ó¥×¥ëÊݸ..." +msgstr "¥µ¥ó¥×¥ë̵¤·¤ËXMÊݸ..." #: app/menubar.c:295 msgid "_Quit" @@ -748,9 +746,8 @@ msgstr "ŽÉÕ(_P)" #: app/menubar.c:330 -#, fuzzy msgid "_Kill notes" -msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/ºï½ü(_D)" +msgstr "²»Éä¤ò¾Ã¤¹(_K)" #: app/menubar.c:332 msgid "_Insert" @@ -762,25 +759,23 @@ #: app/menubar.c:336 msgid "Increment cmd value" -msgstr "" +msgstr "cmdÃÍÁý²Ã" #: app/menubar.c:338 msgid "Decrement cmd value" -msgstr "" +msgstr "cmdÃ͸º¾¯" #: app/menubar.c:345 -#, fuzzy msgid "_Mark mode" -msgstr "¥Þ¡¼¥¯(_M)" +msgstr "¥Þ¡¼¥¯¡¦¥â¡¼¥É(_M)" #: app/menubar.c:347 app/menubar.c:381 -#, fuzzy msgid "C_lear block marks" -msgstr "¥µ¥ó¥×¥ë¾Ãµî" +msgstr "¥Ö¥í¥Ã¥¯¡¦¥Þ¡¼¥¯¾Ãµî(_l)" #: app/menubar.c:355 app/menubar.c:389 msgid "_Interpolate effects" -msgstr "" +msgstr "ÆâÁÞ¥¨¥Õ¥§¥¯¥È(_I)" #: app/menubar.c:363 msgid "_Jazz Edit Mode" @@ -935,9 +930,8 @@ msgstr "/¥Õ¥¡¥¤¥ë/_WAV¤È¤·¤Æ¥â¥¸¥å¡¼¥ë¤òÊݸ..." #: app/menubar.c:541 -#, fuzzy msgid "/File/Save XM without samples..." -msgstr "/¥Õ¥¡¥¤¥ë/_WAV¤È¤·¤Æ¥â¥¸¥å¡¼¥ë¤òÊݸ..." +msgstr "/¥Õ¥¡¥¤¥ë/¥µ¥ó¥×¥ë̵¤·¤ËXMÊݸ..." #: app/menubar.c:543 msgid "/File/_Quit" @@ -1008,9 +1002,8 @@ msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/ŽÉÕ(_P)" #: app/menubar.c:561 -#, fuzzy msgid "/Edit/Track/_Kill notes" -msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/ºï½ü(_D)" +msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/²»Éä¤ò¾Ã¤¹(_K)" #: app/menubar.c:562 msgid "/Edit/Track/_Insert" @@ -1025,14 +1018,12 @@ msgstr "/ÊÔ½¸/ÁªÂò" #: app/menubar.c:565 -#, fuzzy msgid "/Edit/Selection/_Mark mode" -msgstr "/ÊÔ½¸/ÁªÂò/¥Þ¡¼¥¯(_M)" +msgstr "/ÊÔ½¸/ÁªÂò/¥Þ¡¼¥¯¡¦¥â¡¼¥É(_M)" #: app/menubar.c:566 -#, fuzzy msgid "/Edit/Selection/C_lear block marks" -msgstr "/ÊÔ½¸/ÁªÂò/¥Þ¡¼¥¯(_M)" +msgstr "/ÊÔ½¸/ÁªÂò/¥Ö¥í¥Ã¥¯¡¦¥Þ¡¼¥¯¾Ãµî(_l)" #: app/menubar.c:567 msgid "/Edit/Selection/C_ut" @@ -1047,19 +1038,16 @@ msgstr "/ÊÔ½¸/ÁªÂò/ŽÉÕ(_P)" #: app/menubar.c:570 -#, fuzzy msgid "/Edit/Selection/_Interpolate effects" -msgstr "/ÊÔ½¸/ÁªÂò/ŽÉÕ(_P)" +msgstr "/ÊÔ½¸/ÁªÂò/ÆâÁÞ¥¨¥Õ¥§¥¯¥È(_I)" #: app/menubar.c:571 -#, fuzzy msgid "/Edit/Track/Increment cmd value" -msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/ÁÞÆþ(_I)" +msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/cmdÃÍÁý²Ã" #: app/menubar.c:572 -#, fuzzy msgid "/Edit/Track/Decrement cmd value" -msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/ºï½ü(_D)" +msgstr "/ÊÔ½¸/¥È¥é¥Ã¥¯/cmdÃ͸º¾¯" #: app/menubar.c:573 msgid "/_Pattern" @@ -1282,9 +1270,8 @@ msgstr "Ťµ:" #: app/sample-editor.c:321 -#, fuzzy msgid "Set as loop" -msgstr "¥ë¡¼¥×³«»ÏÀßÄê/¥ë¡¼¥×" +msgstr "¥ë¡¼¥×¤È¤·¤ÆÀßÄê" #: app/sample-editor.c:329 msgid "RelNote" @@ -1399,9 +1386,8 @@ msgstr "±¦" #: app/sample-editor.c:1464 -#, fuzzy msgid "Load raw sample" -msgstr "¥¹¥Æ¥ì¥ª¡¦¥µ¥ó¥×¥ë¡¦¥í¡¼¥É" +msgstr "À¸¥µ¥ó¥×¥ë¡¦¥í¡¼¥É" #: app/sample-editor.c:1472 msgid "" @@ -1410,6 +1396,10 @@ "\n" "Please choose a format:" msgstr "" +"´ûÃΤǤʤ¤¥µ¥ó¥×¥ë¤òÁªÂò¤·¤Þ¤·¤¿¡£\n" +"À¸¥Ç¡¼¥¿¤òº£¥í¡¼¥É¤Ç¤­¤Þ¤¹¡£\n" +"\n" +"½ñ¼°¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:" #: app/sample-editor.c:1498 msgid "Wortformat:" @@ -1586,7 +1576,7 @@ #. 5 #: app/track-editor.c:91 msgid "Vibrato + Volume slide" -msgstr "" +msgstr "¥Ó¥Ö¥é¡¼¥È+¥Ü¥ê¥å¡¼¥à¡¦¥¹¥é¥¤¥É" #. 6 #: app/track-editor.c:92 @@ -1652,7 +1642,7 @@ #. P #: app/track-editor.c:111 msgid "LP filter resonance" -msgstr "" +msgstr "LP¥Õ¥£¥ë¥¿¡¦¥ì¥¾¥Ê¥ó¥¹" #. Q #: app/track-editor.c:112 @@ -1673,7 +1663,7 @@ #. Y #: app/track-editor.c:120 msgid "LP filter cutoff" -msgstr "" +msgstr "LP¥Õ¥£¥ë¥¿¡¦¥«¥Ã¥È¥ª¥Õ" #. 0 #: app/track-editor.c:125 @@ -1734,20 +1724,20 @@ #. C #: app/track-editor.c:137 msgid "Note delay" -msgstr "" +msgstr "²»Éä¤ÎÃÙ±ä" #. D #: app/track-editor.c:138 msgid "Pattern delay" -msgstr "" +msgstr "¥Ñ¥¿¡¼¥ó¤ÎÃÙ±ä" #: app/track-editor.c:143 msgid "Volume slide down" -msgstr "" +msgstr "¥Ü¥ê¥å¡¼¥à¡¦¥¹¥é¥¤¥É¡¦¥À¥¦¥ó" #: app/track-editor.c:144 msgid "Volume slide up" -msgstr "" +msgstr "¥Ü¥ê¥å¡¼¥à¡¦¥¹¥é¥¤¥É¡¦¥¢¥Ã¥×" #: app/track-editor.c:147 msgid "Set vibrato speed" @@ -1906,25 +1896,25 @@ msgid "Invalid vibtype %d, using Sine.\n" msgstr "ÉÔÀµ¤Ê¥Ð¥¤¥Ö¥ì¡¼¥·¥ç¥ó·¿%d¡¢Àµ¸¹ÇȤò»ÈÍѤ·¤Þ¤¹¡£\n" -#: app/xm.c:838 app/xm.c:955 +#: app/xm.c:838 app/xm.c:958 msgid "Error while loading patterns." msgstr "¥Ñ¥¿¡¼¥ó¤Î¥í¡¼¥ÉÃæ¤Ë¥¨¥é¡¼¡£" -#: app/xm.c:903 +#: app/xm.c:906 msgid "Can't open file" msgstr "¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó" -#: app/xm.c:917 +#: app/xm.c:920 msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" msgstr "" "XM¥Ø¥Ã¥ÀŤ¬276¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n" "¶²¤é¤¯pre-0.0.12 SoundTracker¥â¥¸¥å¡¼¥ë¤Ç¤Ï? :-)\n" -#: app/xm.c:961 +#: app/xm.c:964 msgid "Error while loading instruments." msgstr "³Ú´ï¤Î¥í¡¼¥ÉÃæ¤Ë¥¨¥é¡¼¡£" -#: app/xm.c:972 +#: app/xm.c:975 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" @@ -1933,16 +1923,7 @@ "¥â¥¸¥å¡¼¥ë¤¬¸½ºß¤Î¥ß¥­¥µ¡¦¥â¥¸¥å¡¼¥ë¤Ë¤ÏĹ²á¤®¤ë¥µ¥ó¥×¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£\n" "¥µ¥ó¥×¥ë¤ÎºÇÂçŤÏ%d¤Ç¤¹¡£" -#: app/xm.c:1296 +#: app/xm.c:1299 msgid "No FastTracker XM and no supported MOD format!" msgstr "" "FastTracker XM¥Õ¥©¡¼¥Þ¥Ã¥È¤Ç¤â¥µ¥Ý¡¼¥È¤µ¤ì¤¿MOD¥Õ¥©¡¼¥Þ¥Ã¥È¤Ç¤â¤¢¤ê¤Þ¤»¤ó!" - -#~ msgid "Save Song as XM..." -#~ msgstr "XM¤È¤·¤Æ¶ÊÊݸ..." - -#~ msgid "/File/Save Song as XM..." -#~ msgstr "/¥Õ¥¡¥¤¥ë/XM¤È¤·¤Æ¶ÊÊݸ..." - -#~ msgid "Show zeroes" -#~ msgstr "ÎíÅÀɽ¼¨" Binary files soundtracker-0.5.9/po/pl.gmo and soundtracker-0.6.0/po/pl.gmo differ diff -urN soundtracker-0.5.9/po/pl.po soundtracker-0.6.0/po/pl.po --- soundtracker-0.5.9/po/pl.po Mon Sep 25 15:07:51 2000 +++ soundtracker-0.6.0/po/pl.po Thu Sep 28 23:06:46 2000 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: soundtracker\n" -"POT-Creation-Date: 2000-09-25 14:53+0200\n" +"POT-Creation-Date: 2000-09-27 10:35+0200\n" "PO-Revision-Date: 1999-09-05 15:58+0200\n" "Last-Translator: GNOME PL Team\n" "Language-Team: Polish \n" @@ -1998,24 +1998,24 @@ msgid "Invalid vibtype %d, using Sine.\n" msgstr "Niepoprawny typ wibrato %d, wykorzystanie sinusa.\n" -#: app/xm.c:838 app/xm.c:955 +#: app/xm.c:838 app/xm.c:958 msgid "Error while loading patterns." msgstr "B³±d podczas wczytywania instrumentów." -#: app/xm.c:903 +#: app/xm.c:906 msgid "Can't open file" msgstr "Nie mo¿na otworzyæ pliku" -#: app/xm.c:917 +#: app/xm.c:920 msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" msgstr "" "D³ugo¶æ nag³ówka XM != 276. Mo¿e to modu³ SoundTrackera przed 0.0.12? :-)\n" -#: app/xm.c:961 +#: app/xm.c:964 msgid "Error while loading instruments." msgstr "B³±d podczas wczytywania instrumentów." -#: app/xm.c:972 +#: app/xm.c:975 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" @@ -2024,7 +2024,7 @@ "Modu³ zawiera próbki, które s± zbyt d³ugie dla aktualnego miksera.\n" "Maksymalna d³ugo¶æ próbki wynosi %d." -#: app/xm.c:1296 +#: app/xm.c:1299 msgid "No FastTracker XM and no supported MOD format!" msgstr "Plik nie jest w formacie XM FastTrackera ani w formacie MOD!" Binary files soundtracker-0.5.9/po/ru.gmo and soundtracker-0.6.0/po/ru.gmo differ diff -urN soundtracker-0.5.9/po/ru.po soundtracker-0.6.0/po/ru.po --- soundtracker-0.5.9/po/ru.po Mon Sep 25 15:07:52 2000 +++ soundtracker-0.6.0/po/ru.po Thu Sep 28 23:06:47 2000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: soundtracker-0.3.10\n" -"POT-Creation-Date: 2000-09-25 14:53+0200\n" +"POT-Creation-Date: 2000-09-27 10:35+0200\n" "PO-Revision-Date: 2000-02-21 11:12+0200\n" "Last-Translator: Michael Shigorin \n" "Language-Team: Russian \n" @@ -1961,23 +1961,23 @@ msgid "Invalid vibtype %d, using Sine.\n" msgstr "îÅ×ÅÒÎÙÊ ÔÉÐ ×ÉÂÒÁÔÏ %d, ÉÓÐÏÌØÚÕÀ ÓÉÎÕÓÏÉÄÕ.\n" -#: app/xm.c:838 app/xm.c:955 +#: app/xm.c:838 app/xm.c:958 msgid "Error while loading patterns." msgstr "ïÛÉÂËÁ ÐÒÉ ÚÁÇÒÕÚËÅ ÐÁÔÔÅÒÎÏ×." -#: app/xm.c:903 +#: app/xm.c:906 msgid "Can't open file" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ" -#: app/xm.c:917 +#: app/xm.c:920 msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" msgstr "äÌÉÎÁ ÚÁÇÏÌÏ×ËÁ XM != 276. íÏÖÅÔ, ÜÔÏ ÏÔ SoundTracker <0.0.12? :-)\n" -#: app/xm.c:961 +#: app/xm.c:964 msgid "Error while loading instruments." msgstr "ïÛÉÂËÁ ÐÒÉ ÚÁÇÒÕÚËÅ ÉÎÓÔÒÕÍÅÎÔÏ×." -#: app/xm.c:972 +#: app/xm.c:975 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" @@ -1986,7 +1986,7 @@ "íÏÄÕÌØ ÓÏÄÅÒÖÉÔ ÓÜÍÐÌ(Ù) ÓÏ ÓÌÉÛËÏÍ ÂÏÌØÛÏÊ ÄÌÑ ÔÅËÕÝÅÇÏ ÍÉËÓÅÒÁ ÄÌÉÎÏÊ.\n" "íÁËÓÉÍÁÌØÎÁÑ ÄÌÉÎÁ ÓÜÍÐÌÁ -- %d." -#: app/xm.c:1296 +#: app/xm.c:1299 msgid "No FastTracker XM and no supported MOD format!" msgstr "îÅÐÏÄÄÅÒÖÉ×ÁÅÍÙÊ ÆÏÒÍÁÔ MOD ÉÌÉ ÎÅ FastTracker XM!" diff -urN soundtracker-0.5.9/po/soundtracker.pot soundtracker-0.6.0/po/soundtracker.pot --- soundtracker-0.5.9/po/soundtracker.pot Mon Sep 25 14:53:41 2000 +++ soundtracker-0.6.0/po/soundtracker.pot Wed Sep 27 10:35:19 2000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-09-25 14:53+0200\n" +"POT-Creation-Date: 2000-09-27 10:35+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1833,29 +1833,29 @@ msgid "Invalid vibtype %d, using Sine.\n" msgstr "" -#: app/xm.c:838 app/xm.c:955 +#: app/xm.c:838 app/xm.c:958 msgid "Error while loading patterns." msgstr "" -#: app/xm.c:903 +#: app/xm.c:906 msgid "Can't open file" msgstr "" -#: app/xm.c:917 +#: app/xm.c:920 msgid "XM header length != 276. Maybe a pre-0.0.12 SoundTracker module? :-)\n" msgstr "" -#: app/xm.c:961 +#: app/xm.c:964 msgid "Error while loading instruments." msgstr "" -#: app/xm.c:972 +#: app/xm.c:975 #, c-format msgid "" "Module contains sample(s) that are too long for the current mixer.\n" "Maximum sample length is %d." msgstr "" -#: app/xm.c:1296 +#: app/xm.c:1299 msgid "No FastTracker XM and no supported MOD format!" msgstr "" diff -urN soundtracker-0.5.9/soundtracker.spec soundtracker-0.6.0/soundtracker.spec --- soundtracker-0.5.9/soundtracker.spec Mon Sep 25 14:58:34 2000 +++ soundtracker-0.6.0/soundtracker.spec Thu Sep 28 23:04:12 2000 @@ -1,6 +1,6 @@ %define name soundtracker -%define version 0.5.9 -%define release 21 +%define version 0.6.0 +%define release 22 %define prefix /usr Summary: Sound modules editor/player