blob: 34d646bb433f4cbf8c86679ee128b54759ca057f (
plain)
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
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
--- dsp_mixxer.c.orig Mon Jun 22 12:39:39 1998
+++ dsp_mixxer.c Sat Jul 14 21:55:28 2007
@@ -15,15 +15,11 @@
***************************************************************************/
#include <stdio.h>
#include <math.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
-#ifdef Linux
- #include <sys/soundcard.h>
-#elif FreeBSD
- #include <machine/soundcard.h>
-#endif
+#include <sys/soundcard.h>
#include "funktracker_defs.h"
#include "funktracker.h"
#include "funkload.h"
@@ -301,12 +297,12 @@
for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
{
- if(chmix[chan_no].funkctrl & 0x2)
+ if(chmix[chan_no].funkctrl & 0x2) {
#pragma pack(1)
sam = *((sDB *)chmix[chan_no].sample_addr +
(unsigned long)chmix[chan_no].sample_ptr);
#pragma pack()
- else
+ } else
sam = 0;
#ifdef DIGITAL_ECHOING
@@ -363,12 +359,12 @@
shift_t = 8 + shift_table[funk_info.no_active_channels];
for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
{
- if(chmix[chan_no].funkctrl & 0x2)
+ if(chmix[chan_no].funkctrl & 0x2) {
#pragma pack(1)
sam = *((sDW *)chmix[chan_no].sample_addr +
(unsigned long)chmix[chan_no].sample_ptr);
#pragma pack()
- else
+ } else
sam = 0;
#ifdef DIGITAL_ECHOING
sam_reverb = *(chmix[chan_no].echo_buffer +
|
