1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
diff -ur TiMidity++-2.13.2-orig/interface/xaw_i.c TiMidity++-2.13.2/interface/xaw_i.c
--- TiMidity++-2.13.2-orig/interface/xaw_i.c 2005-06-25 21:55:19.000000000 -0400
+++ TiMidity++-2.13.2/interface/xaw_i.c 2005-06-25 21:56:01.000000000 -0400
@@ -261,7 +261,7 @@
String bitmapdir = XAW_BITMAP_DIR;
Boolean arrangetitle,savelist;
static char **current_flist = NULL;
-static int voices = 0, last_voice = 0, voices_num_width;
+static int xaw_i_voices = 0, last_voice = 0, voices_num_width;
static int maxentry_on_a_menu = 0,submenu_n = 0;
#define OPTIONS_WINDOW 1
#define FLIST_WINDOW 2
@@ -1329,7 +1329,7 @@
c= *(local_buf+1);
n= atoi(local_buf+2);
if(c == 'L')
- voices = n;
+ xaw_i_voices = n;
else
last_voice = n;
if(IsTracePlaying()) drawVoices();
@@ -2070,7 +2070,7 @@
XSetForeground(disp, gct, tracecolor);
XFillRectangle(disp,XtWindow(trace),gct,voices_num_width +4,
MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+1,VOICENUM_WIDTH,TRACE_FOOT);
- sprintf(local_buf, "%3d/%d", last_voice, voices);
+ sprintf(local_buf, "%3d/%d", last_voice, xaw_i_voices);
XSetForeground(disp, gct, capcolor);
XDrawString(disp, XtWindow(trace),gct,voices_num_width+6,
MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+16,local_buf,strlen(local_buf));
|
