summaryrefslogtreecommitdiff
path: root/audio/tse3/files/patch-OSS.cpp
blob: a30a611e97d9dd591187768f60e447aca256df16 (plain) (blame)
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
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
*** src/tse3/plt/OSS.cpp.orig	2005-07-25 20:22:56.000000000 +0900
--- src/tse3/plt/OSS.cpp	2009-04-02 21:20:35.000000000 +0900
***************
*** 25,30 ****
--- 25,31 ----
  #include <fcntl.h>
  #include <stdarg.h>
  #include <sys/types.h>
+ #include <cstring>
  
  // These #includes are linux specific and I need to do some autoconf
  // magic to work out how to conditionally include them
***************
*** 1484,1494 ****
  #ifdef TSE3_WITH_OSS
      // Happily, if you switch -pedantic on in gcc these macros will always
      // throw up warnings. Marvel at the beauty of awe_voice.h for reasons why.
! 
      AWE_SET_CHANNEL_MODE(deviceno, AWE_PLAY_MULTI);
      AWE_SET_CHANNEL_MODE(deviceno, 1);
      AWE_DRUM_CHANNELS(deviceno, 1<<9);
      AWE_TERMINATE_ALL(deviceno);
      seqbuf_dump();
  #endif
  }
--- 1485,1496 ----
  #ifdef TSE3_WITH_OSS
      // Happily, if you switch -pedantic on in gcc these macros will always
      // throw up warnings. Marvel at the beauty of awe_voice.h for reasons why.
! #if 0
      AWE_SET_CHANNEL_MODE(deviceno, AWE_PLAY_MULTI);
      AWE_SET_CHANNEL_MODE(deviceno, 1);
      AWE_DRUM_CHANNELS(deviceno, 1<<9);
      AWE_TERMINATE_ALL(deviceno);
+ #endif
      seqbuf_dump();
  #endif
  }
***************
*** 1996,2002 ****
          // there is no soundcard
          throw TSE3::MidiSchedulerError(TSE3::MidiSchedulerCreateErr);
      }
!     ioctl(seqfd, SNDCTL_SEQ_NRMIDIS, &nomidis);
      rate = 0;
      ioctl(seqfd, SNDCTL_SEQ_CTRLRATE, &rate);
      if (rate == -1 || rate <= 0) rate = 100;
--- 1998,2005 ----
          // there is no soundcard
          throw TSE3::MidiSchedulerError(TSE3::MidiSchedulerCreateErr);
      }
!     // ioctl(seqfd, SNDCTL_SEQ_NRMIDIS, &nomidis);
!     nomidis = 0;
      rate = 0;
      ioctl(seqfd, SNDCTL_SEQ_CTRLRATE, &rate);
      if (rate == -1 || rate <= 0) rate = 100;
***************
*** 2044,2049 ****
--- 2047,2060 ----
                  }
                  std::cout << ")\n";
              }
+ #if 1
+ 	    devices[n]
+ 		= new OSSMidiScheduler_AWEDevice(n, synthinfo[n], seqfd,
+ 						 _seqbuf, _seqbuflen,
+ 						 _seqbufptr);
+ 	}
+     }
+ #else	
              if (synthinfo[n].synth_type == SYNTH_TYPE_SAMPLE
                  && synthinfo[n].synth_subtype == SAMPLE_TYPE_AWE32)
              {
***************
*** 2100,2105 ****
--- 2111,2117 ----
         }
      }
  
+ #endif
      // Now let the public API know about these devices
      for (unsigned int n = 0; n < nodevices; ++n)
      {