another merge fix...
This commit is contained in:
parent
166c6fca0e
commit
e44d3494bd
1 changed files with 5 additions and 5 deletions
|
@ -26,11 +26,11 @@
|
|||
|
||||
|
||||
/* Implementation *************************************************************/
|
||||
CSound::CSound ( void (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ),
|
||||
void* arg,
|
||||
const int iCtrlMIDIChannel,
|
||||
const bool ,
|
||||
QString& ) :
|
||||
CSound::CSound ( void (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ),
|
||||
void* arg,
|
||||
const int iCtrlMIDIChannel,
|
||||
const bool ,
|
||||
const QString& ) :
|
||||
CSoundBase ( "CoreAudio", true, fpNewProcessCallback, arg, iCtrlMIDIChannel ),
|
||||
midiInPortRef ( static_cast<MIDIPortRef> ( NULL ) )
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue