Fri, 13 Apr 2012 07:38:01 +0000
Fix typo that was breaking compilation for me
"HAVE_FARSTREAM" isn't a valid define.
"HAVE_FARSIGHT" is
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
1 | /** |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2 | * @file backend-fs2.c Farstream backend for media API |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
3 | * @ingroup core |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
4 | */ |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
5 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
6 | /* purple |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
7 | * |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
8 | * Purple is the legal property of its developers, whose names are too numerous |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
9 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
10 | * source distribution. |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
11 | * |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
12 | * This program is free software; you can redistribute it and/or modify |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
13 | * it under the terms of the GNU General Public License as published by |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
14 | * the Free Software Foundation; either version 2 of the License, or |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
15 | * (at your option) any later version. |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
16 | * |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
17 | * This program is distributed in the hope that it will be useful, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
20 | * GNU General Public License for more details. |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
21 | * |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
22 | * You should have received a copy of the GNU General Public License |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
23 | * along with this program; if not, write to the Free Software |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
24 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
25 | */ |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
26 | |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
27 | #include "internal.h" |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
28 | |
|
29661
ae75a0a4d399
Fix compile with --disable-gstreamer.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
29657
diff
changeset
|
29 | #include "backend-fs2.h" |
|
ae75a0a4d399
Fix compile with --disable-gstreamer.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
29657
diff
changeset
|
30 | |
|
29723
d20be93c4c8d
Compile with --disable-vv. Without this change I get this error:
Mark Doliner <markdoliner@pidgin.im>
parents:
29688
diff
changeset
|
31 | #ifdef USE_VV |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
32 | #include "backend-iface.h" |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
33 | #include "debug.h" |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
34 | #include "network.h" |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
35 | #include "media-gst.h" |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
36 | |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
37 | #ifdef HAVE_FARSIGHT |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
38 | #include <gst/farsight/fs-conference-iface.h> |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
39 | #include <gst/farsight/fs-element-added-notifier.h> |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
40 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
41 | #include <farstream/fs-conference.h> |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
42 | #include <farstream/fs-element-added-notifier.h> |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
43 | #include <farstream/fs-utils.h> |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
44 | #endif |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
45 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
46 | /** @copydoc _PurpleMediaBackendFs2Class */ |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
47 | typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
48 | /** @copydoc _PurpleMediaBackendFs2Private */ |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
49 | typedef struct _PurpleMediaBackendFs2Private PurpleMediaBackendFs2Private; |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
50 | /** @copydoc _PurpleMediaBackendFs2Session */ |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
51 | typedef struct _PurpleMediaBackendFs2Session PurpleMediaBackendFs2Session; |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
52 | /** @copydoc _PurpleMediaBackendFs2Stream */ |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
53 | typedef struct _PurpleMediaBackendFs2Stream PurpleMediaBackendFs2Stream; |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
54 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
55 | #define PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(obj) \ |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
56 | (G_TYPE_INSTANCE_GET_PRIVATE((obj), \ |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
57 | PURPLE_TYPE_MEDIA_BACKEND_FS2, PurpleMediaBackendFs2Private)) |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
58 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
59 | static void purple_media_backend_iface_init(PurpleMediaBackendIface *iface); |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
60 | |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
61 | static gboolean |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
62 | gst_bus_cb(GstBus *bus, GstMessage *msg, PurpleMediaBackendFs2 *self); |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
63 | static void |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
64 | state_changed_cb(PurpleMedia *media, PurpleMediaState state, |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
65 | gchar *sid, gchar *name, PurpleMediaBackendFs2 *self); |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
66 | static void |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
67 | stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type, |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
68 | gchar *sid, gchar *name, gboolean local, |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
69 | PurpleMediaBackendFs2 *self); |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
70 | |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
71 | static gboolean purple_media_backend_fs2_add_stream(PurpleMediaBackend *self, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
72 | const gchar *sess_id, const gchar *who, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
73 | PurpleMediaSessionType type, gboolean initiator, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
74 | const gchar *transmitter, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
75 | guint num_params, GParameter *params); |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
76 | static void purple_media_backend_fs2_add_remote_candidates( |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
77 | PurpleMediaBackend *self, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
78 | const gchar *sess_id, const gchar *participant, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
79 | GList *remote_candidates); |
|
29597
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
80 | static gboolean purple_media_backend_fs2_codecs_ready(PurpleMediaBackend *self, |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
81 | const gchar *sess_id); |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
82 | static GList *purple_media_backend_fs2_get_codecs(PurpleMediaBackend *self, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
83 | const gchar *sess_id); |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
84 | static GList *purple_media_backend_fs2_get_local_candidates( |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
85 | PurpleMediaBackend *self, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
86 | const gchar *sess_id, const gchar *participant); |
|
29588
a3fef46ce04a
Make the backend interface's set_remote_codecs function return gboolean.
Michael Ruprecht <maiku@pidgin.im>
parents:
29587
diff
changeset
|
87 | static gboolean purple_media_backend_fs2_set_remote_codecs( |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
88 | PurpleMediaBackend *self, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
89 | const gchar *sess_id, const gchar *participant, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
90 | GList *codecs); |
|
29590
bec92b90acc9
Change the media backend interface's set_send_codec to return gboolean to
Michael Ruprecht <maiku@pidgin.im>
parents:
29589
diff
changeset
|
91 | static gboolean purple_media_backend_fs2_set_send_codec( |
|
bec92b90acc9
Change the media backend interface's set_send_codec to return gboolean to
Michael Ruprecht <maiku@pidgin.im>
parents:
29589
diff
changeset
|
92 | PurpleMediaBackend *self, const gchar *sess_id, |
|
bec92b90acc9
Change the media backend interface's set_send_codec to return gboolean to
Michael Ruprecht <maiku@pidgin.im>
parents:
29589
diff
changeset
|
93 | PurpleMediaCodec *codec); |
|
31687
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
94 | static void purple_media_backend_fs2_set_params(PurpleMediaBackend *self, |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
95 | guint num_params, GParameter *params); |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
96 | static const gchar **purple_media_backend_fs2_get_available_params(void); |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
97 | |
|
31618
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
98 | static void free_stream(PurpleMediaBackendFs2Stream *stream); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
99 | static void free_session(PurpleMediaBackendFs2Session *session); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
100 | |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
101 | struct _PurpleMediaBackendFs2Class |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
102 | { |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
103 | GObjectClass parent_class; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
104 | }; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
105 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
106 | struct _PurpleMediaBackendFs2 |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
107 | { |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
108 | GObject parent; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
109 | }; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
110 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
111 | G_DEFINE_TYPE_WITH_CODE(PurpleMediaBackendFs2, purple_media_backend_fs2, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
112 | G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE( |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
113 | PURPLE_TYPE_MEDIA_BACKEND, purple_media_backend_iface_init)); |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
114 | |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
115 | struct _PurpleMediaBackendFs2Stream |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
116 | { |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
117 | PurpleMediaBackendFs2Session *session; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
118 | gchar *participant; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
119 | FsStream *stream; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
120 | |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
121 | #ifndef HAVE_FARSIGHT |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
122 | gboolean supports_add; |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
123 | #endif |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
124 | |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
125 | GstElement *src; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
126 | GstElement *tee; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
127 | GstElement *volume; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
128 | GstElement *level; |
|
31618
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
129 | GstElement *fakesink; |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
130 | GstElement *queue; |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
131 | |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
132 | GList *local_candidates; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
133 | GList *remote_candidates; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
134 | |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
135 | guint connected_cb_id; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
136 | }; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
137 | |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
138 | struct _PurpleMediaBackendFs2Session |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
139 | { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
140 | PurpleMediaBackendFs2 *backend; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
141 | gchar *id; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
142 | FsSession *session; |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
143 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
144 | GstElement *src; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
145 | GstElement *tee; |
|
31557
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
146 | GstElement *srcvalve; |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
147 | |
|
31313
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
148 | GstPad *srcpad; |
|
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
149 | |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
150 | PurpleMediaSessionType type; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
151 | }; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
152 | |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
153 | struct _PurpleMediaBackendFs2Private |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
154 | { |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
155 | PurpleMedia *media; |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
156 | GstElement *confbin; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
157 | FsConference *conference; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
158 | gchar *conference_type; |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
159 | |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
160 | #ifndef HAVE_FARSIGHT |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
161 | FsElementAddedNotifier *notifier; |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
162 | #endif |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
163 | |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
164 | GHashTable *sessions; |
|
29579
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
165 | GHashTable *participants; |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
166 | |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
167 | GList *streams; |
|
31557
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
168 | |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
169 | gdouble silence_threshold; |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
170 | }; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
171 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
172 | enum { |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
173 | PROP_0, |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
174 | PROP_CONFERENCE_TYPE, |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
175 | PROP_MEDIA, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
176 | }; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
177 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
178 | static void |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
179 | purple_media_backend_fs2_init(PurpleMediaBackendFs2 *self) |
|
31566
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31557
diff
changeset
|
180 | {} |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
181 | |
|
31368
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
182 | static gboolean |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
183 | event_probe_cb(GstPad *srcpad, GstEvent *event, gboolean release_pad) |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
184 | { |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
185 | if (GST_EVENT_TYPE(event) == GST_EVENT_CUSTOM_DOWNSTREAM |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
186 | && gst_event_has_name(event, "purple-unlink-tee")) { |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
187 | |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
188 | const GstStructure *s = gst_event_get_structure(event); |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
189 | |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
190 | gst_pad_unlink(srcpad, gst_pad_get_peer(srcpad)); |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
191 | |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
192 | gst_pad_remove_event_probe(srcpad, |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
193 | g_value_get_uint(gst_structure_get_value(s, "handler-id"))); |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
194 | |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
195 | if (g_value_get_boolean(gst_structure_get_value(s, "release-pad"))) |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
196 | gst_element_release_request_pad(GST_ELEMENT_PARENT(srcpad), srcpad); |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
197 | |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
198 | return FALSE; |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
199 | } |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
200 | |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
201 | return TRUE; |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
202 | } |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
203 | |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
204 | static void |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
205 | unlink_teepad_dynamic(GstPad *srcpad, gboolean release_pad) |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
206 | { |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
207 | guint id = gst_pad_add_event_probe(srcpad, G_CALLBACK(event_probe_cb), NULL); |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
208 | |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
209 | if (GST_IS_GHOST_PAD(srcpad)) |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
210 | srcpad = gst_ghost_pad_get_target(GST_GHOST_PAD(srcpad)); |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
211 | |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
212 | gst_element_send_event(gst_pad_get_parent_element(srcpad), |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
213 | gst_event_new_custom(GST_EVENT_CUSTOM_DOWNSTREAM, |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
214 | gst_structure_new("purple-unlink-tee", |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
215 | "release-pad", G_TYPE_BOOLEAN, release_pad, |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
216 | "handler-id", G_TYPE_UINT, id, |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
217 | NULL))); |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
218 | } |
|
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
219 | |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
220 | static void |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
221 | purple_media_backend_fs2_dispose(GObject *obj) |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
222 | { |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
223 | PurpleMediaBackendFs2Private *priv = |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
224 | PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(obj); |
|
29593
5274ab2ae88c
Properly free PurpleMediaBackendFs2Stream's.
Michael Ruprecht <maiku@pidgin.im>
parents:
29592
diff
changeset
|
225 | GList *iter = NULL; |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
226 | |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
227 | purple_debug_info("backend-fs2", "purple_media_backend_fs2_dispose\n"); |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
228 | |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
229 | #ifndef HAVE_FARSIGHT |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
230 | if (priv->notifier) { |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
231 | g_object_unref(priv->notifier); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
232 | priv->notifier = NULL; |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
233 | } |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
234 | #endif |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
235 | |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
236 | if (priv->confbin) { |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
237 | GstElement *pipeline; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
238 | |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
239 | pipeline = purple_media_manager_get_pipeline( |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
240 | purple_media_get_manager(priv->media)); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
241 | |
|
31313
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
242 | /* All connections to media sources should be blocked before confbin is |
|
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
243 | * removed, to prevent freezing of any other simultaneously running |
|
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
244 | * media calls. */ |
|
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
245 | if (priv->sessions) { |
|
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
246 | GList *sessions = g_hash_table_get_values(priv->sessions); |
|
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
247 | for (; sessions; sessions = |
|
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
248 | g_list_delete_link(sessions, sessions)) { |
|
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
249 | PurpleMediaBackendFs2Session *session = sessions->data; |
|
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
250 | if (session->srcpad) { |
|
31368
ea6ce68f2948
This is a better way to handle ending one call when multiple calls are in
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31313
diff
changeset
|
251 | unlink_teepad_dynamic(session->srcpad, FALSE); |
|
31313
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
252 | gst_object_unref(session->srcpad); |
|
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
253 | session->srcpad = NULL; |
|
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
254 | } |
|
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
255 | } |
|
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
256 | } |
|
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
257 | |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
258 | gst_element_set_locked_state(priv->confbin, TRUE); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
259 | gst_element_set_state(GST_ELEMENT(priv->confbin), |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
260 | GST_STATE_NULL); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
261 | |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
262 | if (pipeline) { |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
263 | GstBus *bus; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
264 | gst_bin_remove(GST_BIN(pipeline), priv->confbin); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
265 | bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline)); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
266 | g_signal_handlers_disconnect_matched(G_OBJECT(bus), |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
267 | G_SIGNAL_MATCH_FUNC | |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
268 | G_SIGNAL_MATCH_DATA, |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
269 | 0, 0, 0, gst_bus_cb, obj); |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
270 | gst_object_unref(bus); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
271 | } else { |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
272 | purple_debug_warning("backend-fs2", "Unable to " |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
273 | "properly dispose the conference. " |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
274 | "Couldn't get the pipeline.\n"); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
275 | } |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
276 | |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
277 | priv->confbin = NULL; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
278 | priv->conference = NULL; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
279 | |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
280 | } |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
281 | |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
282 | if (priv->sessions) { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
283 | GList *sessions = g_hash_table_get_values(priv->sessions); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
284 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
285 | for (; sessions; sessions = |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
286 | g_list_delete_link(sessions, sessions)) { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
287 | PurpleMediaBackendFs2Session *session = |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
288 | sessions->data; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
289 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
290 | if (session->session) { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
291 | g_object_unref(session->session); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
292 | session->session = NULL; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
293 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
294 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
295 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
296 | |
|
29579
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
297 | if (priv->participants) { |
|
30715
61a0bd743512
Fix some media code leaks.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30706
diff
changeset
|
298 | g_hash_table_destroy(priv->participants); |
|
29579
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
299 | priv->participants = NULL; |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
300 | } |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
301 | |
|
29593
5274ab2ae88c
Properly free PurpleMediaBackendFs2Stream's.
Michael Ruprecht <maiku@pidgin.im>
parents:
29592
diff
changeset
|
302 | for (iter = priv->streams; iter; iter = g_list_next(iter)) { |
|
5274ab2ae88c
Properly free PurpleMediaBackendFs2Stream's.
Michael Ruprecht <maiku@pidgin.im>
parents:
29592
diff
changeset
|
303 | PurpleMediaBackendFs2Stream *stream = iter->data; |
|
5274ab2ae88c
Properly free PurpleMediaBackendFs2Stream's.
Michael Ruprecht <maiku@pidgin.im>
parents:
29592
diff
changeset
|
304 | if (stream->stream) { |
|
5274ab2ae88c
Properly free PurpleMediaBackendFs2Stream's.
Michael Ruprecht <maiku@pidgin.im>
parents:
29592
diff
changeset
|
305 | g_object_unref(stream->stream); |
|
5274ab2ae88c
Properly free PurpleMediaBackendFs2Stream's.
Michael Ruprecht <maiku@pidgin.im>
parents:
29592
diff
changeset
|
306 | stream->stream = NULL; |
|
5274ab2ae88c
Properly free PurpleMediaBackendFs2Stream's.
Michael Ruprecht <maiku@pidgin.im>
parents:
29592
diff
changeset
|
307 | } |
|
5274ab2ae88c
Properly free PurpleMediaBackendFs2Stream's.
Michael Ruprecht <maiku@pidgin.im>
parents:
29592
diff
changeset
|
308 | } |
|
5274ab2ae88c
Properly free PurpleMediaBackendFs2Stream's.
Michael Ruprecht <maiku@pidgin.im>
parents:
29592
diff
changeset
|
309 | |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
310 | if (priv->media) { |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
311 | g_object_remove_weak_pointer(G_OBJECT(priv->media), |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
312 | (gpointer*)&priv->media); |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
313 | priv->media = NULL; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
314 | } |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
315 | |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
316 | G_OBJECT_CLASS(purple_media_backend_fs2_parent_class)->dispose(obj); |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
317 | } |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
318 | |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
319 | static void |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
320 | purple_media_backend_fs2_finalize(GObject *obj) |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
321 | { |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
322 | PurpleMediaBackendFs2Private *priv = |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
323 | PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(obj); |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
324 | |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
325 | purple_debug_info("backend-fs2", "purple_media_backend_fs2_finalize\n"); |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
326 | |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
327 | g_free(priv->conference_type); |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
328 | |
|
29593
5274ab2ae88c
Properly free PurpleMediaBackendFs2Stream's.
Michael Ruprecht <maiku@pidgin.im>
parents:
29592
diff
changeset
|
329 | for (; priv->streams; priv->streams = |
|
5274ab2ae88c
Properly free PurpleMediaBackendFs2Stream's.
Michael Ruprecht <maiku@pidgin.im>
parents:
29592
diff
changeset
|
330 | g_list_delete_link(priv->streams, priv->streams)) { |
|
5274ab2ae88c
Properly free PurpleMediaBackendFs2Stream's.
Michael Ruprecht <maiku@pidgin.im>
parents:
29592
diff
changeset
|
331 | PurpleMediaBackendFs2Stream *stream = priv->streams->data; |
|
31618
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
332 | free_stream(stream); |
|
29593
5274ab2ae88c
Properly free PurpleMediaBackendFs2Stream's.
Michael Ruprecht <maiku@pidgin.im>
parents:
29592
diff
changeset
|
333 | } |
|
5274ab2ae88c
Properly free PurpleMediaBackendFs2Stream's.
Michael Ruprecht <maiku@pidgin.im>
parents:
29592
diff
changeset
|
334 | |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
335 | if (priv->sessions) { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
336 | GList *sessions = g_hash_table_get_values(priv->sessions); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
337 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
338 | for (; sessions; sessions = |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
339 | g_list_delete_link(sessions, sessions)) { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
340 | PurpleMediaBackendFs2Session *session = |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
341 | sessions->data; |
|
31618
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
342 | free_session(session); |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
343 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
344 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
345 | g_hash_table_destroy(priv->sessions); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
346 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
347 | |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
348 | G_OBJECT_CLASS(purple_media_backend_fs2_parent_class)->finalize(obj); |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
349 | } |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
350 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
351 | static void |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
352 | purple_media_backend_fs2_set_property(GObject *object, guint prop_id, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
353 | const GValue *value, GParamSpec *pspec) |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
354 | { |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
355 | PurpleMediaBackendFs2Private *priv; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
356 | g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(object)); |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
357 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
358 | priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(object); |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
359 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
360 | switch (prop_id) { |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
361 | case PROP_CONFERENCE_TYPE: |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
362 | priv->conference_type = g_value_dup_string(value); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
363 | break; |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
364 | case PROP_MEDIA: |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
365 | priv->media = g_value_get_object(value); |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
366 | |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
367 | if (priv->media == NULL) |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
368 | break; |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
369 | |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
370 | g_object_add_weak_pointer(G_OBJECT(priv->media), |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
371 | (gpointer*)&priv->media); |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
372 | |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
373 | g_signal_connect(G_OBJECT(priv->media), |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
374 | "state-changed", |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
375 | G_CALLBACK(state_changed_cb), |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
376 | PURPLE_MEDIA_BACKEND_FS2(object)); |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
377 | g_signal_connect(G_OBJECT(priv->media), "stream-info", |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
378 | G_CALLBACK(stream_info_cb), |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
379 | PURPLE_MEDIA_BACKEND_FS2(object)); |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
380 | break; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
31278
diff
changeset
|
381 | default: |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
382 | G_OBJECT_WARN_INVALID_PROPERTY_ID( |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
383 | object, prop_id, pspec); |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
384 | break; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
385 | } |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
386 | } |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
387 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
388 | static void |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
389 | purple_media_backend_fs2_get_property(GObject *object, guint prop_id, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
390 | GValue *value, GParamSpec *pspec) |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
391 | { |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
392 | PurpleMediaBackendFs2Private *priv; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
393 | g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(object)); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
31278
diff
changeset
|
394 | |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
395 | priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(object); |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
396 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
397 | switch (prop_id) { |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
398 | case PROP_CONFERENCE_TYPE: |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
399 | g_value_set_string(value, priv->conference_type); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
400 | break; |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
401 | case PROP_MEDIA: |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
402 | g_value_set_object(value, priv->media); |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
403 | break; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
31278
diff
changeset
|
404 | default: |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
405 | G_OBJECT_WARN_INVALID_PROPERTY_ID( |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
406 | object, prop_id, pspec); |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
407 | break; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
408 | } |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
409 | } |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
410 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
411 | static void |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
412 | purple_media_backend_fs2_class_init(PurpleMediaBackendFs2Class *klass) |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
413 | { |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
414 | GObjectClass *gobject_class = (GObjectClass*)klass; |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
415 | |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
416 | gobject_class->dispose = purple_media_backend_fs2_dispose; |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
417 | gobject_class->finalize = purple_media_backend_fs2_finalize; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
418 | gobject_class->set_property = purple_media_backend_fs2_set_property; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
419 | gobject_class->get_property = purple_media_backend_fs2_get_property; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
420 | |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
421 | g_object_class_override_property(gobject_class, PROP_CONFERENCE_TYPE, |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
422 | "conference-type"); |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
423 | g_object_class_override_property(gobject_class, PROP_MEDIA, "media"); |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
424 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
425 | g_type_class_add_private(klass, sizeof(PurpleMediaBackendFs2Private)); |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
426 | } |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
427 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
428 | static void |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
429 | purple_media_backend_iface_init(PurpleMediaBackendIface *iface) |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
430 | { |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
431 | iface->add_stream = purple_media_backend_fs2_add_stream; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
432 | iface->add_remote_candidates = |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
433 | purple_media_backend_fs2_add_remote_candidates; |
|
29597
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
434 | iface->codecs_ready = purple_media_backend_fs2_codecs_ready; |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
435 | iface->get_codecs = purple_media_backend_fs2_get_codecs; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
436 | iface->get_local_candidates = |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
437 | purple_media_backend_fs2_get_local_candidates; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
438 | iface->set_remote_codecs = purple_media_backend_fs2_set_remote_codecs; |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
439 | iface->set_send_codec = purple_media_backend_fs2_set_send_codec; |
|
31687
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
440 | iface->set_params = purple_media_backend_fs2_set_params; |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
441 | iface->get_available_params = purple_media_backend_fs2_get_available_params; |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
442 | } |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
443 | |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
444 | static FsMediaType |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
445 | session_type_to_fs_media_type(PurpleMediaSessionType type) |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
446 | { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
447 | if (type & PURPLE_MEDIA_AUDIO) |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
448 | return FS_MEDIA_TYPE_AUDIO; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
449 | else if (type & PURPLE_MEDIA_VIDEO) |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
450 | return FS_MEDIA_TYPE_VIDEO; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
451 | else |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
452 | return 0; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
453 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
454 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
455 | static FsStreamDirection |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
456 | session_type_to_fs_stream_direction(PurpleMediaSessionType type) |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
457 | { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
458 | if ((type & PURPLE_MEDIA_AUDIO) == PURPLE_MEDIA_AUDIO || |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
459 | (type & PURPLE_MEDIA_VIDEO) == PURPLE_MEDIA_VIDEO) |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
460 | return FS_DIRECTION_BOTH; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
461 | else if ((type & PURPLE_MEDIA_SEND_AUDIO) || |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
462 | (type & PURPLE_MEDIA_SEND_VIDEO)) |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
463 | return FS_DIRECTION_SEND; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
464 | else if ((type & PURPLE_MEDIA_RECV_AUDIO) || |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
465 | (type & PURPLE_MEDIA_RECV_VIDEO)) |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
466 | return FS_DIRECTION_RECV; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
467 | else |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
468 | return FS_DIRECTION_NONE; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
469 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
470 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
471 | static PurpleMediaSessionType |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
472 | session_type_from_fs(FsMediaType type, FsStreamDirection direction) |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
473 | { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
474 | PurpleMediaSessionType result = PURPLE_MEDIA_NONE; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
475 | if (type == FS_MEDIA_TYPE_AUDIO) { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
476 | if (direction & FS_DIRECTION_SEND) |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
477 | result |= PURPLE_MEDIA_SEND_AUDIO; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
478 | if (direction & FS_DIRECTION_RECV) |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
479 | result |= PURPLE_MEDIA_RECV_AUDIO; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
480 | } else if (type == FS_MEDIA_TYPE_VIDEO) { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
481 | if (direction & FS_DIRECTION_SEND) |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
482 | result |= PURPLE_MEDIA_SEND_VIDEO; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
483 | if (direction & FS_DIRECTION_RECV) |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
484 | result |= PURPLE_MEDIA_RECV_VIDEO; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
485 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
486 | return result; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
487 | } |
|
29570
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
488 | |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
489 | static FsCandidate * |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
490 | candidate_to_fs(PurpleMediaCandidate *candidate) |
|
29570
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
491 | { |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
492 | FsCandidate *fscandidate; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
493 | gchar *foundation; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
494 | guint component_id; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
495 | gchar *ip; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
496 | guint port; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
497 | gchar *base_ip; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
498 | guint base_port; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
499 | PurpleMediaNetworkProtocol proto; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
500 | guint32 priority; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
501 | PurpleMediaCandidateType type; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
502 | gchar *username; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
503 | gchar *password; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
504 | guint ttl; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
505 | |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
506 | if (candidate == NULL) |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
507 | return NULL; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
508 | |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
509 | g_object_get(G_OBJECT(candidate), |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
510 | "foundation", &foundation, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
511 | "component-id", &component_id, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
512 | "ip", &ip, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
513 | "port", &port, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
514 | "base-ip", &base_ip, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
515 | "base-port", &base_port, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
516 | "protocol", &proto, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
517 | "priority", &priority, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
518 | "type", &type, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
519 | "username", &username, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
520 | "password", &password, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
521 | "ttl", &ttl, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
522 | NULL); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
523 | |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
524 | fscandidate = fs_candidate_new(foundation, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
525 | component_id, type, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
526 | proto, ip, port); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
527 | |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
528 | fscandidate->base_ip = base_ip; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
529 | fscandidate->base_port = base_port; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
530 | fscandidate->priority = priority; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
531 | fscandidate->username = username; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
532 | fscandidate->password = password; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
533 | fscandidate->ttl = ttl; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
534 | |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
535 | g_free(foundation); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
536 | g_free(ip); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
537 | return fscandidate; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
538 | } |
|
29583
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
539 | |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
540 | static GList * |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
541 | candidate_list_to_fs(GList *candidates) |
|
29583
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
542 | { |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
543 | GList *new_list = NULL; |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
544 | |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
545 | for (; candidates; candidates = g_list_next(candidates)) { |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
546 | new_list = g_list_prepend(new_list, |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
547 | candidate_to_fs(candidates->data)); |
|
29583
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
548 | } |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
549 | |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
550 | new_list = g_list_reverse(new_list); |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
551 | return new_list; |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
552 | } |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
553 | |
|
29570
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
554 | static PurpleMediaCandidate * |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
555 | candidate_from_fs(FsCandidate *fscandidate) |
|
29570
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
556 | { |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
557 | PurpleMediaCandidate *candidate; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
558 | |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
559 | if (fscandidate == NULL) |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
560 | return NULL; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
561 | |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
562 | candidate = purple_media_candidate_new(fscandidate->foundation, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
563 | fscandidate->component_id, fscandidate->type, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
564 | fscandidate->proto, fscandidate->ip, fscandidate->port); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
565 | g_object_set(candidate, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
566 | "base-ip", fscandidate->base_ip, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
567 | "base-port", fscandidate->base_port, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
568 | "priority", fscandidate->priority, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
569 | "username", fscandidate->username, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
570 | "password", fscandidate->password, |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
571 | "ttl", fscandidate->ttl, NULL); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
572 | return candidate; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
573 | } |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
574 | |
|
29587
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
575 | static GList * |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
576 | candidate_list_from_fs(GList *candidates) |
|
29587
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
577 | { |
|
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
578 | GList *new_list = NULL; |
|
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
579 | |
|
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
580 | for (; candidates; candidates = g_list_next(candidates)) { |
|
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
581 | new_list = g_list_prepend(new_list, |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
582 | candidate_from_fs(candidates->data)); |
|
29587
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
583 | } |
|
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
584 | |
|
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
585 | new_list = g_list_reverse(new_list); |
|
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
586 | return new_list; |
|
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
587 | } |
|
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
588 | |
|
29585
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
589 | static FsCodec * |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
590 | codec_to_fs(const PurpleMediaCodec *codec) |
|
29585
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
591 | { |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
592 | FsCodec *new_codec; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
593 | gint id; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
594 | char *encoding_name; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
595 | PurpleMediaSessionType media_type; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
596 | guint clock_rate; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
597 | guint channels; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
598 | GList *iter; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
599 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
600 | if (codec == NULL) |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
601 | return NULL; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
602 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
603 | g_object_get(G_OBJECT(codec), |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
604 | "id", &id, |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
605 | "encoding-name", &encoding_name, |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
606 | "media-type", &media_type, |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
607 | "clock-rate", &clock_rate, |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
608 | "channels", &channels, |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
609 | "optional-params", &iter, |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
610 | NULL); |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
611 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
612 | new_codec = fs_codec_new(id, encoding_name, |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
613 | session_type_to_fs_media_type(media_type), |
|
29585
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
614 | clock_rate); |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
615 | new_codec->channels = channels; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
616 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
617 | for (; iter; iter = g_list_next(iter)) { |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
618 | PurpleKeyValuePair *param = (PurpleKeyValuePair*)iter->data; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
619 | fs_codec_add_optional_parameter(new_codec, |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
620 | param->key, param->value); |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
621 | } |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
622 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
623 | g_free(encoding_name); |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
624 | return new_codec; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
625 | } |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
626 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
627 | static PurpleMediaCodec * |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
628 | codec_from_fs(const FsCodec *codec) |
|
29585
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
629 | { |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
630 | PurpleMediaCodec *new_codec; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
631 | GList *iter; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
632 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
633 | if (codec == NULL) |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
634 | return NULL; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
635 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
636 | new_codec = purple_media_codec_new(codec->id, codec->encoding_name, |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
637 | session_type_from_fs(codec->media_type, |
|
29585
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
638 | FS_DIRECTION_BOTH), codec->clock_rate); |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
639 | g_object_set(new_codec, "channels", codec->channels, NULL); |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
640 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
641 | for (iter = codec->optional_params; iter; iter = g_list_next(iter)) { |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
642 | FsCodecParameter *param = (FsCodecParameter*)iter->data; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
643 | purple_media_codec_add_optional_parameter(new_codec, |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
644 | param->name, param->value); |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
645 | } |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
646 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
647 | return new_codec; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
648 | } |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
649 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
650 | static GList * |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
651 | codec_list_from_fs(GList *codecs) |
|
29585
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
652 | { |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
653 | GList *new_list = NULL; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
654 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
655 | for (; codecs; codecs = g_list_next(codecs)) { |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
656 | new_list = g_list_prepend(new_list, |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
657 | codec_from_fs(codecs->data)); |
|
29585
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
658 | } |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
659 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
660 | new_list = g_list_reverse(new_list); |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
661 | return new_list; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
662 | } |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
663 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
664 | static GList * |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
665 | codec_list_to_fs(GList *codecs) |
|
29585
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
666 | { |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
667 | GList *new_list = NULL; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
668 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
669 | for (; codecs; codecs = g_list_next(codecs)) { |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
670 | new_list = g_list_prepend(new_list, |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
671 | codec_to_fs(codecs->data)); |
|
29585
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
672 | } |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
673 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
674 | new_list = g_list_reverse(new_list); |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
675 | return new_list; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
676 | } |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
677 | |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
678 | static PurpleMediaBackendFs2Session * |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
679 | get_session(PurpleMediaBackendFs2 *self, const gchar *sess_id) |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
680 | { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
681 | PurpleMediaBackendFs2Private *priv; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
682 | PurpleMediaBackendFs2Session *session = NULL; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
683 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
684 | g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
685 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
686 | priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
687 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
688 | if (priv->sessions != NULL) |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
689 | session = g_hash_table_lookup(priv->sessions, sess_id); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
690 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
691 | return session; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
692 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
693 | |
|
29579
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
694 | static FsParticipant * |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
695 | get_participant(PurpleMediaBackendFs2 *self, const gchar *name) |
|
29579
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
696 | { |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
697 | PurpleMediaBackendFs2Private *priv; |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
698 | FsParticipant *participant = NULL; |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
699 | |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
700 | g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL); |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
701 | |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
702 | priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
703 | |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
704 | if (priv->participants != NULL) |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
705 | participant = g_hash_table_lookup(priv->participants, name); |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
706 | |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
707 | return participant; |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
708 | } |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
709 | |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
710 | static PurpleMediaBackendFs2Stream * |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
711 | get_stream(PurpleMediaBackendFs2 *self, |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
712 | const gchar *sess_id, const gchar *name) |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
713 | { |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
714 | PurpleMediaBackendFs2Private *priv; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
715 | GList *streams; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
716 | |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
717 | g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
718 | |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
719 | priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
720 | streams = priv->streams; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
721 | |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
722 | for (; streams; streams = g_list_next(streams)) { |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
723 | PurpleMediaBackendFs2Stream *stream = streams->data; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
724 | if (!strcmp(stream->session->id, sess_id) && |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
725 | !strcmp(stream->participant, name)) |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
726 | return stream; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
727 | } |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
728 | |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
729 | return NULL; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
730 | } |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
731 | |
|
29592
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
732 | static GList * |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
733 | get_streams(PurpleMediaBackendFs2 *self, |
|
29592
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
734 | const gchar *sess_id, const gchar *name) |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
735 | { |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
736 | PurpleMediaBackendFs2Private *priv; |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
737 | GList *streams, *ret = NULL; |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
738 | |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
739 | g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL); |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
740 | |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
741 | priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
742 | streams = priv->streams; |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
743 | |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
744 | for (; streams; streams = g_list_next(streams)) { |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
745 | PurpleMediaBackendFs2Stream *stream = streams->data; |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
746 | |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
747 | if (sess_id != NULL && strcmp(stream->session->id, sess_id)) |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
748 | continue; |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
749 | else if (name != NULL && strcmp(stream->participant, name)) |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
750 | continue; |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
751 | else |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
752 | ret = g_list_prepend(ret, stream); |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
753 | } |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
754 | |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
755 | ret = g_list_reverse(ret); |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
756 | return ret; |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
757 | } |
|
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
758 | |
|
29570
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
759 | static PurpleMediaBackendFs2Session * |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
760 | get_session_from_fs_stream(PurpleMediaBackendFs2 *self, FsStream *stream) |
|
29570
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
761 | { |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
762 | PurpleMediaBackendFs2Private *priv = |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
763 | PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
764 | FsSession *fssession; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
765 | GList *values; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
766 | |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
767 | g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
768 | g_return_val_if_fail(FS_IS_STREAM(stream), NULL); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
769 | |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
770 | g_object_get(stream, "session", &fssession, NULL); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
771 | |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
772 | values = g_hash_table_get_values(priv->sessions); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
773 | |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
774 | for (; values; values = g_list_delete_link(values, values)) { |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
775 | PurpleMediaBackendFs2Session *session = values->data; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
776 | |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
777 | if (session->session == fssession) { |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
778 | g_list_free(values); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
779 | g_object_unref(fssession); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
780 | return session; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
781 | } |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
782 | } |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
783 | |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
784 | g_object_unref(fssession); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
785 | return NULL; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
786 | } |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
787 | |
|
31557
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
788 | static gdouble |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
789 | gst_msg_db_to_percent(GstMessage *msg, gchar *value_name) |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
790 | { |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
791 | const GValue *list; |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
792 | const GValue *value; |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
793 | gdouble value_db; |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
794 | gdouble percent; |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
795 | |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
796 | list = gst_structure_get_value( |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
797 | gst_message_get_structure(msg), value_name); |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
798 | value = gst_value_list_get_value(list, 0); |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
799 | value_db = g_value_get_double(value); |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
800 | percent = pow(10, value_db / 20); |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
801 | return (percent > 1.0) ? 1.0 : percent; |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
802 | } |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
803 | |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
804 | static void |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
805 | gst_handle_message_element(GstBus *bus, GstMessage *msg, |
|
29570
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
806 | PurpleMediaBackendFs2 *self) |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
807 | { |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
808 | PurpleMediaBackendFs2Private *priv = |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
809 | PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
810 | GstElement *src = GST_ELEMENT(GST_MESSAGE_SRC(msg)); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
811 | static guint level_id = 0; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
812 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
813 | if (level_id == 0) |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
814 | level_id = g_signal_lookup("level", PURPLE_TYPE_MEDIA); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
815 | |
|
31557
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
816 | if (gst_structure_has_name(msg->structure, "level")) { |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
817 | GstElement *src = GST_ELEMENT(GST_MESSAGE_SRC(msg)); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
818 | gchar *name; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
819 | gchar *participant = NULL; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
820 | PurpleMediaBackendFs2Session *session = NULL; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
821 | gdouble percent; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
822 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
823 | if (!PURPLE_IS_MEDIA(priv->media) || |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
824 | GST_ELEMENT_PARENT(src) != priv->confbin) |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
825 | return; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
826 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
827 | name = gst_element_get_name(src); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
828 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
829 | if (!strncmp(name, "sendlevel_", 10)) { |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
830 | session = get_session(self, name+10); |
|
31566
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31557
diff
changeset
|
831 | if (priv->silence_threshold > 0) { |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31557
diff
changeset
|
832 | percent = gst_msg_db_to_percent(msg, "decay"); |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31557
diff
changeset
|
833 | g_object_set(session->srcvalve, |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31557
diff
changeset
|
834 | "drop", (percent < priv->silence_threshold), NULL); |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31557
diff
changeset
|
835 | } |
|
31557
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
836 | } |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
837 | |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
838 | g_free(name); |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
839 | |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
840 | if (!g_signal_has_handler_pending(priv->media, level_id, 0, FALSE)) |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
841 | return; |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
842 | |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
843 | if (!session) { |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
844 | GList *iter = priv->streams; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
845 | PurpleMediaBackendFs2Stream *stream; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
846 | for (; iter; iter = g_list_next(iter)) { |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
847 | stream = iter->data; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
848 | if (stream->level == src) { |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
849 | session = stream->session; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
850 | participant = stream->participant; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
851 | break; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
852 | } |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
853 | } |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
854 | } |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
855 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
856 | if (!session) |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
857 | return; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
858 | |
|
31557
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
859 | percent = gst_msg_db_to_percent(msg, "rms"); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
860 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
861 | g_signal_emit(priv->media, level_id, 0, |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
862 | session->id, participant, percent); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
863 | return; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
864 | } |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
865 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
866 | if (!FS_IS_CONFERENCE(src) || !PURPLE_IS_MEDIA_BACKEND(self) || |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
867 | priv->conference != FS_CONFERENCE(src)) |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
868 | return; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
869 | |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
870 | #ifdef HAVE_FARSIGHT |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
871 | if (gst_structure_has_name(msg->structure, "farsight-error")) { |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
872 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
873 | if (gst_structure_has_name(msg->structure, "farstream-error")) { |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
874 | #endif |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
875 | FsError error_no; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
876 | gst_structure_get_enum(msg->structure, "error-no", |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
877 | FS_TYPE_ERROR, (gint*)&error_no); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
878 | switch (error_no) { |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
879 | case FS_ERROR_NO_CODECS: |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
880 | purple_media_error(priv->media, _("No codecs" |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
881 | " found. Install some" |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
882 | " GStreamer codecs found" |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
883 | " in GStreamer plugins" |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
884 | " packages.")); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
885 | purple_media_end(priv->media, NULL, NULL); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
886 | break; |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
887 | #ifdef HAVE_FARSIGHT |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
888 | case FS_ERROR_NO_CODECS_LEFT: |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
889 | purple_media_error(priv->media, _("No codecs" |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
890 | " left. Your codec" |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
891 | " preferences in" |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
892 | " fs-codecs.conf are too" |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
893 | " strict.")); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
894 | purple_media_end(priv->media, NULL, NULL); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
895 | break; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
896 | case FS_ERROR_UNKNOWN_CNAME: |
|
32110
cf3fc2a5c274
Whitespace normalization
Richard Laager <rlaager@pidgin.im>
parents:
31860
diff
changeset
|
897 | /* |
|
cf3fc2a5c274
Whitespace normalization
Richard Laager <rlaager@pidgin.im>
parents:
31860
diff
changeset
|
898 | * Unknown CName is only a problem for the |
|
cf3fc2a5c274
Whitespace normalization
Richard Laager <rlaager@pidgin.im>
parents:
31860
diff
changeset
|
899 | * multicast transmitter which isn't used. |
|
cf3fc2a5c274
Whitespace normalization
Richard Laager <rlaager@pidgin.im>
parents:
31860
diff
changeset
|
900 | * It is also deprecated. |
|
cf3fc2a5c274
Whitespace normalization
Richard Laager <rlaager@pidgin.im>
parents:
31860
diff
changeset
|
901 | */ |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
902 | break; |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
903 | #endif |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
904 | default: |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
905 | purple_debug_error("backend-fs2", |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
906 | #ifdef HAVE_FARSIGHT |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
907 | "farsight-error: %i: %s\n", |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
908 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
909 | "farstream-error: %i: %s\n", |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
910 | #endif |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
911 | error_no, |
|
32110
cf3fc2a5c274
Whitespace normalization
Richard Laager <rlaager@pidgin.im>
parents:
31860
diff
changeset
|
912 | gst_structure_get_string( |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
913 | msg->structure, "error-msg")); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
914 | break; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
915 | } |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
916 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
917 | if (FS_ERROR_IS_FATAL(error_no)) { |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
918 | #ifdef HAVE_FARSIGHT |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
919 | purple_media_error(priv->media, _("A non-recoverable " |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
920 | "Farsight2 error has occurred.")); |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
921 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
922 | purple_media_error(priv->media, _("A non-recoverable " |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
923 | "Farstream error has occurred.")); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
924 | #endif |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
925 | purple_media_end(priv->media, NULL, NULL); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
926 | } |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
927 | } else if (gst_structure_has_name(msg->structure, |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
928 | #ifdef HAVE_FARSIGHT |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
929 | "farsight-new-local-candidate")) { |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
930 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
931 | "farstream-new-local-candidate")) { |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
932 | #endif |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
933 | const GValue *value; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
934 | FsStream *stream; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
935 | FsCandidate *local_candidate; |
|
29570
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
936 | PurpleMediaCandidate *candidate; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
937 | FsParticipant *participant; |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
938 | PurpleMediaBackendFs2Session *session; |
|
29587
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
939 | PurpleMediaBackendFs2Stream *media_stream; |
|
29570
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
940 | gchar *name; |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
941 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
942 | value = gst_structure_get_value(msg->structure, "stream"); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
943 | stream = g_value_get_object(value); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
944 | value = gst_structure_get_value(msg->structure, "candidate"); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
945 | local_candidate = g_value_get_boxed(value); |
|
29570
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
946 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
947 | session = get_session_from_fs_stream(self, stream); |
|
29570
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
948 | |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
949 | purple_debug_info("backend-fs2", |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
950 | "got new local candidate: %s\n", |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
951 | local_candidate->foundation); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
952 | |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
953 | g_object_get(stream, "participant", &participant, NULL); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
954 | g_object_get(participant, "cname", &name, NULL); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
955 | g_object_unref(participant); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
956 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
957 | media_stream = get_stream(self, session->id, name); |
|
29587
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
958 | media_stream->local_candidates = g_list_append( |
|
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
959 | media_stream->local_candidates, |
|
29570
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
960 | fs_candidate_copy(local_candidate)); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
961 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
962 | candidate = candidate_from_fs(local_candidate); |
|
29570
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
963 | g_signal_emit_by_name(self, "new-candidate", |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
964 | session->id, name, candidate); |
|
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
965 | g_object_unref(candidate); |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
966 | } else if (gst_structure_has_name(msg->structure, |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
967 | #ifdef HAVE_FARSIGHT |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
968 | "farsight-local-candidates-prepared")) { |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
969 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
970 | "farstream-local-candidates-prepared")) { |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
971 | #endif |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
972 | const GValue *value; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
973 | FsStream *stream; |
|
29573
2377156c8bed
Move Farsight 2's local-candidates-prepared signal to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29572
diff
changeset
|
974 | FsParticipant *participant; |
|
2377156c8bed
Move Farsight 2's local-candidates-prepared signal to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29572
diff
changeset
|
975 | PurpleMediaBackendFs2Session *session; |
|
2377156c8bed
Move Farsight 2's local-candidates-prepared signal to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29572
diff
changeset
|
976 | gchar *name; |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
977 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
978 | value = gst_structure_get_value(msg->structure, "stream"); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
979 | stream = g_value_get_object(value); |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
980 | session = get_session_from_fs_stream(self, stream); |
|
29573
2377156c8bed
Move Farsight 2's local-candidates-prepared signal to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29572
diff
changeset
|
981 | |
|
2377156c8bed
Move Farsight 2's local-candidates-prepared signal to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29572
diff
changeset
|
982 | g_object_get(stream, "participant", &participant, NULL); |
|
2377156c8bed
Move Farsight 2's local-candidates-prepared signal to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29572
diff
changeset
|
983 | g_object_get(participant, "cname", &name, NULL); |
|
2377156c8bed
Move Farsight 2's local-candidates-prepared signal to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29572
diff
changeset
|
984 | g_object_unref(participant); |
|
2377156c8bed
Move Farsight 2's local-candidates-prepared signal to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29572
diff
changeset
|
985 | |
|
2377156c8bed
Move Farsight 2's local-candidates-prepared signal to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29572
diff
changeset
|
986 | g_signal_emit_by_name(self, "candidates-prepared", |
|
2377156c8bed
Move Farsight 2's local-candidates-prepared signal to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29572
diff
changeset
|
987 | session->id, name); |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
988 | } else if (gst_structure_has_name(msg->structure, |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
989 | #ifdef HAVE_FARSIGHT |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
990 | "farsight-new-active-candidate-pair")) { |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
991 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
992 | "farstream-new-active-candidate-pair")) { |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
993 | #endif |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
994 | const GValue *value; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
995 | FsStream *stream; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
996 | FsCandidate *local_candidate; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
997 | FsCandidate *remote_candidate; |
|
29572
4e4dbdcf5281
Move Farsight 2's new-active-candidate-pair into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29571
diff
changeset
|
998 | FsParticipant *participant; |
|
4e4dbdcf5281
Move Farsight 2's new-active-candidate-pair into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29571
diff
changeset
|
999 | PurpleMediaBackendFs2Session *session; |
|
4e4dbdcf5281
Move Farsight 2's new-active-candidate-pair into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29571
diff
changeset
|
1000 | PurpleMediaCandidate *lcandidate, *rcandidate; |
|
4e4dbdcf5281
Move Farsight 2's new-active-candidate-pair into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29571
diff
changeset
|
1001 | gchar *name; |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1002 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1003 | value = gst_structure_get_value(msg->structure, "stream"); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1004 | stream = g_value_get_object(value); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1005 | value = gst_structure_get_value(msg->structure, |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1006 | "local-candidate"); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1007 | local_candidate = g_value_get_boxed(value); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1008 | value = gst_structure_get_value(msg->structure, |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1009 | "remote-candidate"); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1010 | remote_candidate = g_value_get_boxed(value); |
|
29572
4e4dbdcf5281
Move Farsight 2's new-active-candidate-pair into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29571
diff
changeset
|
1011 | |
|
4e4dbdcf5281
Move Farsight 2's new-active-candidate-pair into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29571
diff
changeset
|
1012 | g_object_get(stream, "participant", &participant, NULL); |
|
4e4dbdcf5281
Move Farsight 2's new-active-candidate-pair into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29571
diff
changeset
|
1013 | g_object_get(participant, "cname", &name, NULL); |
|
4e4dbdcf5281
Move Farsight 2's new-active-candidate-pair into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29571
diff
changeset
|
1014 | g_object_unref(participant); |
|
4e4dbdcf5281
Move Farsight 2's new-active-candidate-pair into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29571
diff
changeset
|
1015 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1016 | session = get_session_from_fs_stream(self, stream); |
|
29572
4e4dbdcf5281
Move Farsight 2's new-active-candidate-pair into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29571
diff
changeset
|
1017 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1018 | lcandidate = candidate_from_fs(local_candidate); |
|
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1019 | rcandidate = candidate_from_fs(remote_candidate); |
|
29572
4e4dbdcf5281
Move Farsight 2's new-active-candidate-pair into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29571
diff
changeset
|
1020 | |
|
4e4dbdcf5281
Move Farsight 2's new-active-candidate-pair into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29571
diff
changeset
|
1021 | g_signal_emit_by_name(self, "active-candidate-pair", |
|
4e4dbdcf5281
Move Farsight 2's new-active-candidate-pair into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29571
diff
changeset
|
1022 | session->id, name, lcandidate, rcandidate); |
|
4e4dbdcf5281
Move Farsight 2's new-active-candidate-pair into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29571
diff
changeset
|
1023 | |
|
4e4dbdcf5281
Move Farsight 2's new-active-candidate-pair into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29571
diff
changeset
|
1024 | g_object_unref(lcandidate); |
|
4e4dbdcf5281
Move Farsight 2's new-active-candidate-pair into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29571
diff
changeset
|
1025 | g_object_unref(rcandidate); |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1026 | } else if (gst_structure_has_name(msg->structure, |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1027 | #ifdef HAVE_FARSIGHT |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1028 | "farsight-recv-codecs-changed")) { |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1029 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1030 | "farstream-recv-codecs-changed")) { |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1031 | #endif |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1032 | const GValue *value; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1033 | GList *codecs; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1034 | FsCodec *codec; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1035 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1036 | value = gst_structure_get_value(msg->structure, "codecs"); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1037 | codecs = g_value_get_boxed(value); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1038 | codec = codecs->data; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1039 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1040 | purple_debug_info("backend-fs2", |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1041 | #ifdef HAVE_FARSIGHT |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1042 | "farsight-recv-codecs-changed: %s\n", |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1043 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1044 | "farstream-recv-codecs-changed: %s\n", |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1045 | #endif |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1046 | codec->encoding_name); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1047 | } else if (gst_structure_has_name(msg->structure, |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1048 | #ifdef HAVE_FARSIGHT |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1049 | "farsight-component-state-changed")) { |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1050 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1051 | "farstream-component-state-changed")) { |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1052 | #endif |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1053 | const GValue *value; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1054 | FsStreamState fsstate; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1055 | guint component; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1056 | const gchar *state; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1057 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1058 | value = gst_structure_get_value(msg->structure, "state"); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1059 | fsstate = g_value_get_enum(value); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1060 | value = gst_structure_get_value(msg->structure, "component"); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1061 | component = g_value_get_uint(value); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1062 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1063 | switch (fsstate) { |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1064 | case FS_STREAM_STATE_FAILED: |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1065 | state = "FAILED"; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1066 | break; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1067 | case FS_STREAM_STATE_DISCONNECTED: |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1068 | state = "DISCONNECTED"; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1069 | break; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1070 | case FS_STREAM_STATE_GATHERING: |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1071 | state = "GATHERING"; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1072 | break; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1073 | case FS_STREAM_STATE_CONNECTING: |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1074 | state = "CONNECTING"; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1075 | break; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1076 | case FS_STREAM_STATE_CONNECTED: |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1077 | state = "CONNECTED"; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1078 | break; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1079 | case FS_STREAM_STATE_READY: |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1080 | state = "READY"; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1081 | break; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1082 | default: |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1083 | state = "UNKNOWN"; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1084 | break; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1085 | } |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1086 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1087 | purple_debug_info("backend-fs2", |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1088 | #ifdef HAVE_FARSIGHT |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1089 | "farsight-component-state-changed: " |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1090 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1091 | "farstream-component-state-changed: " |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1092 | #endif |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1093 | "component: %u state: %s\n", |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1094 | component, state); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1095 | } else if (gst_structure_has_name(msg->structure, |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1096 | #ifdef HAVE_FARSIGHT |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1097 | "farsight-send-codec-changed")) { |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1098 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1099 | "farstream-send-codec-changed")) { |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1100 | #endif |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1101 | const GValue *value; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1102 | FsCodec *codec; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1103 | gchar *codec_str; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1104 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1105 | value = gst_structure_get_value(msg->structure, "codec"); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1106 | codec = g_value_get_boxed(value); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1107 | codec_str = fs_codec_to_string(codec); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1108 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1109 | purple_debug_info("backend-fs2", |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1110 | #ifdef HAVE_FARSIGHT |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1111 | "farsight-send-codec-changed: codec: %s\n", |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1112 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1113 | "farstream-send-codec-changed: codec: %s\n", |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1114 | #endif |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1115 | codec_str); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1116 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1117 | g_free(codec_str); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1118 | } else if (gst_structure_has_name(msg->structure, |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1119 | #ifdef HAVE_FARSIGHT |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1120 | "farsight-codecs-changed")) { |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1121 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1122 | "farstream-codecs-changed")) { |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1123 | #endif |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1124 | const GValue *value; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1125 | FsSession *fssession; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1126 | GList *sessions; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1127 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1128 | value = gst_structure_get_value(msg->structure, "session"); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1129 | fssession = g_value_get_object(value); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1130 | sessions = g_hash_table_get_values(priv->sessions); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1131 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1132 | for (; sessions; sessions = |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1133 | g_list_delete_link(sessions, sessions)) { |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1134 | PurpleMediaBackendFs2Session *session = sessions->data; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1135 | gchar *session_id; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1136 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1137 | if (session->session != fssession) |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1138 | continue; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1139 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1140 | session_id = g_strdup(session->id); |
|
29571
f5b8fe67c87f
Move handling Farsight 2's codecs-changed signal into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29570
diff
changeset
|
1141 | g_signal_emit_by_name(self, "codecs-changed", |
|
f5b8fe67c87f
Move handling Farsight 2's codecs-changed signal into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29570
diff
changeset
|
1142 | session_id); |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1143 | g_free(session_id); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1144 | g_list_free(sessions); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1145 | break; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1146 | } |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1147 | } |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1148 | } |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1149 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1150 | static void |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1151 | gst_handle_message_error(GstBus *bus, GstMessage *msg, |
|
29570
3c71157baa81
Move handling Farsight 2's new-local-candidate signal in Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29569
diff
changeset
|
1152 | PurpleMediaBackendFs2 *self) |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1153 | { |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1154 | PurpleMediaBackendFs2Private *priv = |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1155 | PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1156 | GstElement *element = GST_ELEMENT(GST_MESSAGE_SRC(msg)); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1157 | GstElement *lastElement = NULL; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1158 | GList *sessions; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1159 | |
|
31807
ea1e6ba109cc
media: Fix a NULL pointer deref crash, and add diagnostic logging.
Paul Aurich <darkrain42@pidgin.im>
parents:
31687
diff
changeset
|
1160 | GError *error = NULL; |
|
ea1e6ba109cc
media: Fix a NULL pointer deref crash, and add diagnostic logging.
Paul Aurich <darkrain42@pidgin.im>
parents:
31687
diff
changeset
|
1161 | gchar *debug_msg = NULL; |
|
ea1e6ba109cc
media: Fix a NULL pointer deref crash, and add diagnostic logging.
Paul Aurich <darkrain42@pidgin.im>
parents:
31687
diff
changeset
|
1162 | |
|
ea1e6ba109cc
media: Fix a NULL pointer deref crash, and add diagnostic logging.
Paul Aurich <darkrain42@pidgin.im>
parents:
31687
diff
changeset
|
1163 | gst_message_parse_error(msg, &error, &debug_msg); |
|
ea1e6ba109cc
media: Fix a NULL pointer deref crash, and add diagnostic logging.
Paul Aurich <darkrain42@pidgin.im>
parents:
31687
diff
changeset
|
1164 | purple_debug_error("backend-fs2", "gst error %s\ndebugging: %s\n", |
|
ea1e6ba109cc
media: Fix a NULL pointer deref crash, and add diagnostic logging.
Paul Aurich <darkrain42@pidgin.im>
parents:
31687
diff
changeset
|
1165 | error->message, debug_msg); |
|
ea1e6ba109cc
media: Fix a NULL pointer deref crash, and add diagnostic logging.
Paul Aurich <darkrain42@pidgin.im>
parents:
31687
diff
changeset
|
1166 | |
|
ea1e6ba109cc
media: Fix a NULL pointer deref crash, and add diagnostic logging.
Paul Aurich <darkrain42@pidgin.im>
parents:
31687
diff
changeset
|
1167 | g_error_free(error); |
|
ea1e6ba109cc
media: Fix a NULL pointer deref crash, and add diagnostic logging.
Paul Aurich <darkrain42@pidgin.im>
parents:
31687
diff
changeset
|
1168 | g_free(debug_msg); |
|
ea1e6ba109cc
media: Fix a NULL pointer deref crash, and add diagnostic logging.
Paul Aurich <darkrain42@pidgin.im>
parents:
31687
diff
changeset
|
1169 | |
|
31824
6942cb72f357
media/backend-fs2: Better fix for the NULL deref crash here.
Paul Aurich <darkrain42@pidgin.im>
parents:
31807
diff
changeset
|
1170 | while (element && !GST_IS_PIPELINE(element)) { |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1171 | if (element == priv->confbin) |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1172 | break; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1173 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1174 | lastElement = element; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1175 | element = GST_ELEMENT_PARENT(element); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1176 | } |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1177 | |
|
31824
6942cb72f357
media/backend-fs2: Better fix for the NULL deref crash here.
Paul Aurich <darkrain42@pidgin.im>
parents:
31807
diff
changeset
|
1178 | if (!element || !GST_IS_PIPELINE(element)) |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1179 | return; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1180 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1181 | sessions = purple_media_get_session_ids(priv->media); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1182 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1183 | for (; sessions; sessions = g_list_delete_link(sessions, sessions)) { |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1184 | if (purple_media_get_src(priv->media, sessions->data) |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1185 | != lastElement) |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1186 | continue; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1187 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1188 | if (purple_media_get_session_type(priv->media, sessions->data) |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1189 | & PURPLE_MEDIA_AUDIO) |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1190 | purple_media_error(priv->media, |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1191 | _("Error with your microphone")); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1192 | else |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1193 | purple_media_error(priv->media, |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1194 | _("Error with your webcam")); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1195 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1196 | break; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1197 | } |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1198 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1199 | g_list_free(sessions); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1200 | |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1201 | purple_media_error(priv->media, _("Conference error")); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1202 | purple_media_end(priv->media, NULL, NULL); |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1203 | } |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1204 | |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
1205 | static gboolean |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1206 | gst_bus_cb(GstBus *bus, GstMessage *msg, PurpleMediaBackendFs2 *self) |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1207 | { |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1208 | switch(GST_MESSAGE_TYPE(msg)) { |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1209 | case GST_MESSAGE_ELEMENT: |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1210 | gst_handle_message_element(bus, msg, self); |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1211 | break; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1212 | case GST_MESSAGE_ERROR: |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1213 | gst_handle_message_error(bus, msg, self); |
|
29568
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1214 | break; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1215 | default: |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1216 | break; |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1217 | } |
|
e2fcbaf4409c
Transfer some GStreamer message handling to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29564
diff
changeset
|
1218 | |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1219 | return TRUE; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1220 | } |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1221 | |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
1222 | static void |
|
31618
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1223 | remove_element(GstElement *element) |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1224 | { |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1225 | if (element) { |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1226 | gst_element_set_locked_state(element, TRUE); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1227 | gst_element_set_state(element, GST_STATE_NULL); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1228 | gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(element)), element); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1229 | } |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1230 | } |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1231 | |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1232 | static void |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1233 | state_changed_cb(PurpleMedia *media, PurpleMediaState state, |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
1234 | gchar *sid, gchar *name, PurpleMediaBackendFs2 *self) |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
1235 | { |
|
31618
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1236 | if (state == PURPLE_MEDIA_STATE_END) { |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1237 | PurpleMediaBackendFs2Private *priv = |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1238 | PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1239 | |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1240 | if (sid && name) { |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1241 | PurpleMediaBackendFs2Stream *stream = get_stream(self, sid, name); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1242 | gst_object_unref(stream->stream); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1243 | |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1244 | priv->streams = g_list_remove(priv->streams, stream); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1245 | |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1246 | remove_element(stream->src); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1247 | remove_element(stream->tee); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1248 | remove_element(stream->volume); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1249 | remove_element(stream->level); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1250 | remove_element(stream->fakesink); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1251 | remove_element(stream->queue); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1252 | |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1253 | free_stream(stream); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1254 | } else if (sid && !name) { |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1255 | PurpleMediaBackendFs2Session *session = get_session(self, sid); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1256 | GstPad *pad; |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1257 | |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1258 | g_object_get(session->session, "sink-pad", &pad, NULL); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1259 | gst_pad_unlink(GST_PAD_PEER(pad), pad); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1260 | gst_object_unref(pad); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1261 | |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1262 | gst_object_unref(session->session); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1263 | g_hash_table_remove(priv->sessions, session->id); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1264 | |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1265 | pad = gst_pad_get_peer(session->srcpad); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1266 | gst_element_remove_pad(GST_ELEMENT_PARENT(pad), pad); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1267 | gst_object_unref(pad); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1268 | gst_object_unref(session->srcpad); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1269 | |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1270 | remove_element(session->srcvalve); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1271 | remove_element(session->tee); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1272 | |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1273 | free_session(session); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1274 | } |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1275 | |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1276 | purple_media_manager_remove_output_windows( |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1277 | purple_media_get_manager(media), media, sid, name); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1278 | } |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
1279 | } |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
1280 | |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
1281 | static void |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1282 | stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type, |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
1283 | gchar *sid, gchar *name, gboolean local, |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
1284 | PurpleMediaBackendFs2 *self) |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
1285 | { |
|
29619
5c64f74c2ebd
Handle individual streams in the Fs2 backend's stream-info callback for accept
Michael Ruprecht <maiku@pidgin.im>
parents:
29618
diff
changeset
|
1286 | if (type == PURPLE_MEDIA_INFO_ACCEPT && sid != NULL && name != NULL) { |
|
5c64f74c2ebd
Handle individual streams in the Fs2 backend's stream-info callback for accept
Michael Ruprecht <maiku@pidgin.im>
parents:
29618
diff
changeset
|
1287 | PurpleMediaBackendFs2Stream *stream = |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1288 | get_stream(self, sid, name); |
|
29619
5c64f74c2ebd
Handle individual streams in the Fs2 backend's stream-info callback for accept
Michael Ruprecht <maiku@pidgin.im>
parents:
29618
diff
changeset
|
1289 | GError *err = NULL; |
|
29592
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
1290 | |
|
29619
5c64f74c2ebd
Handle individual streams in the Fs2 backend's stream-info callback for accept
Michael Ruprecht <maiku@pidgin.im>
parents:
29618
diff
changeset
|
1291 | g_object_set(G_OBJECT(stream->stream), "direction", |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1292 | session_type_to_fs_stream_direction( |
|
29619
5c64f74c2ebd
Handle individual streams in the Fs2 backend's stream-info callback for accept
Michael Ruprecht <maiku@pidgin.im>
parents:
29618
diff
changeset
|
1293 | stream->session->type), NULL); |
|
29592
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
1294 | |
|
29648
be1362619ef2
Allow connection checks before acceptance. Fixes Empathy<->Pidgin.
Michael Ruprecht <maiku@pidgin.im>
parents:
29623
diff
changeset
|
1295 | if (stream->remote_candidates == NULL || |
|
be1362619ef2
Allow connection checks before acceptance. Fixes Empathy<->Pidgin.
Michael Ruprecht <maiku@pidgin.im>
parents:
29623
diff
changeset
|
1296 | purple_media_is_initiator(media, sid, name)) |
|
29619
5c64f74c2ebd
Handle individual streams in the Fs2 backend's stream-info callback for accept
Michael Ruprecht <maiku@pidgin.im>
parents:
29618
diff
changeset
|
1297 | return; |
|
29592
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
1298 | |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1299 | #ifdef HAVE_FARSIGHT |
|
29619
5c64f74c2ebd
Handle individual streams in the Fs2 backend's stream-info callback for accept
Michael Ruprecht <maiku@pidgin.im>
parents:
29618
diff
changeset
|
1300 | fs_stream_set_remote_candidates(stream->stream, |
|
5c64f74c2ebd
Handle individual streams in the Fs2 backend's stream-info callback for accept
Michael Ruprecht <maiku@pidgin.im>
parents:
29618
diff
changeset
|
1301 | stream->remote_candidates, &err); |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1302 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1303 | if (stream->supports_add) |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1304 | fs_stream_add_remote_candidates(stream->stream, |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1305 | stream->remote_candidates, &err); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1306 | else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1307 | fs_stream_force_remote_candidates(stream->stream, |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1308 | stream->remote_candidates, &err); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1309 | #endif |
|
29592
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
1310 | |
|
29619
5c64f74c2ebd
Handle individual streams in the Fs2 backend's stream-info callback for accept
Michael Ruprecht <maiku@pidgin.im>
parents:
29618
diff
changeset
|
1311 | if (err == NULL) |
|
5c64f74c2ebd
Handle individual streams in the Fs2 backend's stream-info callback for accept
Michael Ruprecht <maiku@pidgin.im>
parents:
29618
diff
changeset
|
1312 | return; |
|
29592
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
1313 | |
|
29619
5c64f74c2ebd
Handle individual streams in the Fs2 backend's stream-info callback for accept
Michael Ruprecht <maiku@pidgin.im>
parents:
29618
diff
changeset
|
1314 | purple_debug_error("backend-fs2", "Error adding " |
|
5c64f74c2ebd
Handle individual streams in the Fs2 backend's stream-info callback for accept
Michael Ruprecht <maiku@pidgin.im>
parents:
29618
diff
changeset
|
1315 | "remote candidates: %s\n", |
|
5c64f74c2ebd
Handle individual streams in the Fs2 backend's stream-info callback for accept
Michael Ruprecht <maiku@pidgin.im>
parents:
29618
diff
changeset
|
1316 | err->message); |
|
5c64f74c2ebd
Handle individual streams in the Fs2 backend's stream-info callback for accept
Michael Ruprecht <maiku@pidgin.im>
parents:
29618
diff
changeset
|
1317 | g_error_free(err); |
|
29603
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1318 | } else if (local == TRUE && (type == PURPLE_MEDIA_INFO_MUTE || |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1319 | type == PURPLE_MEDIA_INFO_UNMUTE)) { |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1320 | PurpleMediaBackendFs2Private *priv = |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1321 | PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1322 | gboolean active = (type == PURPLE_MEDIA_INFO_MUTE); |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1323 | GList *sessions; |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1324 | |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1325 | if (sid == NULL) |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1326 | sessions = g_hash_table_get_values(priv->sessions); |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1327 | else |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1328 | sessions = g_list_prepend(NULL, |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1329 | get_session(self, sid)); |
|
29603
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1330 | |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1331 | purple_debug_info("media", "Turning mute %s\n", |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1332 | active ? "on" : "off"); |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1333 | |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1334 | for (; sessions; sessions = g_list_delete_link( |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1335 | sessions, sessions)) { |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1336 | PurpleMediaBackendFs2Session *session = |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1337 | sessions->data; |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1338 | |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1339 | if (session->type & PURPLE_MEDIA_SEND_AUDIO) { |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1340 | gchar *name = g_strdup_printf("volume_%s", |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1341 | session->id); |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1342 | GstElement *volume = gst_bin_get_by_name( |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1343 | GST_BIN(priv->confbin), name); |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1344 | g_free(name); |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1345 | g_object_set(volume, "mute", active, NULL); |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1346 | } |
|
271b6eb28f54
Move mute functionality into the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29601
diff
changeset
|
1347 | } |
|
31278
3314c614763c
Stop sending audio when placing a call on hold. Fixes #13032.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30769
diff
changeset
|
1348 | } else if (local == TRUE && (type == PURPLE_MEDIA_INFO_HOLD || |
|
3314c614763c
Stop sending audio when placing a call on hold. Fixes #13032.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30769
diff
changeset
|
1349 | type == PURPLE_MEDIA_INFO_UNHOLD)) { |
|
3314c614763c
Stop sending audio when placing a call on hold. Fixes #13032.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30769
diff
changeset
|
1350 | gboolean active = (type == PURPLE_MEDIA_INFO_HOLD); |
|
3314c614763c
Stop sending audio when placing a call on hold. Fixes #13032.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30769
diff
changeset
|
1351 | GList *streams = get_streams(self, sid, name); |
|
3314c614763c
Stop sending audio when placing a call on hold. Fixes #13032.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30769
diff
changeset
|
1352 | for (; streams; streams = |
|
3314c614763c
Stop sending audio when placing a call on hold. Fixes #13032.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30769
diff
changeset
|
1353 | g_list_delete_link(streams, streams)) { |
|
3314c614763c
Stop sending audio when placing a call on hold. Fixes #13032.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30769
diff
changeset
|
1354 | PurpleMediaBackendFs2Stream *stream = streams->data; |
|
3314c614763c
Stop sending audio when placing a call on hold. Fixes #13032.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30769
diff
changeset
|
1355 | if (stream->session->type & PURPLE_MEDIA_SEND_AUDIO) { |
|
3314c614763c
Stop sending audio when placing a call on hold. Fixes #13032.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30769
diff
changeset
|
1356 | g_object_set(stream->stream, "direction", |
|
3314c614763c
Stop sending audio when placing a call on hold. Fixes #13032.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30769
diff
changeset
|
1357 | session_type_to_fs_stream_direction( |
|
3314c614763c
Stop sending audio when placing a call on hold. Fixes #13032.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30769
diff
changeset
|
1358 | stream->session->type & ((active) ? |
|
3314c614763c
Stop sending audio when placing a call on hold. Fixes #13032.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30769
diff
changeset
|
1359 | ~PURPLE_MEDIA_SEND_AUDIO : |
|
3314c614763c
Stop sending audio when placing a call on hold. Fixes #13032.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30769
diff
changeset
|
1360 | PURPLE_MEDIA_AUDIO)), NULL); |
|
3314c614763c
Stop sending audio when placing a call on hold. Fixes #13032.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30769
diff
changeset
|
1361 | } |
|
3314c614763c
Stop sending audio when placing a call on hold. Fixes #13032.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30769
diff
changeset
|
1362 | } |
|
29594
1eefaad00189
Move pause functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29593
diff
changeset
|
1363 | } else if (local == TRUE && (type == PURPLE_MEDIA_INFO_PAUSE || |
|
1eefaad00189
Move pause functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29593
diff
changeset
|
1364 | type == PURPLE_MEDIA_INFO_UNPAUSE)) { |
|
1eefaad00189
Move pause functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29593
diff
changeset
|
1365 | gboolean active = (type == PURPLE_MEDIA_INFO_PAUSE); |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1366 | GList *streams = get_streams(self, sid, name); |
|
29594
1eefaad00189
Move pause functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29593
diff
changeset
|
1367 | for (; streams; streams = |
|
1eefaad00189
Move pause functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29593
diff
changeset
|
1368 | g_list_delete_link(streams, streams)) { |
|
1eefaad00189
Move pause functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29593
diff
changeset
|
1369 | PurpleMediaBackendFs2Stream *stream = streams->data; |
|
1eefaad00189
Move pause functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29593
diff
changeset
|
1370 | if (stream->session->type & PURPLE_MEDIA_SEND_VIDEO) { |
|
1eefaad00189
Move pause functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29593
diff
changeset
|
1371 | g_object_set(stream->stream, "direction", |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1372 | session_type_to_fs_stream_direction( |
|
29594
1eefaad00189
Move pause functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29593
diff
changeset
|
1373 | stream->session->type & ((active) ? |
|
1eefaad00189
Move pause functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29593
diff
changeset
|
1374 | ~PURPLE_MEDIA_SEND_VIDEO : |
|
1eefaad00189
Move pause functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29593
diff
changeset
|
1375 | PURPLE_MEDIA_VIDEO)), NULL); |
|
1eefaad00189
Move pause functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29593
diff
changeset
|
1376 | } |
|
1eefaad00189
Move pause functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29593
diff
changeset
|
1377 | } |
|
29592
eac0dd44f441
Handle part of accepting a stream in the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29591
diff
changeset
|
1378 | } |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
1379 | } |
|
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
1380 | |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1381 | static gboolean |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1382 | init_conference(PurpleMediaBackendFs2 *self) |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1383 | { |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1384 | PurpleMediaBackendFs2Private *priv = |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1385 | PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1386 | GstElement *pipeline; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1387 | GstBus *bus; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1388 | gchar *name; |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1389 | #ifndef HAVE_FARSIGHT |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1390 | GKeyFile *default_props; |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1391 | #endif |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1392 | |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1393 | priv->conference = FS_CONFERENCE( |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1394 | gst_element_factory_make(priv->conference_type, NULL)); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1395 | |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1396 | if (priv->conference == NULL) { |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1397 | purple_debug_error("backend-fs2", "Conference == NULL\n"); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1398 | return FALSE; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1399 | } |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1400 | |
|
31566
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31557
diff
changeset
|
1401 | if (purple_account_get_silence_suppression( |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31557
diff
changeset
|
1402 | purple_media_get_account(priv->media))) |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31557
diff
changeset
|
1403 | priv->silence_threshold = purple_prefs_get_int( |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31557
diff
changeset
|
1404 | "/purple/media/audio/silence_threshold") / 100.0; |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31557
diff
changeset
|
1405 | else |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31557
diff
changeset
|
1406 | priv->silence_threshold = 0; |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31557
diff
changeset
|
1407 | |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1408 | pipeline = purple_media_manager_get_pipeline( |
|
29564
fa76e21160fd
Various tweaks, fixes, and added debug output. Attached some media signals,
Michael Ruprecht <maiku@pidgin.im>
parents:
29559
diff
changeset
|
1409 | purple_media_get_manager(priv->media)); |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1410 | |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1411 | if (pipeline == NULL) { |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1412 | purple_debug_error("backend-fs2", |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1413 | "Couldn't retrieve pipeline.\n"); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1414 | return FALSE; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1415 | } |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1416 | |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1417 | name = g_strdup_printf("conf_%p", priv->conference); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1418 | priv->confbin = gst_bin_new(name); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1419 | if (priv->confbin == NULL) { |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1420 | purple_debug_error("backend-fs2", |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1421 | "Couldn't create confbin.\n"); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1422 | return FALSE; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1423 | } |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1424 | |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1425 | g_free(name); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1426 | |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1427 | bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline)); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1428 | if (bus == NULL) { |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1429 | purple_debug_error("backend-fs2", |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1430 | "Couldn't get the pipeline's bus.\n"); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1431 | return FALSE; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1432 | } |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1433 | |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1434 | #ifndef HAVE_FARSIGHT |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1435 | default_props = fs_utils_get_default_element_properties(GST_ELEMENT(priv->conference)); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1436 | if (default_props != NULL) { |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1437 | priv->notifier = fs_element_added_notifier_new(); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1438 | fs_element_added_notifier_add(priv->notifier, |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1439 | GST_BIN(priv->confbin)); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1440 | fs_element_added_notifier_set_properties_from_keyfile(priv->notifier, default_props); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1441 | } |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1442 | #endif |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1443 | |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1444 | g_signal_connect(G_OBJECT(bus), "message", |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1445 | G_CALLBACK(gst_bus_cb), self); |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1446 | gst_object_unref(bus); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1447 | |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1448 | if (!gst_bin_add(GST_BIN(pipeline), |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1449 | GST_ELEMENT(priv->confbin))) { |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1450 | purple_debug_error("backend-fs2", "Couldn't add confbin " |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1451 | "element to the pipeline\n"); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1452 | return FALSE; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1453 | } |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1454 | |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1455 | if (!gst_bin_add(GST_BIN(priv->confbin), |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1456 | GST_ELEMENT(priv->conference))) { |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1457 | purple_debug_error("backend-fs2", "Couldn't add conference " |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1458 | "element to the confbin\n"); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1459 | return FALSE; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1460 | } |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1461 | |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1462 | if (gst_element_set_state(GST_ELEMENT(priv->confbin), |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1463 | GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) { |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1464 | purple_debug_error("backend-fs2", |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1465 | "Failed to start conference.\n"); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1466 | return FALSE; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1467 | } |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1468 | |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1469 | return TRUE; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1470 | } |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1471 | |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1472 | static void |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1473 | gst_element_added_cb(FsElementAddedNotifier *self, |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1474 | GstBin *bin, GstElement *element, gpointer user_data) |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1475 | { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1476 | /* |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1477 | * Hack to make H264 work with Gmail video. |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1478 | */ |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1479 | if (!strncmp(GST_ELEMENT_NAME(element), "x264", 4)) { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1480 | g_object_set(GST_OBJECT(element), "cabac", FALSE, NULL); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1481 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1482 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1483 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1484 | static gboolean |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1485 | create_src(PurpleMediaBackendFs2 *self, const gchar *sess_id, |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1486 | PurpleMediaSessionType type) |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1487 | { |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1488 | PurpleMediaBackendFs2Private *priv = |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1489 | PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1490 | PurpleMediaBackendFs2Session *session; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1491 | PurpleMediaSessionType session_type; |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1492 | FsMediaType media_type = session_type_to_fs_media_type(type); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1493 | FsStreamDirection type_direction = |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1494 | session_type_to_fs_stream_direction(type); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1495 | GstElement *src; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1496 | GstPad *sinkpad, *srcpad; |
|
31313
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
1497 | GstPad *ghost = NULL; |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1498 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1499 | if ((type_direction & FS_DIRECTION_SEND) == 0) |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1500 | return TRUE; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
31278
diff
changeset
|
1501 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1502 | session_type = session_type_from_fs( |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1503 | media_type, FS_DIRECTION_SEND); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1504 | src = purple_media_manager_get_element( |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1505 | purple_media_get_manager(priv->media), |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1506 | session_type, priv->media, sess_id, NULL); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1507 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1508 | if (!GST_IS_ELEMENT(src)) { |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1509 | purple_debug_error("backend-fs2", |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1510 | "Error creating src for session %s\n", |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1511 | sess_id); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1512 | return FALSE; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1513 | } |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1514 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1515 | session = get_session(self, sess_id); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1516 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1517 | if (session == NULL) { |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1518 | purple_debug_warning("backend-fs2", |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1519 | "purple_media_set_src: trying to set" |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1520 | " src on non-existent session\n"); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1521 | return FALSE; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1522 | } |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1523 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1524 | if (session->src) |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1525 | gst_object_unref(session->src); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1526 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1527 | session->src = src; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1528 | gst_element_set_locked_state(session->src, TRUE); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1529 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1530 | session->tee = gst_element_factory_make("tee", NULL); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1531 | gst_bin_add(GST_BIN(priv->confbin), session->tee); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1532 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1533 | /* This supposedly isn't necessary, but it silences some warnings */ |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1534 | if (GST_ELEMENT_PARENT(priv->confbin) |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1535 | == GST_ELEMENT_PARENT(session->src)) { |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1536 | GstPad *pad = gst_element_get_static_pad(session->tee, "sink"); |
|
31313
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
1537 | ghost = gst_ghost_pad_new(NULL, pad); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1538 | gst_object_unref(pad); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1539 | gst_pad_set_active(ghost, TRUE); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1540 | gst_element_add_pad(priv->confbin, ghost); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1541 | } |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1542 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1543 | gst_element_set_state(session->tee, GST_STATE_PLAYING); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1544 | gst_element_link(session->src, priv->confbin); |
|
31313
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
1545 | if (ghost) |
|
eca4138f416c
This patch fixes #12758.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31294
diff
changeset
|
1546 | session->srcpad = gst_pad_get_peer(ghost); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1547 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1548 | g_object_get(session->session, "sink-pad", &sinkpad, NULL); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1549 | if (session->type & PURPLE_MEDIA_SEND_AUDIO) { |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1550 | gchar *name = g_strdup_printf("volume_%s", session->id); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1551 | GstElement *level; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1552 | GstElement *volume = gst_element_factory_make("volume", name); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1553 | double input_volume = purple_prefs_get_int( |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1554 | "/purple/media/audio/volume/input")/10.0; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1555 | g_free(name); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1556 | name = g_strdup_printf("sendlevel_%s", session->id); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1557 | level = gst_element_factory_make("level", name); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1558 | g_free(name); |
|
31557
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
1559 | session->srcvalve = gst_element_factory_make("valve", NULL); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1560 | gst_bin_add(GST_BIN(priv->confbin), volume); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1561 | gst_bin_add(GST_BIN(priv->confbin), level); |
|
31557
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
1562 | gst_bin_add(GST_BIN(priv->confbin), session->srcvalve); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1563 | gst_element_set_state(level, GST_STATE_PLAYING); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1564 | gst_element_set_state(volume, GST_STATE_PLAYING); |
|
31557
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
1565 | gst_element_set_state(session->srcvalve, GST_STATE_PLAYING); |
|
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
1566 | gst_element_link(level, session->srcvalve); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1567 | gst_element_link(volume, level); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1568 | gst_element_link(session->tee, volume); |
|
31557
02082aa1ba41
During a voice call, Pidgin now sends constant audio traffic, even when there
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31368
diff
changeset
|
1569 | srcpad = gst_element_get_static_pad(session->srcvalve, "src"); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1570 | g_object_set(volume, "volume", input_volume, NULL); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1571 | } else { |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1572 | srcpad = gst_element_get_request_pad(session->tee, "src%d"); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1573 | } |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1574 | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
31278
diff
changeset
|
1575 | purple_debug_info("backend-fs2", "connecting pad: %s\n", |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1576 | gst_pad_link(srcpad, sinkpad) == GST_PAD_LINK_OK |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1577 | ? "success" : "failure"); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1578 | gst_element_set_locked_state(session->src, FALSE); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1579 | gst_object_unref(session->src); |
|
31618
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1580 | gst_object_unref(sinkpad); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1581 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1582 | gst_element_set_state(session->src, GST_STATE_PLAYING); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1583 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1584 | purple_media_manager_create_output_window(purple_media_get_manager( |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1585 | priv->media), priv->media, sess_id, NULL); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1586 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1587 | return TRUE; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1588 | } |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1589 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1590 | static gboolean |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1591 | create_session(PurpleMediaBackendFs2 *self, const gchar *sess_id, |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1592 | PurpleMediaSessionType type, gboolean initiator, |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1593 | const gchar *transmitter) |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1594 | { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1595 | PurpleMediaBackendFs2Private *priv = |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1596 | PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1597 | PurpleMediaBackendFs2Session *session; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1598 | GError *err = NULL; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1599 | GList *codec_conf = NULL, *iter = NULL; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1600 | gchar *filename = NULL; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1601 | gboolean is_nice = !strcmp(transmitter, "nice"); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1602 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1603 | session = g_new0(PurpleMediaBackendFs2Session, 1); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1604 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1605 | session->session = fs_conference_new_session(priv->conference, |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1606 | session_type_to_fs_media_type(type), &err); |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1607 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1608 | if (err != NULL) { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1609 | purple_media_error(priv->media, |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1610 | _("Error creating session: %s"), |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1611 | err->message); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1612 | g_error_free(err); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1613 | g_free(session); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1614 | return FALSE; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1615 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1616 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1617 | filename = g_build_filename(purple_user_dir(), "fs-codec.conf", NULL); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1618 | codec_conf = fs_codec_list_from_keyfile(filename, &err); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1619 | g_free(filename); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1620 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1621 | if (err != NULL) { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1622 | if (err->code == 4) |
|
29580
ee364f895072
Correct some debug categories.
Michael Ruprecht <maiku@pidgin.im>
parents:
29579
diff
changeset
|
1623 | purple_debug_info("backend-fs2", "Couldn't read " |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1624 | "fs-codec.conf: %s\n", |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1625 | err->message); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1626 | else |
|
29580
ee364f895072
Correct some debug categories.
Michael Ruprecht <maiku@pidgin.im>
parents:
29579
diff
changeset
|
1627 | purple_debug_error("backend-fs2", "Error reading " |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1628 | "fs-codec.conf: %s\n", |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1629 | err->message); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1630 | g_error_free(err); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1631 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1632 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1633 | /* |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1634 | * Add SPEEX if the configuration file doesn't exist or |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1635 | * there isn't a speex entry. |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1636 | */ |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1637 | for (iter = codec_conf; iter; iter = g_list_next(iter)) { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1638 | FsCodec *codec = iter->data; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1639 | if (!g_ascii_strcasecmp(codec->encoding_name, "speex")) |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1640 | break; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1641 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1642 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1643 | if (iter == NULL) { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1644 | codec_conf = g_list_prepend(codec_conf, |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1645 | fs_codec_new(FS_CODEC_ID_ANY, |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1646 | "SPEEX", FS_MEDIA_TYPE_AUDIO, 8000)); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1647 | codec_conf = g_list_prepend(codec_conf, |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1648 | fs_codec_new(FS_CODEC_ID_ANY, |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1649 | "SPEEX", FS_MEDIA_TYPE_AUDIO, 16000)); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1650 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1651 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1652 | fs_session_set_codec_preferences(session->session, codec_conf, NULL); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1653 | fs_codec_list_destroy(codec_conf); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1654 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1655 | /* |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1656 | * Removes a 5-7 second delay before |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1657 | * receiving the src-pad-added signal. |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1658 | * Only works for non-multicast FsRtpSessions. |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1659 | */ |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1660 | if (!!strcmp(transmitter, "multicast")) |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1661 | g_object_set(G_OBJECT(session->session), |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1662 | "no-rtcp-timeout", 0, NULL); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1663 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1664 | /* |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1665 | * Hack to make x264 work with Gmail video. |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1666 | */ |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1667 | if (is_nice && !strcmp(sess_id, "google-video")) { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1668 | FsElementAddedNotifier *notifier = |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1669 | fs_element_added_notifier_new(); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1670 | g_signal_connect(G_OBJECT(notifier), "element-added", |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1671 | G_CALLBACK(gst_element_added_cb), NULL); |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1672 | fs_element_added_notifier_add(notifier, |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1673 | GST_BIN(priv->conference)); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1674 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1675 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1676 | session->id = g_strdup(sess_id); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1677 | session->backend = self; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1678 | session->type = type; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1679 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1680 | if (!priv->sessions) { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1681 | purple_debug_info("backend-fs2", |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1682 | "Creating hash table for sessions\n"); |
|
30715
61a0bd743512
Fix some media code leaks.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30706
diff
changeset
|
1683 | priv->sessions = g_hash_table_new_full(g_str_hash, g_str_equal, |
|
61a0bd743512
Fix some media code leaks.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30706
diff
changeset
|
1684 | g_free, NULL); |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1685 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1686 | |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1687 | g_hash_table_insert(priv->sessions, g_strdup(session->id), session); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1688 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1689 | if (!create_src(self, sess_id, type)) { |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1690 | purple_debug_info("backend-fs2", "Error creating the src\n"); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1691 | return FALSE; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1692 | } |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1693 | |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1694 | return TRUE; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1695 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
1696 | |
|
31618
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1697 | static void |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1698 | free_session(PurpleMediaBackendFs2Session *session) |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1699 | { |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1700 | g_free(session->id); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1701 | g_free(session); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1702 | } |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1703 | |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
1704 | static gboolean |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1705 | create_participant(PurpleMediaBackendFs2 *self, const gchar *name) |
|
29579
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1706 | { |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1707 | PurpleMediaBackendFs2Private *priv = |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1708 | PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1709 | FsParticipant *participant; |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1710 | GError *err = NULL; |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1711 | |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1712 | participant = fs_conference_new_participant( |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1713 | #ifdef HAVE_FARSIGHT |
|
29579
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1714 | priv->conference, name, &err); |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1715 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1716 | priv->conference, &err); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1717 | #endif |
|
29579
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1718 | |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1719 | if (err) { |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1720 | purple_debug_error("backend-fs2", |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1721 | "Error creating participant: %s\n", |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1722 | err->message); |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1723 | g_error_free(err); |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1724 | return FALSE; |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1725 | } |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1726 | |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1727 | #ifndef HAVE_FARSIGHT |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1728 | if (g_object_class_find_property(G_OBJECT_GET_CLASS(participant), |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1729 | "cname")) { |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1730 | g_object_set(participant, "cname", name, NULL); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1731 | } |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1732 | #endif |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1733 | |
|
29579
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1734 | if (!priv->participants) { |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1735 | purple_debug_info("backend-fs2", |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1736 | "Creating hash table for participants\n"); |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1737 | priv->participants = g_hash_table_new_full(g_str_hash, |
|
30715
61a0bd743512
Fix some media code leaks.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
30706
diff
changeset
|
1738 | g_str_equal, g_free, g_object_unref); |
|
29579
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1739 | } |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1740 | |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1741 | g_hash_table_insert(priv->participants, g_strdup(name), participant); |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1742 | |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1743 | return TRUE; |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1744 | } |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1745 | |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
1746 | static gboolean |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1747 | src_pad_added_cb_cb(PurpleMediaBackendFs2Stream *stream) |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1748 | { |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1749 | PurpleMediaBackendFs2Private *priv; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1750 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1751 | g_return_val_if_fail(stream != NULL, FALSE); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1752 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1753 | priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(stream->session->backend); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1754 | stream->connected_cb_id = 0; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1755 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1756 | purple_media_manager_create_output_window( |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1757 | purple_media_get_manager(priv->media), priv->media, |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1758 | stream->session->id, stream->participant); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1759 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1760 | g_signal_emit_by_name(priv->media, "state-changed", |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1761 | PURPLE_MEDIA_STATE_CONNECTED, |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1762 | stream->session->id, stream->participant); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1763 | return FALSE; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1764 | } |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1765 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1766 | static void |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1767 | src_pad_added_cb(FsStream *fsstream, GstPad *srcpad, |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1768 | FsCodec *codec, PurpleMediaBackendFs2Stream *stream) |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1769 | { |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1770 | PurpleMediaBackendFs2Private *priv; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1771 | GstPad *sinkpad; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1772 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1773 | g_return_if_fail(FS_IS_STREAM(fsstream)); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1774 | g_return_if_fail(stream != NULL); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1775 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1776 | priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(stream->session->backend); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1777 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1778 | if (stream->src == NULL) { |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1779 | GstElement *sink = NULL; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1780 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1781 | if (codec->media_type == FS_MEDIA_TYPE_AUDIO) { |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1782 | double output_volume = purple_prefs_get_int( |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1783 | "/purple/media/audio/volume/output")/10.0; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1784 | /* |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1785 | * Should this instead be: |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1786 | * audioconvert ! audioresample ! liveadder ! |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1787 | * audioresample ! audioconvert ! realsink |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1788 | */ |
|
31618
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1789 | stream->queue = gst_element_factory_make("queue", NULL); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1790 | stream->volume = gst_element_factory_make( |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1791 | "volume", NULL); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1792 | g_object_set(stream->volume, "volume", |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1793 | output_volume, NULL); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1794 | stream->level = gst_element_factory_make( |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1795 | "level", NULL); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1796 | stream->src = gst_element_factory_make( |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1797 | "liveadder", NULL); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1798 | sink = purple_media_manager_get_element( |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1799 | purple_media_get_manager(priv->media), |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1800 | PURPLE_MEDIA_RECV_AUDIO, priv->media, |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1801 | stream->session->id, |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1802 | stream->participant); |
|
31618
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1803 | gst_bin_add(GST_BIN(priv->confbin), stream->queue); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1804 | gst_bin_add(GST_BIN(priv->confbin), stream->volume); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1805 | gst_bin_add(GST_BIN(priv->confbin), stream->level); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1806 | gst_bin_add(GST_BIN(priv->confbin), sink); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1807 | gst_element_set_state(sink, GST_STATE_PLAYING); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1808 | gst_element_set_state(stream->level, GST_STATE_PLAYING); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1809 | gst_element_set_state(stream->volume, GST_STATE_PLAYING); |
|
31618
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1810 | gst_element_set_state(stream->queue, GST_STATE_PLAYING); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1811 | gst_element_link(stream->level, sink); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1812 | gst_element_link(stream->volume, stream->level); |
|
31618
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1813 | gst_element_link(stream->queue, stream->volume); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1814 | sink = stream->queue; |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1815 | } else if (codec->media_type == FS_MEDIA_TYPE_VIDEO) { |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1816 | stream->src = gst_element_factory_make( |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1817 | "fsfunnel", NULL); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1818 | sink = gst_element_factory_make( |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1819 | "fakesink", NULL); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1820 | g_object_set(G_OBJECT(sink), "async", FALSE, NULL); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1821 | gst_bin_add(GST_BIN(priv->confbin), sink); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1822 | gst_element_set_state(sink, GST_STATE_PLAYING); |
|
31618
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
1823 | stream->fakesink = sink; |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1824 | } |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1825 | stream->tee = gst_element_factory_make("tee", NULL); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1826 | gst_bin_add_many(GST_BIN(priv->confbin), |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1827 | stream->src, stream->tee, NULL); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1828 | gst_element_set_state(stream->tee, GST_STATE_PLAYING); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1829 | gst_element_set_state(stream->src, GST_STATE_PLAYING); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1830 | gst_element_link_many(stream->src, stream->tee, sink, NULL); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1831 | } |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1832 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1833 | sinkpad = gst_element_get_request_pad(stream->src, "sink%d"); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1834 | gst_pad_link(srcpad, sinkpad); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1835 | gst_object_unref(sinkpad); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1836 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1837 | stream->connected_cb_id = purple_timeout_add(0, |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1838 | (GSourceFunc)src_pad_added_cb_cb, stream); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1839 | } |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1840 | |
|
30622
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1841 | static GValueArray * |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1842 | append_relay_info(GValueArray *relay_info, const gchar *ip, gint port, |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1843 | const gchar *username, const gchar *password, const gchar *type) |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1844 | { |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1845 | GValue value; |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1846 | GstStructure *turn_setup = gst_structure_new("relay-info", |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
31278
diff
changeset
|
1847 | "ip", G_TYPE_STRING, ip, |
|
30622
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1848 | "port", G_TYPE_UINT, port, |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1849 | "username", G_TYPE_STRING, username, |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1850 | "password", G_TYPE_STRING, password, |
|
32110
cf3fc2a5c274
Whitespace normalization
Richard Laager <rlaager@pidgin.im>
parents:
31860
diff
changeset
|
1851 | "relay-type", G_TYPE_STRING, type, |
|
30622
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1852 | NULL); |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1853 | |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1854 | if (turn_setup) { |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1855 | memset(&value, 0, sizeof(GValue)); |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1856 | g_value_init(&value, GST_TYPE_STRUCTURE); |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1857 | gst_value_set_structure(&value, turn_setup); |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1858 | relay_info = g_value_array_append(relay_info, &value); |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1859 | gst_structure_free(turn_setup); |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1860 | } |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1861 | |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1862 | return relay_info; |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1863 | } |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
31278
diff
changeset
|
1864 | |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
1865 | static gboolean |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1866 | create_stream(PurpleMediaBackendFs2 *self, |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1867 | const gchar *sess_id, const gchar *who, |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1868 | PurpleMediaSessionType type, gboolean initiator, |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1869 | const gchar *transmitter, |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1870 | guint num_params, GParameter *params) |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1871 | { |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1872 | PurpleMediaBackendFs2Private *priv = |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1873 | PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1874 | GError *err = NULL; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1875 | FsStream *fsstream = NULL; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1876 | const gchar *stun_ip = purple_network_get_stun_ip(); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1877 | const gchar *turn_ip = purple_network_get_turn_ip(); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1878 | guint _num_params = num_params; |
|
32111
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1879 | GParameter *_params; |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1880 | FsStreamDirection type_direction = |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
1881 | session_type_to_fs_stream_direction(type); |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1882 | PurpleMediaBackendFs2Session *session; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1883 | PurpleMediaBackendFs2Stream *stream; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1884 | FsParticipant *participant; |
|
30766
602dc4de31cf
Make the check for PRPL-supplied TURN parameters in the new place
Marcus Lundblad <malu@pidgin.im>
parents:
29723
diff
changeset
|
1885 | /* check if the prpl has already specified a relay-info |
|
602dc4de31cf
Make the check for PRPL-supplied TURN parameters in the new place
Marcus Lundblad <malu@pidgin.im>
parents:
29723
diff
changeset
|
1886 | we need to do this to allow them to override when using non-standard |
|
602dc4de31cf
Make the check for PRPL-supplied TURN parameters in the new place
Marcus Lundblad <malu@pidgin.im>
parents:
29723
diff
changeset
|
1887 | TURN modes, like Google f.ex. */ |
|
602dc4de31cf
Make the check for PRPL-supplied TURN parameters in the new place
Marcus Lundblad <malu@pidgin.im>
parents:
29723
diff
changeset
|
1888 | gboolean got_turn_from_prpl = FALSE; |
|
602dc4de31cf
Make the check for PRPL-supplied TURN parameters in the new place
Marcus Lundblad <malu@pidgin.im>
parents:
29723
diff
changeset
|
1889 | int i; |
|
602dc4de31cf
Make the check for PRPL-supplied TURN parameters in the new place
Marcus Lundblad <malu@pidgin.im>
parents:
29723
diff
changeset
|
1890 | |
|
32111
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1891 | session = get_session(self, sess_id); |
|
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1892 | |
|
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1893 | if (session == NULL) { |
|
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1894 | purple_debug_error("backend-fs2", |
|
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1895 | "Couldn't find session to create stream.\n"); |
|
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1896 | return FALSE; |
|
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1897 | } |
|
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1898 | |
|
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1899 | participant = get_participant(self, who); |
|
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1900 | |
|
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1901 | if (participant == NULL) { |
|
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1902 | purple_debug_error("backend-fs2", "Couldn't find " |
|
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1903 | "participant to create stream.\n"); |
|
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1904 | return FALSE; |
|
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1905 | } |
|
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1906 | |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1907 | #ifndef HAVE_FARSIGHT |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1908 | fsstream = fs_session_new_stream(session->session, participant, |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1909 | initiator == TRUE ? type_direction : |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1910 | (type_direction & FS_DIRECTION_RECV), &err); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1911 | |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1912 | if (fsstream == NULL) { |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1913 | if (err) { |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1914 | purple_debug_error("backend-fs2", |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1915 | "Error creating stream: %s\n", |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1916 | err && err->message ? |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1917 | err->message : "NULL"); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1918 | g_error_free(err); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1919 | } else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1920 | purple_debug_error("backend-fs2", |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1921 | "Error creating stream\n"); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1922 | return FALSE; |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1923 | } |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1924 | #endif |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1925 | |
|
30766
602dc4de31cf
Make the check for PRPL-supplied TURN parameters in the new place
Marcus Lundblad <malu@pidgin.im>
parents:
29723
diff
changeset
|
1926 | for (i = 0 ; i < num_params ; i++) { |
|
602dc4de31cf
Make the check for PRPL-supplied TURN parameters in the new place
Marcus Lundblad <malu@pidgin.im>
parents:
29723
diff
changeset
|
1927 | if (purple_strequal(params[i].name, "relay-info")) { |
|
602dc4de31cf
Make the check for PRPL-supplied TURN parameters in the new place
Marcus Lundblad <malu@pidgin.im>
parents:
29723
diff
changeset
|
1928 | got_turn_from_prpl = TRUE; |
|
602dc4de31cf
Make the check for PRPL-supplied TURN parameters in the new place
Marcus Lundblad <malu@pidgin.im>
parents:
29723
diff
changeset
|
1929 | break; |
|
602dc4de31cf
Make the check for PRPL-supplied TURN parameters in the new place
Marcus Lundblad <malu@pidgin.im>
parents:
29723
diff
changeset
|
1930 | } |
|
602dc4de31cf
Make the check for PRPL-supplied TURN parameters in the new place
Marcus Lundblad <malu@pidgin.im>
parents:
29723
diff
changeset
|
1931 | } |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1932 | |
|
32111
1a0b313cc0b7
Reorder create_stream()
Richard Laager <rlaager@pidgin.im>
parents:
32110
diff
changeset
|
1933 | _params = g_new0(GParameter, num_params + 3); |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1934 | memcpy(_params, params, sizeof(GParameter) * num_params); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1935 | |
|
29688
d5409dbda6e7
media: "Backport" the ICE controlling-mode fix in the new media subdirectory
Marcus Lundblad <malu@pidgin.im>
parents:
29661
diff
changeset
|
1936 | /* set the controlling mode parameter */ |
|
d5409dbda6e7
media: "Backport" the ICE controlling-mode fix in the new media subdirectory
Marcus Lundblad <malu@pidgin.im>
parents:
29661
diff
changeset
|
1937 | _params[_num_params].name = "controlling-mode"; |
|
d5409dbda6e7
media: "Backport" the ICE controlling-mode fix in the new media subdirectory
Marcus Lundblad <malu@pidgin.im>
parents:
29661
diff
changeset
|
1938 | g_value_init(&_params[_num_params].value, G_TYPE_BOOLEAN); |
|
d5409dbda6e7
media: "Backport" the ICE controlling-mode fix in the new media subdirectory
Marcus Lundblad <malu@pidgin.im>
parents:
29661
diff
changeset
|
1939 | g_value_set_boolean(&_params[_num_params].value, initiator); |
|
d5409dbda6e7
media: "Backport" the ICE controlling-mode fix in the new media subdirectory
Marcus Lundblad <malu@pidgin.im>
parents:
29661
diff
changeset
|
1940 | ++_num_params; |
|
d5409dbda6e7
media: "Backport" the ICE controlling-mode fix in the new media subdirectory
Marcus Lundblad <malu@pidgin.im>
parents:
29661
diff
changeset
|
1941 | |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1942 | if (stun_ip) { |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
31278
diff
changeset
|
1943 | purple_debug_info("backend-fs2", |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1944 | "Setting stun-ip on new stream: %s\n", stun_ip); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1945 | |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1946 | _params[_num_params].name = "stun-ip"; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1947 | g_value_init(&_params[_num_params].value, G_TYPE_STRING); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1948 | g_value_set_string(&_params[_num_params].value, stun_ip); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1949 | ++_num_params; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1950 | } |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1951 | |
|
30766
602dc4de31cf
Make the check for PRPL-supplied TURN parameters in the new place
Marcus Lundblad <malu@pidgin.im>
parents:
29723
diff
changeset
|
1952 | if (turn_ip && !strcmp("nice", transmitter) && !got_turn_from_prpl) { |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1953 | GValueArray *relay_info = g_value_array_new(0); |
|
30622
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1954 | gint port; |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1955 | const gchar *username = purple_prefs_get_string( |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1956 | "/purple/network/turn_username"); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1957 | const gchar *password = purple_prefs_get_string( |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1958 | "/purple/network/turn_password"); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1959 | |
|
30622
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1960 | /* UDP */ |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1961 | port = purple_prefs_get_int("/purple/network/turn_port"); |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1962 | if (port > 0) { |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1963 | relay_info = append_relay_info(relay_info, turn_ip, port, username, |
|
aa5a1b0e69bd
Added ability to relay over TCP and TLS for TURN for media.
Marcus Lundblad <malu@pidgin.im>
parents:
30424
diff
changeset
|
1964 | password, "udp"); |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1965 | } |
|
31831
c3778a69ecee
Add support for using TCP relaying with TURN
Marcus Lundblad <malu@pidgin.im>
parents:
31824
diff
changeset
|
1966 | |
|
c3778a69ecee
Add support for using TCP relaying with TURN
Marcus Lundblad <malu@pidgin.im>
parents:
31824
diff
changeset
|
1967 | /* TCP */ |
|
c3778a69ecee
Add support for using TCP relaying with TURN
Marcus Lundblad <malu@pidgin.im>
parents:
31824
diff
changeset
|
1968 | port = purple_prefs_get_int("/purple/network/turn_port_tcp"); |
|
c3778a69ecee
Add support for using TCP relaying with TURN
Marcus Lundblad <malu@pidgin.im>
parents:
31824
diff
changeset
|
1969 | if (port > 0) { |
|
c3778a69ecee
Add support for using TCP relaying with TURN
Marcus Lundblad <malu@pidgin.im>
parents:
31824
diff
changeset
|
1970 | relay_info = append_relay_info(relay_info, turn_ip, port, username, |
|
31860
0f36ebd8631b
Actually set the relay info for TCP
Marcus Lundblad <malu@pidgin.im>
parents:
31831
diff
changeset
|
1971 | password, "tcp"); |
|
31831
c3778a69ecee
Add support for using TCP relaying with TURN
Marcus Lundblad <malu@pidgin.im>
parents:
31824
diff
changeset
|
1972 | } |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1973 | |
|
31831
c3778a69ecee
Add support for using TCP relaying with TURN
Marcus Lundblad <malu@pidgin.im>
parents:
31824
diff
changeset
|
1974 | /* TURN over SSL is only supported by libnice for Google's "psuedo" SSL mode |
|
c3778a69ecee
Add support for using TCP relaying with TURN
Marcus Lundblad <malu@pidgin.im>
parents:
31824
diff
changeset
|
1975 | at this time */ |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
31278
diff
changeset
|
1976 | |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1977 | purple_debug_info("backend-fs2", |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1978 | "Setting relay-info on new stream\n"); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1979 | _params[_num_params].name = "relay-info"; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
31278
diff
changeset
|
1980 | g_value_init(&_params[_num_params].value, |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1981 | G_TYPE_VALUE_ARRAY); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1982 | g_value_set_boxed(&_params[_num_params].value, |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1983 | relay_info); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1984 | g_value_array_free(relay_info); |
|
30424
24a75f52a4bd
media: Fix the TURN server setting to actually work again (it was apparently
Marcus Lundblad <malu@pidgin.im>
parents:
29723
diff
changeset
|
1985 | _num_params++; |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1986 | } |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1987 | |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
1988 | #ifdef HAVE_FARSIGHT |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1989 | fsstream = fs_session_new_stream(session->session, participant, |
|
29648
be1362619ef2
Allow connection checks before acceptance. Fixes Empathy<->Pidgin.
Michael Ruprecht <maiku@pidgin.im>
parents:
29623
diff
changeset
|
1990 | initiator == TRUE ? type_direction : |
|
be1362619ef2
Allow connection checks before acceptance. Fixes Empathy<->Pidgin.
Michael Ruprecht <maiku@pidgin.im>
parents:
29623
diff
changeset
|
1991 | (type_direction & FS_DIRECTION_RECV), transmitter, |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1992 | _num_params, _params, &err); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1993 | g_free(_params); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1994 | |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1995 | if (fsstream == NULL) { |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1996 | if (err) { |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1997 | purple_debug_error("backend-fs2", |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1998 | "Error creating stream: %s\n", |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
1999 | err && err->message ? |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2000 | err->message : "NULL"); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2001 | g_error_free(err); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2002 | } else |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2003 | purple_debug_error("backend-fs2", |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2004 | "Error creating stream\n"); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2005 | return FALSE; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2006 | } |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2007 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2008 | if (!fs_stream_set_transmitter(fsstream, transmitter, |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2009 | _params, _num_params, &err)) { |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2010 | purple_debug_error("backend-fs2", |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2011 | "Could not set transmitter %s: %s.\n", |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2012 | transmitter, err->message); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2013 | g_clear_error(&err); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2014 | g_free(_params); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2015 | return FALSE; |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2016 | } |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2017 | g_free(_params); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2018 | #endif |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2019 | |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2020 | stream = g_new0(PurpleMediaBackendFs2Stream, 1); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2021 | stream->participant = g_strdup(who); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2022 | stream->session = session; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2023 | stream->stream = fsstream; |
|
32115
410435e8fae5
Fix typo that was breaking compilation for me
Mark Doliner <markdoliner@pidgin.im>
parents:
32114
diff
changeset
|
2024 | #ifndef HAVE_FARSIGHT |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2025 | stream->supports_add = !strcmp(transmitter, "nice"); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2026 | #endif |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2027 | |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2028 | priv->streams = g_list_append(priv->streams, stream); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2029 | |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2030 | g_signal_connect(G_OBJECT(fsstream), "src-pad-added", |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2031 | G_CALLBACK(src_pad_added_cb), stream); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2032 | |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2033 | return TRUE; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2034 | } |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2035 | |
|
31618
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2036 | static void |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2037 | free_stream(PurpleMediaBackendFs2Stream *stream) |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2038 | { |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2039 | /* Remove the connected_cb timeout */ |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2040 | if (stream->connected_cb_id != 0) |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2041 | purple_timeout_remove(stream->connected_cb_id); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2042 | |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2043 | g_free(stream->participant); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2044 | |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2045 | if (stream->local_candidates) |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2046 | fs_candidate_list_destroy(stream->local_candidates); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2047 | |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2048 | if (stream->remote_candidates) |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2049 | fs_candidate_list_destroy(stream->remote_candidates); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2050 | |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2051 | g_free(stream); |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2052 | } |
|
5a2acc3fb58c
Allow adding or removing media sessions (voice or video) on-the-fly. This
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31566
diff
changeset
|
2053 | |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2054 | static gboolean |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2055 | purple_media_backend_fs2_add_stream(PurpleMediaBackend *self, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2056 | const gchar *sess_id, const gchar *who, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2057 | PurpleMediaSessionType type, gboolean initiator, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2058 | const gchar *transmitter, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2059 | guint num_params, GParameter *params) |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2060 | { |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
2061 | PurpleMediaBackendFs2 *backend = PURPLE_MEDIA_BACKEND_FS2(self); |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
2062 | PurpleMediaBackendFs2Private *priv = |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
2063 | PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(backend); |
|
29595
f7e57d58c8be
Move odd direction changing functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29594
diff
changeset
|
2064 | PurpleMediaBackendFs2Stream *stream; |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
2065 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2066 | if (priv->conference == NULL && !init_conference(backend)) { |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
2067 | purple_debug_error("backend-fs2", |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
2068 | "Error initializing the conference.\n"); |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
2069 | return FALSE; |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
2070 | } |
|
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
2071 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2072 | if (get_session(backend, sess_id) == NULL && |
|
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2073 | !create_session(backend, sess_id, type, |
|
29569
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
2074 | initiator, transmitter)) { |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
2075 | purple_debug_error("backend-fs2", |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
2076 | "Error creating the session.\n"); |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
2077 | return FALSE; |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
2078 | } |
|
03db05b81c5c
Begin transferring FsSession over to the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29568
diff
changeset
|
2079 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2080 | if (get_participant(backend, who) == NULL && |
|
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2081 | !create_participant(backend, who)) { |
|
29579
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
2082 | purple_debug_error("backend-fs2", |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
2083 | "Error creating the participant.\n"); |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
2084 | return FALSE; |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
2085 | } |
|
bbe57f516ffd
Add participant creation and destruction to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29573
diff
changeset
|
2086 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2087 | stream = get_stream(backend, sess_id, who); |
|
29595
f7e57d58c8be
Move odd direction changing functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29594
diff
changeset
|
2088 | |
|
f7e57d58c8be
Move odd direction changing functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29594
diff
changeset
|
2089 | if (stream != NULL) { |
|
f7e57d58c8be
Move odd direction changing functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29594
diff
changeset
|
2090 | FsStreamDirection type_direction = |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2091 | session_type_to_fs_stream_direction(type); |
|
29595
f7e57d58c8be
Move odd direction changing functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29594
diff
changeset
|
2092 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2093 | if (session_type_to_fs_stream_direction( |
|
29595
f7e57d58c8be
Move odd direction changing functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29594
diff
changeset
|
2094 | stream->session->type) != type_direction) { |
|
f7e57d58c8be
Move odd direction changing functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29594
diff
changeset
|
2095 | /* change direction */ |
|
f7e57d58c8be
Move odd direction changing functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29594
diff
changeset
|
2096 | g_object_set(stream->stream, "direction", |
|
f7e57d58c8be
Move odd direction changing functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29594
diff
changeset
|
2097 | type_direction, NULL); |
|
f7e57d58c8be
Move odd direction changing functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29594
diff
changeset
|
2098 | } |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2099 | } else if (!create_stream(backend, sess_id, who, type, |
|
29582
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2100 | initiator, transmitter, num_params, params)) { |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2101 | purple_debug_error("backend-fs2", |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2102 | "Error creating the stream.\n"); |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2103 | return FALSE; |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2104 | } |
|
c4ef3aed1366
Transfer creating Farsight 2 streams to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29580
diff
changeset
|
2105 | |
|
29559
fc9fa90d7c4a
Create and dispose the conference in the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29556
diff
changeset
|
2106 | return TRUE; |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2107 | } |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2108 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2109 | static void |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2110 | purple_media_backend_fs2_add_remote_candidates(PurpleMediaBackend *self, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2111 | const gchar *sess_id, const gchar *participant, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2112 | GList *remote_candidates) |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2113 | { |
|
29583
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2114 | PurpleMediaBackendFs2Private *priv; |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2115 | PurpleMediaBackendFs2Stream *stream; |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2116 | GError *err = NULL; |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2117 | |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2118 | g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self)); |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2119 | |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2120 | priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2121 | stream = get_stream(PURPLE_MEDIA_BACKEND_FS2(self), |
|
29583
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2122 | sess_id, participant); |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2123 | |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2124 | if (stream == NULL) { |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2125 | purple_debug_error("backend-fs2", |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2126 | "purple_media_add_remote_candidates: " |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2127 | "couldn't find stream %s %s.\n", |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2128 | sess_id ? sess_id : "(null)", |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2129 | participant ? participant : "(null)"); |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2130 | return; |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2131 | } |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2132 | |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2133 | stream->remote_candidates = g_list_concat(stream->remote_candidates, |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2134 | candidate_list_to_fs(remote_candidates)); |
|
29583
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2135 | |
|
29648
be1362619ef2
Allow connection checks before acceptance. Fixes Empathy<->Pidgin.
Michael Ruprecht <maiku@pidgin.im>
parents:
29623
diff
changeset
|
2136 | if (purple_media_is_initiator(priv->media, sess_id, participant) || |
|
be1362619ef2
Allow connection checks before acceptance. Fixes Empathy<->Pidgin.
Michael Ruprecht <maiku@pidgin.im>
parents:
29623
diff
changeset
|
2137 | purple_media_accepted( |
|
be1362619ef2
Allow connection checks before acceptance. Fixes Empathy<->Pidgin.
Michael Ruprecht <maiku@pidgin.im>
parents:
29623
diff
changeset
|
2138 | priv->media, sess_id, participant)) { |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2139 | #ifdef HAVE_FARSIGHT |
|
29583
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2140 | fs_stream_set_remote_candidates(stream->stream, |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2141 | stream->remote_candidates, &err); |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2142 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2143 | if (stream->supports_add) |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2144 | fs_stream_add_remote_candidates(stream->stream, |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2145 | stream->remote_candidates, &err); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2146 | else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2147 | fs_stream_force_remote_candidates(stream->stream, |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2148 | stream->remote_candidates, &err); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2149 | #endif |
|
29583
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2150 | |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2151 | if (err) { |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2152 | purple_debug_error("backend-fs2", "Error adding remote" |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2153 | " candidates: %s\n", err->message); |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2154 | g_error_free(err); |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2155 | } |
|
706454e8df2b
Transfer setting Farsight 2's remote candidates to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29582
diff
changeset
|
2156 | } |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2157 | } |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2158 | |
|
29597
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2159 | static gboolean |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2160 | purple_media_backend_fs2_codecs_ready(PurpleMediaBackend *self, |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2161 | const gchar *sess_id) |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2162 | { |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2163 | PurpleMediaBackendFs2Private *priv; |
|
30627
5aba54c21ca3
Fix a possible Garbage return value.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30424
diff
changeset
|
2164 | gboolean ret = FALSE; |
|
29597
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2165 | |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2166 | g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), FALSE); |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2167 | |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2168 | priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2169 | |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2170 | if (sess_id != NULL) { |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2171 | PurpleMediaBackendFs2Session *session = get_session( |
|
29597
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2172 | PURPLE_MEDIA_BACKEND_FS2(self), sess_id); |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2173 | |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2174 | if (session == NULL) |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2175 | return FALSE; |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2176 | |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2177 | if (session->type & (PURPLE_MEDIA_SEND_AUDIO | |
|
32112
721223fa619b
Minor refactoring of purple_media_backend_fs2_codecs_ready()
Richard Laager <rlaager@pidgin.im>
parents:
32111
diff
changeset
|
2178 | PURPLE_MEDIA_SEND_VIDEO)) { |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2179 | #ifdef HAVE_FARSIGHT |
|
29597
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2180 | g_object_get(session->session, |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2181 | "codecs-ready", &ret, NULL); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2182 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2183 | GList *codecs = NULL; |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2184 | |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2185 | g_object_get(session->session, |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2186 | "codecs", &codecs, NULL); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2187 | if (codecs) { |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2188 | fs_codec_list_destroy (codecs); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2189 | ret = TRUE; |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2190 | } |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2191 | #endif |
|
32112
721223fa619b
Minor refactoring of purple_media_backend_fs2_codecs_ready()
Richard Laager <rlaager@pidgin.im>
parents:
32111
diff
changeset
|
2192 | } else |
|
29597
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2193 | ret = TRUE; |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2194 | } else { |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2195 | GList *values = g_hash_table_get_values(priv->sessions); |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2196 | |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2197 | for (; values; values = g_list_delete_link(values, values)) { |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2198 | PurpleMediaBackendFs2Session *session = values->data; |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2199 | |
|
29597
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2200 | if (session->type & (PURPLE_MEDIA_SEND_AUDIO | |
|
32112
721223fa619b
Minor refactoring of purple_media_backend_fs2_codecs_ready()
Richard Laager <rlaager@pidgin.im>
parents:
32111
diff
changeset
|
2201 | PURPLE_MEDIA_SEND_VIDEO)) { |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2202 | #ifdef HAVE_FARSIGHT |
|
29597
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2203 | g_object_get(session->session, |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2204 | "codecs-ready", &ret, NULL); |
|
32112
721223fa619b
Minor refactoring of purple_media_backend_fs2_codecs_ready()
Richard Laager <rlaager@pidgin.im>
parents:
32111
diff
changeset
|
2205 | if (ret == FALSE) |
|
721223fa619b
Minor refactoring of purple_media_backend_fs2_codecs_ready()
Richard Laager <rlaager@pidgin.im>
parents:
32111
diff
changeset
|
2206 | break; |
|
32113
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2207 | #else |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2208 | GList *codecs = NULL; |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2209 | |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2210 | g_object_get(session->session, |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2211 | "codecs", &codecs, NULL); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2212 | if (codecs) { |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2213 | fs_codec_list_destroy (codecs); |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2214 | ret = TRUE; |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2215 | } else { |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2216 | ret = FALSE; |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2217 | break; |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2218 | } |
|
2a75cce047d5
Port to Farstream
Olivier Crête <olivier.crete@collabora.com>
parents:
32112
diff
changeset
|
2219 | #endif |
|
32112
721223fa619b
Minor refactoring of purple_media_backend_fs2_codecs_ready()
Richard Laager <rlaager@pidgin.im>
parents:
32111
diff
changeset
|
2220 | } else |
|
29597
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2221 | ret = TRUE; |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2222 | } |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2223 | |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2224 | if (values != NULL) |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2225 | g_list_free(values); |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2226 | } |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2227 | |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2228 | return ret; |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2229 | } |
|
22843326ee22
Add codecs_ready to the media backend interface.
Michael Ruprecht <maiku@pidgin.im>
parents:
29595
diff
changeset
|
2230 | |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2231 | static GList * |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2232 | purple_media_backend_fs2_get_codecs(PurpleMediaBackend *self, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2233 | const gchar *sess_id) |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2234 | { |
|
29585
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
2235 | PurpleMediaBackendFs2Session *session; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
2236 | GList *fscodecs; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
2237 | GList *codecs; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
2238 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
2239 | g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL); |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
2240 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2241 | session = get_session(PURPLE_MEDIA_BACKEND_FS2(self), sess_id); |
|
29585
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
2242 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
2243 | if (session == NULL) |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
2244 | return NULL; |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
2245 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
2246 | g_object_get(G_OBJECT(session->session), |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
2247 | "codecs", &fscodecs, NULL); |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2248 | codecs = codec_list_from_fs(fscodecs); |
|
29585
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
2249 | fs_codec_list_destroy(fscodecs); |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
2250 | |
|
37a79cc62b55
Transfer get_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29583
diff
changeset
|
2251 | return codecs; |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2252 | } |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2253 | |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2254 | static GList * |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2255 | purple_media_backend_fs2_get_local_candidates(PurpleMediaBackend *self, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2256 | const gchar *sess_id, const gchar *participant) |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2257 | { |
|
29587
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
2258 | PurpleMediaBackendFs2Stream *stream; |
|
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
2259 | GList *candidates = NULL; |
|
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
2260 | |
|
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
2261 | g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL); |
|
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
2262 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2263 | stream = get_stream(PURPLE_MEDIA_BACKEND_FS2(self), |
|
29587
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
2264 | sess_id, participant); |
|
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
2265 | |
|
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
2266 | if (stream != NULL) |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2267 | candidates = candidate_list_from_fs( |
|
29587
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
2268 | stream->local_candidates); |
|
9bf09e3031b0
Move get_local_candidates functionality over to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29586
diff
changeset
|
2269 | return candidates; |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2270 | } |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2271 | |
|
29588
a3fef46ce04a
Make the backend interface's set_remote_codecs function return gboolean.
Michael Ruprecht <maiku@pidgin.im>
parents:
29587
diff
changeset
|
2272 | static gboolean |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2273 | purple_media_backend_fs2_set_remote_codecs(PurpleMediaBackend *self, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2274 | const gchar *sess_id, const gchar *participant, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2275 | GList *codecs) |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2276 | { |
|
29589
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2277 | PurpleMediaBackendFs2Stream *stream; |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2278 | GList *fscodecs; |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2279 | GError *err = NULL; |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2280 | |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2281 | g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), FALSE); |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2282 | stream = get_stream(PURPLE_MEDIA_BACKEND_FS2(self), |
|
29589
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2283 | sess_id, participant); |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2284 | |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2285 | if (stream == NULL) |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2286 | return FALSE; |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2287 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2288 | fscodecs = codec_list_to_fs(codecs); |
|
29589
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2289 | fs_stream_set_remote_codecs(stream->stream, fscodecs, &err); |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2290 | fs_codec_list_destroy(fscodecs); |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2291 | |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2292 | if (err) { |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2293 | purple_debug_error("backend-fs2", |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2294 | "Error setting remote codecs: %s\n", |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2295 | err->message); |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2296 | g_error_free(err); |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2297 | return FALSE; |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2298 | } |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2299 | |
|
3ff2d4b37b1f
Move set_remote_codecs functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29588
diff
changeset
|
2300 | return TRUE; |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2301 | } |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2302 | |
|
29590
bec92b90acc9
Change the media backend interface's set_send_codec to return gboolean to
Michael Ruprecht <maiku@pidgin.im>
parents:
29589
diff
changeset
|
2303 | static gboolean |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2304 | purple_media_backend_fs2_set_send_codec(PurpleMediaBackend *self, |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2305 | const gchar *sess_id, PurpleMediaCodec *codec) |
|
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2306 | { |
|
29591
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2307 | PurpleMediaBackendFs2Session *session; |
|
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2308 | FsCodec *fscodec; |
|
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2309 | GError *err = NULL; |
|
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2310 | |
|
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2311 | g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), FALSE); |
|
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2312 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2313 | session = get_session(PURPLE_MEDIA_BACKEND_FS2(self), sess_id); |
|
29591
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2314 | |
|
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2315 | if (session == NULL) |
|
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2316 | return FALSE; |
|
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2317 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2318 | fscodec = codec_to_fs(codec); |
|
29591
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2319 | fs_session_set_send_codec(session->session, fscodec, &err); |
|
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2320 | fs_codec_destroy(fscodec); |
|
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2321 | |
|
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2322 | if (err) { |
|
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2323 | purple_debug_error("media", "Error setting send codec\n"); |
|
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2324 | g_error_free(err); |
|
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2325 | return FALSE; |
|
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2326 | } |
|
fe94e4516832
Move set_remote_codec functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29590
diff
changeset
|
2327 | |
|
29590
bec92b90acc9
Change the media backend interface's set_send_codec to return gboolean to
Michael Ruprecht <maiku@pidgin.im>
parents:
29589
diff
changeset
|
2328 | return TRUE; |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2329 | } |
|
31687
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2330 | |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2331 | static void |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2332 | purple_media_backend_fs2_set_params(PurpleMediaBackend *self, |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2333 | guint num_params, GParameter *params) |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2334 | { |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2335 | PurpleMediaBackendFs2Private *priv; |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2336 | const gchar **supported = purple_media_backend_fs2_get_available_params(); |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2337 | const gchar **p; |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2338 | guint i; |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2339 | |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2340 | g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self)); |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2341 | |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2342 | priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2343 | |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2344 | if (priv->conference == NULL && |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2345 | !init_conference(PURPLE_MEDIA_BACKEND_FS2(self))) { |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2346 | purple_debug_error("backend-fs2", |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2347 | "Error initializing the conference.\n"); |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2348 | return; |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2349 | } |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2350 | |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2351 | for (i = 0; i != num_params; ++i) { |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2352 | for (p = supported; *p != NULL; ++p) { |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2353 | if (!strcmp(params[i].name, *p)) { |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2354 | g_object_set(priv->conference, |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2355 | params[i].name, g_value_get_string(¶ms[i].value), |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2356 | NULL); |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2357 | break; |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2358 | } |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2359 | } |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2360 | } |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2361 | } |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2362 | |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2363 | static const gchar ** |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2364 | purple_media_backend_fs2_get_available_params(void) |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2365 | { |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2366 | static const gchar *supported_params[] = { |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2367 | "sdes-cname", "sdes-email", "sdes-location", "sdes-name", "sdes-note", |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2368 | "sdes-phone", "sdes-tool", NULL |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2369 | }; |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2370 | |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2371 | return supported_params; |
|
4877d06f3234
media: Allow setting SDES properties of RTP conferences. Fixes #12981.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31618
diff
changeset
|
2372 | } |
|
29657
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2373 | #else |
|
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2374 | GType |
|
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2375 | purple_media_backend_fs2_get_type(void) |
|
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2376 | { |
|
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2377 | return G_TYPE_NONE; |
|
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2378 | } |
|
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2379 | #endif /* USE_VV */ |
|
29556
ebf1af169279
Skeleton of the Farsight 2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2380 | |
|
29657
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2381 | #ifdef USE_GSTREAMER |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2382 | GstElement * |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2383 | purple_media_backend_fs2_get_src(PurpleMediaBackendFs2 *self, |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2384 | const gchar *sess_id) |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2385 | { |
|
29657
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2386 | #ifdef USE_VV |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2387 | PurpleMediaBackendFs2Session *session = get_session(self, sess_id); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2388 | return session != NULL ? session->src : NULL; |
|
29657
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2389 | #else |
|
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2390 | return NULL; |
|
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2391 | #endif |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2392 | } |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2393 | |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2394 | GstElement * |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2395 | purple_media_backend_fs2_get_tee(PurpleMediaBackendFs2 *self, |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2396 | const gchar *sess_id, const gchar *who) |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2397 | { |
|
29657
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2398 | #ifdef USE_VV |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2399 | if (sess_id != NULL && who == NULL) { |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2400 | PurpleMediaBackendFs2Session *session = |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2401 | get_session(self, sess_id); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2402 | return (session != NULL) ? session->tee : NULL; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2403 | } else if (sess_id != NULL && who != NULL) { |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2404 | PurpleMediaBackendFs2Stream *stream = |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2405 | get_stream(self, sess_id, who); |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2406 | return (stream != NULL) ? stream->tee : NULL; |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2407 | } |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2408 | |
|
29657
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2409 | #endif /* USE_VV */ |
|
29599
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2410 | g_return_val_if_reached(NULL); |
|
24e1d49a6fce
Move all src and sink creation in PurpleMedia to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29598
diff
changeset
|
2411 | } |
|
29601
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2412 | |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2413 | void |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2414 | purple_media_backend_fs2_set_input_volume(PurpleMediaBackendFs2 *self, |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2415 | const gchar *sess_id, double level) |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2416 | { |
|
29657
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2417 | #ifdef USE_VV |
|
29601
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2418 | PurpleMediaBackendFs2Private *priv; |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2419 | GList *sessions; |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2420 | |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2421 | g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self)); |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2422 | |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2423 | priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2424 | |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2425 | purple_prefs_set_int("/purple/media/audio/volume/input", level); |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2426 | |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2427 | if (sess_id == NULL) |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2428 | sessions = g_hash_table_get_values(priv->sessions); |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2429 | else |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2430 | sessions = g_list_append(NULL, get_session(self, sess_id)); |
|
29601
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2431 | |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2432 | for (; sessions; sessions = g_list_delete_link(sessions, sessions)) { |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2433 | PurpleMediaBackendFs2Session *session = sessions->data; |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2434 | |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2435 | if (session->type & PURPLE_MEDIA_SEND_AUDIO) { |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2436 | gchar *name = g_strdup_printf("volume_%s", |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2437 | session->id); |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2438 | GstElement *volume = gst_bin_get_by_name( |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2439 | GST_BIN(priv->confbin), name); |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2440 | g_free(name); |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2441 | g_object_set(volume, "volume", level/10.0, NULL); |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2442 | } |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2443 | } |
|
29657
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2444 | #endif /* USE_VV */ |
|
29601
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2445 | } |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2446 | |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2447 | void |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2448 | purple_media_backend_fs2_set_output_volume(PurpleMediaBackendFs2 *self, |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2449 | const gchar *sess_id, const gchar *who, double level) |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2450 | { |
|
29657
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2451 | #ifdef USE_VV |
|
29601
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2452 | GList *streams; |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2453 | |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2454 | g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self)); |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2455 | |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2456 | purple_prefs_set_int("/purple/media/audio/volume/output", level); |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2457 | |
|
29623
664df0ecb40f
Remove the underscore from functions as the underscore is reserved for compilers
Michael Ruprecht <maiku@pidgin.im>
parents:
29619
diff
changeset
|
2458 | streams = get_streams(self, sess_id, who); |
|
29601
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2459 | |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2460 | for (; streams; streams = g_list_delete_link(streams, streams)) { |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2461 | PurpleMediaBackendFs2Stream *stream = streams->data; |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2462 | |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2463 | if (stream->session->type & PURPLE_MEDIA_RECV_AUDIO |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2464 | && GST_IS_ELEMENT(stream->volume)) { |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2465 | g_object_set(stream->volume, "volume", |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2466 | level/10.0, NULL); |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2467 | } |
|
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2468 | } |
|
29657
d7e6c5fcabcc
Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.
Michael Ruprecht <maiku@pidgin.im>
parents:
29648
diff
changeset
|
2469 | #endif /* USE_VV */ |
|
29601
fb1168d4ee6b
Move volume setting functionality to the Fs2 media backend.
Michael Ruprecht <maiku@pidgin.im>
parents:
29600
diff
changeset
|
2470 | } |
|
29661
ae75a0a4d399
Fix compile with --disable-gstreamer.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
29657
diff
changeset
|
2471 | #endif /* USE_GSTREAMER */ |