From ea76bb832c45d86bcbaa83d62cff7024404e696d Mon Sep 17 00:00:00 2001 From: sletz Date: Mon, 21 Nov 2011 15:17:33 +0000 Subject: [PATCH] Cleanup. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4592 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/JackNetManager.cpp | 15 --------------- common/JackNetManager.h | 3 --- 2 files changed, 18 deletions(-) diff --git a/common/JackNetManager.cpp b/common/JackNetManager.cpp index a432094c..f9325bca 100644 --- a/common/JackNetManager.cpp +++ b/common/JackNetManager.cpp @@ -779,9 +779,6 @@ namespace Jack jack_info("Takes physical %d outputs for client", params.fReturnAudioChannels); } - // Rename done in jack_client_open if needed ? - //SetSlaveName(params); - //create a new master and add it to the list JackNetMaster* master = new JackNetMaster(fSocket, params, fMulticastIP); if (master->Init(fAutoConnect)) { @@ -792,18 +789,6 @@ namespace Jack return NULL; } - void JackNetMasterManager::SetSlaveName(session_params_t& params) - { - jack_log("JackNetMasterManager::SetSlaveName"); - - master_list_it_t it; - for (it = fMasterList.begin(); it != fMasterList.end(); it++) { - if (strcmp((*it)->fParams.fName, params.fName) == 0) { - snprintf(params.fName, sizeof(params.fName), "%s-%u", params.fName, params.fID); - } - } - } - master_list_it_t JackNetMasterManager::FindMaster(uint32_t id) { jack_log("JackNetMasterManager::FindMaster ID = %u", id); diff --git a/common/JackNetManager.h b/common/JackNetManager.h index bc1e790a..60d53b10 100644 --- a/common/JackNetManager.h +++ b/common/JackNetManager.h @@ -113,10 +113,7 @@ namespace Jack JackNetMaster* InitMaster(session_params_t& params); master_list_it_t FindMaster(uint32_t client_id); int KillMaster(session_params_t* params); - void SetSlaveName(session_params_t& params); - int SyncCallback(jack_transport_state_t state, jack_position_t* pos); - int CountIO(int flags); public: