Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
TPF
jack2
Commits
5ebeb196
Commit
5ebeb196
authored
Jul 23, 2011
by
Stephane Letz
Browse files
More relax JackEngine::NotifyAddClient.
parent
f62f984b
Changes
6
Hide whitespace changes
Inline
Side-by-side
common/JackClient.cpp
View file @
5ebeb196
...
...
@@ -149,6 +149,8 @@ int JackClient::ClientNotify(int refnum, const char* name, int notify, int sync,
{
int
res
=
0
;
jack_log
(
"JackClient::ClientNotify ref = %ld name = %s notify = %ld"
,
refnum
,
name
,
notify
);
// Done all time: redirected on subclass implementation JackLibClient and JackInternalClient
switch
(
notify
)
{
...
...
common/JackDriver.cpp
View file @
5ebeb196
...
...
@@ -217,6 +217,8 @@ void JackDriver::SetupDriverSync(int ref, bool freewheel)
int
JackDriver
::
ClientNotify
(
int
refnum
,
const
char
*
name
,
int
notify
,
int
sync
,
const
char
*
message
,
int
value1
,
int
value2
)
{
jack_log
(
"JackDriver::ClientNotify ref = %ld driver = %s name = %s notify = %ld"
,
refnum
,
fClientControl
.
fName
,
name
,
notify
);
switch
(
notify
)
{
case
kStartFreewheelCallback
:
...
...
@@ -228,7 +230,7 @@ int JackDriver::ClientNotify(int refnum, const char* name, int notify, int sync,
jack_log
(
"JackDriver::kStopFreewheel"
);
SetupDriverSync
(
fClientControl
.
fRefNum
,
false
);
break
;
}
}
return
0
;
}
...
...
common/JackEngine.cpp
View file @
5ebeb196
...
...
@@ -275,10 +275,10 @@ int JackEngine::NotifyAddClient(JackClientInterface* new_client, const char* nam
// Notify existing clients of the new client and new client of existing clients.
for
(
int
i
=
0
;
i
<
CLIENT_NUM
;
i
++
)
{
JackClientInterface
*
old_client
=
fClientTable
[
i
];
if
(
old_client
)
{
if
(
old_client
&&
old_client
!=
new_client
)
{
if
(
old_client
->
ClientNotify
(
refnum
,
name
,
kAddClient
,
true
,
""
,
0
,
0
)
<
0
)
{
jack_error
(
"NotifyAddClient old_client fails name = %s"
,
old_client
->
GetClientControl
()
->
fName
);
return
-
1
;
// Not considered as a failure...
}
if
(
new_client
->
ClientNotify
(
i
,
old_client
->
GetClientControl
()
->
fName
,
kAddClient
,
true
,
""
,
0
,
0
)
<
0
)
{
jack_error
(
"NotifyAddClient new_client fails name = %s"
,
name
);
...
...
@@ -296,7 +296,7 @@ void JackEngine::NotifyRemoveClient(const char* name, int refnum)
for
(
int
i
=
0
;
i
<
CLIENT_NUM
;
i
++
)
{
JackClientInterface
*
client
=
fClientTable
[
i
];
if
(
client
)
{
client
->
ClientNotify
(
refnum
,
name
,
kRemoveClient
,
true
,
""
,
0
,
0
);
client
->
ClientNotify
(
refnum
,
name
,
kRemoveClient
,
true
,
""
,
0
,
0
);
}
}
}
...
...
common/JackExternalClient.cpp
View file @
5ebeb196
...
...
@@ -36,7 +36,7 @@ JackExternalClient::~JackExternalClient()
int
JackExternalClient
::
ClientNotify
(
int
refnum
,
const
char
*
name
,
int
notify
,
int
sync
,
const
char
*
message
,
int
value1
,
int
value2
)
{
int
result
=
-
1
;
jack_log
(
"JackExternalClient::ClientNotify ref = %ld name = %s notify = %ld"
,
refnum
,
name
,
notify
);
jack_log
(
"JackExternalClient::ClientNotify ref = %ld
client = %s
name = %s notify = %ld"
,
refnum
,
fClientControl
->
fName
,
name
,
notify
);
fChannel
.
ClientNotify
(
refnum
,
name
,
notify
,
sync
,
message
,
value1
,
value2
,
&
result
);
return
result
;
}
...
...
@@ -49,17 +49,17 @@ int JackExternalClient::Open(const char* name, int pid, int refnum, int uuid, in
jack_error
(
"Cannot connect to client name = %s
\n
"
,
name
);
return
-
1
;
}
// Use "placement new" to allocate object in shared memory
JackShmMemAble
*
shared_mem
=
static_cast
<
JackShmMemAble
*>
(
JackShmMem
::
operator
new
(
sizeof
(
JackClientControl
)));
shared_mem
->
Init
();
fClientControl
=
new
(
shared_mem
)
JackClientControl
(
name
,
pid
,
refnum
,
uuid
);
if
(
!
fClientControl
)
{
jack_error
(
"Cannot allocate client shared memory segment"
);
return
-
1
;
}
*
shared_client
=
shared_mem
->
GetShmIndex
();
jack_log
(
"JackExternalClient::Open name = %s index = %ld base = %x"
,
name
,
shared_mem
->
GetShmIndex
(),
shared_mem
->
GetShmAddress
());
return
0
;
...
...
posix/JackPosixSemaphore.cpp
View file @
5ebeb196
...
...
@@ -187,7 +187,7 @@ bool JackPosixSemaphore::ConnectOutput(const char* name, const char* server_name
bool
JackPosixSemaphore
::
Disconnect
()
{
if
(
fSemaphore
)
{
jack_log
(
"JackPosixSemaphore::Disconnect name = %s"
,
fName
);
jack_log
(
"JackPosixSemaphore::Disconnect name = %s"
,
fName
);
if
(
sem_close
(
fSemaphore
)
!=
0
)
{
jack_error
(
"Disconnect: can't disconnect named semaphore name = %s err = %s"
,
fName
,
strerror
(
errno
));
return
false
;
...
...
posix/JackSocket.cpp
View file @
5ebeb196
...
...
@@ -188,6 +188,7 @@ int JackClientSocket::Read(void* data, int len)
jack_error
(
"Cannot read socket fd = %d err = %s"
,
fSocket
,
strerror
(
errno
));
return
0
;
}
else
{
jack_error
(
"Cannot read socket fd = %d err = %s"
,
fSocket
,
strerror
(
errno
));
return
-
1
;
}
}
else
{
...
...
@@ -232,6 +233,7 @@ int JackClientSocket::Write(void* data, int len)
jack_error
(
"Cannot write socket fd = %ld err = %s"
,
fSocket
,
strerror
(
errno
));
return
0
;
}
else
{
jack_error
(
"Cannot write socket fd = %ld err = %s"
,
fSocket
,
strerror
(
errno
));
return
-
1
;
}
}
else
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment