Browse Source

Cleanup

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1764 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.69
sletz 17 years ago
parent
commit
0e372f9119
2 changed files with 7 additions and 6 deletions
  1. +3
    -3
      common/JackSocketServerChannel.cpp
  2. +4
    -3
      common/JackSocketServerChannel.h

+ 3
- 3
common/JackSocketServerChannel.cpp View File

@@ -77,9 +77,9 @@ void JackSocketServerChannel::Close()
fRequestListenSocket.Close(); fRequestListenSocket.Close();
} }


void JackSocketServerChannel::CreateClient()
void JackSocketServerChannel::ClientCreate()
{ {
JackLog("JackSocketServerChannel::CreateClient socket\n");
JackLog("JackSocketServerChannel::ClientCreate socket\n");
JackClientSocket* socket = fRequestListenSocket.Accept(); JackClientSocket* socket = fRequestListenSocket.Accept();
if (socket) { if (socket) {
fSocketTable[socket->GetFd()] = make_pair( -1, socket); fSocketTable[socket->GetFd()] = make_pair( -1, socket);
@@ -413,7 +413,7 @@ bool JackSocketServerChannel::Execute()
} }


if (fPollTable[0].revents & POLLIN) { if (fPollTable[0].revents & POLLIN) {
CreateClient();
ClientCreate();
} }
} }




+ 4
- 3
common/JackSocketServerChannel.h View File

@@ -46,12 +46,13 @@ class JackSocketServerChannel : public JackServerChannelInterface, public JackRu
std::map<int, std::pair<int, JackClientSocket*> > fSocketTable; std::map<int, std::pair<int, JackClientSocket*> > fSocketTable;


int HandleRequest(int fd); int HandleRequest(int fd);
void CreateClient();
void BuildPoolTable();
void ClientCreate();
void ClientAdd(int fd, char* name, int* shared_engine, int* shared_client, int* shared_graph, int* result); void ClientAdd(int fd, char* name, int* shared_engine, int* shared_client, int* shared_graph, int* result);
void ClientRemove(int fd, int refnum); void ClientRemove(int fd, int refnum);
void ClientKill(int fd); void ClientKill(int fd);
void BuildPoolTable();

public: public:


JackSocketServerChannel(); JackSocketServerChannel();


Loading…
Cancel
Save