Browse Source

Correct JackServer::AddSlave.

tags/v1.9.10
Stephane Letz 12 years ago
parent
commit
1fe6799803
1 changed files with 7 additions and 5 deletions
  1. +7
    -5
      common/JackServer.cpp

+ 7
- 5
common/JackServer.cpp View File

@@ -327,19 +327,21 @@ JackDriverInfo* JackServer::AddSlave(jack_driver_desc_t* driver_desc, JSList* dr
{ {
JackDriverInfo* info = new JackDriverInfo(); JackDriverInfo* info = new JackDriverInfo();
JackDriverClientInterface* slave = info->Open(driver_desc, fEngine, GetSynchroTable(), driver_params); JackDriverClientInterface* slave = info->Open(driver_desc, fEngine, GetSynchroTable(), driver_params);
if (slave == NULL) {
goto error;
if (!slave) {
goto error1;
} }
if (slave->Attach() < 0) { if (slave->Attach() < 0) {
goto error;
goto error2;
} }
slave->SetMaster(false); slave->SetMaster(false);
fAudioDriver->AddSlave(slave); fAudioDriver->AddSlave(slave);
return info; return info;


error:
error2:
slave->Close(); slave->Close();
error1:
delete info; delete info;
return NULL; return NULL;
} }
@@ -366,7 +368,7 @@ int JackServer::SwitchMaster(jack_driver_desc_t* driver_desc, JSList* driver_par
JackDriverInfo* info = new JackDriverInfo(); JackDriverInfo* info = new JackDriverInfo();
JackDriverClientInterface* master = info->Open(driver_desc, fEngine, GetSynchroTable(), driver_params); JackDriverClientInterface* master = info->Open(driver_desc, fEngine, GetSynchroTable(), driver_params);


if (master == NULL) {
if (!master) {
goto error; goto error;
} }




Loading…
Cancel
Save