← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to daemon/src/client/callmanager.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2015-01-07 14:51:16 UTC
  • mfrom: (4.3.5 sid)
  • Revision ID: package-import@ubuntu.com-20150107145116-yxnafinf4lrdvrmx
Tags: 1.4.1-0.1ubuntu1
* Merge with Debian, remaining changes:
 - Drop soprano, nepomuk build-dep
* Drop ubuntu patches, now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/client/callmanager.cpp
186
186
    return Manager::instance().getParticipantList(confID);
187
187
}
188
188
 
 
189
std::vector<std::string>
 
190
CallManager::getDisplayNames(const std::string& confID)
 
191
{
 
192
    return Manager::instance().getDisplayNames(confID);
 
193
}
 
194
 
189
195
std::string
190
196
CallManager::getConferenceId(const std::string& callID)
191
197
{
228
234
    return Manager::instance().isRecording(callID);
229
235
}
230
236
 
231
 
std::string CallManager::getCurrentAudioCodecName(const std::string& callID)
 
237
std::string CallManager::getCurrentAudioCodecName(const std::string& /*callID*/)
232
238
{
233
 
    return Manager::instance().getCurrentAudioCodecName(callID);
 
239
    WARN("Deprecated");
 
240
    return "";
234
241
}
235
242
 
236
243
std::map<std::string, std::string>
277
284
    if (!link)
278
285
        throw CallManagerException("Failed to get sip link");
279
286
 
280
 
    SIPCall *call = link->getSipCall(callID);
 
287
    auto call = link->getSipCall(callID);
281
288
    if (!call)
282
289
        throw CallManagerException("Call id " + callID + " is not valid");
283
290