| @@ -81,7 +81,7 @@ namespace android { | |||||
| /* pointers to registry header and array */ | /* pointers to registry header and array */ | ||||
| jack_shm_header_t *Shm::jack_shm_header = NULL; | jack_shm_header_t *Shm::jack_shm_header = NULL; | ||||
| jack_shm_registry_t *Shm::jack_shm_registry = NULL; | jack_shm_registry_t *Shm::jack_shm_registry = NULL; | ||||
| char Shm::jack_shm_server_prefix[JACK_SERVER_NAME_SIZE] = ""; | |||||
| char Shm::jack_shm_server_prefix[JACK_SERVER_NAME_SIZE+1] = ""; | |||||
| /* jack_shm_lock_registry() serializes updates to the shared memory | /* jack_shm_lock_registry() serializes updates to the shared memory | ||||
| * segment JACK uses to keep track of the SHM segments allocated to | * segment JACK uses to keep track of the SHM segments allocated to | ||||
| @@ -124,7 +124,7 @@ namespace android { | |||||
| static jack_shm_info_t registry_info; | static jack_shm_info_t registry_info; | ||||
| static jack_shm_header_t *jack_shm_header; | static jack_shm_header_t *jack_shm_header; | ||||
| static jack_shm_registry_t *jack_shm_registry; | static jack_shm_registry_t *jack_shm_registry; | ||||
| static char jack_shm_server_prefix[JACK_SERVER_NAME_SIZE]; | |||||
| static char jack_shm_server_prefix[JACK_SERVER_NAME_SIZE+1]; | |||||
| static int semid; | static int semid; | ||||
| static pthread_mutex_t mutex; | static pthread_mutex_t mutex; | ||||
| static Shm* ref; | static Shm* ref; | ||||
| @@ -1481,12 +1481,12 @@ LIB_EXPORT char* jack_get_client_name(jack_client_t* ext_client) | |||||
| LIB_EXPORT int jack_client_name_size(void) | LIB_EXPORT int jack_client_name_size(void) | ||||
| { | { | ||||
| return JACK_CLIENT_NAME_SIZE; | |||||
| return JACK_CLIENT_NAME_SIZE+1; | |||||
| } | } | ||||
| LIB_EXPORT int jack_port_name_size(void) | LIB_EXPORT int jack_port_name_size(void) | ||||
| { | { | ||||
| return REAL_JACK_PORT_NAME_SIZE; | |||||
| return REAL_JACK_PORT_NAME_SIZE+1; | |||||
| } | } | ||||
| LIB_EXPORT int jack_port_type_size(void) | LIB_EXPORT int jack_port_type_size(void) | ||||
| @@ -115,8 +115,8 @@ int JackAudioDriver::Attach() | |||||
| { | { | ||||
| JackPort* port; | JackPort* port; | ||||
| jack_port_id_t port_index; | jack_port_id_t port_index; | ||||
| char name[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char alias[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char name[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| char alias[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| int i; | int i; | ||||
| jack_log("JackAudioDriver::Attach fBufferSize = %ld fSampleRate = %ld", fEngineControl->fBufferSize, fEngineControl->fSampleRate); | jack_log("JackAudioDriver::Attach fBufferSize = %ld fSampleRate = %ld", fEngineControl->fBufferSize, fEngineControl->fSampleRate); | ||||
| @@ -1195,7 +1195,7 @@ int JackClient::SetLatencyCallback(JackLatencyCallback callback, void *arg) | |||||
| char* JackClient::GetInternalClientName(int ref) | char* JackClient::GetInternalClientName(int ref) | ||||
| { | { | ||||
| char name_res[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char name_res[JACK_CLIENT_NAME_SIZE+1]; | |||||
| int result = -1; | int result = -1; | ||||
| fChannel->GetInternalClientName(GetClientControl()->fRefNum, ref, name_res, &result); | fChannel->GetInternalClientName(GetClientControl()->fRefNum, ref, name_res, &result); | ||||
| return (result < 0) ? NULL : strdup(name_res); | return (result < 0) ? NULL : strdup(name_res); | ||||
| @@ -87,7 +87,7 @@ class SERVER_EXPORT JackClient : public JackClientInterface, public JackRunnable | |||||
| void* fThreadFunArg; | void* fThreadFunArg; | ||||
| void* fSessionArg; | void* fSessionArg; | ||||
| void* fLatencyArg; | void* fLatencyArg; | ||||
| char fServerName[JACK_SERVER_NAME_SIZE]; | |||||
| char fServerName[JACK_SERVER_NAME_SIZE+1]; | |||||
| JackThread fThread; /*! Thread to execute the Process function */ | JackThread fThread; /*! Thread to execute the Process function */ | ||||
| detail::JackClientChannelInterface* fChannel; | detail::JackClientChannelInterface* fChannel; | ||||
| @@ -59,7 +59,7 @@ class JackDebugClient : public JackClient | |||||
| int fIsDeactivated; | int fIsDeactivated; | ||||
| int fIsClosed; | int fIsClosed; | ||||
| bool fFreewheel; | bool fFreewheel; | ||||
| char fClientName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fClientName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| JackProcessCallback fProcessTimeCallback; | JackProcessCallback fProcessTimeCallback; | ||||
| void* fProcessTimeCallbackArg; | void* fProcessTimeCallbackArg; | ||||
| @@ -422,10 +422,10 @@ static string RemoveLast(const string& name) | |||||
| void JackDriver::SaveConnections(int alias) | void JackDriver::SaveConnections(int alias) | ||||
| { | { | ||||
| const char** connections; | const char** connections; | ||||
| char alias1[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char alias2[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char system_alias1[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char system_alias2[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char alias1[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| char alias2[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| char system_alias1[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| char system_alias2[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| char* aliases[2]; | char* aliases[2]; | ||||
| char* system_aliases[2]; | char* system_aliases[2]; | ||||
| @@ -506,8 +506,8 @@ void JackDriver::SaveConnections(int alias) | |||||
| string JackDriver::MatchPortName(const char* name, const char** ports, int alias, const std::string& type) | string JackDriver::MatchPortName(const char* name, const char** ports, int alias, const std::string& type) | ||||
| { | { | ||||
| char alias1[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char alias2[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char alias1[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| char alias2[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| char* aliases[2]; | char* aliases[2]; | ||||
| aliases[0] = alias1; | aliases[0] = alias1; | ||||
| @@ -129,10 +129,9 @@ class SERVER_EXPORT JackDriver : public JackDriverClientInterface | |||||
| protected: | protected: | ||||
| char fCaptureDriverName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fPlaybackDriverName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fAliasName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fCaptureDriverName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| char fPlaybackDriverName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| char fAliasName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| jack_nframes_t fCaptureLatency; | jack_nframes_t fCaptureLatency; | ||||
| jack_nframes_t fPlaybackLatency; | jack_nframes_t fPlaybackLatency; | ||||
| @@ -1038,7 +1038,7 @@ int JackEngine::PortDisconnect(int refnum, jack_port_id_t src, jack_port_id_t ds | |||||
| int JackEngine::PortRename(int refnum, jack_port_id_t port, const char* name) | int JackEngine::PortRename(int refnum, jack_port_id_t port, const char* name) | ||||
| { | { | ||||
| char old_name[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char old_name[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| strcpy(old_name, fGraphManager->GetPort(port)->GetName()); | strcpy(old_name, fGraphManager->GetPort(port)->GetName()); | ||||
| fGraphManager->GetPort(port)->SetName(name); | fGraphManager->GetPort(port)->SetName(name); | ||||
| NotifyPortRename(port, old_name); | NotifyPortRename(port, old_name); | ||||
| @@ -63,7 +63,7 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem | |||||
| int fServerPriority; | int fServerPriority; | ||||
| int fClientPriority; | int fClientPriority; | ||||
| int fMaxClientPriority; | int fMaxClientPriority; | ||||
| char fServerName[JACK_SERVER_NAME_SIZE]; | |||||
| char fServerName[JACK_SERVER_NAME_SIZE+1]; | |||||
| JackTransportEngine fTransport; | JackTransportEngine fTransport; | ||||
| jack_timer_type_t fClockSource; | jack_timer_type_t fClockSource; | ||||
| int fDriverNum; | int fDriverNum; | ||||
| @@ -98,7 +98,7 @@ int JackLibClient::Open(const char* server_name, const char* name, int uuid, jac | |||||
| strncpy(fServerName, server_name, sizeof(fServerName)); | strncpy(fServerName, server_name, sizeof(fServerName)); | ||||
| // Open server/client channel | // Open server/client channel | ||||
| char name_res[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char name_res[JACK_CLIENT_NAME_SIZE+1]; | |||||
| if (fChannel->Open(server_name, name, uuid, name_res, this, options, status) < 0) { | if (fChannel->Open(server_name, name, uuid, name_res, this, options, status) < 0) { | ||||
| jack_error("Cannot connect to the server"); | jack_error("Cannot connect to the server"); | ||||
| goto error; | goto error; | ||||
| @@ -58,8 +58,8 @@ int JackMidiDriver::Attach() | |||||
| { | { | ||||
| JackPort* port; | JackPort* port; | ||||
| jack_port_id_t port_index; | jack_port_id_t port_index; | ||||
| char name[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char alias[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char name[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| char alias[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| int i; | int i; | ||||
| jack_log("JackMidiDriver::Attach fBufferSize = %ld fSampleRate = %ld", fEngineControl->fBufferSize, fEngineControl->fSampleRate); | jack_log("JackMidiDriver::Attach fBufferSize = %ld fSampleRate = %ld", fEngineControl->fBufferSize, fEngineControl->fSampleRate); | ||||
| @@ -519,7 +519,7 @@ struct JackNetExtSlave : public JackNetSlaveInterface, public JackRunnableInterf | |||||
| fBufferSizeCallback(NULL), fBufferSizeArg(NULL), | fBufferSizeCallback(NULL), fBufferSizeArg(NULL), | ||||
| fSampleRateCallback(NULL), fSampleRateArg(NULL) | fSampleRateCallback(NULL), fSampleRateArg(NULL) | ||||
| { | { | ||||
| char host_name[JACK_CLIENT_NAME_SIZE]; | |||||
| char host_name[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| // Request parameters | // Request parameters | ||||
| assert(strlen(ip) < 32); | assert(strlen(ip) < 32); | ||||
| @@ -318,8 +318,8 @@ namespace Jack | |||||
| JackPort* port; | JackPort* port; | ||||
| jack_port_id_t port_index; | jack_port_id_t port_index; | ||||
| char name[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char alias[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char name[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| char alias[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| int audio_port_index; | int audio_port_index; | ||||
| int midi_port_index; | int midi_port_index; | ||||
| @@ -720,7 +720,7 @@ Deactivated for now.. | |||||
| SERVER_EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) | SERVER_EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) | ||||
| { | { | ||||
| char multicast_ip[32]; | char multicast_ip[32]; | ||||
| char net_name[JACK_CLIENT_NAME_SIZE + 1] = {0}; | |||||
| char net_name[JACK_CLIENT_NAME_SIZE+1] = {0}; | |||||
| int udp_port; | int udp_port; | ||||
| int mtu = DEFAULT_MTU; | int mtu = DEFAULT_MTU; | ||||
| // Desactivated for now... | // Desactivated for now... | ||||
| @@ -94,9 +94,9 @@ namespace Jack | |||||
| char fPacketType[8]; //packet type ('param') | char fPacketType[8]; //packet type ('param') | ||||
| uint32_t fProtocolVersion; //version | uint32_t fProtocolVersion; //version | ||||
| int32_t fPacketID; //indicates the packet type | int32_t fPacketID; //indicates the packet type | ||||
| char fName[JACK_CLIENT_NAME_SIZE]; //slave's name | |||||
| char fMasterNetName[JACK_SERVER_NAME_SIZE]; //master hostname (network) | |||||
| char fSlaveNetName[JACK_SERVER_NAME_SIZE]; //slave hostname (network) | |||||
| char fName[JACK_CLIENT_NAME_SIZE+1]; //slave's name | |||||
| char fMasterNetName[JACK_SERVER_NAME_SIZE+1]; //master hostname (network) | |||||
| char fSlaveNetName[JACK_SERVER_NAME_SIZE+1]; //slave hostname (network) | |||||
| uint32_t fMtu; //connection mtu | uint32_t fMtu; //connection mtu | ||||
| uint32_t fID; //slave's ID | uint32_t fID; //slave's ID | ||||
| uint32_t fTransportSync; //is the transport synced ? | uint32_t fTransportSync; //is the transport synced ? | ||||
| @@ -230,7 +230,7 @@ void JackPort::SetName(const char* new_name) | |||||
| bool JackPort::NameEquals(const char* target) | bool JackPort::NameEquals(const char* target) | ||||
| { | { | ||||
| char buf[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char buf[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| /* this nasty, nasty kludge is here because between 0.109.0 and 0.109.1, | /* this nasty, nasty kludge is here because between 0.109.0 and 0.109.1, | ||||
| the ALSA audio backend had the name "ALSA", whereas as before and | the ALSA audio backend had the name "ALSA", whereas as before and | ||||
| @@ -45,9 +45,9 @@ class SERVER_EXPORT JackPort | |||||
| int fTypeId; | int fTypeId; | ||||
| enum JackPortFlags fFlags; | enum JackPortFlags fFlags; | ||||
| char fName[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char fAlias1[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char fAlias2[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char fName[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| char fAlias1[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| char fAlias2[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| int fRefNum; | int fRefNum; | ||||
| jack_nframes_t fLatency; | jack_nframes_t fLatency; | ||||
| @@ -62,9 +62,9 @@ namespace Jack | |||||
| private: | private: | ||||
| char fUpstream[JACK_CLIENT_NAME_SIZE]; /*<! the upstream server name */ | |||||
| char fClientName[JACK_CLIENT_NAME_SIZE]; /*<! client name to use when connecting */ | |||||
| const char* fPromiscuous; /*<! if not null, group or gid to use for promiscuous mode */ | |||||
| char fUpstream[JACK_CLIENT_NAME_SIZE+1]; /*<! the upstream server name */ | |||||
| char fClientName[JACK_CLIENT_NAME_SIZE+1]; /*<! client name to use when connecting */ | |||||
| const char* fPromiscuous; /*<! if not null, group or gid to use for promiscuous mode */ | |||||
| //jack data | //jack data | ||||
| jack_client_t* fClient; /*<! client handle */ | jack_client_t* fClient; /*<! client handle */ | ||||
| @@ -157,7 +157,7 @@ struct JackResult | |||||
| struct JackClientCheckRequest : public JackRequest | struct JackClientCheckRequest : public JackRequest | ||||
| { | { | ||||
| char fName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| int fProtocol; | int fProtocol; | ||||
| int fOptions; | int fOptions; | ||||
| int fUUID; | int fUUID; | ||||
| @@ -202,7 +202,7 @@ struct JackClientCheckRequest : public JackRequest | |||||
| struct JackClientCheckResult : public JackResult | struct JackClientCheckResult : public JackResult | ||||
| { | { | ||||
| char fName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| int fStatus; | int fStatus; | ||||
| JackClientCheckResult(): JackResult(), fStatus(0) | JackClientCheckResult(): JackResult(), fStatus(0) | ||||
| @@ -240,7 +240,7 @@ struct JackClientOpenRequest : public JackRequest | |||||
| int fPID; | int fPID; | ||||
| int fUUID; | int fUUID; | ||||
| char fName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| JackClientOpenRequest() | JackClientOpenRequest() | ||||
| {} | {} | ||||
| @@ -517,8 +517,8 @@ struct JackPortConnectNameRequest : public JackRequest | |||||
| { | { | ||||
| int fRefNum; | int fRefNum; | ||||
| char fSrc[REAL_JACK_PORT_NAME_SIZE + 1]; // port full name | |||||
| char fDst[REAL_JACK_PORT_NAME_SIZE + 1]; // port full name | |||||
| char fSrc[REAL_JACK_PORT_NAME_SIZE+1]; // port full name | |||||
| char fDst[REAL_JACK_PORT_NAME_SIZE+1]; // port full name | |||||
| JackPortConnectNameRequest() | JackPortConnectNameRequest() | ||||
| {} | {} | ||||
| @@ -559,8 +559,8 @@ struct JackPortDisconnectNameRequest : public JackRequest | |||||
| { | { | ||||
| int fRefNum; | int fRefNum; | ||||
| char fSrc[REAL_JACK_PORT_NAME_SIZE + 1]; // port full name | |||||
| char fDst[REAL_JACK_PORT_NAME_SIZE + 1]; // port full name | |||||
| char fSrc[REAL_JACK_PORT_NAME_SIZE+1]; // port full name | |||||
| char fDst[REAL_JACK_PORT_NAME_SIZE+1]; // port full name | |||||
| JackPortDisconnectNameRequest() | JackPortDisconnectNameRequest() | ||||
| {} | {} | ||||
| @@ -901,7 +901,7 @@ struct JackGetInternalClientNameRequest : public JackRequest | |||||
| struct JackGetInternalClientNameResult : public JackResult | struct JackGetInternalClientNameResult : public JackResult | ||||
| { | { | ||||
| char fName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| JackGetInternalClientNameResult(): JackResult() | JackGetInternalClientNameResult(): JackResult() | ||||
| {} | {} | ||||
| @@ -936,7 +936,7 @@ struct JackInternalClientHandleRequest : public JackRequest | |||||
| { | { | ||||
| int fRefNum; | int fRefNum; | ||||
| char fName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| JackInternalClientHandleRequest() | JackInternalClientHandleRequest() | ||||
| {} | {} | ||||
| @@ -1010,9 +1010,9 @@ struct JackInternalClientLoadRequest : public JackRequest | |||||
| #endif | #endif | ||||
| int fRefNum; | int fRefNum; | ||||
| char fName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fDllName[MAX_PATH + 1]; | |||||
| char fLoadInitName[JACK_LOAD_INIT_LIMIT + 1]; | |||||
| char fName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| char fDllName[MAX_PATH+1]; | |||||
| char fLoadInitName[JACK_LOAD_INIT_LIMIT+1]; | |||||
| int fOptions; | int fOptions; | ||||
| int fUUID; | int fUUID; | ||||
| @@ -1194,7 +1194,7 @@ struct JackClientNotificationRequest : public JackRequest | |||||
| struct JackSessionCommand | struct JackSessionCommand | ||||
| { | { | ||||
| char fUUID[JACK_UUID_SIZE]; | char fUUID[JACK_UUID_SIZE]; | ||||
| char fClientName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fClientName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| char fCommand[JACK_SESSION_COMMAND_SIZE]; | char fCommand[JACK_SESSION_COMMAND_SIZE]; | ||||
| jack_session_flags_t fFlags; | jack_session_flags_t fFlags; | ||||
| @@ -1305,8 +1305,8 @@ struct JackSessionNotifyResult : public JackResult | |||||
| struct JackSessionNotifyRequest : public JackRequest | struct JackSessionNotifyRequest : public JackRequest | ||||
| { | { | ||||
| char fPath[JACK_MESSAGE_SIZE + 1]; | |||||
| char fDst[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fPath[JACK_MESSAGE_SIZE+1]; | |||||
| char fDst[JACK_CLIENT_NAME_SIZE+1]; | |||||
| jack_session_event_type_t fEventType; | jack_session_event_type_t fEventType; | ||||
| int fRefNum; | int fRefNum; | ||||
| @@ -1377,7 +1377,7 @@ struct JackSessionReplyRequest : public JackRequest | |||||
| struct JackClientNameResult : public JackResult | struct JackClientNameResult : public JackResult | ||||
| { | { | ||||
| char fName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| JackClientNameResult(): JackResult() | JackClientNameResult(): JackResult() | ||||
| {} | {} | ||||
| @@ -1433,7 +1433,7 @@ struct JackUUIDResult : public JackResult | |||||
| struct JackGetUUIDRequest : public JackRequest | struct JackGetUUIDRequest : public JackRequest | ||||
| { | { | ||||
| char fName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| JackGetUUIDRequest() | JackGetUUIDRequest() | ||||
| {} | {} | ||||
| @@ -1496,7 +1496,7 @@ struct JackGetClientNameRequest : public JackRequest | |||||
| struct JackReserveNameRequest : public JackRequest | struct JackReserveNameRequest : public JackRequest | ||||
| { | { | ||||
| int fRefNum; | int fRefNum; | ||||
| char fName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| char fUUID[JACK_UUID_SIZE]; | char fUUID[JACK_UUID_SIZE]; | ||||
| JackReserveNameRequest() | JackReserveNameRequest() | ||||
| @@ -1533,7 +1533,7 @@ struct JackReserveNameRequest : public JackRequest | |||||
| struct JackClientHasSessionCallbackRequest : public JackRequest | struct JackClientHasSessionCallbackRequest : public JackRequest | ||||
| { | { | ||||
| char fName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| JackClientHasSessionCallbackRequest() | JackClientHasSessionCallbackRequest() | ||||
| {} | {} | ||||
| @@ -1569,13 +1569,13 @@ struct JackClientHasSessionCallbackRequest : public JackRequest | |||||
| struct JackClientNotification | struct JackClientNotification | ||||
| { | { | ||||
| int fSize; | int fSize; | ||||
| char fName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| int fRefNum; | int fRefNum; | ||||
| int fNotify; | int fNotify; | ||||
| int fValue1; | int fValue1; | ||||
| int fValue2; | int fValue2; | ||||
| int fSync; | int fSync; | ||||
| char fMessage[JACK_MESSAGE_SIZE + 1]; | |||||
| char fMessage[JACK_MESSAGE_SIZE+1]; | |||||
| JackClientNotification(): fNotify(-1), fValue1(-1), fValue2(-1) | JackClientNotification(): fNotify(-1), fValue1(-1), fValue2(-1) | ||||
| {} | {} | ||||
| @@ -119,7 +119,7 @@ static jack_shm_info_t registry_info = { /* SHM info for the registry */ | |||||
| /* pointers to registry header and array */ | /* pointers to registry header and array */ | ||||
| static jack_shm_header_t *jack_shm_header = NULL; | static jack_shm_header_t *jack_shm_header = NULL; | ||||
| static jack_shm_registry_t *jack_shm_registry = NULL; | static jack_shm_registry_t *jack_shm_registry = NULL; | ||||
| static char jack_shm_server_prefix[JACK_SERVER_NAME_SIZE] = ""; | |||||
| static char jack_shm_server_prefix[JACK_SERVER_NAME_SIZE+1] = ""; | |||||
| /* jack_shm_lock_registry() serializes updates to the shared memory | /* jack_shm_lock_registry() serializes updates to the shared memory | ||||
| * segment JACK uses to keep track of the SHM segments allocated to | * segment JACK uses to keep track of the SHM segments allocated to | ||||
| @@ -123,7 +123,7 @@ extern "C" | |||||
| pid_t pid; /* process ID */ | pid_t pid; /* process ID */ | ||||
| #endif | #endif | ||||
| char name[JACK_SERVER_NAME_SIZE]; | |||||
| char name[JACK_SERVER_NAME_SIZE+1]; | |||||
| } | } | ||||
| jack_shm_server_t; | jack_shm_server_t; | ||||
| @@ -116,8 +116,8 @@ int JackAlsaDriver::Attach() | |||||
| JackPort* port; | JackPort* port; | ||||
| jack_port_id_t port_index; | jack_port_id_t port_index; | ||||
| unsigned long port_flags = (unsigned long)CaptureDriverFlags; | unsigned long port_flags = (unsigned long)CaptureDriverFlags; | ||||
| char name[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char alias[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char name[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| char alias[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| assert(fCaptureChannels < DRIVER_PORT_NUM); | assert(fCaptureChannels < DRIVER_PORT_NUM); | ||||
| assert(fPlaybackChannels < DRIVER_PORT_NUM); | assert(fPlaybackChannels < DRIVER_PORT_NUM); | ||||
| @@ -31,12 +31,12 @@ namespace Jack { | |||||
| private: | private: | ||||
| char alias[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char alias[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| struct pollfd *alsa_poll_fds; | struct pollfd *alsa_poll_fds; | ||||
| int alsa_poll_fd_count; | int alsa_poll_fd_count; | ||||
| int fds[2]; | int fds[2]; | ||||
| unsigned short io_mask; | unsigned short io_mask; | ||||
| char name[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char name[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| struct pollfd *queue_poll_fd; | struct pollfd *queue_poll_fd; | ||||
| protected: | protected: | ||||
| @@ -2029,7 +2029,7 @@ | |||||
| 4BF8D2470834F20600C94B91 /* testSem.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = testSem.cpp; path = ../tests/testSem.cpp; sourceTree = SOURCE_ROOT; }; | 4BF8D2470834F20600C94B91 /* testSem.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = testSem.cpp; path = ../tests/testSem.cpp; sourceTree = SOURCE_ROOT; }; | ||||
| 4BF8FB0D08AC88EF00D1A344 /* JackFrameTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackFrameTimer.cpp; path = ../common/JackFrameTimer.cpp; sourceTree = SOURCE_ROOT; }; | 4BF8FB0D08AC88EF00D1A344 /* JackFrameTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackFrameTimer.cpp; path = ../common/JackFrameTimer.cpp; sourceTree = SOURCE_ROOT; }; | ||||
| 4BF8FB0E08AC88EF00D1A344 /* JackFrameTimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackFrameTimer.h; path = ../common/JackFrameTimer.h; sourceTree = SOURCE_ROOT; }; | 4BF8FB0E08AC88EF00D1A344 /* JackFrameTimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackFrameTimer.h; path = ../common/JackFrameTimer.h; sourceTree = SOURCE_ROOT; }; | ||||
| 4BFA5E980DEC4D9C00FA4CDB /* testSem */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testSem; sourceTree = BUILT_PRODUCTS_DIR; }; | |||||
| 4BFA5E980DEC4D9C00FA4CDB /* testMutex */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testMutex; sourceTree = BUILT_PRODUCTS_DIR; }; | |||||
| 4BFA5E9E0DEC4DD900FA4CDB /* testMutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testMutex.cpp; path = ../tests/testMutex.cpp; sourceTree = SOURCE_ROOT; }; | 4BFA5E9E0DEC4DD900FA4CDB /* testMutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testMutex.cpp; path = ../tests/testMutex.cpp; sourceTree = SOURCE_ROOT; }; | ||||
| 4BFA828C0DF6A9E40087B4E1 /* jack_evmon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_evmon; sourceTree = BUILT_PRODUCTS_DIR; }; | 4BFA828C0DF6A9E40087B4E1 /* jack_evmon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_evmon; sourceTree = BUILT_PRODUCTS_DIR; }; | ||||
| 4BFA829F0DF6A9E40087B4E1 /* jack_bufsize */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_bufsize; sourceTree = BUILT_PRODUCTS_DIR; }; | 4BFA829F0DF6A9E40087B4E1 /* jack_bufsize */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_bufsize; sourceTree = BUILT_PRODUCTS_DIR; }; | ||||
| @@ -2837,7 +2837,7 @@ | |||||
| 4B363F1E0DEB0A6A001F72D9 /* jack_monitor_client */, | 4B363F1E0DEB0A6A001F72D9 /* jack_monitor_client */, | ||||
| 4B363F350DEB0BD1001F72D9 /* jack_showtime */, | 4B363F350DEB0BD1001F72D9 /* jack_showtime */, | ||||
| 4B363F720DEB0D4E001F72D9 /* jack_impulse_grabber */, | 4B363F720DEB0D4E001F72D9 /* jack_impulse_grabber */, | ||||
| 4BFA5E980DEC4D9C00FA4CDB /* testSem */, | |||||
| 4BFA5E980DEC4D9C00FA4CDB /* testMutex */, | |||||
| 4BFA828C0DF6A9E40087B4E1 /* jack_evmon */, | 4BFA828C0DF6A9E40087B4E1 /* jack_evmon */, | ||||
| 4BFA829F0DF6A9E40087B4E1 /* jack_bufsize */, | 4BFA829F0DF6A9E40087B4E1 /* jack_bufsize */, | ||||
| 4BFA82AB0DF6A9E40087B4E1 /* jack_rec */, | 4BFA82AB0DF6A9E40087B4E1 /* jack_rec */, | ||||
| @@ -6200,7 +6200,7 @@ | |||||
| name = "testMutex Universal"; | name = "testMutex Universal"; | ||||
| productInstallPath = /usr/local/bin; | productInstallPath = /usr/local/bin; | ||||
| productName = testSem; | productName = testSem; | ||||
| productReference = 4BFA5E980DEC4D9C00FA4CDB /* testSem */; | |||||
| productReference = 4BFA5E980DEC4D9C00FA4CDB /* testMutex */; | |||||
| productType = "com.apple.product-type.tool"; | productType = "com.apple.product-type.tool"; | ||||
| }; | }; | ||||
| 4BFA82820DF6A9E40087B4E1 /* jack_evmon 64 bits */ = { | 4BFA82820DF6A9E40087B4E1 /* jack_evmon 64 bits */ = { | ||||
| @@ -2262,8 +2262,8 @@ int JackCoreAudioDriver::Attach() | |||||
| UInt32 size; | UInt32 size; | ||||
| Boolean isWritable; | Boolean isWritable; | ||||
| char channel_name[64]; | char channel_name[64]; | ||||
| char name[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char alias[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char name[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| char alias[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| jack_log("JackCoreAudioDriver::Attach : fBufferSize %ld fSampleRate %ld", fEngineControl->fBufferSize, fEngineControl->fSampleRate); | jack_log("JackCoreAudioDriver::Attach : fBufferSize %ld fSampleRate %ld", fEngineControl->fBufferSize, fEngineControl->fSampleRate); | ||||
| @@ -70,7 +70,7 @@ JackCoreMidiPort::Initialize(const char *alias_name, const char *client_name, | |||||
| const char *driver_name, int index, | const char *driver_name, int index, | ||||
| MIDIEndpointRef endpoint, bool is_output) | MIDIEndpointRef endpoint, bool is_output) | ||||
| { | { | ||||
| char endpoint_name[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char endpoint_name[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| CFStringRef endpoint_name_ref; | CFStringRef endpoint_name_ref; | ||||
| int num = index + 1; | int num = index + 1; | ||||
| Boolean res; | Boolean res; | ||||
| @@ -31,9 +31,9 @@ namespace Jack { | |||||
| private: | private: | ||||
| char alias[REAL_JACK_PORT_NAME_SIZE]; | |||||
| char alias[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| char name[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| bool initialized; | bool initialized; | ||||
| char name[REAL_JACK_PORT_NAME_SIZE]; | |||||
| protected: | protected: | ||||
| @@ -55,8 +55,8 @@ class JackOSSAdapter : public JackAudioAdapterInterface, public JackRunnableInte | |||||
| JackThread fThread; | JackThread fThread; | ||||
| char fCaptureDriverName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fPlaybackDriverName[JACK_CLIENT_NAME_SIZE + 1]; | |||||
| char fCaptureDriverName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| char fPlaybackDriverName[JACK_CLIENT_NAME_SIZE+1]; | |||||
| int fInFD; | int fInFD; | ||||
| int fOutFD; | int fOutFD; | ||||
| @@ -80,7 +80,7 @@ class JackWinNamedPipeServerChannel : public JackRunnableInterface | |||||
| JackWinNamedPipeServer fRequestListenPipe; // Pipe to create request socket for the client | JackWinNamedPipeServer fRequestListenPipe; // Pipe to create request socket for the client | ||||
| JackServer* fServer; | JackServer* fServer; | ||||
| JackThread fThread; // Thread to execute the event loop | JackThread fThread; // Thread to execute the event loop | ||||
| char fServerName[JACK_SERVER_NAME_SIZE]; | |||||
| char fServerName[JACK_SERVER_NAME_SIZE+1]; | |||||
| std::list<JackClientPipeThread*> fClientList; | std::list<JackClientPipeThread*> fClientList; | ||||
| @@ -31,8 +31,8 @@ namespace Jack { | |||||
| protected: | protected: | ||||
| char alias[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE]; | |||||
| char name[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE]; | |||||
| char alias[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| char name[REAL_JACK_PORT_NAME_SIZE+1]; | |||||
| public: | public: | ||||