diff -urN gramofile-1.6/bplaysrc/shmbuf.c gramofile-1.6-braille/bplaysrc/shmbuf.c --- gramofile-1.6/bplaysrc/shmbuf.c Mon Mar 27 23:38:56 2000 +++ gramofile-1.6-braille/bplaysrc/shmbuf.c Fri Feb 15 10:18:37 2002 @@ -316,7 +316,9 @@ for (; numwr < ERROR_WINDOW_W-6; numwr ++) addch(' '); - move(0,79); + /* move(0,79); */ + /* move cursor to end of Left channel bar */ + move (ERROR_WINDOW_Y + 2, ERROR_WINDOW_X + 5 + leftvalue); refresh(); #endif diff -urN gramofile-1.6/errorwindow.c gramofile-1.6-braille/errorwindow.c --- gramofile-1.6/errorwindow.c Tue Mar 28 23:07:25 2000 +++ gramofile-1.6-braille/errorwindow.c Fri Feb 15 09:46:45 2002 @@ -36,7 +36,8 @@ display_textwin (text, ERROR_WINDOW_Y, ERROR_WINDOW_X + 1, ERROR_WINDOW_H, ERROR_WINDOW_W - 2); button_display (&ok_button); - move (0, 79); + /* move (0, 79); */ + move (ERROR_WINDOW_Y, ERROR_WINDOW_X); refresh (); } diff -urN gramofile-1.6/mainmenu.c gramofile-1.6-braille/mainmenu.c --- gramofile-1.6/mainmenu.c Tue Mar 28 23:07:25 2000 +++ gramofile-1.6-braille/mainmenu.c Fri Feb 15 09:10:46 2002 @@ -50,7 +50,8 @@ display_textwin (helptext[selected], 17, 2, 5, 76); - move (0, 79); + /* move (0, 79); */ + move(y + selected * distance, x + 2); refresh (); } diff -urN gramofile-1.6/playwav.c gramofile-1.6-braille/playwav.c --- gramofile-1.6/playwav.c Tue Mar 28 23:07:25 2000 +++ gramofile-1.6-braille/playwav.c Fri Feb 15 12:27:00 2002 @@ -321,16 +321,34 @@ helpline (helplines[focus]); /* this really should be a switch... */ - if (focus == 1) - stringinput_display (&trackstring); - else if (focus == 3) - stringinput_display (&begintimestring); - else if (focus == 4) - stringinput_display (&endtimestring); - else if (focus == 5) - stringinput_display (&string); - else - move (0, 79); + /* move (0, 79); */ + /* OK, you got it /chlor */ + switch (focus) { + case 0: + move (dirfilelist.y + dirfilelist.selected - dirfilelist.firstonscreen, dirfilelist.x - 1); + break; + case 1: + stringinput_display (&trackstring); + break; + case 2: + move (beginend_check.y, beginend_check.x); + break; + case 3: + stringinput_display (&begintimestring); + break; + case 4: + stringinput_display (&endtimestring); + break; + case 5: + stringinput_display (&string); + break; + case 6: + move (cancel_button.y, cancel_button.x); + break; + case 7: + move (ok_button.y, ok_button.x); + break; + } refresh (); Binary files gramofile-1.6/processed.wav and gramofile-1.6-braille/processed.wav differ diff -urN gramofile-1.6/reclp_filenm.c gramofile-1.6-braille/reclp_filenm.c --- gramofile-1.6/reclp_filenm.c Tue Mar 28 23:07:25 2000 +++ gramofile-1.6-braille/reclp_filenm.c Fri Feb 15 12:25:33 2002 @@ -136,10 +136,27 @@ helpline (helplines[focus]); - if (focus == 1) - stringinput_display (&string); + /* if (focus == 1) + stringinput_display (&string); else - move (0, 79); + move (0, 79); */ + switch (focus) { + case 0: + move (dirfilelist.y + dirfilelist.selected - dirfilelist.firstonscreen, dirfilelist.x - 1); + break; + case 1: + stringinput_display (&string); + break; + case 2: + move (cancel_button.y, cancel_button.x); + break; + case 3: + move (mixer_button.y, mixer_button.x); + break; + case 4: + move (ok_button.y, ok_button.x); + break; + } refresh (); diff -urN gramofile-1.6/signpr_cmf.c gramofile-1.6-braille/signpr_cmf.c --- gramofile-1.6/signpr_cmf.c Tue Mar 28 23:07:25 2000 +++ gramofile-1.6-braille/signpr_cmf.c Fri Feb 15 14:14:21 2002 @@ -236,8 +236,17 @@ case 4: stringinput_display (&thresholdstr); break; - default: - move (0, 79); + case 5: + move (cancel_button.y, cancel_button.x); + break; + case 6: + move (defaults_button.y, defaults_button.x); + break; + case 7: + move (ok_button.y, ok_button.x); + break; + /* default: + move (0, 79); */ } refresh (); diff -urN gramofile-1.6/signpr_cmf2.c gramofile-1.6-braille/signpr_cmf2.c --- gramofile-1.6/signpr_cmf2.c Tue Mar 28 23:07:25 2000 +++ gramofile-1.6-braille/signpr_cmf2.c Fri Feb 15 14:15:50 2002 @@ -239,8 +239,17 @@ case 4: stringinput_display (&threshold2str); break; - default: - move (0, 79); + case 5: + move (cancel_button.y, cancel_button.x); + break; + case 6: + move (defaults_button.y, defaults_button.x); + break; + case 7: + move (ok_button.y, ok_button.x); + break; + /* default: + move (0, 79); */ } refresh (); diff -urN gramofile-1.6/signpr_doubmed.c gramofile-1.6-braille/signpr_doubmed.c --- gramofile-1.6/signpr_doubmed.c Tue Mar 28 23:07:25 2000 +++ gramofile-1.6-braille/signpr_doubmed.c Fri Feb 15 14:20:40 2002 @@ -128,8 +128,14 @@ case 1: stringinput_display (&medlength2str); break; - default: - move (0, 79); + case 2: + move (cancel_button.y, cancel_button.x); + break; + case 3: + move (ok_button.y, ok_button.x); + break; + /* default: + move (0, 79); */ } refresh (); diff -urN gramofile-1.6/signpr_filtmenu.c gramofile-1.6-braille/signpr_filtmenu.c --- gramofile-1.6/signpr_filtmenu.c Tue Mar 28 23:07:25 2000 +++ gramofile-1.6-braille/signpr_filtmenu.c Fri Feb 15 11:54:39 2002 @@ -222,12 +222,41 @@ else helpline (helplines[focus]); - if (focus == 4) + /* if (focus == 4) stringinput_display (&begintimestring); else if (focus == 5) stringinput_display (&endtimestring); else - move (0, 79); + move (0, 79); */ + switch (focus) { + case 0: + move (filtlist->y + filtlist->selected - filtlist->firstonscreen, filtlist->x - 1); + break; + case 1: + move (selectedfilts->y + selectedfilts->selected - selectedfilts->firstonscreen, selectedfilts->x - 1); + break; + case 2: + move (tracktimes_check.y, tracktimes_check.x); + break; + case 3: + move (beginend_check.y, beginend_check.x); + break; + case 4: + stringinput_display (&begintimestring); + break; + case 5: + stringinput_display (&endtimestring); + break; + case 6: + move (prev_button.y, prev_button.x); + break; + case 7: + move (cancel_button.y, cancel_button.x); + break; + case 8: + move (next_button.y, next_button.x); + break; + } refresh (); diff -urN gramofile-1.6/signpr_infilenm.c gramofile-1.6-braille/signpr_infilenm.c --- gramofile-1.6/signpr_infilenm.c Tue Mar 28 23:07:26 2000 +++ gramofile-1.6-braille/signpr_infilenm.c Fri Feb 15 11:53:09 2002 @@ -121,10 +121,24 @@ helpline (helplines[focus]); - if (focus == 1) + /* if (focus == 1) stringinput_display (&string); else - move (0, 79); + move (0, 79); */ + switch (focus) { + case 0: + move (dirfilelist.y + dirfilelist.selected - dirfilelist.firstonscreen, dirfilelist.x - 1); + break; + case 1: + stringinput_display (&string); + break; + case 2: + move (cancel_button.y, cancel_button.x); + break; + case 3: + move (next_button.y, next_button.x); + break; + } refresh (); diff -urN gramofile-1.6/signpr_main.c gramofile-1.6-braille/signpr_main.c --- gramofile-1.6/signpr_main.c Tue Mar 28 23:07:26 2000 +++ gramofile-1.6-braille/signpr_main.c Fri Feb 15 14:03:58 2002 @@ -425,7 +425,8 @@ mvprintw (ERROR_WINDOW_Y + 2, ERROR_WINDOW_X + 1, " %3ld%% total", (long) ((100. * current_total_sample) / totalsize_samples)); - move (0, 79); + /* move (0, 79); */ + /* move (ERROR_WINDOW_Y + 1, ERROR_WINDOW_X); */ refresh (); in_ch = getch (); diff -urN gramofile-1.6/signpr_mean.c gramofile-1.6-braille/signpr_mean.c --- gramofile-1.6/signpr_mean.c Tue Mar 28 23:07:26 2000 +++ gramofile-1.6-braille/signpr_mean.c Fri Feb 15 14:26:34 2002 @@ -102,10 +102,21 @@ helpline (helplines[focus]); - if (focus == 0) + /* if (focus == 0) stringinput_display (&meanlengthstr); else - move (0, 79); + move (0, 79); */ + switch (focus) { + case 0: + stringinput_display (&meanlengthstr); + break; + case 1: + move (cancel_button.y, cancel_button.x); + break; + case 2: + move (ok_button.y, ok_button.x); + break; + } refresh (); diff -urN gramofile-1.6/signpr_median.c gramofile-1.6-braille/signpr_median.c --- gramofile-1.6/signpr_median.c Tue Mar 28 23:07:26 2000 +++ gramofile-1.6-braille/signpr_median.c Fri Feb 15 14:25:37 2002 @@ -105,10 +105,21 @@ helpline (helplines[focus]); - if (focus == 0) + /* if (focus == 0) stringinput_display (&medlengthstr); else - move (0, 79); + move (0, 79); */ + switch (focus) { + case 0: + stringinput_display (&medlengthstr); + break; + case 1: + move (cancel_button.y, cancel_button.x); + break; + case 2: + move (ok_button.y, ok_button.x); + break; + } refresh (); diff -urN gramofile-1.6/signpr_outfilenm.c gramofile-1.6-braille/signpr_outfilenm.c --- gramofile-1.6/signpr_outfilenm.c Tue Mar 28 23:07:26 2000 +++ gramofile-1.6-braille/signpr_outfilenm.c Fri Feb 15 13:56:26 2002 @@ -138,10 +138,27 @@ helpline (helplines[focus]); - if (focus == 1) + /*if (focus == 1) stringinput_display (&string); else - move (0, 79); + move (0, 79); */ + switch (focus) { + case 0: + move (dirfilelist.y + dirfilelist.selected - dirfilelist.firstonscreen, dirfilelist.x - 1); + break; + case 1: + stringinput_display (&string); + break; + case 2: + move (prev_button.y, prev_button.x); + break; + case 3: + move (cancel_button.y, cancel_button.x); + break; + case 4: + move (next_button.y, next_button.x); + break; + } refresh (); diff -urN gramofile-1.6/signpr_rms.c gramofile-1.6-braille/signpr_rms.c --- gramofile-1.6/signpr_rms.c Tue Mar 28 23:07:26 2000 +++ gramofile-1.6-braille/signpr_rms.c Fri Feb 15 14:28:00 2002 @@ -103,10 +103,22 @@ helpline (helplines[focus]); - if (focus == 0) + /* if (focus == 0) stringinput_display (&rmslengthstr); else - move (0, 79); + move (0, 79); */ + switch (focus) { + case 0: + stringinput_display (&rmslengthstr); + break; + case 1: + move (cancel_button.y, cancel_button.x); + break; + case 2: + move (ok_button.y, ok_button.x); + break; + } + refresh (); diff -urN gramofile-1.6/splashscr.c gramofile-1.6-braille/splashscr.c --- gramofile-1.6/splashscr.c Tue Mar 28 23:07:26 2000 +++ gramofile-1.6-braille/splashscr.c Fri Feb 15 10:30:09 2002 @@ -28,7 +28,7 @@ ## ## ## ## ## ## ## ## ## ## ## ## ## ##\n\ ####### ## ###### ## ## ## ##### ## #### #### #####\n\ \n\ - Version 1.6\n\ + Braille Version 1.6\n\ ________________________________________________________________________________ \n\ Recording - Playback - Track Splitting - Signal Processing\n\ \n\ @@ -54,7 +54,7 @@ usleep (500000); addstr (splashtext); - move (0, 79); + move (9, 79-13-8); refresh (); sleep (3); diff -urN gramofile-1.6/tracksplit.c gramofile-1.6-braille/tracksplit.c --- gramofile-1.6/tracksplit.c Tue Mar 28 23:07:26 2000 +++ gramofile-1.6-braille/tracksplit.c Fri Feb 15 09:53:00 2002 @@ -541,7 +541,7 @@ return; clearscreen (TRACKSPLIT_COMPUTE_HEADERTEXT); - move (0, 79); + /* move (0, 79); */ refresh (); compute_rms_now = 0; /* Should we compute RMS? */ @@ -648,7 +648,7 @@ mvprintw (ERROR_WINDOW_Y + 2, ERROR_WINDOW_X + 1, "Done : %3d %%", (int) (current_block * 100. / total_blocks)); - move (0, 79); + /* move (0, 79); */ } samples_read = 0; /* Compute RMS */ diff -urN gramofile-1.6/tracksplit_filenm.c gramofile-1.6-braille/tracksplit_filenm.c --- gramofile-1.6/tracksplit_filenm.c Tue Mar 28 23:07:26 2000 +++ gramofile-1.6-braille/tracksplit_filenm.c Fri Feb 15 11:56:05 2002 @@ -123,10 +123,24 @@ helpline (helplines[focus]); - if (focus == 1) + /* if (focus == 1) stringinput_display (&string); else - move (0, 79); + move (0, 79); */ + switch (focus) { + case 0: + move (dirfilelist.y + dirfilelist.selected - dirfilelist.firstonscreen, dirfilelist.x - 1); + break; + case 1: + stringinput_display (&string); + break; + case 2: + move (cancel_button.y, cancel_button.x); + break; + case 3: + move (next_button.y, next_button.x); + break; + } refresh (); diff -urN gramofile-1.6/tracksplit_parammenu.c gramofile-1.6-braille/tracksplit_parammenu.c --- gramofile-1.6/tracksplit_parammenu.c Tue Mar 28 23:07:26 2000 +++ gramofile-1.6-braille/tracksplit_parammenu.c Fri Feb 15 11:56:42 2002 @@ -256,6 +256,12 @@ switch (focus) { + case 0: + move (make_use_rms_check.y, make_use_rms_check.x); + break; + case 1: + move (make_graphs_check.y, make_graphs_check.x); + break; case 2: stringinput_display (&blocklen_string); break; @@ -277,8 +283,17 @@ case 8: stringinput_display (&extra_blocks_end_string); break; - default: - move (0, 79); + case 9: + move (prev_button.y, prev_button.x); + break; + case 10: + move (cancel_button.y, cancel_button.x); + break; + case 11: + move (next_button.y, next_button.x); + break; + /* default: + move (0, 79); */ } refresh (); diff -urN gramofile-1.6/yesnowindow.c gramofile-1.6-braille/yesnowindow.c --- gramofile-1.6/yesnowindow.c Tue Mar 28 23:07:26 2000 +++ gramofile-1.6-braille/yesnowindow.c Fri Feb 15 14:01:12 2002 @@ -51,15 +51,19 @@ { yes_button.selected = FALSE; no_button.selected = FALSE; - if (focus == 0) + if (focus == 0) { no_button.selected = TRUE; - if (focus == 1) + move (no_button.y, no_button.x - 1); + } + if (focus == 1) { yes_button.selected = TRUE; + move (yes_button.y, yes_button.x - 1); + } button_display (&yes_button); button_display (&no_button); - move (0, 79); + /* move (0, 79); */ refresh (); do