diff --git a/daemon/src/audio/audiortp/audio_rtp_factory.cpp b/daemon/src/audio/audiortp/audio_rtp_factory.cpp index 0fb6fbf63ec5a4fbbf43d5414ff14104ef0b9149..5b884f55d3135600e589d09f610805240d98df88 100644 --- a/daemon/src/audio/audiortp/audio_rtp_factory.cpp +++ b/daemon/src/audio/audiortp/audio_rtp_factory.cpp @@ -71,7 +71,7 @@ void AudioRtpFactory::initConfig() if (rtpSession_ != NULL) stop(); - std::string accountId(Manager::instance().getAccountFromCall(ca_->getCallId())); + const std::string accountId(ca_->getAccountId()); SIPAccount *account = Manager::instance().getSipAccount(accountId); diff --git a/daemon/src/map_utils.h b/daemon/src/map_utils.h new file mode 100644 index 0000000000000000000000000000000000000000..9cb8bde4f820777d2a3087bf34cd09d12aa5c101 --- /dev/null +++ b/daemon/src/map_utils.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2013 Savoir-Faire Linux Inc. + * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Additional permission under GNU GPL version 3 section 7: + * + * If you modify this program, or any covered work, by linking or + * combining it with the OpenSSL project's OpenSSL library (or a + * modified version of that library), containing parts covered by the + * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc. + * grants you additional permission to convey the resulting work. + * Corresponding Source for a non-source form of such a combination + * shall include the source code for the parts of OpenSSL used as well + * as that of the covered work. + */ + +#ifndef MAP_UTILS_H_ +#define MAP_UTILS_H_ + +#include <vector> + +namespace map_utils { +template <typename M, typename V> +void vectorFromMapKeys(const M &m, V &v) +{ + for (typename M::const_iterator it = m.begin(); it != m.end(); ++it) + v.push_back(it->first); +} +} + +#endif // MAP_UTILS_H_