Skip to content

Commit

Permalink
Merge branch 'master' into 'master'
Browse files Browse the repository at this point in the history
[voicecall] Compile with new Farstream/GStreamer. Contributes to JB#27731

It compiles, therefore it works.

Not much idea what I'm doing, but cannot break the current state much more. 

See merge request !9
  • Loading branch information
pvuorela committed May 4, 2016
2 parents 1d727f9 + b91e038 commit bfa4603
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions plugins/providers/telepathy/src/farstreamchannel.cpp
Expand Up @@ -277,8 +277,7 @@ void FarstreamChannel::initAudioInput()
setError("GStreamer audio input bin could not be created");
return;
}
gst_object_ref(mGstAudioInput);
gst_object_sink(mGstAudioInput);
gst_object_ref_sink(mGstAudioInput);

GstElement *source = 0;
source = addElementToBin(mGstAudioInput, source, AUDIO_SOURCE_ELEMENT);
Expand Down Expand Up @@ -409,8 +408,7 @@ void FarstreamChannel::initAudioOutput()
setError("GStreamer audio output could not be created");
return;
}
gst_object_ref(mGstAudioOutput);
gst_object_sink(mGstAudioOutput);
gst_object_ref_sink(mGstAudioOutput);

GstElement *source = 0;
pushElement(mGstAudioOutput, source, "queue", false, &mGstAudioOutputSink, false);
Expand Down

0 comments on commit bfa4603

Please sign in to comment.