diff --git a/android/sound.cpp b/android/sound.cpp index f5c6e7b7..0b2ae651 100644 --- a/android/sound.cpp +++ b/android/sound.cpp @@ -29,9 +29,9 @@ CSound::CSound ( void (*fpNewProcessCallback) ( CVector& psData, void* arg ), void* arg, const int iCtrlMIDIChannel, - const bool bNoAutoJackConnect, - const QString& strJackClientName ) : - CSoundBase ( "OpenSL", true, fpNewProcessCallback, arg, iCtrlMIDIChannel, bNoAutoJackConnect, strJackClientName ) + const bool , + const QString& ) : + CSoundBase ( "OpenSL", true, fpNewProcessCallback, arg, iCtrlMIDIChannel ) { } diff --git a/android/sound.h b/android/sound.h index 2f888b01..6ab4c34b 100644 --- a/android/sound.h +++ b/android/sound.h @@ -35,11 +35,11 @@ class CSound : public CSoundBase { public: - CSound ( void (*fpNewProcessCallback) ( CVector& psData, void* arg ), - void* arg, - const int iCtrlMIDIChannel, - const bool bNoAutoJackConnect, - const QString& strJackClientName ); + CSound ( void (*fpNewProcessCallback) ( CVector& psData, void* arg ), + void* arg, + const int iCtrlMIDIChannel, + const bool , + const QString& ); virtual ~CSound() {} virtual int Init ( const int iNewPrefMonoBufferSize ); diff --git a/linux/sound.cpp b/linux/sound.cpp index 61100bae..9fd08995 100755 --- a/linux/sound.cpp +++ b/linux/sound.cpp @@ -27,7 +27,8 @@ #include "sound.h" #ifdef WITH_SOUND -void CSound::OpenJack ( const char* jackClientName ) +void CSound::OpenJack ( const bool bNoAutoJackConnect, + const char* jackClientName ) { jack_status_t JackStatus; diff --git a/linux/sound.h b/linux/sound.h index 332229e9..bb753ee7 100755 --- a/linux/sound.h +++ b/linux/sound.h @@ -65,8 +65,8 @@ public: const int iCtrlMIDIChannel, const bool bNoAutoJackConnect, const QString& strJackClientName ) : - CSoundBase ( "Jack", true, fpNewProcessCallback, arg, iCtrlMIDIChannel, bNoAutoJackConnect, strJackClientName ), - iJACKBufferSizeMono ( 0 ) { OpenJack ( strJackClientName.toLocal8Bit().data() ); } + CSoundBase ( "Jack", true, fpNewProcessCallback, arg, iCtrlMIDIChannel ), + iJACKBufferSizeMono ( 0 ) { OpenJack ( bNoAutoJackConnect, strJackClientName.toLocal8Bit().data() ); } virtual ~CSound() { CloseJack(); } @@ -87,7 +87,9 @@ public: jack_port_t* input_port_midi; protected: - void OpenJack ( const char* jackClientName ); + void OpenJack ( const bool bNoAutoJackConnect, + const char* jackClientName ); + void CloseJack(); // callbacks @@ -104,9 +106,9 @@ public: CSound ( void (*fpNewProcessCallback) ( CVector& psData, void* pParg ), void* pParg, const int iCtrlMIDIChannel, - const bool bNoAutoJackConnect, - const QString& strJackClientName ) : - CSoundBase ( "nosound", false, fpNewProcessCallback, pParg, iCtrlMIDIChannel, bNoAutoJackConnect, strJackClientName ) {} + const bool , + const QString& ) : + CSoundBase ( "nosound", false, fpNewProcessCallback, pParg, iCtrlMIDIChannel ) {} virtual ~CSound() {} }; #endif // WITH_SOUND diff --git a/mac/sound.cpp b/mac/sound.cpp index 1b022708..84743e21 100755 --- a/mac/sound.cpp +++ b/mac/sound.cpp @@ -29,9 +29,9 @@ CSound::CSound ( void (*fpNewProcessCallback) ( CVector& psData, void* arg ), void* arg, const int iCtrlMIDIChannel, - const bool bNoAutoJackConnect, - QString& strJackClientName ) : - CSoundBase ( "CoreAudio", true, fpNewProcessCallback, arg, iCtrlMIDIChannel, bNoAutoJackConnect, strJackClientName ), + const bool , + QString& ) : + CSoundBase ( "CoreAudio", true, fpNewProcessCallback, arg, iCtrlMIDIChannel ), midiInPortRef ( static_cast ( NULL ) ) { // Apple Mailing Lists: Subject: GUI Apps should set kAudioHardwarePropertyRunLoop diff --git a/mac/sound.h b/mac/sound.h index 3ec81a07..1b4688e7 100755 --- a/mac/sound.h +++ b/mac/sound.h @@ -39,8 +39,8 @@ public: CSound ( void (*fpNewProcessCallback) ( CVector& psData, void* arg ), void* arg, const int iCtrlMIDIChannel, - const bool bNoAutoJackConnect, - const QString& strJackClientName ); + const bool , + const QString& ); virtual int Init ( const int iNewPrefMonoBufferSize ); virtual void Start(); diff --git a/src/soundbase.cpp b/src/soundbase.cpp index f354a544..032659e3 100755 --- a/src/soundbase.cpp +++ b/src/soundbase.cpp @@ -30,16 +30,12 @@ CSoundBase::CSoundBase ( const QString& strNewSystemDriverTechniqueName, const bool bNewIsCallbackAudioInterface, void (*fpNewProcessCallback) ( CVector& psData, void* pParg ), void* pParg, - const int iNewCtrlMIDIChannel, - const bool bNewNoAutoJackConnect, - const QString& strNewJackClientName ) : + const int iNewCtrlMIDIChannel ) : fpProcessCallback ( fpNewProcessCallback ), pProcessCallbackArg ( pParg ), bRun ( false ), bIsCallbackAudioInterface ( bNewIsCallbackAudioInterface ), strSystemDriverTechniqueName ( strNewSystemDriverTechniqueName ), - iCtrlMIDIChannel ( iNewCtrlMIDIChannel ), - bNoAutoJackConnect ( bNewNoAutoJackConnect ), - strJackClientName ( strNewJackClientName ) + iCtrlMIDIChannel ( iNewCtrlMIDIChannel ) { // initializations for the sound card names (default) lNumDevs = 1; diff --git a/src/soundbase.h b/src/soundbase.h index 3ecc36cf..381648f7 100755 --- a/src/soundbase.h +++ b/src/soundbase.h @@ -51,9 +51,7 @@ public: const bool bNewIsCallbackAudioInterface, void (*fpNewProcessCallback) ( CVector& psData, void* pParg ), void* pParg, - const int iNewCtrlMIDIChannel, - const bool bNewNoAutoJackConnect, - const QString& strNewJackClientName ); + const int iNewCtrlMIDIChannel ); virtual int Init ( const int iNewPrefMonoBufferSize ); virtual void Start(); @@ -122,8 +120,6 @@ protected: bool bIsCallbackAudioInterface; QString strSystemDriverTechniqueName; int iCtrlMIDIChannel; - bool bNoAutoJackConnect; - QString strJackClientName; CVector vecsAudioSndCrdStereo; diff --git a/windows/sound.cpp b/windows/sound.cpp index 5745c77d..e5674b8b 100755 --- a/windows/sound.cpp +++ b/windows/sound.cpp @@ -486,9 +486,9 @@ void CSound::Stop() CSound::CSound ( void (*fpNewCallback) ( CVector& psData, void* arg ), void* arg, const int iCtrlMIDIChannel, - const bool bNoAutoJackConnect, - const QString& strJackClientName ) : - CSoundBase ( "ASIO", true, fpNewCallback, arg, iCtrlMIDIChannel, bNoAutoJackConnect, strJackClientName ), + const bool , + const QString& ) : + CSoundBase ( "ASIO", true, fpNewCallback, arg, iCtrlMIDIChannel ), lNumInChan ( 0 ), lNumInChanPlusAddChan ( 0 ), lNumOutChan ( 0 ), diff --git a/windows/sound.h b/windows/sound.h index 4a9dfaf0..951acfcb 100755 --- a/windows/sound.h +++ b/windows/sound.h @@ -49,8 +49,8 @@ public: CSound ( void (*fpNewCallback) ( CVector& psData, void* arg ), void* arg, const int iCtrlMIDIChannel, - const bool bNoAutoJackConnect, - const QString& strJackClientName ); + const bool , + const QString& ); virtual ~CSound() { UnloadCurrentDriver(); }