diff options
| author | Olivier Crête <olivier.crete@collabora.co.uk> | 2011-02-07 16:24:45 +0100 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2011-10-11 15:37:14 -0400 |
| commit | 4d3b2521dcaf27f5fd5682a45a723b495c98b4bd (patch) | |
| tree | ddf4a432d9aac3de042512894508088b2135e058 /examples | |
| parent | 8b0c48cfc07464dc993ccca4c6635430c2bf3272 (diff) | |
| download | farstream-4d3b2521dcaf27f5fd5682a45a723b495c98b4bd.tar.gz | |
session: Remove "codecs-ready"
Now "codecs" is NULL until the codecs are ready
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/commandline/simple-call-shm.c | 2 | ||||
| -rw-r--r-- | examples/commandline/simple-call.c | 2 | ||||
| -rwxr-xr-x | examples/gui/fs2-gui.py | 9 |
3 files changed, 6 insertions, 7 deletions
diff --git a/examples/commandline/simple-call-shm.c b/examples/commandline/simple-call-shm.c index b0786c78..a8d81f5a 100644 --- a/examples/commandline/simple-call-shm.c +++ b/examples/commandline/simple-call-shm.c @@ -163,7 +163,7 @@ add_audio_session (GstElement *pipeline, FsConference *conf, guint id, fs_codec_list_destroy (codecs); - g_object_get (ses->session, "codecs", &codecs, NULL); + g_object_get (ses->session, "codecs-without-config", &codecs, NULL); res = fs_stream_set_remote_codecs (ses->stream, codecs, &error); print_error (error); g_assert (res); diff --git a/examples/commandline/simple-call.c b/examples/commandline/simple-call.c index 0e42bd18..eed9198d 100644 --- a/examples/commandline/simple-call.c +++ b/examples/commandline/simple-call.c @@ -163,7 +163,7 @@ add_audio_session (GstElement *pipeline, FsConference *conf, guint id, fs_codec_list_destroy (codecs); - g_object_get (ses->session, "codecs", &codecs, NULL); + g_object_get (ses->session, "codecs-without-config", &codecs, NULL); res = fs_stream_set_remote_codecs (ses->stream, codecs, &error); print_error (error); g_assert (res); diff --git a/examples/gui/fs2-gui.py b/examples/gui/fs2-gui.py index 7f753c54..c6bda853 100755 --- a/examples/gui/fs2-gui.py +++ b/examples/gui/fs2-gui.py @@ -536,11 +536,10 @@ class FsUIStream: "Internal function to send our local codecs when they're ready" if not self.send_codecs: return - if not self.session.fssession.get_property("codecs-ready"): + codecs = self.session.fssession.get_property("codecs") + if not codecs: print "Codecs are not ready" return - codecs = self.session.fssession.get_property("codecs") - assert(codecs is not None and len(codecs) > 0) if (codecs == self.last_codecs): return self.last_codecs = codecs @@ -550,7 +549,7 @@ class FsUIStream: def send_stream_codecs(self): if not self.connect.is_server: return - if not self.session.fssession.get_property("codecs-ready"): + if not self.session.fssession.get_property("codecs"): return codecs = self.fsstream.get_property("negotiated-codecs") if codecs: @@ -780,7 +779,7 @@ class FsMainUI: liststore = combobox.get_model() current = fssession.get_property("current-send-codec") liststore.clear() - for c in fssession.get_property("codecs"): + for c in fssession.get_property("codecs-without-config"): str = ("%s: %s/%s %s" % (c.id, c.media_type.value_nick, c.encoding_name, |