1
--- bristol-0.9.1.orig/src/bristol/brightongui/bristolhelp.h
2
+++ bristol-0.9.1/src/bristol/brightongui/bristolhelp.h
6
- bristol: a synthesiser emulation package.
8
+" bristol: a synthesiser emulation package.\n\n"
10
- You should start this package with the startBristol script. This script
11
- will start up the bristol synthesiser binaries, evaluating the correct
12
- library paths and executable paths. There are emulation, synthesiser and
13
- operational parameters:
14
+" You should start this package with the startBristol script. This script\n"
15
+" will start up the bristol synthesiser binaries, evaluating the correct\n"
16
+" library paths and executable paths. There are emulation, synthesiser and\n"
17
+" operational parameters:\n\n"
23
- -explorer - moog voyager
24
- -hammond - hammond module
25
- -b3 - dual manual hammond B3
26
- -pro5|-prophet - sequential circuits prophet-5
27
- -pro10 - sequential circuits prophet-10
28
- -juno - roland juno-6
30
- -vox - vox continental
31
- -rhodes - fender rhodes stage 73
32
- -mixer - 16 track mixer (-libtest only)
33
+" -mini - mini moog\n"
34
+" -explorer - moog voyager\n"
35
+" -hammond - hammond module\n"
36
+" -b3 - dual manual hammond B3\n"
37
+" -pro5|-prophet - sequential circuits prophet-5\n"
38
+" -pro10 - sequential circuits prophet-10\n"
39
+" -juno - roland juno-6\n"
40
+" -dx - yamaha DX-7\n"
41
+" -vox - vox continental\n"
42
+" -rhodes - fender rhodes stage 73\n"
43
+" -mixer - 16 track mixer (-libtest only)\n\n"
48
- -voices <n> - operate with a total of 'n' voices, default 16
49
- -channel <c> - initial midi channel selected to 'c', default 1
50
+" -voices <n> - operate with a total of 'n' voices, default 16\n"
51
+" -channel <c> - initial midi channel selected to 'c', default 1\n\n"
57
- -engine - don't start engine (connect to current invocation)
58
- -port <p> - connect to engine on TCP port 'p' (default 5028)
59
- -libtest - just display a GUI
60
- -quiet - redirect output to /dev/null
61
- -oss - use OSS defaults for audio and MIDI (default)
62
- -alsa - use ALSA defaults for audio and MIDI
64
+" -engine - don't start engine (connect to current invocation)\n"
65
+" -port <p> - connect to engine on TCP port 'p' (default 5028)\n"
66
+" -libtest - just display a GUI\n"
67
+" -quiet - redirect output to /dev/null\n"
68
+" -oss - use OSS defaults for audio and MIDI (default)\n"
69
+" -alsa - use ALSA defaults for audio and MIDI\n\n"
72
- -audio [oss|alsa] - audio driver selection
73
- -audiodev <dev> - audio device selection
74
- -bufsize <bytes> - buffer size, default 1024 bytes (256 samples)
75
- -preload <buffers> - configure preload buffer count (default 4)
76
- -rate <hz> - sample rate
78
+" -audio [oss|alsa] - audio driver selection\n"
79
+" -audiodev <dev> - audio device selection\n"
80
+" -bufsize <bytes> - buffer size, default 1024 bytes (256 samples)\n"
81
+" -preload <buffers> - configure preload buffer count (default 4)\n"
82
+" -rate <hz> - sample rate\n\n"
85
- -midi [oss|alsa] - midi driver selection
86
- -mididev <dev> - midi device selection
87
- -seq - use the ALSA SEQ interface
89
+" -midi [oss|alsa] - midi driver selection\n"
90
+" -mididev <dev> - midi device selection\n"
91
+" -seq - use the ALSA SEQ interface\n\n"
93
- Audio drivers are PCM or PCM plug only. Future releases may add Jack
94
- support. Midi drivers are either OSS/ALSA rawmidi interface, or ALSA SEQ.
95
- Multple GUIs can connect to the single audio engine, which then operates
97
+" Audio drivers are PCM or PCM plug only. Future releases may add Jack\n"
98
+" support. Midi drivers are either OSS/ALSA rawmidi interface, or ALSA SEQ.\n"
99
+" Multple GUIs can connect to the single audio engine, which then operates\n"
100
+" multitimbrally.\n\n"
108
- Run a minimoog using OSS interface for audio and midi. This is
109
- equivalent to all the following options:
110
- -mini -audio oss -audiodev /dev/audio -midi oss -mididev /dev/midi
111
- -bufsize 1024 -preload 4 -port 5028 -voices 16 -channel 1 -rate 44100
112
+" Run a minimoog using OSS interface for audio and midi. This is\n"
113
+" equivalent to all the following options:\n"
114
+" -mini -audio oss -audiodev /dev/audio -midi oss -mididev /dev/midi\n"
115
+" -bufsize 1024 -preload 4 -port 5028 -voices 16 -channel 1 -rate 44100\n\n"
118
+" startBristol -alsa\n\n"
120
- Run a minimoog using ALSA interface for audio and midi. This is
121
- equivalent to all the following options:
122
- -mini -audio alsa -audiodev plughw:0,0 -midi alsa -mididev hw:0
123
- -bufsize 1024 -preload 4 -port 5028 -voices 16 -channel 1 -rate 44100
124
+" Run a minimoog using ALSA interface for audio and midi. This is\n"
125
+" equivalent to all the following options:\n"
126
+" -mini -audio alsa -audiodev plughw:0,0 -midi alsa -mididev hw:0\n"
127
+" -bufsize 1024 -preload 4 -port 5028 -voices 16 -channel 1 -rate 44100\n\n"
129
- startBristol -explorer -voices 1
130
+" startBristol -explorer -voices 1\n\n"
132
- Run a moog explorer as a monophonic instrument, using OSS interface for
134
+" Run a moog explorer as a monophonic instrument, using OSS interface for\n"
135
+" audio and midi.\n\n"
137
- startBristol -prophet -alsa -channel 3
138
+" startBristol -prophet -alsa -channel 3\n\n"
140
- Run a prophet-5 using ALSA for audio and midi (on channel 3).
141
+" Run a prophet-5 using ALSA for audio and midi (on channel 3).\n\n"
143
- startBristol -b3 -bufsize 2048 -preload 2
144
+" startBristol -b3 -bufsize 2048 -preload 2\n\n"
146
- Run a hammond b3 with a buffer size of 2048 bytes (512 samples), and
147
- preload two such buffers before going active. Some Live! cards need
148
- this larger buffer size with ALSA drivers.
149
+" Run a hammond b3 with a buffer size of 2048 bytes (512 samples), and\n"
150
+" preload two such buffers before going active. Some Live! cards need \n"
151
+" this larger buffer size with ALSA drivers.\n\n"
153
- startBristol -oss -audiodev /dev/dsp1 -vox -voices 8
154
+" startBristol -oss -audiodev /dev/dsp1 -vox -voices 8\n\n"
156
- Run a vox continental using OSS device 1, and default midi device
157
- /dev/midi0. Operate with just 8 voices.
158
+" Run a vox continental using OSS device 1, and default midi device\n"
159
+" /dev/midi0. Operate with just 8 voices.\n\n"
161
- startBristol -b3 -audio alsa -audiodev plughw:0,0 -seq -mididev 128.0
162
+" startBristol -b3 -audio alsa -audiodev plughw:0,0 -seq -mididev 128.0\n\n"
164
- Run a B3 emulation over the ALSA PCM plug interface, using the ALSA
165
- sequencer over client 128, port 0.
166
+" Run a B3 emulation over the ALSA PCM plug interface, using the ALSA\n"
167
+" sequencer over client 128, port 0.\n\n"
169
- startBristol -juno &
170
- startBristol -prophet -channel 2 -engine
171
+" startBristol -juno &\n"
172
+" startBristol -prophet -channel 2 -engine\n\n"
174
- Start two synthesisers, a juno and a prophet. Both synthesisers will
175
- will be executed on one engine (multitimbral) with 16 voices between
176
- them. The juno will be on default midi channel (1), and the prophet on
177
- channel 2. Output over the same default OSS audio device (/dev/audio).
178
+" Start two synthesisers, a juno and a prophet. Both synthesisers will\n"
179
+" will be executed on one engine (multitimbral) with 16 voices between \n"
180
+" them. The juno will be on default midi channel (1), and the prophet on\n"
181
+" channel 2. Output over the same default OSS audio device (/dev/audio).\n\n"
183
- startBristol -juno &
184
- startBristol -prophet -port 5029 -audiodev /dev/dsp1 -mididev /dev/midi1
185
+" startBristol -juno &\n"
186
+" startBristol -prophet -port 5029 -audiodev /dev/dsp1 -mididev /dev/midi1\n"
188
- Start two synthesisers, a juno on the first OSS soundcard, and a
189
- prophet on the second OSS soundcard. Each synth is totally independant
190
- and runs with 16 voice polyphony (looks nice, but not been tested).
191
+" Start two synthesisers, a juno on the first OSS soundcard, and a\n"
192
+" prophet on the second OSS soundcard. Each synth is totally independant\n"
193
+" and runs with 16 voice polyphony (looks nice, but not been tested).\n\n"
195
- Author: nick.copeland@ntlworld.com
198
+" Author: nick.copeland@ntlworld.com\n\n";
201
--- bristol-0.9.1.orig/src/bristol/bristol/Makefile
202
+++ bristol-0.9.1/src/bristol/bristol/Makefile
204
LIBS = -lc -lm ${LIBASOUND} -lpthread -Xlinker -Bstatic -lbristol -lbristolmidi -lslabaudio
205
LDFLAGS = ${LIBSDIR} -Xlinker -B${BINDING} ${LIBS}
213
--- bristol-0.9.1.orig/src/bristol/include/bristol.h
214
+++ bristol-0.9.1/src/bristol/include/bristol.h
221
#define bOMD "/dev/midi"
222
#define bOAD "/dev/audio"
225
--- bristol-0.9.1.orig/src/slab/include/slabtrack.h
226
+++ bristol-0.9.1/src/slab/include/slabtrack.h
232
+#endif /* SLAB_TRACK */
235
--- bristol-0.9.1.orig/src/bristol/libbristol/Makefile
236
+++ bristol-0.9.1/src/bristol/libbristol/Makefile
239
# FEATURES = -DDEBUG -DEBUG2
241
-FEATURES = -DNEW_DEBUG
242
+ FEATURES = -DNEW_DEBUG