Melys User's Guide
Prev

Beneath the ruler, there is a scale showing the current timesignature + and keysignature. + + It is not yet possible to edit these.

You can have several tempo map views open at the same time, although this is mostly pointless. Changes made in one view will be reflected in all other open @@ -90,7 +101,7 @@ >

The tempo map view

Each tempo change is represented by a little square. +> Each tempo change is represented by a small square. These are connected by a line, the horizontal line shows the current tempo at that time. The scale at the left is in beats per minute, from zero up to a @@ -140,7 +151,7 @@ >

Changing the tempo

Adding a new tempo change

Copying/moving a set of tempo changes

Next Key bindings

+ Key bindings + + + Many of the common operations can be carried out using keystrokes + rather than using the menus. + Indeed this is the best way to operate the program once you are + used to it. + + + Default keybindings + + + Default keybindings for play actions + + + + ReturnStart or continue playing + + PPause playing + + SpaceStop playing or recording + + Keypad AddStart recording + + Keypad SubtractStop recording while continuing + play + + +

+ + + Default keybindings for file operations + + + + F3Open a file + + Control-SSave the current file + + Control-WClose the current song + + Control-QQuit &mel; + + +

+ diff -rNu melys-0.1.10/help/C/melys.sgml melys-0.1.11/help/C/melys.sgml --- melys-0.1.10/help/C/melys.sgml Mon Nov 29 10:25:15 1999 +++ melys-0.1.11/help/C/melys.sgml Fri Dec 3 17:23:54 1999 @@ -10,6 +10,7 @@ + ] > @@ -55,4 +56,5 @@ &PIANO-CHAPTER; &TEMPO-CHAPTER; +&keybindings; diff -rNu melys-0.1.10/help/C/tempo.sgml melys-0.1.11/help/C/tempo.sgml --- melys-0.1.10/help/C/tempo.sgml Mon Nov 29 10:25:15 1999 +++ melys-0.1.11/help/C/tempo.sgml Fri Dec 3 17:23:54 1999 @@ -21,6 +21,12 @@ buttons. + Beneath the ruler, there is a scale showing the current timesignature + and keysignature. + + It is not yet possible to edit these. + + You can have several tempo map views open at the same time, although this is mostly pointless. Changes made in one view will be reflected in all other open @@ -47,7 +53,7 @@ things. - Each tempo change is represented by a little square. + Each tempo change is represented by a small square. These are connected by a line, the horizontal line shows the current tempo at that time. The scale at the left is in beats per minute, from zero up to a diff -rNu melys-0.1.10/help/C/topic.dat melys-0.1.11/help/C/topic.dat --- melys-0.1.10/help/C/topic.dat Sat Oct 16 17:24:06 1999 +++ melys-0.1.11/help/C/topic.dat Fri Dec 3 17:23:54 1999 @@ -1 +1,2 @@ melys.html Manual +key-bindings.html Key bindings diff -rNu melys-0.1.10/include/md.h melys-0.1.11/include/md.h --- melys-0.1.10/include/md.h Thu Dec 2 17:45:37 1999 +++ melys-0.1.11/include/md.h Tue Dec 7 14:59:47 1999 @@ -199,8 +199,34 @@ int bars; short beats; short ticks; + + /* The following are only valid after a md_tick_to_mbt and + * are just for convenience. */ + short top; /* Time sig at the current time */ + short bottom; }; +/* + * Snap to grid types. + */ +enum snap_type { + SNAP_NONE, + SNAP_BAR, + SNAP_1, + SNAP_1_2, + SNAP_1_4, + SNAP_1_8, + SNAP_1_16, + SNAP_1_32, + SNAP_1_64, + SNAP_1_3, + SNAP_1_6, + SNAP_1_24, + SNAP_1_48, + SNAP_1_96, + SNAP_1_192, + /* ETC */ +}; void md_walk(struct containerElement *c, walkFunc fn, void *arg, int flags); struct rootElement *md_empty(void); @@ -223,5 +249,5 @@ ticktime_t md_mbt_to_tick(struct tempomapElement *tempomap, struct mbt *inmbtp); ticktime_t md_snap_tick(struct tempomapElement *tmap, ticktime_t tick, - int snap); + enum snap_type snap); struct element *md_copy(struct element *e); diff -rNu melys-0.1.10/include/melysrule.h melys-0.1.11/include/melysrule.h --- melys-0.1.10/include/melysrule.h Thu Dec 2 17:45:40 1999 +++ melys-0.1.11/include/melysrule.h Tue Dec 7 14:59:49 1999 @@ -35,6 +35,8 @@ int hbase; /* Zero point base TEMP XXX */ struct tempomapElement *tempomap; + + GdkPixmap *pixmap; /* For double buffering */ }; struct _MelysRuleClass { diff -rNu melys-0.1.10/include/viewcontrol.h melys-0.1.11/include/viewcontrol.h --- melys-0.1.10/include/viewcontrol.h Thu Dec 2 17:45:41 1999 +++ melys-0.1.11/include/viewcontrol.h Tue Dec 7 14:59:51 1999 @@ -33,21 +33,6 @@ VC_BOTH = (VC_HORIZONTAL|VC_VERTICAL) }; -/* - * Snap to grid types. - */ -enum snap_type { - SNAP_NONE, - SNAP_BAR, - SNAP_1, - SNAP_1_2, - SNAP_1_4, - SNAP_1_8, - SNAP_1_16, - SNAP_1_32, - ETC -}; - struct _ViewControl { GtkObject object; diff -rNu melys-0.1.10/md/mdtools.c melys-0.1.11/md/mdtools.c --- melys-0.1.10/md/mdtools.c Thu Dec 2 17:45:54 1999 +++ melys-0.1.11/md/mdtools.c Tue Dec 7 15:00:04 1999 @@ -111,7 +111,7 @@ if (part2 == NULL) return; - for (i = 0; i < MD_CONTAINER_LEN(part2); i++) { + while (MD_CONTAINER_LEN(part2) > 0) { el = MD_GET_INDEX(part2, 0); MD_REF(el); md_remove(MD_CONTAINER(part2), el); diff -rNu melys-0.1.10/md/mdtools.m melys-0.1.11/md/mdtools.m --- melys-0.1.10/md/mdtools.m Sat Nov 27 11:43:22 1999 +++ melys-0.1.11/md/mdtools.m Sat Dec 4 13:58:42 1999 @@ -107,7 +107,7 @@ if (part2 == NULL) return; - for (i = 0; i < MD_CONTAINER_LEN(part2); i++) { + while (MD_CONTAINER_LEN(part2) > 0) { el = MD_GET_INDEX(part2, 0); MD_REF(el); md_remove(MD_CONTAINER(part2), el); diff -rNu melys-0.1.10/md/mdutil.c melys-0.1.11/md/mdutil.c --- melys-0.1.10/md/mdutil.c Thu Dec 2 17:45:55 1999 +++ melys-0.1.11/md/mdutil.c Tue Dec 7 15:00:05 1999 @@ -29,8 +29,10 @@ /* Static functions */ static void set_diff_time(struct element *base, ticktime_t tdiff); -static void mbtoffset(struct timesigElement *tsig, ticktime_t tdiff, - int timebase, struct mbt *mbtp); +static void mbtoffset(struct timesigElement *tsig, ticktime_t tdiff, int ppq, + struct mbt *mbtp); +static ticktime_t tickround(struct tempomapElement *tmap, ticktime_t ticks, + int div); /* @@ -504,6 +506,8 @@ mbtoffset(lasttsig, t, tempomap->timebase, mbtp); mbtp->bars += count; + mbtp->top = lasttsig->top; + mbtp->bottom = lasttsig->bottom; } /* @@ -561,23 +565,58 @@ t = MD_TIME(lasttsig); t += (inmbtp->bars - count) * (full * lasttsig->top) / lasttsig->bottom; t += (inmbtp->beats * full) / lasttsig->bottom; - t += (inmbtp->ticks * 4) / lasttsig->bottom; + t += inmbtp->ticks; return t; } +/* + * The given time is snapped to the nearest boundry of the + * specified type. + * + * Arguments: + * tmap - The tempomap + * tick - The tick value to snap + * snap - The boundry to snap to + */ ticktime_t -md_snap_tick(struct tempomapElement *tmap, ticktime_t tick, int snap) +md_snap_tick(struct tempomapElement *tmap, ticktime_t tick, + enum snap_type snap) { struct mbt mbt; + ticktime_t try1; + ticktime_t try2; md_tick_to_mbt(tmap, tick, &mbt); - if (mbt.ticks > tmap->timebase/2) - mbt.beats++; - mbt.ticks = 0; + switch (snap) { + case SNAP_NONE: + break; /* Nothing to do */ + case SNAP_BAR: + mbt.beats = 0; + mbt.ticks = 0; + try1 = md_mbt_to_tick(tmap, &mbt); + mbt.bars++; + try2 = md_mbt_to_tick(tmap, &mbt); + if (tick - try1 < try2 - tick) + mbt.bars--; + break; + + case SNAP_1: tick = tickround(tmap, tick, 1); break; + case SNAP_1_2: tick = tickround(tmap, tick, 2); break; + case SNAP_1_4: tick = tickround(tmap, tick, 4); break; + case SNAP_1_8: tick = tickround(tmap, tick, 8); break; + case SNAP_1_16: tick = tickround(tmap, tick, 16); break; + case SNAP_1_32: tick = tickround(tmap, tick, 32); break; + case SNAP_1_64: tick = tickround(tmap, tick, 64); break; + case SNAP_1_3: tick = tickround(tmap, tick, 3); break; + case SNAP_1_6: tick = tickround(tmap, tick, 6); break; + case SNAP_1_24: tick = tickround(tmap, tick, 24); break; + case SNAP_1_48: tick = tickround(tmap, tick, 48); break; + case SNAP_1_96: tick = tickround(tmap, tick, 96); break; + case SNAP_1_192: tick = tickround(tmap, tick, 192); break; + } - tick = md_mbt_to_tick(tmap, &mbt); return tick; } @@ -590,23 +629,57 @@ * Arguments: * tsig - an individual time signature element * tdiff - the time difference from begining of tsig in ticks - * timebase - Beats per quarter note + * ppq - Ticks per quarter note * mbtp - output as meters, beats and ticks */ static void -mbtoffset(struct timesigElement *tsig, ticktime_t tdiff, int timebase, +mbtoffset(struct timesigElement *tsig, ticktime_t tdiff, int ppq, struct mbt *mbtp) { - int full; + int ppnote; + int ppbeat; + int ppbar; int rem; - full = timebase * 4; - mbtp->bars = (tdiff * tsig->bottom) / (full * tsig->top); + ppnote = ppq * 4; + ppbeat = ppnote / tsig->bottom; + ppbar = tsig->top * ppbeat; + mbtp->bars = tdiff / ppbar; + + rem = tdiff - (mbtp->bars * ppbar); + + mbtp->beats = rem / ppbeat; + + rem = rem - (mbtp->beats * ppbeat); + mbtp->ticks = rem; +} + +/* + * Routine for rounding to nearest simple note divisions + * (non-swing). When rounding to a whole note, other programs + * appear to never round beyond the next bar line, which we do + * not do here yet. + * + * Arguments: + * tmap - The tempomap. + * ticks - The mbt to snap to the given note division + * div - The division of a note to snap to + */ +static ticktime_t +tickround(struct tempomapElement *tmap, ticktime_t ticks, int div) +{ + int ppq; + int ppnote; + int roundval; + + ppq = tmap->timebase; /* ticks per quarter note */ + ppnote = ppq * 4; - rem = tdiff - ((mbtp->bars * full * tsig->top) / tsig->bottom); + roundval = ppnote / div; - mbtp->beats = (rem * tsig->bottom) / (full); + /* Round to the nearest requested division */ + ticks = (ticks + roundval/2) / roundval; + ticks *= roundval; - rem = rem - (mbtp->beats * full) / tsig->bottom; - mbtp->ticks = (rem * tsig->bottom) / 4; + return ticks; } diff -rNu melys-0.1.10/md/mdutil.m melys-0.1.11/md/mdutil.m --- melys-0.1.10/md/mdutil.m Mon Nov 29 21:57:57 1999 +++ melys-0.1.11/md/mdutil.m Tue Dec 7 14:11:32 1999 @@ -108,8 +108,34 @@ int bars; short beats; short ticks; + + /* The following are only valid after a md_tick_to_mbt and + * are just for convenience. */ + short top; /* Time sig at the current time */ + short bottom; }; +/* + * Snap to grid types. + */ +enum snap_type { + SNAP_NONE, + SNAP_BAR, + SNAP_1, + SNAP_1_2, + SNAP_1_4, + SNAP_1_8, + SNAP_1_16, + SNAP_1_32, + SNAP_1_64, + SNAP_1_3, + SNAP_1_6, + SNAP_1_24, + SNAP_1_48, + SNAP_1_96, + SNAP_1_192, + /* ETC */ +}; >>function md_walk void @@ -618,6 +644,8 @@ mbtoffset(lasttsig, t, tempomap->timebase, mbtp); mbtp->bars += count; + mbtp->top = lasttsig->top; + mbtp->bottom = lasttsig->bottom; >>function md_mbt_to_tick @@ -674,7 +702,7 @@ t = MD_TIME(lasttsig); t += (inmbtp->bars - count) * (full * lasttsig->top) / lasttsig->bottom; t += (inmbtp->beats * full) / lasttsig->bottom; - t += (inmbtp->ticks * 4) / lasttsig->bottom; + t += inmbtp->ticks; return t; @@ -682,19 +710,48 @@ >>function md_snap_tick ticktime_t struct tempomapElement *tmap; The tempomap -ticktime_t tick; The tick value to snap -int snap; The boundry to snap to +ticktime_t tick; The tick value to snap +enum snap_type snap; The boundry to snap to + +>>description +The given time is snapped to the nearest boundry +of the specified type. >>code struct mbt mbt; + ticktime_t try1; + ticktime_t try2; md_tick_to_mbt(tmap, tick, &mbt); - if (mbt.ticks > tmap->timebase/2) - mbt.beats++; - mbt.ticks = 0; + switch (snap) { + case SNAP_NONE: + break; /* Nothing to do */ + case SNAP_BAR: + mbt.beats = 0; + mbt.ticks = 0; + try1 = md_mbt_to_tick(tmap, &mbt); + mbt.bars++; + try2 = md_mbt_to_tick(tmap, &mbt); + if (tick - try1 < try2 - tick) + mbt.bars--; + break; + + case SNAP_1: tick = tickround(tmap, tick, 1); break; + case SNAP_1_2: tick = tickround(tmap, tick, 2); break; + case SNAP_1_4: tick = tickround(tmap, tick, 4); break; + case SNAP_1_8: tick = tickround(tmap, tick, 8); break; + case SNAP_1_16: tick = tickround(tmap, tick, 16); break; + case SNAP_1_32: tick = tickround(tmap, tick, 32); break; + case SNAP_1_64: tick = tickround(tmap, tick, 64); break; + case SNAP_1_3: tick = tickround(tmap, tick, 3); break; + case SNAP_1_6: tick = tickround(tmap, tick, 6); break; + case SNAP_1_24: tick = tickround(tmap, tick, 24); break; + case SNAP_1_48: tick = tickround(tmap, tick, 48); break; + case SNAP_1_96: tick = tickround(tmap, tick, 96); break; + case SNAP_1_192: tick = tickround(tmap, tick, 192); break; + } - tick = md_mbt_to_tick(tmap, &mbt); return tick; @@ -702,7 +759,7 @@ static void struct timesigElement *tsig; an individual time signature element ticktime_t tdiff; the time difference from begining of tsig in ticks -int timebase; Beats per quarter note +int ppq; Ticks per quarter note struct mbt *mbtp; output as meters, beats and ticks >>description @@ -712,17 +769,47 @@ step through them all and calculate the offsets separately. >>code - int full; + int ppnote; + int ppbeat; + int ppbar; int rem; - full = timebase * 4; - mbtp->bars = (tdiff * tsig->bottom) / (full * tsig->top); + ppnote = ppq * 4; + ppbeat = ppnote / tsig->bottom; + ppbar = tsig->top * ppbeat; + mbtp->bars = tdiff / ppbar; + + rem = tdiff - (mbtp->bars * ppbar); - rem = tdiff - ((mbtp->bars * full * tsig->top) / tsig->bottom); + mbtp->beats = rem / ppbeat; + + rem = rem - (mbtp->beats * ppbeat); + mbtp->ticks = rem; + + +>>function tickround +static ticktime_t +struct tempomapElement *tmap; The tempomap. +ticktime_t ticks; The mbt to snap to the given note division +int div; The division of a note to snap to + +>>description +Routine for rounding to nearest simple note divisions (non-swing). +When rounding to a whole note, other programs appear to never +round beyond the next bar line, which we do not do here yet. + +>>code + int ppq; + int ppnote; + int roundval; - mbtp->beats = (rem * tsig->bottom) / (full); + ppq = tmap->timebase; /* ticks per quarter note */ + ppnote = ppq * 4; - rem = rem - (mbtp->beats * full) / tsig->bottom; - mbtp->ticks = (rem * tsig->bottom) / 4; + roundval = ppnote / div; + /* Round to the nearest requested division */ + ticks = (ticks + roundval/2) / roundval; + ticks *= roundval; + return ticks; diff -rNu melys-0.1.10/po/FILES melys-0.1.11/po/FILES --- melys-0.1.10/po/FILES Tue Oct 12 00:37:39 1999 +++ melys-0.1.11/po/FILES Fri Dec 3 17:54:24 1999 @@ -12,6 +12,7 @@ gui/trackprop.c md/elements.c md/mdadd.c +md/mdconv.c md/mdlist.c md/mdseq.c md/mdtools.c @@ -20,6 +21,7 @@ midi/play.c midi/record.c pixmaps/balls.c +pixmaps/mag.c pixmaps/menu_icons.c programs/mdmlconv.c programs/melplay.c @@ -33,11 +35,22 @@ util/except.c util/gxstack.c util/util.c +widgets/melyskeys.c +widgets/melyskeysig.c widgets/melyspartitem.c +widgets/melyspiano.c +widgets/melyspos.c widgets/melysrule.c +widgets/melysscale.c +widgets/melysscroll.c +widgets/melyssig.c +widgets/melystempo.c +widgets/melystimesig.c widgets/melystrack.c widgets/melystrackdisplay.c widgets/melystrackinfo.c widgets/melystransport.c +widgets/melysview.c widgets/misc.c widgets/register.c +widgets/viewcontrol.c diff -rNu melys-0.1.10/po/melys.pot melys-0.1.11/po/melys.pot --- melys-0.1.10/po/melys.pot Tue Oct 26 15:04:40 1999 +++ melys-0.1.11/po/melys.pot Fri Dec 3 17:54:24 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-10-26 11:24+0100\n" +"POT-Creation-Date: 1999-12-03 17:52+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,35 +14,35 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: file.m:163 file.m:478 +#: file.m:170 file.m:526 msgid "The file type was not recognised" msgstr "" -#: file.m:270 +#: file.m:299 msgid "No information available, sorry" msgstr "" -#: file.m:344 +#: file.m:378 msgid "" "Could not read file\n" "This is probably a bug" msgstr "" -#: file.m:378 +#: file.m:426 msgid "" "Could not write file\n" "This is probably a bug" msgstr "" -#: mdmlread.m:91 +#: mdmlread.m:93 msgid "Incomplete or partial file" msgstr "" -#: mdmlread.m:832 mdmlwrite.m:43 +#: mdmlread.m:817 mdmlwrite.m:43 msgid "Could not open file" msgstr "" -#: midiread.m:114 +#: midiread.m:112 #, c-format msgid "" "Could not open file\n" @@ -50,7 +50,7 @@ "%s" msgstr "" -#: midiread.m:165 +#: midiread.m:163 #, c-format msgid "" "Could not read file\n" @@ -58,75 +58,63 @@ "%s" msgstr "" -#: midiread.m:227 +#: midiread.m:225 #, c-format msgid "Bad header (%x), probably not a real midi file" msgstr "" -#: midiread.m:238 +#: midiread.m:236 msgid "Bad header length, probably not a real midi file" msgstr "" -#: midiread.m:279 +#: midiread.m:277 #, c-format msgid "Bad track header (%x), probably not a midi file" msgstr "" -#: midiread.m:480 +#: midiread.m:458 #, c-format msgid "Bad status type 0x%x" msgstr "" -#: midiread.m:554 +#: midiread.m:532 #, c-format msgid "Meta event %d not implemented\n" msgstr "" -#: midiread.m:746 +#: midiread.m:724 #, c-format msgid "" "Unexpected end of file\n" " (offset %d/%d, type %s)\n" msgstr "" -#: midiwrite.m:59 +#: midiwrite.m:60 msgid "Can not open file" msgstr "" -#: midiwrite.m:395 +#: midiwrite.m:396 #, c-format msgid "Negative time difference (%d) writing midi file" msgstr "" -#: midiwrite.m:397 +#: midiwrite.m:398 msgid " difference set to zero" msgstr "" -#: main.m:90 -msgid "" -"Here you can view the tracks and modify properties of the track such as " -"instrument and midi channel. You can also add and delete tracks from this " -"menu" +#: main.m:111 +msgid "Melys" msgstr "" -#: main.m:122 -msgid "The Melys sequencer" -msgstr "" - -#: main.m:193 +#: main.m:182 msgid "Song position" msgstr "" -#: main.m:314 +#: main.m:303 msgid "Untitled" msgstr "" -#: main.m:316 -#, c-format -msgid "Track: %s" -msgstr "" - -#: main.m:589 +#: main.m:570 #, c-format msgid "" "There was a problem opening the file %s\n" @@ -173,11 +161,11 @@ msgid "Delete empty" msgstr "" -#: menus.m:87 +#: melystrackinfo.m:179 menus.m:87 msgid "Delete all empty tracks" msgstr "" -#: melystrackdisplay.m:217 menus.m:92 +#: melystrackdisplay.m:160 melystrackinfo.m:201 menus.m:92 msgid "Properties..." msgstr "" @@ -245,104 +233,104 @@ msgid "Select the file name to write to..." msgstr "" -#: menus.m:558 +#: menus.m:557 msgid "Copyright Steve Ratcliffe (C) 1999" msgstr "" -#: menus.m:560 +#: menus.m:559 msgid "Melys is a Midi sequencer for ALSA" msgstr "" -#: menus.m:705 +#: menus.m:704 #, c-format msgid "Number of allocated elements %d\n" msgstr "" -#: menus.m:735 +#: menus.m:733 msgid "No selected tracks" msgstr "" -#: partprop.m:81 trackprop.m:97 +#: partprop.m:83 trackprop.m:103 msgid "Basic" msgstr "" -#: partprop.m:123 +#: partprop.m:127 msgid "Part properties" msgstr "" #. spacing #. spacing #. Create the labels -#: partprop.m:134 +#: partprop.m:138 msgid "Part name" msgstr "" -#: trackprop.m:102 trackprop.m:291 +#: trackprop.m:108 trackprop.m:300 msgid "Instruments" msgstr "" -#: trackprop.m:140 +#: trackprop.m:148 msgid "Track properties" msgstr "" -#: trackprop.m:159 +#: trackprop.m:167 msgid "Track name" msgstr "" -#: trackprop.m:180 +#: trackprop.m:188 msgid "Output device" msgstr "" -#: trackprop.m:198 +#: trackprop.m:206 msgid "Channel" msgstr "" -#: trackprop.m:219 +#: trackprop.m:227 msgid "Initial volume" msgstr "" -#: trackprop.m:245 +#: trackprop.m:254 msgid "Pan position" msgstr "" -#: trackprop.m:294 +#: trackprop.m:303 msgid "Instrument" msgstr "" -#: trackprop.m:295 +#: trackprop.m:304 msgid "Bank MSB" msgstr "" -#: trackprop.m:296 +#: trackprop.m:305 msgid "Bank LSB" msgstr "" -#: trackprop.m:299 +#: trackprop.m:308 msgid "" "This page will be a comprehensive instrument selection page\n" "At present you can just select from program\n" "and bank MSB/LSB numbers\n" msgstr "" -#: mdadd.m:179 +#: mdadd.m:186 #, c-format msgid "Freed an element %d with bad reference count %d" msgstr "" -#: play.m:357 +#: play.m:360 msgid "" "Melys was not built with the ALSA remove_events\n" "patch. The muting function will not work very well\n" "You will get hanging notes, for example" msgstr "" -#: play.m:386 +#: play.m:389 msgid "" "Melys should be built with ALSA version of\n" "at least 0.4.1. The muting function will hardly work at all" msgstr "" -#: play.m:469 +#: play.m:473 #, c-format msgid "BUG: play_unmute: t2=%ld, ahead time=%ld\n" msgstr "" @@ -372,12 +360,12 @@ msgid "begin" msgstr "" -#: melplay.m:308 showseq.m:98 +#: melplay.m:308 showseq.m:99 #, c-format msgid "Could not open sequencer %s" msgstr "" -#: melplay.m:314 showseq.m:104 +#: melplay.m:314 showseq.m:105 #, c-format msgid "Could not get sequencer information %s" msgstr "" @@ -415,7 +403,7 @@ msgid " -b time - Begin time" msgstr "" -#: melys.m:118 +#: melys.m:124 #, c-format msgid "" "A debugging error occurred\n" @@ -425,35 +413,35 @@ "MESSAGE: %s" msgstr "" -#: melys.m:133 +#: melys.m:139 msgid "" "This operation is not possible\n" "because there are no open files\n" msgstr "" -#: melys.m:164 +#: melys.m:170 msgid "Usage: melys [-x level]" msgstr "" -#: melys.m:166 +#: melys.m:172 msgid " -x, --debug=LEVEL Set debuging level" msgstr "" -#: showseq.m:160 +#: showseq.m:161 msgid "Usage: showseq" msgstr "" -#: seqlib.m:100 seqlib.m:165 +#: seqlib.m:107 seqlib.m:172 #, c-format msgid "Could not open sequencer: %s" msgstr "" -#: seqlib.m:252 +#: seqlib.m:259 #, c-format msgid "Error (%s) creating sequencer port\n" msgstr "" -#: song.m:133 song.m:206 +#: song.m:145 song.m:218 msgid "" "Could not open ALSA sequencer\n" "Perhaps modules are not loaded\n" @@ -463,83 +451,135 @@ msgid "ethrow called without being set up" msgstr "" -#: melystrack.m:376 -msgid "Expand the height of the tracks" -msgstr "" - -#: melystrack.m:377 -msgid "Shrink the height of the tracks" -msgstr "" - -#: melystrack.m:383 -msgid "Increase horizontal scale" -msgstr "" - -#: melystrack.m:384 -msgid "Decrease horizontail scale" +#: melyskeysig.m:162 +msgid "m" msgstr "" -#: melystrackdisplay.m:199 +#: melystrackdisplay.m:131 msgid "_Slice" msgstr "" -#: melystrackdisplay.m:199 +#: melystrackdisplay.m:131 msgid "Slice the part into two" msgstr "" -#: melystrackdisplay.m:205 +#: melystrackdisplay.m:137 msgid "_Join" msgstr "" -#: melystrackdisplay.m:205 +#: melystrackdisplay.m:137 msgid "Join this part and the next" msgstr "" -#: melystrackdisplay.m:211 +#: melystrackdisplay.m:143 msgid "Delete" msgstr "" -#: melystrackdisplay.m:211 +#: melystrackdisplay.m:143 msgid "Delete this part" msgstr "" -#: melystrackdisplay.m:217 +#: melystrackdisplay.m:151 +msgid "Piano roll view" +msgstr "" + +#: melystrackdisplay.m:152 +msgid "Open a piano roll view for this part" +msgstr "" + +#: melystrackdisplay.m:160 msgid "Part property box" msgstr "" -#: melystrackinfo.m:146 +#: melystrackinfo.m:154 msgid "Name" msgstr "" -#: melystrackinfo.m:147 +#: melystrackinfo.m:155 msgid "Prog" msgstr "" -#: melystrackinfo.m:148 +#: melystrackinfo.m:156 msgid "C" msgstr "" -#: melystrackinfo.m:149 +#: melystrackinfo.m:157 msgid "Mute" msgstr "" -#: melystrackinfo.m:150 +#: melystrackinfo.m:158 msgid "Solo" msgstr "" -#: melystrackinfo.m:151 +#: melystrackinfo.m:159 msgid "Rec" msgstr "" -#: melystrackinfo.m:787 +#: melystrackinfo.m:168 +msgid "_Add track" +msgstr "" + +#: melystrackinfo.m:168 +msgid "Add a track below this one" +msgstr "" + +#: melystrackinfo.m:173 +msgid "_Delete track" +msgstr "" + +#: melystrackinfo.m:174 +msgid "Delete all selected or this track" +msgstr "" + +#: melystrackinfo.m:179 +msgid "Delete _empty" +msgstr "" + +#: melystrackinfo.m:186 +msgid "_Piano roll view" +msgstr "" + +#: melystrackinfo.m:187 +msgid "Open a new piano roll view for this track" +msgstr "" + +#: melystrackinfo.m:192 +msgid "_Tempomap view" +msgstr "" + +#: melystrackinfo.m:193 +msgid "Open a view of the tempo, time and key signatures for this track" +msgstr "" + +#: melystrackinfo.m:202 +msgid "Bring up the track properties dialog" +msgstr "" + +#: melystrackinfo.m:836 #, c-format msgid "Track %d" msgstr "" -#: melystrackinfo.m:858 +#: melystrackinfo.m:907 #, c-format msgid "" "Internal error.\n" "There is a missing case in draw_col_button\n" "Value was %d\n" +msgstr "" + +#: viewcontrol.m:271 +msgid "Increase vertical scale" +msgstr "" + +#: viewcontrol.m:272 +msgid "Decrease vertical scale" +msgstr "" + +#: viewcontrol.m:282 +msgid "Increase horizontal scale" +msgstr "" + +#: viewcontrol.m:283 +msgid "Decrease horizontail scale" msgstr "" diff -rNu melys-0.1.10/po/zz.po melys-0.1.11/po/zz.po --- melys-0.1.10/po/zz.po Tue Oct 26 15:04:40 1999 +++ melys-0.1.11/po/zz.po Fri Dec 3 17:54:24 1999 @@ -5,15 +5,15 @@ msgid "" msgstr "" -#: file.m:163 file.m:478 +#: file.m:170 file.m:526 msgid "The file type was not recognised" msgstr "T.H.E. F.I.L.E. T.Y.P.E. W.A.S. N.O.T. R.E.C.O.G.N.I.S.E.D." -#: file.m:270 +#: file.m:299 msgid "No information available, sorry" msgstr "N.O. I.N.F.O.R.M.A.T.I.O.N. A.V.A.I.L.A.B.L.E., S.O.R.R.Y." -#: file.m:344 +#: file.m:378 msgid "" "Could not read file\n" "This is probably a bug" @@ -21,7 +21,7 @@ "C.O.U.L.D. N.O.T. R.E.A.D. F.I.L.E.\n" "T.H.I.S. I.S. P.R.O.B.A.B.L.Y. A. B.U.G." -#: file.m:378 +#: file.m:426 msgid "" "Could not write file\n" "This is probably a bug" @@ -29,15 +29,15 @@ "C.O.U.L.D. N.O.T. W.R.I.T.E. F.I.L.E.\n" "T.H.I.S. I.S. P.R.O.B.A.B.L.Y. A. B.U.G." -#: mdmlread.m:91 +#: mdmlread.m:93 msgid "Incomplete or partial file" msgstr "I.N.C.O.M.P.L.E.T.E. O.R. P.A.R.T.I.A.L. F.I.L.E." -#: mdmlread.m:832 mdmlwrite.m:43 +#: mdmlread.m:817 mdmlwrite.m:43 msgid "Could not open file" msgstr "C.O.U.L.D. N.O.T. O.P.E.N. F.I.L.E." -#: midiread.m:114 +#: midiread.m:112 #, c-format msgid "" "Could not open file\n" @@ -48,7 +48,7 @@ "\n" "%s" -#: midiread.m:165 +#: midiread.m:163 #, c-format msgid "" "Could not read file\n" @@ -59,31 +59,31 @@ "\n" "%s" -#: midiread.m:227 +#: midiread.m:225 #, c-format msgid "Bad header (%x), probably not a real midi file" msgstr "B.A.D. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. N.O.T. A. R.E.A.L. M.I.D.I. F.I.L.E." -#: midiread.m:238 +#: midiread.m:236 msgid "Bad header length, probably not a real midi file" msgstr "B.A.D. H.E.A.D.E.R. L.E.N.G.T.H., P.R.O.B.A.B.L.Y. N.O.T. A. R.E.A.L. M.I.D.I. F.I.L.E." -#: midiread.m:279 +#: midiread.m:277 #, c-format msgid "Bad track header (%x), probably not a midi file" msgstr "B.A.D. T.R.A.C.K. H.E.A.D.E.R. (%x), P.R.O.B.A.B.L.Y. N.O.T. A. M.I.D.I. F.I.L.E." -#: midiread.m:480 +#: midiread.m:458 #, c-format msgid "Bad status type 0x%x" msgstr "B.A.D. S.T.A.T.U.S. T.Y.P.E. 0X.%x" -#: midiread.m:554 +#: midiread.m:532 #, c-format msgid "Meta event %d not implemented\n" msgstr "M.E.T.A. E.V.E.N.T. %d N.O.T. I.M.P.L.E.M.E.N.T.E.D.\n" -#: midiread.m:746 +#: midiread.m:724 #, c-format msgid "" "Unexpected end of file\n" @@ -92,47 +92,32 @@ "U.N.E.X.P.E.C.T.E.D. E.N.D. O.F. F.I.L.E.\n" " (O.F.F.S.E.T. %d/%d, T.Y.P.E. %s)\n" -#: midiwrite.m:59 +#: midiwrite.m:60 msgid "Can not open file" msgstr "C.A.N. N.O.T. O.P.E.N. F.I.L.E." -#: midiwrite.m:395 +#: midiwrite.m:396 #, c-format msgid "Negative time difference (%d) writing midi file" msgstr "N.E.G.A.T.I.V.E. T.I.M.E. D.I.F.F.E.R.E.N.C.E. (%d) W.R.I.T.I.N.G. M.I.D.I. F.I.L.E." -#: midiwrite.m:397 +#: midiwrite.m:398 msgid " difference set to zero" msgstr " D.I.F.F.E.R.E.N.C.E. S.E.T. T.O. Z.E.R.O." -#: main.m:90 -msgid "" -"Here you can view the tracks and modify properties of the track such as " -"instrument and midi channel. You can also add and delete tracks from this " -"menu" -msgstr "" -"H.E.R.E. Y.O.U. C.A.N. V.I.E.W. T.H.E. T.R.A.C.K.S. A.N.D. M.O.D.I.F.Y. P.R.O.P.E.R.T.I.E.S. O.F. T.H.E. T.R.A.C.K. S.U.C.H. A.S. " -"I.N.S.T.R.U.M.E.N.T. A.N.D. M.I.D.I. C.H.A.N.N.E.L.. Y.O.U. C.A.N. A.L.S.O. A.D.D. A.N.D. D.E.L.E.T.E. T.R.A.C.K.S. F.R.O.M. T.H.I.S. " -"M.E.N.U." +#: main.m:111 +msgid "Melys" +msgstr "M.E.L.Y.S." -#: main.m:122 -msgid "The Melys sequencer" -msgstr "T.H.E. M.E.L.Y.S. S.E.Q.U.E.N.C.E.R." - -#: main.m:193 +#: main.m:182 msgid "Song position" msgstr "S.O.N.G. P.O.S.I.T.I.O.N." -#: main.m:314 +#: main.m:303 msgid "Untitled" msgstr "U.N.T.I.T.L.E.D." -#: main.m:316 -#, c-format -msgid "Track: %s" -msgstr "T.R.A.C.K.: %s" - -#: main.m:589 +#: main.m:570 #, c-format msgid "" "There was a problem opening the file %s\n" @@ -181,11 +166,11 @@ msgid "Delete empty" msgstr "D.E.L.E.T.E. E.M.P.T.Y." -#: menus.m:87 +#: melystrackinfo.m:179 menus.m:87 msgid "Delete all empty tracks" msgstr "D.E.L.E.T.E. A.L.L. E.M.P.T.Y. T.R.A.C.K.S." -#: melystrackdisplay.m:217 menus.m:92 +#: melystrackdisplay.m:160 melystrackinfo.m:201 menus.m:92 msgid "Properties..." msgstr "P.R.O.P.E.R.T.I.E.S...." @@ -253,79 +238,79 @@ msgid "Select the file name to write to..." msgstr "S.E.L.E.C.T. T.H.E. F.I.L.E. N.A.M.E. T.O. W.R.I.T.E. T.O...." -#: menus.m:558 +#: menus.m:557 msgid "Copyright Steve Ratcliffe (C) 1999" msgstr "C.O.P.Y.R.I.G.H.T. S.T.E.V.E. R.A.T.C.L.I.F.F.E. (C.) 1999" -#: menus.m:560 +#: menus.m:559 msgid "Melys is a Midi sequencer for ALSA" msgstr "M.E.L.Y.S. I.S. A. M.I.D.I. S.E.Q.U.E.N.C.E.R. F.O.R. A.L.S.A." -#: menus.m:705 +#: menus.m:704 #, c-format msgid "Number of allocated elements %d\n" msgstr "N.U.M.B.E.R. O.F. A.L.L.O.C.A.T.E.D. E.L.E.M.E.N.T.S. %d\n" -#: menus.m:735 +#: menus.m:733 msgid "No selected tracks" msgstr "N.O. S.E.L.E.C.T.E.D. T.R.A.C.K.S." -#: partprop.m:81 trackprop.m:97 +#: partprop.m:83 trackprop.m:103 msgid "Basic" msgstr "B.A.S.I.C." -#: partprop.m:123 +#: partprop.m:127 msgid "Part properties" msgstr "P.A.R.T. P.R.O.P.E.R.T.I.E.S." #. spacing #. spacing #. Create the labels -#: partprop.m:134 +#: partprop.m:138 msgid "Part name" msgstr "P.A.R.T. N.A.M.E." -#: trackprop.m:102 trackprop.m:291 +#: trackprop.m:108 trackprop.m:300 msgid "Instruments" msgstr "I.N.S.T.R.U.M.E.N.T.S." -#: trackprop.m:140 +#: trackprop.m:148 msgid "Track properties" msgstr "T.R.A.C.K. P.R.O.P.E.R.T.I.E.S." -#: trackprop.m:159 +#: trackprop.m:167 msgid "Track name" msgstr "T.R.A.C.K. N.A.M.E." -#: trackprop.m:180 +#: trackprop.m:188 msgid "Output device" msgstr "O.U.T.P.U.T. D.E.V.I.C.E." -#: trackprop.m:198 +#: trackprop.m:206 msgid "Channel" msgstr "C.H.A.N.N.E.L." -#: trackprop.m:219 +#: trackprop.m:227 msgid "Initial volume" msgstr "I.N.I.T.I.A.L. V.O.L.U.M.E." -#: trackprop.m:245 +#: trackprop.m:254 msgid "Pan position" msgstr "P.A.N. P.O.S.I.T.I.O.N." -#: trackprop.m:294 +#: trackprop.m:303 msgid "Instrument" msgstr "I.N.S.T.R.U.M.E.N.T." -#: trackprop.m:295 +#: trackprop.m:304 msgid "Bank MSB" msgstr "B.A.N.K. M.S.B." -#: trackprop.m:296 +#: trackprop.m:305 msgid "Bank LSB" msgstr "B.A.N.K. L.S.B." -#: trackprop.m:299 +#: trackprop.m:308 msgid "" "This page will be a comprehensive instrument selection page\n" "At present you can just select from program\n" @@ -335,12 +320,12 @@ "A.T. P.R.E.S.E.N.T. Y.O.U. C.A.N. J.U.S.T. S.E.L.E.C.T. F.R.O.M. P.R.O.G.R.A.M.\n" "A.N.D. B.A.N.K. M.S.B./L.S.B. N.U.M.B.E.R.S.\n" -#: mdadd.m:179 +#: mdadd.m:186 #, c-format msgid "Freed an element %d with bad reference count %d" msgstr "F.R.E.E.D. A.N. E.L.E.M.E.N.T. %d W.I.T.H. B.A.D. R.E.F.E.R.E.N.C.E. C.O.U.N.T. %d" -#: play.m:357 +#: play.m:360 msgid "" "Melys was not built with the ALSA remove_events\n" "patch. The muting function will not work very well\n" @@ -350,7 +335,7 @@ "P.A.T.C.H.. T.H.E. M.U.T.I.N.G. F.U.N.C.T.I.O.N. W.I.L.L. N.O.T. W.O.R.K. V.E.R.Y. W.E.L.L.\n" "Y.O.U. W.I.L.L. G.E.T. H.A.N.G.I.N.G. N.O.T.E.S., F.O.R. E.X.A.M.P.L.E." -#: play.m:386 +#: play.m:389 msgid "" "Melys should be built with ALSA version of\n" "at least 0.4.1. The muting function will hardly work at all" @@ -358,7 +343,7 @@ "M.E.L.Y.S. S.H.O.U.L.D. B.E. B.U.I.L.T. W.I.T.H. A.L.S.A. V.E.R.S.I.O.N. O.F.\n" "A.T. L.E.A.S.T. 0.4.1. T.H.E. M.U.T.I.N.G. F.U.N.C.T.I.O.N. W.I.L.L. H.A.R.D.L.Y. W.O.R.K. A.T. A.L.L." -#: play.m:469 +#: play.m:473 #, c-format msgid "BUG: play_unmute: t2=%ld, ahead time=%ld\n" msgstr "B.U.G.: P.L.A.Y._U.N.M.U.T.E.: T.2=%lD., A.H.E.A.D. T.I.M.E.=%lD.\n" @@ -388,12 +373,12 @@ msgid "begin" msgstr "B.E.G.I.N." -#: melplay.m:308 showseq.m:98 +#: melplay.m:308 showseq.m:99 #, c-format msgid "Could not open sequencer %s" msgstr "C.O.U.L.D. N.O.T. O.P.E.N. S.E.Q.U.E.N.C.E.R. %s" -#: melplay.m:314 showseq.m:104 +#: melplay.m:314 showseq.m:105 #, c-format msgid "Could not get sequencer information %s" msgstr "C.O.U.L.D. N.O.T. G.E.T. S.E.Q.U.E.N.C.E.R. I.N.F.O.R.M.A.T.I.O.N. %s" @@ -431,7 +416,7 @@ msgid " -b time - Begin time" msgstr " -B. T.I.M.E. - B.E.G.I.N. T.I.M.E." -#: melys.m:118 +#: melys.m:124 #, c-format msgid "" "A debugging error occurred\n" @@ -446,7 +431,7 @@ "T.H.E. A.P.P.L.I.C.A.T.I.O.N. A.S. S.O.O.N. A.S. P.O.S.S.I.B.L.E.\n" "M.E.S.S.A.G.E.: %s" -#: melys.m:133 +#: melys.m:139 msgid "" "This operation is not possible\n" "because there are no open files\n" @@ -454,29 +439,29 @@ "T.H.I.S. O.P.E.R.A.T.I.O.N. I.S. N.O.T. P.O.S.S.I.B.L.E.\n" "B.E.C.A.U.S.E. T.H.E.R.E. A.R.E. N.O. O.P.E.N. F.I.L.E.S.\n" -#: melys.m:164 +#: melys.m:170 msgid "Usage: melys [-x level]" msgstr "U.S.A.G.E.: M.E.L.Y.S. [-X. L.E.V.E.L.]" -#: melys.m:166 +#: melys.m:172 msgid " -x, --debug=LEVEL Set debuging level" msgstr " -X., --D.E.B.U.G.=L.E.V.E.L. S.E.T. D.E.B.U.G.I.N.G. L.E.V.E.L." -#: showseq.m:160 +#: showseq.m:161 msgid "Usage: showseq" msgstr "U.S.A.G.E.: S.H.O.W.S.E.Q." -#: seqlib.m:100 seqlib.m:165 +#: seqlib.m:107 seqlib.m:172 #, c-format msgid "Could not open sequencer: %s" msgstr "C.O.U.L.D. N.O.T. O.P.E.N. S.E.Q.U.E.N.C.E.R.: %s" -#: seqlib.m:252 +#: seqlib.m:259 #, c-format msgid "Error (%s) creating sequencer port\n" msgstr "E.R.R.O.R. (%s) C.R.E.A.T.I.N.G. S.E.Q.U.E.N.C.E.R. P.O.R.T.\n" -#: song.m:133 song.m:206 +#: song.m:145 song.m:218 msgid "" "Could not open ALSA sequencer\n" "Perhaps modules are not loaded\n" @@ -488,80 +473,116 @@ msgid "ethrow called without being set up" msgstr "E.T.H.R.O.W. C.A.L.L.E.D. W.I.T.H.O.U.T. B.E.I.N.G. S.E.T. U.P." -#: melystrack.m:376 -msgid "Expand the height of the tracks" -msgstr "E.X.P.A.N.D. T.H.E. H.E.I.G.H.T. O.F. T.H.E. T.R.A.C.K.S." - -#: melystrack.m:377 -msgid "Shrink the height of the tracks" -msgstr "S.H.R.I.N.K. T.H.E. H.E.I.G.H.T. O.F. T.H.E. T.R.A.C.K.S." - -#: melystrack.m:383 -msgid "Increase horizontal scale" -msgstr "I.N.C.R.E.A.S.E. H.O.R.I.Z.O.N.T.A.L. S.C.A.L.E." - -#: melystrack.m:384 -msgid "Decrease horizontail scale" -msgstr "D.E.C.R.E.A.S.E. H.O.R.I.Z.O.N.T.A.I.L. S.C.A.L.E." +#: melyskeysig.m:162 +msgid "m" +msgstr "M." -#: melystrackdisplay.m:199 +#: melystrackdisplay.m:131 msgid "_Slice" msgstr "_S.L.I.C.E." -#: melystrackdisplay.m:199 +#: melystrackdisplay.m:131 msgid "Slice the part into two" msgstr "S.L.I.C.E. T.H.E. P.A.R.T. I.N.T.O. T.W.O." -#: melystrackdisplay.m:205 +#: melystrackdisplay.m:137 msgid "_Join" msgstr "_J.O.I.N." -#: melystrackdisplay.m:205 +#: melystrackdisplay.m:137 msgid "Join this part and the next" msgstr "J.O.I.N. T.H.I.S. P.A.R.T. A.N.D. T.H.E. N.E.X.T." -#: melystrackdisplay.m:211 +#: melystrackdisplay.m:143 msgid "Delete" msgstr "D.E.L.E.T.E." -#: melystrackdisplay.m:211 +#: melystrackdisplay.m:143 msgid "Delete this part" msgstr "D.E.L.E.T.E. T.H.I.S. P.A.R.T." -#: melystrackdisplay.m:217 +#: melystrackdisplay.m:151 +msgid "Piano roll view" +msgstr "P.I.A.N.O. R.O.L.L. V.I.E.W." + +#: melystrackdisplay.m:152 +msgid "Open a piano roll view for this part" +msgstr "O.P.E.N. A. P.I.A.N.O. R.O.L.L. V.I.E.W. F.O.R. T.H.I.S. P.A.R.T." + +#: melystrackdisplay.m:160 msgid "Part property box" msgstr "P.A.R.T. P.R.O.P.E.R.T.Y. B.O.X." -#: melystrackinfo.m:146 +#: melystrackinfo.m:154 msgid "Name" msgstr "N.A.M.E." -#: melystrackinfo.m:147 +#: melystrackinfo.m:155 msgid "Prog" msgstr "P.R.O.G." -#: melystrackinfo.m:148 +#: melystrackinfo.m:156 msgid "C" msgstr "C." -#: melystrackinfo.m:149 +#: melystrackinfo.m:157 msgid "Mute" msgstr "M.U.T.E." -#: melystrackinfo.m:150 +#: melystrackinfo.m:158 msgid "Solo" msgstr "S.O.L.O." -#: melystrackinfo.m:151 +#: melystrackinfo.m:159 msgid "Rec" msgstr "R.E.C." -#: melystrackinfo.m:787 +#: melystrackinfo.m:168 +msgid "_Add track" +msgstr "_A.D.D. T.R.A.C.K." + +#: melystrackinfo.m:168 +msgid "Add a track below this one" +msgstr "A.D.D. A. T.R.A.C.K. B.E.L.O.W. T.H.I.S. O.N.E." + +#: melystrackinfo.m:173 +msgid "_Delete track" +msgstr "_D.E.L.E.T.E. T.R.A.C.K." + +#: melystrackinfo.m:174 +msgid "Delete all selected or this track" +msgstr "D.E.L.E.T.E. A.L.L. S.E.L.E.C.T.E.D. O.R. T.H.I.S. T.R.A.C.K." + +#: melystrackinfo.m:179 +msgid "Delete _empty" +msgstr "D.E.L.E.T.E. _E.M.P.T.Y." + +#: melystrackinfo.m:186 +msgid "_Piano roll view" +msgstr "_P.I.A.N.O. R.O.L.L. V.I.E.W." + +#: melystrackinfo.m:187 +msgid "Open a new piano roll view for this track" +msgstr "O.P.E.N. A. N.E.W. P.I.A.N.O. R.O.L.L. V.I.E.W. F.O.R. T.H.I.S. T.R.A.C.K." + +#: melystrackinfo.m:192 +msgid "_Tempomap view" +msgstr "_T.E.M.P.O.M.A.P. V.I.E.W." + +#: melystrackinfo.m:193 +msgid "Open a view of the tempo, time and key signatures for this track" +msgstr "O.P.E.N. A. V.I.E.W. O.F. T.H.E. T.E.M.P.O., T.I.M.E. A.N.D. K.E.Y. S.I.G.N.A.T.U.R.E.S. F.O.R. T.H.I.S. T.R.A.C.K." + +#: melystrackinfo.m:202 +msgid "Bring up the track properties dialog" +msgstr "B.R.I.N.G. U.P. T.H.E. T.R.A.C.K. P.R.O.P.E.R.T.I.E.S. D.I.A.L.O.G." + +#: melystrackinfo.m:836 #, c-format msgid "Track %d" msgstr "T.R.A.C.K. %d" -#: melystrackinfo.m:858 +#: melystrackinfo.m:907 #, c-format msgid "" "Internal error.\n" @@ -571,3 +592,41 @@ "I.N.T.E.R.N.A.L. E.R.R.O.R..\n" "T.H.E.R.E. I.S. A. M.I.S.S.I.N.G. C.A.S.E. I.N. D.R.A.W._C.O.L._B.U.T.T.O.N.\n" "V.A.L.U.E. W.A.S. %d\n" + +#: viewcontrol.m:271 +msgid "Increase vertical scale" +msgstr "I.N.C.R.E.A.S.E. V.E.R.T.I.C.A.L. S.C.A.L.E." + +#: viewcontrol.m:272 +msgid "Decrease vertical scale" +msgstr "D.E.C.R.E.A.S.E. V.E.R.T.I.C.A.L. S.C.A.L.E." + +#: viewcontrol.m:282 +msgid "Increase horizontal scale" +msgstr "I.N.C.R.E.A.S.E. H.O.R.I.Z.O.N.T.A.L. S.C.A.L.E." + +#: viewcontrol.m:283 +msgid "Decrease horizontail scale" +msgstr "D.E.C.R.E.A.S.E. H.O.R.I.Z.O.N.T.A.I.L. S.C.A.L.E." + +#~ msgid "" +#~ "Here you can view the tracks and modify properties of the track such as " +#~ "instrument and midi channel. You can also add and delete tracks from this " +#~ "menu" +#~ msgstr "" +#~ "H.E.R.E. Y.O.U. C.A.N. V.I.E.W. T.H.E. T.R.A.C.K.S. A.N.D. M.O.D.I.F.Y. " +#~ "P.R.O.P.E.R.T.I.E.S. O.F. T.H.E. T.R.A.C.K. S.U.C.H. A.S. " +#~ "I.N.S.T.R.U.M.E.N.T. A.N.D. M.I.D.I. C.H.A.N.N.E.L.. Y.O.U. C.A.N. A.L.S.O. " +#~ "A.D.D. A.N.D. D.E.L.E.T.E. T.R.A.C.K.S. F.R.O.M. T.H.I.S. M.E.N.U." + +#~ msgid "The Melys sequencer" +#~ msgstr "T.H.E. M.E.L.Y.S. S.E.Q.U.E.N.C.E.R." + +#~ msgid "Track: %s" +#~ msgstr "T.R.A.C.K.: %s" + +#~ msgid "Expand the height of the tracks" +#~ msgstr "E.X.P.A.N.D. T.H.E. H.E.I.G.H.T. O.F. T.H.E. T.R.A.C.K.S." + +#~ msgid "Shrink the height of the tracks" +#~ msgstr "S.H.R.I.N.K. T.H.E. H.E.I.G.H.T. O.F. T.H.E. T.R.A.C.K.S." diff -rNu melys-0.1.10/song/song.c melys-0.1.11/song/song.c --- melys-0.1.10/song/song.c Thu Dec 2 17:45:50 1999 +++ melys-0.1.11/song/song.c Tue Dec 7 14:59:59 1999 @@ -44,8 +44,10 @@ void song_set_view(struct song *song, GtkWidget *view) { + regid_t id; - song->viewlist = g_slist_prepend(song->viewlist, view); + id = reg_object(GTK_OBJECT(view), NULL); + song->viewlist = g_slist_prepend(song->viewlist, GINT_TO_POINTER(id)); if (IS_MELYS_TRACK(view)) { song->trackview = view; @@ -305,10 +307,13 @@ song_view_update(struct song *song) { GSList *list; + GtkWidget *w; list = song->viewlist; while (list) { - gtk_widget_queue_draw(GTK_WIDGET(list->data)); + w = reg_get_widget(GPOINTER_TO_INT(list->data)); + if (w) + gtk_widget_queue_draw(w); list = list->next; } diff -rNu melys-0.1.10/song/song.m melys-0.1.11/song/song.m --- melys-0.1.10/song/song.m Sat Nov 13 09:11:16 1999 +++ melys-0.1.11/song/song.m Sat Dec 4 00:16:16 1999 @@ -80,8 +80,10 @@ GtkWidget *view; >>code + regid_t id; - song->viewlist = g_slist_prepend(song->viewlist, view); + id = reg_object(GTK_OBJECT(view), NULL); + song->viewlist = g_slist_prepend(song->viewlist, GINT_TO_POINTER(id)); if (IS_MELYS_TRACK(view)) { song->trackview = view; @@ -351,10 +353,13 @@ >>code GSList *list; + GtkWidget *w; list = song->viewlist; while (list) { - gtk_widget_queue_draw(GTK_WIDGET(list->data)); + w = reg_get_widget(GPOINTER_TO_INT(list->data)); + if (w) + gtk_widget_queue_draw(w); list = list->next; } diff -rNu melys-0.1.10/version melys-0.1.11/version --- melys-0.1.10/version Thu Dec 2 17:44:41 1999 +++ melys-0.1.11/version Tue Dec 7 14:59:16 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.1.10" +#define MELYS_VERSION_STRING "0.1.11" diff -rNu melys-0.1.10/widgets/Makefile melys-0.1.11/widgets/Makefile --- melys-0.1.10/widgets/Makefile Thu Dec 2 17:45:48 1999 +++ melys-0.1.11/widgets/Makefile Tue Dec 7 14:59:58 1999 @@ -150,6 +150,9 @@ melyspartitem.o: ../include/elements.h melyspartitem.o: ../include/md.h melyspartitem.o: ../include/melyspartitem.h +melystrackdisplay.o: ../include/elements.h +melystrackdisplay.o: ../include/song.h +melystrackdisplay.o: ../include/md.h melystrackdisplay.o: ../include/viewcontrol.h melystrackdisplay.o: ../include/melysscroll.h melystrackdisplay.o: ../include/melysview.h @@ -160,9 +163,6 @@ melystrackdisplay.o: ../include/melgui.h melystrackdisplay.o: ../include/melmsg.h melystrackdisplay.o: ../include/meldnd.h -melystrackdisplay.o: ../include/elements.h -melystrackdisplay.o: ../include/song.h -melystrackdisplay.o: ../include/md.h melystrackdisplay.o: ../include/melystrackdisplay.h misc.o: ../include/pixmaps.h misc.o: ../include/melgui.h diff -rNu melys-0.1.10/widgets/melyspiano.c melys-0.1.11/widgets/melyspiano.c --- melys-0.1.10/widgets/melyspiano.c Thu Dec 2 17:45:58 1999 +++ melys-0.1.11/widgets/melyspiano.c Tue Dec 7 15:00:08 1999 @@ -126,20 +126,22 @@ melys_piano_init(MelysPiano *mpiano) { GtkTable *tab; + GtkTable *tab2; MelysView *mview = MELYS_VIEW(mpiano); GtkWidget *frame1; GtkWidget *frame2; GtkBox *vbox1; - GtkBox *vbox2; GtkWidget *mkeys; GtkWidget *invis; mview->type = MD_TYPE_NOTE; + mview->snap = SNAP_1_16; view_control_set_vertical(mview->vcp, 8); view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE/4); view_control_set_limits(mview->vcp, 1, 0, 4, 0); - tab = (GtkTable *)gtk_table_new(3, 3, 0); + tab = (GtkTable *)gtk_table_new(2, 2, 0); + tab2 = (GtkTable *)gtk_table_new(2, 2, 0); gtk_box_pack_start(GTK_BOX(mpiano), GTK_WIDGET(tab), 1, 1, 0); @@ -148,12 +150,12 @@ */ /* The vert scrollbar group */ - gtk_table_attach(tab, mview->vcp->vsb, 2, 3, 0, 2, + gtk_table_attach(tab, mview->vcp->vsb, 1, 2, 0, 1, 0, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0 ); - gtk_table_attach(tab, mview->vcp->hsb, 0, 2, 2, 3, + gtk_table_attach(tab, mview->vcp->hsb, 0, 1, 1, 2, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0, 0 @@ -173,26 +175,33 @@ gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(vbox1)); /* And add the frame */ - gtk_table_attach(tab, frame1, 1, 2, 0, 2, + gtk_table_attach(tab2, frame1, 1, 2, 0, 2, GTK_SHRINK|GTK_EXPAND|GTK_FILL, GTK_SHRINK|GTK_EXPAND|GTK_FILL, 0, 0 ); /* The keyboard */ - vbox2 = (GtkBox *)gtk_vbox_new(0, 0); - frame2 = gtk_frame_new(NULL); - gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_IN); mkeys = melys_keys_new(mview->vcp); invis = gtk_label_new(""); - /* Pack them into a box */ - gtk_box_pack_start(vbox2, invis, 0, 0, 0); + frame2 = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_IN); gtk_container_add(GTK_CONTAINER(frame2), mkeys); - gtk_box_pack_start(vbox2, frame2, 1, 1, 0); - gtk_table_attach(tab, GTK_WIDGET(vbox2), 0, 1, 0, 2, + gtk_table_attach(tab2, invis, 0, 1, 0, 1, 0, + 0, + 0, 0 + ); + gtk_table_attach(tab2, frame2, 0, 1, 1, 2, + 0, + GTK_SHRINK|GTK_EXPAND|GTK_FILL, + 0, 0 + ); + + gtk_table_attach(tab, GTK_WIDGET(tab2), 0, 1, 0, 1, + GTK_SHRINK|GTK_EXPAND|GTK_FILL, GTK_SHRINK|GTK_EXPAND|GTK_FILL, 0, 0 ); diff -rNu melys-0.1.10/widgets/melyspiano.m melys-0.1.11/widgets/melyspiano.m --- melys-0.1.10/widgets/melyspiano.m Thu Dec 2 17:19:52 1999 +++ melys-0.1.11/widgets/melyspiano.m Tue Dec 7 14:13:21 1999 @@ -92,20 +92,22 @@ Initialise the MelysPiano. >>code GtkTable *tab; + GtkTable *tab2; MelysView *mview = MELYS_VIEW(mpiano); GtkWidget *frame1; GtkWidget *frame2; GtkBox *vbox1; - GtkBox *vbox2; GtkWidget *mkeys; GtkWidget *invis; mview->type = MD_TYPE_NOTE; + mview->snap = SNAP_1_16; view_control_set_vertical(mview->vcp, 8); view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE/4); view_control_set_limits(mview->vcp, 1, 0, 4, 0); - tab = (GtkTable *)gtk_table_new(3, 3, 0); + tab = (GtkTable *)gtk_table_new(2, 2, 0); + tab2 = (GtkTable *)gtk_table_new(2, 2, 0); gtk_box_pack_start(GTK_BOX(mpiano), GTK_WIDGET(tab), 1, 1, 0); @@ -114,12 +116,12 @@ */ /* The vert scrollbar group */ - gtk_table_attach(tab, mview->vcp->vsb, 2, 3, 0, 2, + gtk_table_attach(tab, mview->vcp->vsb, 1, 2, 0, 1, 0, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0 ); - gtk_table_attach(tab, mview->vcp->hsb, 0, 2, 2, 3, + gtk_table_attach(tab, mview->vcp->hsb, 0, 1, 1, 2, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0, 0 @@ -139,26 +141,33 @@ gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(vbox1)); /* And add the frame */ - gtk_table_attach(tab, frame1, 1, 2, 0, 2, + gtk_table_attach(tab2, frame1, 1, 2, 0, 2, GTK_SHRINK|GTK_EXPAND|GTK_FILL, GTK_SHRINK|GTK_EXPAND|GTK_FILL, 0, 0 ); /* The keyboard */ - vbox2 = (GtkBox *)gtk_vbox_new(0, 0); - frame2 = gtk_frame_new(NULL); - gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_IN); mkeys = melys_keys_new(mview->vcp); invis = gtk_label_new(""); - /* Pack them into a box */ - gtk_box_pack_start(vbox2, invis, 0, 0, 0); + frame2 = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_IN); gtk_container_add(GTK_CONTAINER(frame2), mkeys); - gtk_box_pack_start(vbox2, frame2, 1, 1, 0); - gtk_table_attach(tab, GTK_WIDGET(vbox2), 0, 1, 0, 2, + gtk_table_attach(tab2, invis, 0, 1, 0, 1, 0, + 0, + 0, 0 + ); + gtk_table_attach(tab2, frame2, 0, 1, 1, 2, + 0, + GTK_SHRINK|GTK_EXPAND|GTK_FILL, + 0, 0 + ); + + gtk_table_attach(tab, GTK_WIDGET(tab2), 0, 1, 0, 1, + GTK_SHRINK|GTK_EXPAND|GTK_FILL, GTK_SHRINK|GTK_EXPAND|GTK_FILL, 0, 0 ); diff -rNu melys-0.1.10/widgets/melysrule.c melys-0.1.11/widgets/melysrule.c --- melys-0.1.10/widgets/melysrule.c Thu Dec 2 17:45:59 1999 +++ melys-0.1.11/widgets/melysrule.c Tue Dec 7 15:00:09 1999 @@ -47,6 +47,7 @@ static void melys_rule_init(MelysRule *mrule); static void melys_rule_class_init(MelysRuleClass *klass); static void scale_changed(GtkObject *obj, gpointer data); +static gint rule_configure(GtkWidget *widget, GdkEventConfigure *event); static void rule_draw(GtkWidget *widget, GdkRectangle *ap); static int rule_expose(GtkWidget *widget, GdkEventExpose *event); static void rule_scroll(GtkAdjustment *adj, gpointer data); @@ -135,6 +136,7 @@ widget_class->draw = rule_draw; widget_class->expose_event = rule_expose; + widget_class->configure_event = rule_configure; object_class->destroy = rule_destroy; } @@ -182,6 +184,23 @@ } /* + * The size has changed, reallocate our backing pixmap. + */ +static gint +rule_configure(GtkWidget *widget, GdkEventConfigure *event) +{ + MelysRule *mrule = MELYS_RULE(widget); + + if (mrule->pixmap) + gdk_pixmap_unref(mrule->pixmap); + + mrule->pixmap = gdk_pixmap_new(widget->window, + widget->allocation.width, widget->allocation.height, -1); + + return TRUE; +} + +/* * Draw the ruler markings. */ static void @@ -215,21 +234,25 @@ tick = md_mbt_to_tick(tempomap, &mbt); x = tick_to_x(mrule, tick - mrule->hoffset); - gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], ap); + gdk_draw_rectangle(mrule->pixmap, + widget->style->bg_gc[widget->state], + TRUE, + 0, 0, + widget->allocation.width, widget->allocation.height); for (; x < ap->x + ap->width; ) { x += mrule->hbase; if ((mbt.bars % 4) == 0) { yoff = 10; g_snprintf(numbuf, 20, "%d", mbt.bars+1); - gdk_draw_string(widget->window, + gdk_draw_string(mrule->pixmap, widget->style->font, widget->style->fg_gc[widget->state], x+2, yoff, numbuf); } else yoff = 18; - gdk_draw_line(widget->window, widget->style->fg_gc[widget->state], + gdk_draw_line(mrule->pixmap, widget->style->fg_gc[widget->state], x, yoff, x, mrule->vcp->vtitle - VIEW_TITLE_RULE); /* Increment to the next one */ @@ -238,12 +261,19 @@ x = tick_to_x(mrule, tick - mrule->hoffset); } - gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], NULL); - - gdk_draw_line(widget->window, widget->style->fg_gc[widget->state], + gdk_draw_line(mrule->pixmap, widget->style->fg_gc[widget->state], 0, mrule->vcp->vtitle - VIEW_TITLE_RULE, widget->allocation.width, mrule->vcp->vtitle - VIEW_TITLE_RULE); + gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], ap); + gdk_draw_pixmap(widget->window, + widget->style->fg_gc[GTK_WIDGET_STATE(widget)], + mrule->pixmap, + 0, 0, + 0, 0, + widget->allocation.width, widget->allocation.height); + gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], NULL); + return; } @@ -257,7 +287,11 @@ mrule = MELYS_RULE(widget); - gtk_widget_queue_draw_area(widget, event->area.x, event->area.y, + gdk_draw_pixmap(widget->window, + widget->style->fg_gc[GTK_WIDGET_STATE(widget)], + mrule->pixmap, + event->area.x, event->area.y, + event->area.x, event->area.y, event->area.width, event->area.height); return FALSE; @@ -272,28 +306,25 @@ { MelysRule *mrule = data; GtkWidget *widget = data; + int val; int xchanged = 0; if (adj == mrule->vcp->hadj) { - if ((int)adj->value != mrule->hoffset) { - if (adj->value >= 0) { + /* Need to do this to get a consistant scale */ + /* (Avoids the marking jiggling around as you scroll at low mag) */ + val = adj->value; + val = (val + mrule->vcp->hscale/2) / mrule->vcp->hscale; + val *= mrule->vcp->hscale; + if (val != mrule->hoffset) { + if (val >= 0) { xchanged = 1; - mrule->hoffset = (int)adj->value; + mrule->hoffset = val; } } } - if (xchanged) { - - /* At present just clear the whole lot so it will be re-drawn - * this is not as efficient as it could be of course - */ - gtk_widget_queue_clear(widget); - gdk_window_clear_area_e(widget->window, - 0, 0, - widget->allocation.width, - widget->allocation.height); - } + if (xchanged) + gtk_widget_queue_draw(widget); } static void @@ -306,4 +337,7 @@ gtk_object_unref((GtkObject *) mrule->vcp); if (mrule->tempomap) md_free((struct element *) mrule->tempomap); + + if (mrule->pixmap) + gdk_pixmap_unref(mrule->pixmap); } diff -rNu melys-0.1.10/widgets/melysrule.m melys-0.1.11/widgets/melysrule.m --- melys-0.1.10/widgets/melysrule.m Mon Nov 29 01:22:23 1999 +++ melys-0.1.11/widgets/melysrule.m Fri Dec 3 17:22:43 1999 @@ -35,6 +35,8 @@ int hbase; /* Zero point base TEMP XXX */ struct tempomapElement *tempomap; + + GdkPixmap *pixmap; /* For double buffering */ }; struct _MelysRuleClass { @@ -102,6 +104,7 @@ widget_class->draw = rule_draw; widget_class->expose_event = rule_expose; + widget_class->configure_event = rule_configure; object_class->destroy = rule_destroy; @@ -153,6 +156,26 @@ gtk_widget_queue_draw((GtkWidget *)mrule); +>>function rule_configure +static gint +GtkWidget *widget; +GdkEventConfigure *event; + +>>description +The size has changed, reallocate our backing pixmap. + +>>code + MelysRule *mrule = MELYS_RULE(widget); + + if (mrule->pixmap) + gdk_pixmap_unref(mrule->pixmap); + + mrule->pixmap = gdk_pixmap_new(widget->window, + widget->allocation.width, widget->allocation.height, -1); + + return TRUE; + + >>function rule_draw static void GtkWidget *widget; @@ -190,21 +213,25 @@ tick = md_mbt_to_tick(tempomap, &mbt); x = tick_to_x(mrule, tick - mrule->hoffset); - gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], ap); + gdk_draw_rectangle(mrule->pixmap, + widget->style->bg_gc[widget->state], + TRUE, + 0, 0, + widget->allocation.width, widget->allocation.height); for (; x < ap->x + ap->width; ) { x += mrule->hbase; if ((mbt.bars % 4) == 0) { yoff = 10; g_snprintf(numbuf, 20, "%d", mbt.bars+1); - gdk_draw_string(widget->window, + gdk_draw_string(mrule->pixmap, widget->style->font, widget->style->fg_gc[widget->state], x+2, yoff, numbuf); } else yoff = 18; - gdk_draw_line(widget->window, widget->style->fg_gc[widget->state], + gdk_draw_line(mrule->pixmap, widget->style->fg_gc[widget->state], x, yoff, x, mrule->vcp->vtitle - VIEW_TITLE_RULE); /* Increment to the next one */ @@ -213,12 +240,19 @@ x = tick_to_x(mrule, tick - mrule->hoffset); } - gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], NULL); - - gdk_draw_line(widget->window, widget->style->fg_gc[widget->state], + gdk_draw_line(mrule->pixmap, widget->style->fg_gc[widget->state], 0, mrule->vcp->vtitle - VIEW_TITLE_RULE, widget->allocation.width, mrule->vcp->vtitle - VIEW_TITLE_RULE); + gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], ap); + gdk_draw_pixmap(widget->window, + widget->style->fg_gc[GTK_WIDGET_STATE(widget)], + mrule->pixmap, + 0, 0, + 0, 0, + widget->allocation.width, widget->allocation.height); + gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], NULL); + return; @@ -234,7 +268,11 @@ mrule = MELYS_RULE(widget); - gtk_widget_queue_draw_area(widget, event->area.x, event->area.y, + gdk_draw_pixmap(widget->window, + widget->style->fg_gc[GTK_WIDGET_STATE(widget)], + mrule->pixmap, + event->area.x, event->area.y, + event->area.x, event->area.y, event->area.width, event->area.height); return FALSE; @@ -251,28 +289,26 @@ >>code MelysRule *mrule = data; GtkWidget *widget = data; + int val; int xchanged = 0; if (adj == mrule->vcp->hadj) { - if ((int)adj->value != mrule->hoffset) { - if (adj->value >= 0) { + /* Need to do this to get a consistant scale */ + /* (Avoids the marking jiggling around as you scroll at low mag) */ + val = adj->value; + val = (val + mrule->vcp->hscale/2) / mrule->vcp->hscale; + val *= mrule->vcp->hscale; + if (val != mrule->hoffset) { + if (val >= 0) { xchanged = 1; - mrule->hoffset = (int)adj->value; + mrule->hoffset = val; } } } - if (xchanged) { + if (xchanged) + gtk_widget_queue_draw(widget); - /* At present just clear the whole lot so it will be re-drawn - * this is not as efficient as it could be of course - */ - gtk_widget_queue_clear(widget); - gdk_window_clear_area_e(widget->window, - 0, 0, - widget->allocation.width, - widget->allocation.height); - } >>function rule_destroy static void @@ -287,4 +323,6 @@ if (mrule->tempomap) md_free((struct element *) mrule->tempomap); + if (mrule->pixmap) + gdk_pixmap_unref(mrule->pixmap); diff -rNu melys-0.1.10/widgets/melystrackdisplay.c melys-0.1.11/widgets/melystrackdisplay.c --- melys-0.1.10/widgets/melystrackdisplay.c Thu Dec 2 17:46:01 1999 +++ melys-0.1.11/widgets/melystrackdisplay.c Tue Dec 7 15:00:10 1999 @@ -36,6 +36,9 @@ #include "libgnomeui/gnome-canvas-util.h" #include "libgnomeui/gnome-canvas-text.h" #include "libgnomeui/gnome-popup-menu.h" +#include "elements.h" +#include "song.h" +#include "md.h" #include "viewcontrol.h" #include "melysscroll.h" #include "melysview.h" @@ -46,9 +49,6 @@ #include "melgui.h" #include "melmsg.h" #include "meldnd.h" -#include "elements.h" -#include "song.h" -#include "md.h" #include "melystrackdisplay.h" #include "intl.h" @@ -59,6 +59,7 @@ + /* * The different canvas items that go together to make * up a part on the display. @@ -220,6 +221,7 @@ box = gtk_vbox_new(0, 0); mview->type = MD_TYPE_PART; + mview->snap = SNAP_1_4; /* Create the pop up menu */ mview->menu = gnome_popup_menu_new(displaymenu); diff -rNu melys-0.1.10/widgets/melystrackdisplay.m melys-0.1.11/widgets/melystrackdisplay.m --- melys-0.1.10/widgets/melystrackdisplay.m Thu Dec 2 17:19:52 1999 +++ melys-0.1.11/widgets/melystrackdisplay.m Tue Dec 7 14:16:45 1999 @@ -34,6 +34,10 @@ >>header libgnomeui/gnome-canvas-text.h >>header libgnomeui/gnome-popup-menu.h +>>header elements.h +>>header song.h +>>header md.h + >>header viewcontrol.h >>header melysscroll.h >>header melysview.h @@ -45,9 +49,6 @@ >>header melmsg.h >>header meldnd.h ->>header elements.h ->>header song.h ->>header md.h >>set nosignals >>gtkobject melys_track_display melys_view @@ -189,6 +190,7 @@ box = gtk_vbox_new(0, 0); mview->type = MD_TYPE_PART; + mview->snap = SNAP_1_4; /* Create the pop up menu */ mview->menu = gnome_popup_menu_new(displaymenu); diff -rNu melys-0.1.10/widgets/melystrackinfo.c melys-0.1.11/widgets/melystrackinfo.c --- melys-0.1.10/widgets/melystrackinfo.c Thu Dec 2 17:46:01 1999 +++ melys-0.1.11/widgets/melystrackinfo.c Tue Dec 7 15:00:11 1999 @@ -1538,11 +1538,13 @@ trk = md_track_nth(minfo->mdroot, i); if (MD_SELECTED(trk)) { + md_clear_data(MD_ELEMENT(trk)); md_remove(MD_CONTAINER(minfo->mdroot), MD_ELEMENT(trk)); goto rescan; } } } else { + md_clear_data(MD_ELEMENT(track)); md_remove(MD_CONTAINER(minfo->mdroot), MD_ELEMENT(track)); } diff -rNu melys-0.1.10/widgets/melystrackinfo.m melys-0.1.11/widgets/melystrackinfo.m --- melys-0.1.10/widgets/melystrackinfo.m Fri Nov 26 22:07:50 1999 +++ melys-0.1.11/widgets/melystrackinfo.m Tue Dec 7 14:16:19 1999 @@ -1594,11 +1594,13 @@ trk = md_track_nth(minfo->mdroot, i); if (MD_SELECTED(trk)) { + md_clear_data(MD_ELEMENT(trk)); md_remove(MD_CONTAINER(minfo->mdroot), MD_ELEMENT(trk)); goto rescan; } } } else { + md_clear_data(MD_ELEMENT(track)); md_remove(MD_CONTAINER(minfo->mdroot), MD_ELEMENT(track)); } diff -rNu melys-0.1.10/widgets/melysview.c melys-0.1.11/widgets/melysview.c --- melys-0.1.10/widgets/melysview.c Thu Dec 2 17:46:02 1999 +++ melys-0.1.11/widgets/melysview.c Tue Dec 7 15:00:12 1999 @@ -732,9 +732,11 @@ if (t - hoff > (ticktime_t)page_width - boundry && t - hoff <= (ticktime_t)page_width) { - hadj->value += page_width - 2*boundry; - - set_hscroll(mview); + /* If this is a restricted part then just fall off end */ + if (t < MD_ENDTIME(mview->viewcon)) { + hadj->value += page_width - 2*boundry; + set_hscroll(mview); + } } /* diff -rNu melys-0.1.10/widgets/melysview.m melys-0.1.11/widgets/melysview.m --- melys-0.1.10/widgets/melysview.m Thu Dec 2 17:19:52 1999 +++ melys-0.1.11/widgets/melysview.m Tue Dec 7 14:15:12 1999 @@ -788,9 +788,11 @@ if (t - hoff > (ticktime_t)page_width - boundry && t - hoff <= (ticktime_t)page_width) { - hadj->value += page_width - 2*boundry; - - set_hscroll(mview); + /* If this is a restricted part then just fall off end */ + if (t < MD_ENDTIME(mview->viewcon)) { + hadj->value += page_width - 2*boundry; + set_hscroll(mview); + } } /* diff -rNu melys-0.1.10/widgets/viewcontrol.m melys-0.1.11/widgets/viewcontrol.m --- melys-0.1.10/widgets/viewcontrol.m Wed Dec 1 11:52:01 1999 +++ melys-0.1.11/widgets/viewcontrol.m Tue Dec 7 14:12:40 1999 @@ -44,21 +44,6 @@ VC_BOTH = (VC_HORIZONTAL|VC_VERTICAL) }; -/* - * Snap to grid types. - */ -enum snap_type { - SNAP_NONE, - SNAP_BAR, - SNAP_1, - SNAP_1_2, - SNAP_1_4, - SNAP_1_8, - SNAP_1_16, - SNAP_1_32, - ETC -}; - struct _ViewControl { GtkObject object;

Chapter 5. Key bindings

Default keybindings

The tempo map view

Accessing a tempo view

Editing in the tempomap view

Changing the tempo

Adding a new tempo change

Copying/moving a set of tempo changes

Return	Start or continue playing +
P	Pause playing +
Space	Stop playing or recording +
Keypad Add	Start recording +
Keypad Subtract	Stop recording while continuing + play +

F3	Open a file +
Control-S	Save the current file +
Control-W	Close the current song +
Control-Q	Quit Melys +