← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kopete/trusty

« back to all changes in this revision

Viewing changes to protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc

  • Committer: Package Import Robot
  • Author(s): Rohan Garg
  • Date: 2013-11-23 17:46:40 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20131123174640-gz1zjv1xqh81bi2h
Tags: 4:4.11.80-0ubuntu1
* New upstream beta release
* Bump build dependency to libotr5-dev
* Update symbols
* Update install files
* Drop new_linphone.diff, not required anymore

Show diffs side-by-side

added added

removed removed

Lines of Context:
protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
200
200
      LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
201
201
      pt_ = i->id;
202
202
      audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
203
 
      port2 = rtp_session_get_local_port(((MediaStream *)audio_stream_)->session);
 
203
#ifdef MEDIASTREAMER_OLD
 
204
      port2 = rtp_session_get_local_port(audio_stream_->session);
 
205
#else
 
206
      port2 = rtp_session_get_local_port(audio_stream_->ms.session);
 
207
#endif
204
208
      first = false;
205
209
    }
206
210
  }
211
215
    // working with a buggy client; let's try PCMU.
212
216
    LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
213
217
    audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
214
 
    port2 = rtp_session_get_local_port(((MediaStream *)audio_stream_)->session);
 
218
#ifdef MEDIASTREAMER_OLD
 
219
    port2 = rtp_session_get_local_port(audio_stream_->session);
 
220
#else
 
221
    port2 = rtp_session_get_local_port(audio_stream_->ms.session);
 
222
#endif
215
223
  }
216
224
 
217
225
  return true;