annotate pidgin/gtkmedia.c @ 32779:f124ad0022ce

Still making trunk usable again: correctly display plaintext logs
author tomkiewicz@cpw.pidgin.im
date Sun, 20 May 2012 19:08:37 +0000
parents 0c23f5856806
children 763d65f3f758
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1 /**
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
2 * @file media.c Account API
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
3 * @ingroup core
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
4 *
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
5 * Pidgin
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
6 *
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
7 * Pidgin is the legal property of its developers, whose names are too numerous
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
8 * to list here. Please refer to the COPYRIGHT file distributed with this
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
9 * source distribution.
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
10 *
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
11 * This program is free software; you can redistribute it and/or modify
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
12 * it under the terms of the GNU General Public License as published by
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
13 * the Free Software Foundation; either version 2 of the License, or
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
14 * (at your option) any later version.
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
15 *
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
16 * This program is distributed in the hope that it will be useful,
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
19 * GNU General Public License for more details.
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
20 *
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
21 * You should have received a copy of the GNU General Public License
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
22 * along with this program; if not, write to the Free Software
28047
8c991e09efcb Update various header copyrights thanks to licensecheck.
Paul Aurich <paul@darkrain42.org>
parents: 27999
diff changeset
23 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
24 */
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
25
28647
f1437342cc0e Include 'internal.h' before all other headers to make some non-gcc compilers happy.
Paul Aurich <paul@darkrain42.org>
parents: 28401
diff changeset
26 #include "internal.h"
23828
1fb16d784ccb Listen to the media pipeline and display errors.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23824
diff changeset
27 #include "debug.h"
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
28 #include "connection.h"
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
29 #include "media.h"
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
30 #include "mediamanager.h"
23836
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
31 #include "pidgin.h"
26067
a6e53d23bcbb Use request API for a media invitation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26066
diff changeset
32 #include "request.h"
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
33
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
34 #include "gtkmedia.h"
26092
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
35 #include "gtkutils.h"
28119
092659955afb Set the icon of media corresponding to the media type
Marcus Lundblad <ml@update.uu.se>
parents: 28102
diff changeset
36 #include "pidginstock.h"
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
37
23804
cbe97caec684 Use USE_VV instead of USE_FARSIGHT.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23801
diff changeset
38 #ifdef USE_VV
26424
beb22a90bf5d Gstreamer shouldn't be a requirement if USE_VV isn't defined.
Daniel Atallah <daniel.atallah@gmail.com>
parents: 26415
diff changeset
39 #include "media-gst.h"
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
40
27710
6e3c83e1057c Make gtkmedia.c compilable on systems without X11 (as long as they're Win32)
Stu Tomlinson <stu@nosnilmot.com>
parents: 26524
diff changeset
41 #ifdef _WIN32
6e3c83e1057c Make gtkmedia.c compilable on systems without X11 (as long as they're Win32)
Stu Tomlinson <stu@nosnilmot.com>
parents: 26524
diff changeset
42 #include <gdk/gdkwin32.h>
32399
0c23f5856806 Allow compile of V/V on OSX without X11. Patch by Eion Robb.
eion@robbmob.com
parents: 32398
diff changeset
43 #elif defined(GDK_WINDOWING_QUARTZ)
0c23f5856806 Allow compile of V/V on OSX without X11. Patch by Eion Robb.
eion@robbmob.com
parents: 32398
diff changeset
44 #include <gdk/gdkquartz.h>
27710
6e3c83e1057c Make gtkmedia.c compilable on systems without X11 (as long as they're Win32)
Stu Tomlinson <stu@nosnilmot.com>
parents: 26524
diff changeset
45 #endif
6e3c83e1057c Make gtkmedia.c compilable on systems without X11 (as long as they're Win32)
Stu Tomlinson <stu@nosnilmot.com>
parents: 26524
diff changeset
46
23836
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
47 #include <gst/interfaces/xoverlay.h>
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
48
26373
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
49 #define PIDGIN_TYPE_MEDIA (pidgin_media_get_type())
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
50 #define PIDGIN_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PIDGIN_TYPE_MEDIA, PidginMedia))
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
51 #define PIDGIN_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PIDGIN_TYPE_MEDIA, PidginMediaClass))
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
52 #define PIDGIN_IS_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PIDGIN_TYPE_MEDIA))
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
53 #define PIDGIN_IS_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PIDGIN_TYPE_MEDIA))
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
54 #define PIDGIN_MEDIA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PIDGIN_TYPE_MEDIA, PidginMediaClass))
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
55
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
56 typedef struct _PidginMedia PidginMedia;
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
57 typedef struct _PidginMediaClass PidginMediaClass;
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
58 typedef struct _PidginMediaPrivate PidginMediaPrivate;
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
59
23793
befeece4dd48 Change a few things:
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23787
diff changeset
60 typedef enum
befeece4dd48 Change a few things:
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23787
diff changeset
61 {
befeece4dd48 Change a few things:
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23787
diff changeset
62 /* Waiting for response */
befeece4dd48 Change a few things:
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23787
diff changeset
63 PIDGIN_MEDIA_WAITING = 1,
befeece4dd48 Change a few things:
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23787
diff changeset
64 /* Got request */
befeece4dd48 Change a few things:
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23787
diff changeset
65 PIDGIN_MEDIA_REQUESTED,
befeece4dd48 Change a few things:
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23787
diff changeset
66 /* Accepted call */
befeece4dd48 Change a few things:
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23787
diff changeset
67 PIDGIN_MEDIA_ACCEPTED,
befeece4dd48 Change a few things:
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23787
diff changeset
68 /* Rejected call */
befeece4dd48 Change a few things:
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23787
diff changeset
69 PIDGIN_MEDIA_REJECTED,
befeece4dd48 Change a few things:
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23787
diff changeset
70 } PidginMediaState;
befeece4dd48 Change a few things:
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23787
diff changeset
71
26373
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
72 struct _PidginMediaClass
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
73 {
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
74 GtkWindowClass parent_class;
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
75 };
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
76
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
77 struct _PidginMedia
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
78 {
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
79 GtkWindow parent;
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
80 PidginMediaPrivate *priv;
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
81 };
84374a764255 Hide PidginMedia and related structs.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26372
diff changeset
82
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
83 struct _PidginMediaPrivate
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
84 {
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
85 PurpleMedia *media;
24984
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
86 gchar *screenname;
27849
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
87 gulong level_handler_id;
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
88
30294
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
89 GtkUIManager *ui;
26092
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
90 GtkWidget *menubar;
26079
2b843d38d1f2 Add statusbar to eventually replace the label.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26078
diff changeset
91 GtkWidget *statusbar;
2b843d38d1f2 Add statusbar to eventually replace the label.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26078
diff changeset
92
28401
ee55fb88f512 Add a hold button to the media window.
maiku@pidgin.im
parents: 28136
diff changeset
93 GtkWidget *hold;
23863
4eae2d40f11b Added a mute button for the local microphone.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23856
diff changeset
94 GtkWidget *mute;
27857
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
95 GtkWidget *pause;
23787
92e71f6e10d4 Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23784
diff changeset
96
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
97 GtkWidget *send_progress;
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
98 GHashTable *recv_progressbars;
23787
92e71f6e10d4 Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23784
diff changeset
99
92e71f6e10d4 Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23784
diff changeset
100 PidginMediaState state;
23836
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
101
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
102 GtkWidget *display;
26034
3b82059e4069 Replace the ready signal in PidginMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26033
diff changeset
103 GtkWidget *send_widget;
3b82059e4069 Replace the ready signal in PidginMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26033
diff changeset
104 GtkWidget *recv_widget;
27857
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
105 GtkWidget *button_widget;
23836
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
106 GtkWidget *local_video;
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
107 GHashTable *remote_videos;
26382
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
108
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
109 guint timeout_id;
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
110 PurpleMediaSessionType request_type;
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
111 };
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
112
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
113 #define PIDGIN_MEDIA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), PIDGIN_TYPE_MEDIA, PidginMediaPrivate))
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
114
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
115 static void pidgin_media_class_init (PidginMediaClass *klass);
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
116 static void pidgin_media_init (PidginMedia *media);
26005
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
117 static void pidgin_media_dispose (GObject *object);
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
118 static void pidgin_media_finalize (GObject *object);
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
119 static void pidgin_media_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
120 static void pidgin_media_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
23793
befeece4dd48 Change a few things:
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23787
diff changeset
121 static void pidgin_media_set_state(PidginMedia *gtkmedia, PidginMediaState state);
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
122
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
123 static GtkWindowClass *parent_class = NULL;
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
124
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
125
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
126 #if 0
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
127 enum {
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
128 LAST_SIGNAL
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
129 };
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
130 static guint pidgin_media_signals[LAST_SIGNAL] = {0};
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
131 #endif
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
132
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
133 enum {
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
134 PROP_0,
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
135 PROP_MEDIA,
27850
47a356df8b5a Remove send_level and recv_level from PidginMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27849
diff changeset
136 PROP_SCREENNAME
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
137 };
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
138
26374
aa85cf759b98 Silence warning.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26373
diff changeset
139 static GType
23784
741a702033e0 Show a message when the remote end terminates a session.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23773
diff changeset
140 pidgin_media_get_type(void)
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
141 {
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
142 static GType type = 0;
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
143
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
144 if (type == 0) {
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
145 static const GTypeInfo info = {
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
146 sizeof(PidginMediaClass),
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
147 NULL,
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
148 NULL,
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
149 (GClassInitFunc) pidgin_media_class_init,
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
150 NULL,
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
151 NULL,
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
152 sizeof(PidginMedia),
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
153 0,
23773
1ec6a26cfefc Remove a compile error, and a few warnings.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23764
diff changeset
154 (GInstanceInitFunc) pidgin_media_init,
1ec6a26cfefc Remove a compile error, and a few warnings.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23764
diff changeset
155 NULL
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
156 };
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
157 type = g_type_register_static(GTK_TYPE_WINDOW, "PidginMedia", &info, 0);
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
158 }
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
159 return type;
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
160 }
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
161
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
162
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
163 static void
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
164 pidgin_media_class_init (PidginMediaClass *klass)
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
165 {
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
166 GObjectClass *gobject_class = (GObjectClass*)klass;
23829
54adcf17d271 Silence warning.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23828
diff changeset
167 /* GtkContainerClass *container_class = (GtkContainerClass*)klass; */
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
168 parent_class = g_type_class_peek_parent(klass);
23787
92e71f6e10d4 Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23784
diff changeset
169
26005
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
170 gobject_class->dispose = pidgin_media_dispose;
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
171 gobject_class->finalize = pidgin_media_finalize;
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
172 gobject_class->set_property = pidgin_media_set_property;
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
173 gobject_class->get_property = pidgin_media_get_property;
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
174
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
175 g_object_class_install_property(gobject_class, PROP_MEDIA,
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
176 g_param_spec_object("media",
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
177 "PurpleMedia",
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
178 "The PurpleMedia associated with this media.",
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
179 PURPLE_TYPE_MEDIA,
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
180 G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
24984
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
181 g_object_class_install_property(gobject_class, PROP_SCREENNAME,
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
182 g_param_spec_string("screenname",
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
183 "Screenname",
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
184 "The screenname of the user this session is with.",
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
185 NULL,
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
186 G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
187
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
188 g_type_class_add_private(klass, sizeof(PidginMediaPrivate));
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
189 }
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
190
23863
4eae2d40f11b Added a mute button for the local microphone.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23856
diff changeset
191 static void
28401
ee55fb88f512 Add a hold button to the media window.
maiku@pidgin.im
parents: 28136
diff changeset
192 pidgin_media_hold_toggled(GtkToggleButton *toggle, PidginMedia *media)
ee55fb88f512 Add a hold button to the media window.
maiku@pidgin.im
parents: 28136
diff changeset
193 {
ee55fb88f512 Add a hold button to the media window.
maiku@pidgin.im
parents: 28136
diff changeset
194 purple_media_stream_info(media->priv->media,
ee55fb88f512 Add a hold button to the media window.
maiku@pidgin.im
parents: 28136
diff changeset
195 gtk_toggle_button_get_active(toggle) ?
ee55fb88f512 Add a hold button to the media window.
maiku@pidgin.im
parents: 28136
diff changeset
196 PURPLE_MEDIA_INFO_HOLD : PURPLE_MEDIA_INFO_UNHOLD,
ee55fb88f512 Add a hold button to the media window.
maiku@pidgin.im
parents: 28136
diff changeset
197 NULL, NULL, TRUE);
ee55fb88f512 Add a hold button to the media window.
maiku@pidgin.im
parents: 28136
diff changeset
198 }
ee55fb88f512 Add a hold button to the media window.
maiku@pidgin.im
parents: 28136
diff changeset
199
ee55fb88f512 Add a hold button to the media window.
maiku@pidgin.im
parents: 28136
diff changeset
200 static void
23863
4eae2d40f11b Added a mute button for the local microphone.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23856
diff changeset
201 pidgin_media_mute_toggled(GtkToggleButton *toggle, PidginMedia *media)
4eae2d40f11b Added a mute button for the local microphone.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23856
diff changeset
202 {
26372
d254bc6b4d60 Remove purple_media_mute.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26371
diff changeset
203 purple_media_stream_info(media->priv->media,
d254bc6b4d60 Remove purple_media_mute.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26371
diff changeset
204 gtk_toggle_button_get_active(toggle) ?
d254bc6b4d60 Remove purple_media_mute.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26371
diff changeset
205 PURPLE_MEDIA_INFO_MUTE : PURPLE_MEDIA_INFO_UNMUTE,
d254bc6b4d60 Remove purple_media_mute.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26371
diff changeset
206 NULL, NULL, TRUE);
23863
4eae2d40f11b Added a mute button for the local microphone.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23856
diff changeset
207 }
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
208
27857
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
209 static void
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
210 pidgin_media_pause_toggled(GtkToggleButton *toggle, PidginMedia *media)
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
211 {
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
212 purple_media_stream_info(media->priv->media,
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
213 gtk_toggle_button_get_active(toggle) ?
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
214 PURPLE_MEDIA_INFO_PAUSE : PURPLE_MEDIA_INFO_UNPAUSE,
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
215 NULL, NULL, TRUE);
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
216 }
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
217
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
218 static gboolean
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
219 pidgin_media_delete_event_cb(GtkWidget *widget,
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
220 GdkEvent *event, PidginMedia *media)
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
221 {
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
222 if (media->priv->media)
26369
2862fee7acf2 Remove purple_media_hangup.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
223 purple_media_stream_info(media->priv->media,
2862fee7acf2 Remove purple_media_hangup.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
224 PURPLE_MEDIA_INFO_HANGUP, NULL, NULL, TRUE);
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
225 return FALSE;
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
226 }
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
227
27710
6e3c83e1057c Make gtkmedia.c compilable on systems without X11 (as long as they're Win32)
Stu Tomlinson <stu@nosnilmot.com>
parents: 26524
diff changeset
228 #ifdef HAVE_X11
26077
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
229 static int
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
230 pidgin_x_error_handler(Display *display, XErrorEvent *event)
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
231 {
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
232 const gchar *error_type;
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
233 switch (event->error_code) {
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
234 #define XERRORCASE(type) case type: error_type = #type; break
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
235 XERRORCASE(BadAccess);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
236 XERRORCASE(BadAlloc);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
237 XERRORCASE(BadAtom);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
238 XERRORCASE(BadColor);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
239 XERRORCASE(BadCursor);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
240 XERRORCASE(BadDrawable);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
241 XERRORCASE(BadFont);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
242 XERRORCASE(BadGC);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
243 XERRORCASE(BadIDChoice);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
244 XERRORCASE(BadImplementation);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
245 XERRORCASE(BadLength);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
246 XERRORCASE(BadMatch);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
247 XERRORCASE(BadName);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
248 XERRORCASE(BadPixmap);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
249 XERRORCASE(BadRequest);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
250 XERRORCASE(BadValue);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
251 XERRORCASE(BadWindow);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
252 #undef XERRORCASE
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
253 default:
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
254 error_type = "unknown";
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
255 break;
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
256 }
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
257 purple_debug_error("media", "A %s Xlib error has occurred. "
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
258 "The program would normally crash now.\n",
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
259 error_type);
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
260 return 0;
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
261 }
27710
6e3c83e1057c Make gtkmedia.c compilable on systems without X11 (as long as they're Win32)
Stu Tomlinson <stu@nosnilmot.com>
parents: 26524
diff changeset
262 #endif
26077
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
263
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
264 static void
30294
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
265 menu_hangup(GtkAction *action, gpointer data)
26092
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
266 {
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
267 PidginMedia *gtkmedia = PIDGIN_MEDIA(data);
26369
2862fee7acf2 Remove purple_media_hangup.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
268 purple_media_stream_info(gtkmedia->priv->media,
2862fee7acf2 Remove purple_media_hangup.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26366
diff changeset
269 PURPLE_MEDIA_INFO_HANGUP, NULL, NULL, TRUE);
26092
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
270 }
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
271
30294
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
272 static const GtkActionEntry menu_entries[] = {
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
273 { "MediaMenu", NULL, N_("_Media"), NULL, NULL, NULL },
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
274 { "Hangup", NULL, N_("_Hangup"), NULL, NULL, G_CALLBACK(menu_hangup) },
26092
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
275 };
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
276
30294
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
277 static const char *media_menu =
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
278 "<ui>"
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
279 "<menubar name='Media'>"
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
280 "<menu action='MediaMenu'>"
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
281 "<menuitem action='Hangup'/>"
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
282 "</menu>"
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
283 "</menubar>"
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
284 "</ui>";
26092
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
285
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
286 static GtkWidget *
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
287 setup_menubar(PidginMedia *window)
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
288 {
30294
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
289 GtkActionGroup *action_group;
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
290 GError *error;
26092
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
291 GtkAccelGroup *accel_group;
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
292 GtkWidget *menu;
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
293
30294
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
294 action_group = gtk_action_group_new("MediaActions");
32340
f21518a8f3b8 Fix translation of the menu items on the media window.
Mark Doliner <mark@kingant.net>
parents: 31739
diff changeset
295 #ifdef ENABLE_NLS
f21518a8f3b8 Fix translation of the menu items on the media window.
Mark Doliner <mark@kingant.net>
parents: 31739
diff changeset
296 gtk_action_group_set_translation_domain(action_group,
f21518a8f3b8 Fix translation of the menu items on the media window.
Mark Doliner <mark@kingant.net>
parents: 31739
diff changeset
297 PACKAGE);
f21518a8f3b8 Fix translation of the menu items on the media window.
Mark Doliner <mark@kingant.net>
parents: 31739
diff changeset
298 #endif
30294
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
299 gtk_action_group_add_actions(action_group,
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
300 menu_entries,
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
301 G_N_ELEMENTS(menu_entries),
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
302 GTK_WINDOW(window));
26092
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
303
30294
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
304 window->priv->ui = gtk_ui_manager_new();
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
305 gtk_ui_manager_insert_action_group(window->priv->ui, action_group, 0);
26092
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
306
30294
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
307 accel_group = gtk_ui_manager_get_accel_group(window->priv->ui);
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
308 gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
26092
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
309
30294
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
310 error = NULL;
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
311 if (!gtk_ui_manager_add_ui_from_string(window->priv->ui, media_menu, -1, &error))
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
312 {
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
313 g_message("building menus failed: %s", error->message);
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
314 g_error_free(error);
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
315 exit(EXIT_FAILURE);
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
316 }
26092
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
317
30294
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
318 menu = gtk_ui_manager_get_widget(window->priv->ui, "/Media");
26092
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
319
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
320 gtk_widget_show(menu);
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
321 return menu;
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
322 }
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
323
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
324 static void
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
325 pidgin_media_init (PidginMedia *media)
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
326 {
26410
343ca84d5997 Improve the padding around the mute button.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26409
diff changeset
327 GtkWidget *vbox;
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
328 media->priv = PIDGIN_MEDIA_GET_PRIVATE(media);
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
329
27710
6e3c83e1057c Make gtkmedia.c compilable on systems without X11 (as long as they're Win32)
Stu Tomlinson <stu@nosnilmot.com>
parents: 26524
diff changeset
330 #ifdef HAVE_X11
26077
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
331 XSetErrorHandler(pidgin_x_error_handler);
27710
6e3c83e1057c Make gtkmedia.c compilable on systems without X11 (as long as they're Win32)
Stu Tomlinson <stu@nosnilmot.com>
parents: 26524
diff changeset
332 #endif
26077
46a6ba93c376 Implement an X error handler to prevent Pidgin from crashing on
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26076
diff changeset
333
26351
0dfd05966e09 Improve padding in media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26349
diff changeset
334 vbox = gtk_vbox_new(FALSE, 0);
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
335 gtk_container_add(GTK_CONTAINER(media), vbox);
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
336
26079
2b843d38d1f2 Add statusbar to eventually replace the label.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26078
diff changeset
337 media->priv->statusbar = gtk_statusbar_new();
2b843d38d1f2 Add statusbar to eventually replace the label.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26078
diff changeset
338 gtk_box_pack_end(GTK_BOX(vbox), media->priv->statusbar,
2b843d38d1f2 Add statusbar to eventually replace the label.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26078
diff changeset
339 FALSE, FALSE, 0);
2b843d38d1f2 Add statusbar to eventually replace the label.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26078
diff changeset
340 gtk_statusbar_push(GTK_STATUSBAR(media->priv->statusbar),
26094
08a3749993fe Remove unnecessary buttons and change statusbar to say "Calling..."
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26092
diff changeset
341 0, _("Calling..."));
26079
2b843d38d1f2 Add statusbar to eventually replace the label.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26078
diff changeset
342 gtk_widget_show(media->priv->statusbar);
2b843d38d1f2 Add statusbar to eventually replace the label.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26078
diff changeset
343
26092
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
344 media->priv->menubar = setup_menubar(media);
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
345 gtk_box_pack_start(GTK_BOX(vbox), media->priv->menubar,
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
346 FALSE, TRUE, 0);
cc96a5ec4782 Add a basic menu to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26083
diff changeset
347
30249
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
348 media->priv->display = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
26351
0dfd05966e09 Improve padding in media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26349
diff changeset
349 gtk_container_set_border_width(GTK_CONTAINER(media->priv->display),
0dfd05966e09 Improve padding in media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26349
diff changeset
350 PIDGIN_HIG_BOX_SPACE);
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
351 gtk_box_pack_start(GTK_BOX(vbox), media->priv->display,
26049
6eeb500ce9a2 Remove unneeded pidgin_media_get_display_widget function.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26048
diff changeset
352 TRUE, TRUE, PIDGIN_HIG_BOX_SPACE);
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
353 gtk_widget_show(vbox);
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
354
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
355 g_signal_connect(G_OBJECT(media), "delete-event",
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
356 G_CALLBACK(pidgin_media_delete_event_cb), media);
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
357
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
358 media->priv->recv_progressbars =
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
359 g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
360 media->priv->remote_videos =
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
361 g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
362 }
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
363
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
364 static gchar *
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
365 create_key(const gchar *session_id, const gchar *participant)
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
366 {
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
367 return g_strdup_printf("%s_%s", session_id, participant);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
368 }
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
369
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
370 static void
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
371 pidgin_media_insert_widget(PidginMedia *gtkmedia, GtkWidget *widget,
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
372 const gchar *session_id, const gchar *participant)
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
373 {
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
374 gchar *key = create_key(session_id, participant);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
375 PurpleMediaSessionType type =
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
376 purple_media_get_session_type(gtkmedia->priv->media, session_id);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
377
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
378 if (type & PURPLE_MEDIA_AUDIO)
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
379 g_hash_table_insert(gtkmedia->priv->recv_progressbars, key, widget);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
380 else if (type & PURPLE_MEDIA_VIDEO)
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
381 g_hash_table_insert(gtkmedia->priv->remote_videos, key, widget);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
382 }
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
383
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
384 static GtkWidget *
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
385 pidgin_media_get_widget(PidginMedia *gtkmedia,
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
386 const gchar *session_id, const gchar *participant)
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
387 {
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
388 GtkWidget *widget = NULL;
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
389 gchar *key = create_key(session_id, participant);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
390 PurpleMediaSessionType type =
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
391 purple_media_get_session_type(gtkmedia->priv->media, session_id);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
392
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
393 if (type & PURPLE_MEDIA_AUDIO)
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
394 widget = g_hash_table_lookup(gtkmedia->priv->recv_progressbars, key);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
395 else if (type & PURPLE_MEDIA_VIDEO)
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
396 widget = g_hash_table_lookup(gtkmedia->priv->remote_videos, key);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
397
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
398 g_free(key);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
399 return widget;
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
400 }
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
401
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
402 static void
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
403 pidgin_media_remove_widget(PidginMedia *gtkmedia,
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
404 const gchar *session_id, const gchar *participant)
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
405 {
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
406 GtkWidget *widget = pidgin_media_get_widget(gtkmedia, session_id, participant);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
407
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
408 if (widget) {
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
409 PurpleMediaSessionType type =
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
410 purple_media_get_session_type(gtkmedia->priv->media, session_id);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
411 gchar *key = create_key(session_id, participant);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
412 GtkRequisition req;
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
413
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
414 if (type & PURPLE_MEDIA_AUDIO) {
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
415 g_hash_table_remove(gtkmedia->priv->recv_progressbars, key);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
416
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
417 if (g_hash_table_size(gtkmedia->priv->recv_progressbars) == 0 &&
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
418 gtkmedia->priv->send_progress) {
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
419
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
420 gtk_widget_destroy(gtkmedia->priv->send_progress);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
421 gtkmedia->priv->send_progress = NULL;
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
422
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
423 gtk_widget_destroy(gtkmedia->priv->mute);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
424 gtkmedia->priv->mute = NULL;
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
425 }
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
426 } else if (type & PURPLE_MEDIA_VIDEO) {
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
427 g_hash_table_remove(gtkmedia->priv->remote_videos, key);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
428
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
429 if (g_hash_table_size(gtkmedia->priv->remote_videos) == 0 &&
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
430 gtkmedia->priv->local_video) {
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
431
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
432 gtk_widget_destroy(gtkmedia->priv->local_video);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
433 gtkmedia->priv->local_video = NULL;
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
434
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
435 gtk_widget_destroy(gtkmedia->priv->pause);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
436 gtkmedia->priv->pause = NULL;
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
437 }
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
438 }
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
439
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
440 g_free(key);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
441
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
442 gtk_widget_destroy(widget);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
443
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
444 gtk_widget_size_request(GTK_WIDGET(gtkmedia), &req);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
445 gtk_window_resize(GTK_WINDOW(gtkmedia), req.width, req.height);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
446 }
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
447 }
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
448
27849
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
449 static void
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
450 level_message_cb(PurpleMedia *media, gchar *session_id, gchar *participant,
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
451 double level, PidginMedia *gtkmedia)
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
452 {
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
453 GtkWidget *progress = NULL;
27849
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
454 if (participant == NULL)
26070
7be8c88d630c Have all media sessions use a single pipeline.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26069
diff changeset
455 progress = gtkmedia->priv->send_progress;
27849
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
456 else
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
457 progress = pidgin_media_get_widget(gtkmedia, session_id, participant);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
458
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
459 if (progress)
32398
544e6ed9d850 The function gst_msg_db_to_percent already retyrns a number between
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 32345
diff changeset
460 gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress), level);
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
461 }
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
462
23797
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23793
diff changeset
463
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23793
diff changeset
464 static void
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23793
diff changeset
465 pidgin_media_disconnect_levels(PurpleMedia *media, PidginMedia *gtkmedia)
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23793
diff changeset
466 {
26393
462e5c27dbd7 Use purple_media_manager_get_pipeline instead.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26392
diff changeset
467 PurpleMediaManager *manager = purple_media_get_manager(media);
462e5c27dbd7 Use purple_media_manager_get_pipeline instead.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26392
diff changeset
468 GstElement *element = purple_media_manager_get_pipeline(manager);
23797
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23793
diff changeset
469 gulong handler_id = g_signal_handler_find(G_OBJECT(gst_pipeline_get_bus(GST_PIPELINE(element))),
31086
a8cc50c2279f Remove trailing whitespace
Richard Laager <rlaager@wiktel.com>
parents: 30949
diff changeset
470 G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0,
23797
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23793
diff changeset
471 NULL, G_CALLBACK(level_message_cb), gtkmedia);
23801
43b3b9ff6028 Added better Farsight error handling. Fixes several crash bugs related
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23797
diff changeset
472 if (handler_id)
43b3b9ff6028 Added better Farsight error handling. Fixes several crash bugs related
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23797
diff changeset
473 g_signal_handler_disconnect(G_OBJECT(gst_pipeline_get_bus(GST_PIPELINE(element))),
43b3b9ff6028 Added better Farsight error handling. Fixes several crash bugs related
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23797
diff changeset
474 handler_id);
23797
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23793
diff changeset
475 }
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23793
diff changeset
476
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23793
diff changeset
477 static void
26005
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
478 pidgin_media_dispose(GObject *media)
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
479 {
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
480 PidginMedia *gtkmedia = PIDGIN_MEDIA(media);
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
481 purple_debug_info("gtkmedia", "pidgin_media_dispose\n");
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
482
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
483 if (gtkmedia->priv->media) {
26095
8b95080061ed Close the request dialog if the remote user hung up.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26094
diff changeset
484 purple_request_close_with_handle(gtkmedia);
26075
1aed9a92b657 Implement *_remove_output_window and *_remove_output_windows.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26070
diff changeset
485 purple_media_remove_output_windows(gtkmedia->priv->media);
26005
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
486 pidgin_media_disconnect_levels(gtkmedia->priv->media, gtkmedia);
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
487 g_object_unref(gtkmedia->priv->media);
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
488 gtkmedia->priv->media = NULL;
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
489 }
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
490
30294
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
491 if (gtkmedia->priv->ui) {
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
492 g_object_unref(gtkmedia->priv->ui);
b6c3000eec60 Use GtkUIManager for gtk media stuff, since it's internal.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30249
diff changeset
493 gtkmedia->priv->ui = NULL;
26093
1830d339f9b9 Properly free item factory. Should fix a crash on close.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26092
diff changeset
494 }
1830d339f9b9 Properly free item factory. Should fix a crash on close.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26092
diff changeset
495
30949
11211e6427ae pidgin: Remove a timeout when destroying this object to avoid a use-after-free
jakub.adam@ktknet.cz
parents: 30294
diff changeset
496 if (gtkmedia->priv->timeout_id != 0)
11211e6427ae pidgin: Remove a timeout when destroying this object to avoid a use-after-free
jakub.adam@ktknet.cz
parents: 30294
diff changeset
497 g_source_remove(gtkmedia->priv->timeout_id);
11211e6427ae pidgin: Remove a timeout when destroying this object to avoid a use-after-free
jakub.adam@ktknet.cz
parents: 30294
diff changeset
498
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
499 if (gtkmedia->priv->recv_progressbars) {
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
500 g_hash_table_destroy(gtkmedia->priv->recv_progressbars);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
501 g_hash_table_destroy(gtkmedia->priv->remote_videos);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
502 gtkmedia->priv->recv_progressbars = NULL;
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
503 gtkmedia->priv->remote_videos = NULL;
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
504 }
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
505
26005
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
506 G_OBJECT_CLASS(parent_class)->dispose(media);
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
507 }
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
508
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
509 static void
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
510 pidgin_media_finalize(GObject *media)
23797
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23793
diff changeset
511 {
26049
6eeb500ce9a2 Remove unneeded pidgin_media_get_display_widget function.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26048
diff changeset
512 /* PidginMedia *gtkmedia = PIDGIN_MEDIA(media); */
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24937
diff changeset
513 purple_debug_info("gtkmedia", "pidgin_media_finalize\n");
26005
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
514
83704757fa36 Use the dispose method too.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24984
diff changeset
515 G_OBJECT_CLASS(parent_class)->finalize(media);
23797
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23793
diff changeset
516 }
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23793
diff changeset
517
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23793
diff changeset
518 static void
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23793
diff changeset
519 pidgin_media_emit_message(PidginMedia *gtkmedia, const char *msg)
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23793
diff changeset
520 {
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
521 PurpleConversation *conv = purple_find_conversation_with_account(
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
522 PURPLE_CONV_TYPE_ANY, gtkmedia->priv->screenname,
26524
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26514
diff changeset
523 purple_media_get_account(gtkmedia->priv->media));
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
524 if (conv != NULL)
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
525 purple_conversation_write(conv, NULL, msg,
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
526 PURPLE_MESSAGE_SYSTEM, time(NULL));
23797
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23793
diff changeset
527 }
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23793
diff changeset
528
26053
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
529 typedef struct
23836
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
530 {
26053
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
531 PidginMedia *gtkmedia;
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
532 gchar *session_id;
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
533 gchar *participant;
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
534 } PidginMediaRealizeData;
23836
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
535
26025
4859b0b82289 Hopefully stop the last of the BadWindow errors.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26007
diff changeset
536 static gboolean
26053
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
537 realize_cb_cb(PidginMediaRealizeData *data)
26025
4859b0b82289 Hopefully stop the last of the BadWindow errors.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26007
diff changeset
538 {
26053
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
539 PidginMediaPrivate *priv = data->gtkmedia->priv;
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
540 GdkWindow *window = NULL;
26053
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
541
27710
6e3c83e1057c Make gtkmedia.c compilable on systems without X11 (as long as they're Win32)
Stu Tomlinson <stu@nosnilmot.com>
parents: 26524
diff changeset
542 if (data->participant == NULL)
31739
6f503dcd843e pidgin: Fix building on GTK+ less than 2.14.
Paul Aurich <paul@darkrain42.org>
parents: 31421
diff changeset
543 #if GTK_CHECK_VERSION(2, 14, 0)
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
544 window = gtk_widget_get_window(priv->local_video);
31739
6f503dcd843e pidgin: Fix building on GTK+ less than 2.14.
Paul Aurich <paul@darkrain42.org>
parents: 31421
diff changeset
545 #else
6f503dcd843e pidgin: Fix building on GTK+ less than 2.14.
Paul Aurich <paul@darkrain42.org>
parents: 31421
diff changeset
546 window = (priv->local_video)->window;
6f503dcd843e pidgin: Fix building on GTK+ less than 2.14.
Paul Aurich <paul@darkrain42.org>
parents: 31421
diff changeset
547 #endif
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
548 else {
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
549 GtkWidget *widget = pidgin_media_get_widget(data->gtkmedia,
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
550 data->session_id, data->participant);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
551 if (widget)
31739
6f503dcd843e pidgin: Fix building on GTK+ less than 2.14.
Paul Aurich <paul@darkrain42.org>
parents: 31421
diff changeset
552 #if GTK_CHECK_VERSION(2, 14, 0)
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
553 window = gtk_widget_get_window(widget);
31739
6f503dcd843e pidgin: Fix building on GTK+ less than 2.14.
Paul Aurich <paul@darkrain42.org>
parents: 31421
diff changeset
554 #else
6f503dcd843e pidgin: Fix building on GTK+ less than 2.14.
Paul Aurich <paul@darkrain42.org>
parents: 31421
diff changeset
555 window = widget->window;
6f503dcd843e pidgin: Fix building on GTK+ less than 2.14.
Paul Aurich <paul@darkrain42.org>
parents: 31421
diff changeset
556 #endif
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
557 }
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
558
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
559 if (window) {
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
560 gulong window_id;
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
561 #ifdef _WIN32
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
562 window_id = GDK_WINDOW_HWND(window);
27710
6e3c83e1057c Make gtkmedia.c compilable on systems without X11 (as long as they're Win32)
Stu Tomlinson <stu@nosnilmot.com>
parents: 26524
diff changeset
563 #elif defined(HAVE_X11)
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
564 window_id = GDK_WINDOW_XWINDOW(window);
32399
0c23f5856806 Allow compile of V/V on OSX without X11. Patch by Eion Robb.
eion@robbmob.com
parents: 32398
diff changeset
565 #elif defined(GDK_WINDOWING_QUARTZ)
0c23f5856806 Allow compile of V/V on OSX without X11. Patch by Eion Robb.
eion@robbmob.com
parents: 32398
diff changeset
566 window_id = (gulong) gdk_quartz_window_get_nsview(window);
27710
6e3c83e1057c Make gtkmedia.c compilable on systems without X11 (as long as they're Win32)
Stu Tomlinson <stu@nosnilmot.com>
parents: 26524
diff changeset
567 #else
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
568 # error "Unsupported windowing system"
27710
6e3c83e1057c Make gtkmedia.c compilable on systems without X11 (as long as they're Win32)
Stu Tomlinson <stu@nosnilmot.com>
parents: 26524
diff changeset
569 #endif
26053
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
570
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
571 purple_media_set_output_window(priv->media, data->session_id,
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
572 data->participant, window_id);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
573 }
26053
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
574
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
575 g_free(data->session_id);
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
576 g_free(data->participant);
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
577 g_free(data);
26025
4859b0b82289 Hopefully stop the last of the BadWindow errors.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26007
diff changeset
578 return FALSE;
4859b0b82289 Hopefully stop the last of the BadWindow errors.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26007
diff changeset
579 }
4859b0b82289 Hopefully stop the last of the BadWindow errors.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26007
diff changeset
580
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
581 static void
26053
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
582 realize_cb(GtkWidget *widget, PidginMediaRealizeData *data)
24977
99c3489e06b0 Wait for local video frame to be realized before starting local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24958
diff changeset
583 {
26053
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
584 g_timeout_add(0, (GSourceFunc)realize_cb_cb, data);
24977
99c3489e06b0 Wait for local video frame to be realized before starting local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24958
diff changeset
585 }
99c3489e06b0 Wait for local video frame to be realized before starting local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24958
diff changeset
586
99c3489e06b0 Wait for local video frame to be realized before starting local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24958
diff changeset
587 static void
24982
0ad1b8e950d7 Add purple_media_error.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24977
diff changeset
588 pidgin_media_error_cb(PidginMedia *media, const char *error, PidginMedia *gtkmedia)
0ad1b8e950d7 Add purple_media_error.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24977
diff changeset
589 {
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
590 PurpleConversation *conv = purple_find_conversation_with_account(
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
591 PURPLE_CONV_TYPE_ANY, gtkmedia->priv->screenname,
26524
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26514
diff changeset
592 purple_media_get_account(gtkmedia->priv->media));
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
593 if (conv != NULL)
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
594 purple_conversation_write(conv, NULL, error,
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
595 PURPLE_MESSAGE_ERROR, time(NULL));
26079
2b843d38d1f2 Add statusbar to eventually replace the label.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26078
diff changeset
596 gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar),
2b843d38d1f2 Add statusbar to eventually replace the label.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26078
diff changeset
597 0, error);
24982
0ad1b8e950d7 Add purple_media_error.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24977
diff changeset
598 }
0ad1b8e950d7 Add purple_media_error.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24977
diff changeset
599
26061
f6a98b2b8d92 Add the accepted signal and make the accept button go away immediately.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26053
diff changeset
600 static void
26382
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
601 pidgin_media_accept_cb(PurpleMedia *media, int index)
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
602 {
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
603 purple_media_stream_info(media, PURPLE_MEDIA_INFO_ACCEPT,
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
604 NULL, NULL, TRUE);
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
605 }
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
606
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
607 static void
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
608 pidgin_media_reject_cb(PurpleMedia *media, int index)
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
609 {
31421
db480fe010d5 Adapt Pidgin's incoming call dialog behavior so that rejecting the addition of a
jakub.adam@ktknet.cz
parents: 31420
diff changeset
610 GList *iter = purple_media_get_session_ids(media);
db480fe010d5 Adapt Pidgin's incoming call dialog behavior so that rejecting the addition of a
jakub.adam@ktknet.cz
parents: 31420
diff changeset
611 for (; iter; iter = g_list_delete_link(iter, iter)) {
db480fe010d5 Adapt Pidgin's incoming call dialog behavior so that rejecting the addition of a
jakub.adam@ktknet.cz
parents: 31420
diff changeset
612 const gchar *sessionid = iter->data;
db480fe010d5 Adapt Pidgin's incoming call dialog behavior so that rejecting the addition of a
jakub.adam@ktknet.cz
parents: 31420
diff changeset
613 if (!purple_media_accepted(media, sessionid, NULL))
db480fe010d5 Adapt Pidgin's incoming call dialog behavior so that rejecting the addition of a
jakub.adam@ktknet.cz
parents: 31420
diff changeset
614 purple_media_stream_info(media, PURPLE_MEDIA_INFO_REJECT,
db480fe010d5 Adapt Pidgin's incoming call dialog behavior so that rejecting the addition of a
jakub.adam@ktknet.cz
parents: 31420
diff changeset
615 sessionid, NULL, TRUE);
db480fe010d5 Adapt Pidgin's incoming call dialog behavior so that rejecting the addition of a
jakub.adam@ktknet.cz
parents: 31420
diff changeset
616 }
26382
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
617 }
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
618
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
619 static gboolean
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
620 pidgin_request_timeout_cb(PidginMedia *gtkmedia)
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
621 {
26524
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26514
diff changeset
622 PurpleAccount *account;
26382
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
623 PurpleBuddy *buddy;
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
624 const gchar *alias;
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
625 PurpleMediaSessionType type;
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
626 gchar *message = NULL;
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
627
26524
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26514
diff changeset
628 account = purple_media_get_account(gtkmedia->priv->media);
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26514
diff changeset
629 buddy = purple_find_buddy(account, gtkmedia->priv->screenname);
26382
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
630 alias = buddy ? purple_buddy_get_contact_alias(buddy) :
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
631 gtkmedia->priv->screenname;
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
632 type = gtkmedia->priv->request_type;
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
633 gtkmedia->priv->timeout_id = 0;
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
634
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
635 if (type & PURPLE_MEDIA_AUDIO && type & PURPLE_MEDIA_VIDEO) {
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
636 message = g_strdup_printf(_("%s wishes to start an audio/video session with you."),
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
637 alias);
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
638 } else if (type & PURPLE_MEDIA_AUDIO) {
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
639 message = g_strdup_printf(_("%s wishes to start an audio session with you."),
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
640 alias);
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
641 } else if (type & PURPLE_MEDIA_VIDEO) {
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
642 message = g_strdup_printf(_("%s wishes to start a video session with you."),
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
643 alias);
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
644 }
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
645
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
646 gtkmedia->priv->request_type = PURPLE_MEDIA_NONE;
28102
7a66b8d66456 There's no reason to ask for acceptance if the stream has been accepted. Also,
maiku@pidgin.im
parents: 28047
diff changeset
647 if (!purple_media_accepted(gtkmedia->priv->media, NULL, NULL)) {
7a66b8d66456 There's no reason to ask for acceptance if the stream has been accepted. Also,
maiku@pidgin.im
parents: 28047
diff changeset
648 purple_request_accept_cancel(gtkmedia, _("Incoming Call"),
7a66b8d66456 There's no reason to ask for acceptance if the stream has been accepted. Also,
maiku@pidgin.im
parents: 28047
diff changeset
649 message, NULL, PURPLE_DEFAULT_ACTION_NONE,
7a66b8d66456 There's no reason to ask for acceptance if the stream has been accepted. Also,
maiku@pidgin.im
parents: 28047
diff changeset
650 (void*)account, gtkmedia->priv->screenname,
7a66b8d66456 There's no reason to ask for acceptance if the stream has been accepted. Also,
maiku@pidgin.im
parents: 28047
diff changeset
651 NULL, gtkmedia->priv->media,
7a66b8d66456 There's no reason to ask for acceptance if the stream has been accepted. Also,
maiku@pidgin.im
parents: 28047
diff changeset
652 pidgin_media_accept_cb,
7a66b8d66456 There's no reason to ask for acceptance if the stream has been accepted. Also,
maiku@pidgin.im
parents: 28047
diff changeset
653 pidgin_media_reject_cb);
7a66b8d66456 There's no reason to ask for acceptance if the stream has been accepted. Also,
maiku@pidgin.im
parents: 28047
diff changeset
654 }
26382
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
655 pidgin_media_emit_message(gtkmedia, message);
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
656 g_free(message);
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
657 return FALSE;
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
658 }
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
659
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
660 static void
26514
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
661 #if GTK_CHECK_VERSION(2,12,0)
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
662 pidgin_media_input_volume_changed(GtkScaleButton *range, double value,
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
663 PurpleMedia *media)
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
664 {
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
665 double val = (double)value * 100.0;
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
666 #else
26408
ee0282fe3673 Move volume levels for media to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26405
diff changeset
667 pidgin_media_input_volume_changed(GtkRange *range, PurpleMedia *media)
ee0282fe3673 Move volume levels for media to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26405
diff changeset
668 {
ee0282fe3673 Move volume levels for media to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26405
diff changeset
669 double val = (double)gtk_range_get_value(GTK_RANGE(range));
26514
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
670 #endif
27849
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
671 purple_media_set_input_volume(media, NULL, val);
26408
ee0282fe3673 Move volume levels for media to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26405
diff changeset
672 }
ee0282fe3673 Move volume levels for media to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26405
diff changeset
673
ee0282fe3673 Move volume levels for media to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26405
diff changeset
674 static void
26514
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
675 #if GTK_CHECK_VERSION(2,12,0)
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
676 pidgin_media_output_volume_changed(GtkScaleButton *range, double value,
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
677 PurpleMedia *media)
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
678 {
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
679 double val = (double)value * 100.0;
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
680 #else
26408
ee0282fe3673 Move volume levels for media to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26405
diff changeset
681 pidgin_media_output_volume_changed(GtkRange *range, PurpleMedia *media)
ee0282fe3673 Move volume levels for media to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26405
diff changeset
682 {
ee0282fe3673 Move volume levels for media to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26405
diff changeset
683 double val = (double)gtk_range_get_value(GTK_RANGE(range));
26514
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
684 #endif
27849
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
685 purple_media_set_output_volume(media, NULL, NULL, val);
26514
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
686 }
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
687
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
688 static void
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
689 destroy_parent_widget_cb(GtkWidget *widget, GtkWidget *parent)
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
690 {
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
691 g_return_if_fail(GTK_IS_WIDGET(parent));
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
692
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
693 gtk_widget_destroy(parent);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
694 }
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
695
26514
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
696 static GtkWidget *
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
697 pidgin_media_add_audio_widget(PidginMedia *gtkmedia,
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
698 PurpleMediaSessionType type, const gchar *sid)
26514
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
699 {
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
700 GtkWidget *volume_widget, *progress_parent, *volume, *progress;
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
701 double value;
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
702
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
703 if (type & PURPLE_MEDIA_SEND_AUDIO) {
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
704 value = purple_prefs_get_int(
27849
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
705 "/purple/media/audio/volume/input");
26514
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
706 } else if (type & PURPLE_MEDIA_RECV_AUDIO) {
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
707 value = purple_prefs_get_int(
27849
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
708 "/purple/media/audio/volume/output");
26514
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
709 } else
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
710 g_return_val_if_reached(NULL);
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
711
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
712 #if GTK_CHECK_VERSION(2,12,0)
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
713 /* Setup widget structure */
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
714 volume_widget = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
715 progress_parent = gtk_vbox_new(FALSE, 0);
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
716 gtk_box_pack_start(GTK_BOX(volume_widget),
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
717 progress_parent, TRUE, TRUE, 0);
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
718
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
719 /* Volume button */
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
720 volume = gtk_volume_button_new();
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
721 gtk_scale_button_set_value(GTK_SCALE_BUTTON(volume), value/100.0);
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
722 gtk_box_pack_end(GTK_BOX(volume_widget),
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
723 volume, FALSE, FALSE, 0);
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
724 #else
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
725 /* Setup widget structure */
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
726 volume_widget = gtk_vbox_new(FALSE, 0);
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
727 progress_parent = volume_widget;
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
728
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
729 /* Volume slider */
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
730 volume = gtk_hscale_new_with_range(0.0, 100.0, 5.0);
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
731 gtk_range_set_increments(GTK_RANGE(volume), 5.0, 25.0);
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
732 gtk_range_set_value(GTK_RANGE(volume), value);
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
733 gtk_scale_set_draw_value(GTK_SCALE(volume), FALSE);
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
734 gtk_box_pack_end(GTK_BOX(volume_widget),
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
735 volume, TRUE, FALSE, 0);
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
736 #endif
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
737
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
738 /* Volume level indicator */
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
739 progress = gtk_progress_bar_new();
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
740 gtk_widget_set_size_request(progress, 250, 10);
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
741 gtk_box_pack_end(GTK_BOX(progress_parent), progress, TRUE, FALSE, 0);
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
742
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
743 if (type & PURPLE_MEDIA_SEND_AUDIO) {
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
744 g_signal_connect (G_OBJECT(volume), "value-changed",
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
745 G_CALLBACK(pidgin_media_input_volume_changed),
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
746 gtkmedia->priv->media);
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
747 gtkmedia->priv->send_progress = progress;
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
748 } else if (type & PURPLE_MEDIA_RECV_AUDIO) {
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
749 g_signal_connect (G_OBJECT(volume), "value-changed",
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
750 G_CALLBACK(pidgin_media_output_volume_changed),
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
751 gtkmedia->priv->media);
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
752
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
753 pidgin_media_insert_widget(gtkmedia, progress, sid, gtkmedia->priv->screenname);
26514
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
754 }
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
755
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
756 g_signal_connect(G_OBJECT(progress), "destroy",
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
757 G_CALLBACK(destroy_parent_widget_cb),
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
758 volume_widget);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
759
26514
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
760 gtk_widget_show_all(volume_widget);
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
761
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
762 return volume_widget;
26408
ee0282fe3673 Move volume levels for media to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26405
diff changeset
763 }
ee0282fe3673 Move volume levels for media to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26405
diff changeset
764
ee0282fe3673 Move volume levels for media to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26405
diff changeset
765 static void
26034
3b82059e4069 Replace the ready signal in PidginMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26033
diff changeset
766 pidgin_media_ready_cb(PurpleMedia *media, PidginMedia *gtkmedia, const gchar *sid)
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
767 {
27857
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
768 GtkWidget *send_widget = NULL, *recv_widget = NULL, *button_widget = NULL;
26064
4f013819e4e3 Create the media srcs inside PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26063
diff changeset
769 PurpleMediaSessionType type =
4f013819e4e3 Create the media srcs inside PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26063
diff changeset
770 purple_media_get_session_type(media, sid);
28119
092659955afb Set the icon of media corresponding to the media type
Marcus Lundblad <ml@update.uu.se>
parents: 28102
diff changeset
771 GdkPixbuf *icon = NULL;
23821
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23804
diff changeset
772
26034
3b82059e4069 Replace the ready signal in PidginMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26033
diff changeset
773 if (gtkmedia->priv->recv_widget == NULL
26064
4f013819e4e3 Create the media srcs inside PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26063
diff changeset
774 && type & (PURPLE_MEDIA_RECV_VIDEO |
4f013819e4e3 Create the media srcs inside PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26063
diff changeset
775 PURPLE_MEDIA_RECV_AUDIO)) {
31086
a8cc50c2279f Remove trailing whitespace
Richard Laager <rlaager@wiktel.com>
parents: 30949
diff changeset
776 recv_widget = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
23874
64080c01ee50 Decouple stream direction. Allows send only or recv only streams.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23869
diff changeset
777 gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display),
64080c01ee50 Decouple stream direction. Allows send only or recv only streams.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23869
diff changeset
778 recv_widget, TRUE, TRUE, 0);
64080c01ee50 Decouple stream direction. Allows send only or recv only streams.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23869
diff changeset
779 gtk_widget_show(recv_widget);
30249
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
780 } else {
26034
3b82059e4069 Replace the ready signal in PidginMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26033
diff changeset
781 recv_widget = gtkmedia->priv->recv_widget;
30249
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
782 }
26034
3b82059e4069 Replace the ready signal in PidginMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26033
diff changeset
783 if (gtkmedia->priv->send_widget == NULL
26064
4f013819e4e3 Create the media srcs inside PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26063
diff changeset
784 && type & (PURPLE_MEDIA_SEND_VIDEO |
4f013819e4e3 Create the media srcs inside PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26063
diff changeset
785 PURPLE_MEDIA_SEND_AUDIO)) {
26065
09386489e6d1 Change the media window items' orientations to look better.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26064
diff changeset
786 send_widget = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
23874
64080c01ee50 Decouple stream direction. Allows send only or recv only streams.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23869
diff changeset
787 gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display),
30249
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
788 send_widget, FALSE, TRUE, 0);
27857
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
789 button_widget = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
30249
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
790 gtk_box_pack_end(GTK_BOX(recv_widget), button_widget,
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
791 FALSE, TRUE, 0);
23874
64080c01ee50 Decouple stream direction. Allows send only or recv only streams.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23869
diff changeset
792 gtk_widget_show(send_widget);
28401
ee55fb88f512 Add a hold button to the media window.
maiku@pidgin.im
parents: 28136
diff changeset
793
ee55fb88f512 Add a hold button to the media window.
maiku@pidgin.im
parents: 28136
diff changeset
794 /* Hold button */
ee55fb88f512 Add a hold button to the media window.
maiku@pidgin.im
parents: 28136
diff changeset
795 gtkmedia->priv->hold =
32341
15e80ced77a2 Mark the "hold" and "mute" menu items for translation in the media dialog.
Mark Doliner <mark@kingant.net>
parents: 32340
diff changeset
796 gtk_toggle_button_new_with_mnemonic(_("_Hold"));
30249
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
797 gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->hold,
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
798 FALSE, FALSE, 0);
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
799 gtk_widget_show(gtkmedia->priv->hold);
28401
ee55fb88f512 Add a hold button to the media window.
maiku@pidgin.im
parents: 28136
diff changeset
800 g_signal_connect(gtkmedia->priv->hold, "toggled",
ee55fb88f512 Add a hold button to the media window.
maiku@pidgin.im
parents: 28136
diff changeset
801 G_CALLBACK(pidgin_media_hold_toggled),
ee55fb88f512 Add a hold button to the media window.
maiku@pidgin.im
parents: 28136
diff changeset
802 gtkmedia);
27857
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
803 } else {
26034
3b82059e4069 Replace the ready signal in PidginMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26033
diff changeset
804 send_widget = gtkmedia->priv->send_widget;
27857
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
805 button_widget = gtkmedia->priv->button_widget;
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
806 }
23838
9c6915254610 Move the audio progress bar widgets to be beside the video displays.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23837
diff changeset
807
26064
4f013819e4e3 Create the media srcs inside PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26063
diff changeset
808 if (type & PURPLE_MEDIA_RECV_VIDEO) {
26053
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
809 PidginMediaRealizeData *data;
23836
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
810 GtkWidget *aspect;
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
811 GtkWidget *remote_video;
26076
bb8d4ff8276a Make the backgrounds of the drawing areas black so it doesn't look as
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26075
diff changeset
812 GdkColor color = {0, 0, 0, 0};
23836
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
813
30249
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
814 aspect = gtk_aspect_frame_new(NULL, 0, 0, 4.0/3.0, FALSE);
23836
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
815 gtk_frame_set_shadow_type(GTK_FRAME(aspect), GTK_SHADOW_IN);
23843
b8e0a56cd6cf Fix the order of the send/recv audio/video display widgets.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23842
diff changeset
816 gtk_box_pack_start(GTK_BOX(recv_widget), aspect, TRUE, TRUE, 0);
23836
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
817
26053
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
818 data = g_new0(PidginMediaRealizeData, 1);
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
819 data->gtkmedia = gtkmedia;
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
820 data->session_id = g_strdup(sid);
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
821 data->participant = g_strdup(gtkmedia->priv->screenname);
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
822
23836
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
823 remote_video = gtk_drawing_area_new();
26076
bb8d4ff8276a Make the backgrounds of the drawing areas black so it doesn't look as
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26075
diff changeset
824 gtk_widget_modify_bg(remote_video, GTK_STATE_NORMAL, &color);
26053
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
825 g_signal_connect(G_OBJECT(remote_video), "realize",
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
826 G_CALLBACK(realize_cb), data);
26434
30c870ee4ec9 Remove old GtkPlug and GtkSocket code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26424
diff changeset
827 gtk_container_add(GTK_CONTAINER(aspect), remote_video);
26078
27b553a07800 Make the sinks better default sizes and display them immediately.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
828 gtk_widget_set_size_request (GTK_WIDGET(remote_video), 320, 240);
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
829 g_signal_connect(G_OBJECT(remote_video), "destroy",
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
830 G_CALLBACK(destroy_parent_widget_cb), aspect);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
831
23836
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
832 gtk_widget_show(remote_video);
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
833 gtk_widget_show(aspect);
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
834
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
835 pidgin_media_insert_widget(gtkmedia, remote_video,
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
836 data->session_id, data->participant);
23874
64080c01ee50 Decouple stream direction. Allows send only or recv only streams.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23869
diff changeset
837 }
30249
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
838
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
839 if (type & PURPLE_MEDIA_SEND_VIDEO && !gtkmedia->priv->local_video) {
26053
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
840 PidginMediaRealizeData *data;
23874
64080c01ee50 Decouple stream direction. Allows send only or recv only streams.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23869
diff changeset
841 GtkWidget *aspect;
64080c01ee50 Decouple stream direction. Allows send only or recv only streams.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23869
diff changeset
842 GtkWidget *local_video;
26076
bb8d4ff8276a Make the backgrounds of the drawing areas black so it doesn't look as
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26075
diff changeset
843 GdkColor color = {0, 0, 0, 0};
23874
64080c01ee50 Decouple stream direction. Allows send only or recv only streams.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23869
diff changeset
844
30249
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
845 aspect = gtk_aspect_frame_new(NULL, 0, 0, 4.0/3.0, TRUE);
23836
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
846 gtk_frame_set_shadow_type(GTK_FRAME(aspect), GTK_SHADOW_IN);
30249
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
847 gtk_box_pack_start(GTK_BOX(send_widget), aspect, FALSE, TRUE, 0);
23836
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
848
26053
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
849 data = g_new0(PidginMediaRealizeData, 1);
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
850 data->gtkmedia = gtkmedia;
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
851 data->session_id = g_strdup(sid);
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
852 data->participant = NULL;
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
853
23836
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
854 local_video = gtk_drawing_area_new();
26076
bb8d4ff8276a Make the backgrounds of the drawing areas black so it doesn't look as
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26075
diff changeset
855 gtk_widget_modify_bg(local_video, GTK_STATE_NORMAL, &color);
24977
99c3489e06b0 Wait for local video frame to be realized before starting local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24958
diff changeset
856 g_signal_connect(G_OBJECT(local_video), "realize",
26053
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
857 G_CALLBACK(realize_cb), data);
26434
30c870ee4ec9 Remove old GtkPlug and GtkSocket code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26424
diff changeset
858 gtk_container_add(GTK_CONTAINER(aspect), local_video);
30249
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
859 gtk_widget_set_size_request (GTK_WIDGET(local_video), 80, 60);
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
860 g_signal_connect(G_OBJECT(local_video), "destroy",
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
861 G_CALLBACK(destroy_parent_widget_cb), aspect);
24977
99c3489e06b0 Wait for local video frame to be realized before starting local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24958
diff changeset
862
23836
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
863 gtk_widget_show(local_video);
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
864 gtk_widget_show(aspect);
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
865
27857
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
866 gtkmedia->priv->pause =
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
867 gtk_toggle_button_new_with_mnemonic(_("_Pause"));
30249
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
868 gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->pause,
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
869 FALSE, FALSE, 0);
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
870 gtk_widget_show(gtkmedia->priv->pause);
27857
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
871 g_signal_connect(gtkmedia->priv->pause, "toggled",
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
872 G_CALLBACK(pidgin_media_pause_toggled),
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
873 gtkmedia);
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
874
23836
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
875 gtkmedia->priv->local_video = local_video;
3bf9748fdef0 Preliminary video embedded in the conversation window. It's still kind of buggy.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23829
diff changeset
876 }
26064
4f013819e4e3 Create the media srcs inside PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26063
diff changeset
877 if (type & PURPLE_MEDIA_RECV_AUDIO) {
26408
ee0282fe3673 Move volume levels for media to the media window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26405
diff changeset
878 gtk_box_pack_end(GTK_BOX(recv_widget),
26514
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
879 pidgin_media_add_audio_widget(gtkmedia,
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
880 PURPLE_MEDIA_RECV_AUDIO, sid), FALSE, FALSE, 0);
23838
9c6915254610 Move the audio progress bar widgets to be beside the video displays.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23837
diff changeset
881 }
30249
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
882
26064
4f013819e4e3 Create the media srcs inside PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26063
diff changeset
883 if (type & PURPLE_MEDIA_SEND_AUDIO) {
26410
343ca84d5997 Improve the padding around the mute button.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26409
diff changeset
884 gtkmedia->priv->mute =
32341
15e80ced77a2 Mark the "hold" and "mute" menu items for translation in the media dialog.
Mark Doliner <mark@kingant.net>
parents: 32340
diff changeset
885 gtk_toggle_button_new_with_mnemonic(_("_Mute"));
30249
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
886 gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->mute,
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
887 FALSE, FALSE, 0);
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
888 gtk_widget_show(gtkmedia->priv->mute);
26410
343ca84d5997 Improve the padding around the mute button.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26409
diff changeset
889 g_signal_connect(gtkmedia->priv->mute, "toggled",
343ca84d5997 Improve the padding around the mute button.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26409
diff changeset
890 G_CALLBACK(pidgin_media_mute_toggled),
343ca84d5997 Improve the padding around the mute button.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26409
diff changeset
891 gtkmedia);
343ca84d5997 Improve the padding around the mute button.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26409
diff changeset
892
30249
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
893 gtk_box_pack_end(GTK_BOX(recv_widget),
26514
9cb62ecb4715 Use GtkVolumeButtons for audio if it's available.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26434
diff changeset
894 pidgin_media_add_audio_widget(gtkmedia,
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
895 PURPLE_MEDIA_SEND_AUDIO, NULL), FALSE, FALSE, 0);
23874
64080c01ee50 Decouple stream direction. Allows send only or recv only streams.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23869
diff changeset
896 }
64080c01ee50 Decouple stream direction. Allows send only or recv only streams.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23869
diff changeset
897
27849
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
898 if (type & PURPLE_MEDIA_AUDIO &&
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
899 gtkmedia->priv->level_handler_id == 0) {
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
900 gtkmedia->priv->level_handler_id = g_signal_connect(
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
901 media, "level", G_CALLBACK(level_message_cb),
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
902 gtkmedia);
26053
c334a9e17426 Wait to create the sinks until the frames are ready.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26049
diff changeset
903 }
24951
94224a5563db Prepare vv GUI earlier and create sinks when src-pad-added is triggered.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24938
diff changeset
904
26034
3b82059e4069 Replace the ready signal in PidginMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26033
diff changeset
905 if (send_widget != NULL)
3b82059e4069 Replace the ready signal in PidginMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26033
diff changeset
906 gtkmedia->priv->send_widget = send_widget;
3b82059e4069 Replace the ready signal in PidginMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26033
diff changeset
907 if (recv_widget != NULL)
3b82059e4069 Replace the ready signal in PidginMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26033
diff changeset
908 gtkmedia->priv->recv_widget = recv_widget;
30249
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
909 if (button_widget != NULL) {
27857
c1687897825f Add pause capability for local video.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27850
diff changeset
910 gtkmedia->priv->button_widget = button_widget;
30249
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
911 gtk_widget_show(GTK_WIDGET(button_widget));
5ec2d3617538 pidgin: Re-arrange media window. Layout remote and local video side-by-side.
Marcus Lundblad <ml@update.uu.se>
parents: 28647
diff changeset
912 }
24951
94224a5563db Prepare vv GUI earlier and create sinks when src-pad-added is triggered.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24938
diff changeset
913
26384
bea334b214fa Add purple_media_is_initiator.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26382
diff changeset
914 if (purple_media_is_initiator(media, sid, NULL) == FALSE) {
26382
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
915 if (gtkmedia->priv->timeout_id != 0)
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
916 g_source_remove(gtkmedia->priv->timeout_id);
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
917 gtkmedia->priv->request_type |= type;
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
918 gtkmedia->priv->timeout_id = g_timeout_add(500,
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
919 (GSourceFunc)pidgin_request_timeout_cb,
f42892982e30 Display which type of media session is being requested.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26380
diff changeset
920 gtkmedia);
23837
ddbea813862e Notify the user which type of media session the remote user wants to initiate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23836
diff changeset
921 }
26078
27b553a07800 Make the sinks better default sizes and display them immediately.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
922
28119
092659955afb Set the icon of media corresponding to the media type
Marcus Lundblad <ml@update.uu.se>
parents: 28102
diff changeset
923 /* set the window icon according to the type */
092659955afb Set the icon of media corresponding to the media type
Marcus Lundblad <ml@update.uu.se>
parents: 28102
diff changeset
924 if (type & PURPLE_MEDIA_VIDEO) {
28136
916a4d2aa0b6 Fix another warning.
maiku@pidgin.im
parents: 28119
diff changeset
925 icon = gtk_widget_render_icon(GTK_WIDGET(gtkmedia),
916a4d2aa0b6 Fix another warning.
maiku@pidgin.im
parents: 28119
diff changeset
926 PIDGIN_STOCK_TOOLBAR_VIDEO_CALL,
28119
092659955afb Set the icon of media corresponding to the media type
Marcus Lundblad <ml@update.uu.se>
parents: 28102
diff changeset
927 gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_LARGE), NULL);
092659955afb Set the icon of media corresponding to the media type
Marcus Lundblad <ml@update.uu.se>
parents: 28102
diff changeset
928 } else if (type & PURPLE_MEDIA_AUDIO) {
28136
916a4d2aa0b6 Fix another warning.
maiku@pidgin.im
parents: 28119
diff changeset
929 icon = gtk_widget_render_icon(GTK_WIDGET(gtkmedia),
916a4d2aa0b6 Fix another warning.
maiku@pidgin.im
parents: 28119
diff changeset
930 PIDGIN_STOCK_TOOLBAR_AUDIO_CALL,
28119
092659955afb Set the icon of media corresponding to the media type
Marcus Lundblad <ml@update.uu.se>
parents: 28102
diff changeset
931 gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_LARGE), NULL);
092659955afb Set the icon of media corresponding to the media type
Marcus Lundblad <ml@update.uu.se>
parents: 28102
diff changeset
932 }
092659955afb Set the icon of media corresponding to the media type
Marcus Lundblad <ml@update.uu.se>
parents: 28102
diff changeset
933
092659955afb Set the icon of media corresponding to the media type
Marcus Lundblad <ml@update.uu.se>
parents: 28102
diff changeset
934 if (icon) {
092659955afb Set the icon of media corresponding to the media type
Marcus Lundblad <ml@update.uu.se>
parents: 28102
diff changeset
935 gtk_window_set_icon(GTK_WINDOW(gtkmedia), icon);
092659955afb Set the icon of media corresponding to the media type
Marcus Lundblad <ml@update.uu.se>
parents: 28102
diff changeset
936 g_object_unref(icon);
092659955afb Set the icon of media corresponding to the media type
Marcus Lundblad <ml@update.uu.se>
parents: 28102
diff changeset
937 }
31086
a8cc50c2279f Remove trailing whitespace
Richard Laager <rlaager@wiktel.com>
parents: 30949
diff changeset
938
26078
27b553a07800 Make the sinks better default sizes and display them immediately.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
939 gtk_widget_show(gtkmedia->priv->display);
23837
ddbea813862e Notify the user which type of media session the remote user wants to initiate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23836
diff changeset
940 }
ddbea813862e Notify the user which type of media session the remote user wants to initiate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23836
diff changeset
941
ddbea813862e Notify the user which type of media session the remote user wants to initiate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23836
diff changeset
942 static void
26329
86bc2d34f689 Rename state-changed enum and values.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26324
diff changeset
943 pidgin_media_state_changed_cb(PurpleMedia *media, PurpleMediaState state,
26032
2809a63dbadf Convert PidginMedia to use the state-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26026
diff changeset
944 gchar *sid, gchar *name, PidginMedia *gtkmedia)
23784
741a702033e0 Show a message when the remote end terminates a session.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23773
diff changeset
945 {
26329
86bc2d34f689 Rename state-changed enum and values.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26324
diff changeset
946 purple_debug_info("gtkmedia", "state: %d sid: %s name: %s\n",
27712
813f2eb3fdc8 Fixes for some potential printf("%s", NULL) type of problems from Maiku
Stu Tomlinson <stu@nosnilmot.com>
parents: 27710
diff changeset
947 state, sid ? sid : "(null)", name ? name : "(null)");
31420
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
948 if (state == PURPLE_MEDIA_STATE_END) {
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
949 if (sid != NULL && name != NULL) {
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
950 pidgin_media_remove_widget(gtkmedia, sid, name);
9f8da7c21afd Adapt the Pidgin UI to correctly handle dynamic addition and removal of streams
jakub.adam@ktknet.cz
parents: 31356
diff changeset
951 } else if (sid == NULL && name == NULL) {
26032
2809a63dbadf Convert PidginMedia to use the state-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26026
diff changeset
952 pidgin_media_emit_message(gtkmedia,
2809a63dbadf Convert PidginMedia to use the state-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26026
diff changeset
953 _("The call has been terminated."));
2809a63dbadf Convert PidginMedia to use the state-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26026
diff changeset
954 gtk_widget_destroy(GTK_WIDGET(gtkmedia));
2809a63dbadf Convert PidginMedia to use the state-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26026
diff changeset
955 }
26329
86bc2d34f689 Rename state-changed enum and values.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26324
diff changeset
956 } else if (state == PURPLE_MEDIA_STATE_NEW &&
26034
3b82059e4069 Replace the ready signal in PidginMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26033
diff changeset
957 sid != NULL && name != NULL) {
3b82059e4069 Replace the ready signal in PidginMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26033
diff changeset
958 pidgin_media_ready_cb(media, gtkmedia, sid);
26032
2809a63dbadf Convert PidginMedia to use the state-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26026
diff changeset
959 }
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
960 }
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
961
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
962 static void
26324
065d865e7dd1 Use stream-info for reject instead of state-changed.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26319
diff changeset
963 pidgin_media_stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type,
26366
4e1286e76f1f Create purple_media_stream_info. Add local parameter to stream-info signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26364
diff changeset
964 gchar *sid, gchar *name, gboolean local,
4e1286e76f1f Create purple_media_stream_info. Add local parameter to stream-info signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26364
diff changeset
965 PidginMedia *gtkmedia)
26324
065d865e7dd1 Use stream-info for reject instead of state-changed.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26319
diff changeset
966 {
065d865e7dd1 Use stream-info for reject instead of state-changed.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26319
diff changeset
967 if (type == PURPLE_MEDIA_INFO_REJECT) {
065d865e7dd1 Use stream-info for reject instead of state-changed.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26319
diff changeset
968 pidgin_media_emit_message(gtkmedia,
065d865e7dd1 Use stream-info for reject instead of state-changed.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26319
diff changeset
969 _("You have rejected the call."));
27835
584fa66dfb31 Remove the "accepted" signal from PurpleMedia as it was redundant.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27712
diff changeset
970 } else if (type == PURPLE_MEDIA_INFO_ACCEPT) {
28102
7a66b8d66456 There's no reason to ask for acceptance if the stream has been accepted. Also,
maiku@pidgin.im
parents: 28047
diff changeset
971 if (local == TRUE)
7a66b8d66456 There's no reason to ask for acceptance if the stream has been accepted. Also,
maiku@pidgin.im
parents: 28047
diff changeset
972 purple_request_close_with_handle(gtkmedia);
27835
584fa66dfb31 Remove the "accepted" signal from PurpleMedia as it was redundant.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27712
diff changeset
973 pidgin_media_set_state(gtkmedia, PIDGIN_MEDIA_ACCEPTED);
584fa66dfb31 Remove the "accepted" signal from PurpleMedia as it was redundant.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27712
diff changeset
974 pidgin_media_emit_message(gtkmedia, _("Call in progress."));
584fa66dfb31 Remove the "accepted" signal from PurpleMedia as it was redundant.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27712
diff changeset
975 gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar),
32344
fed510b05c32 Remove a period from a phrase that appears in the status bar of active calls
Mark Doliner <mark@kingant.net>
parents: 31739
diff changeset
976 0, _("Call in progress"));
27835
584fa66dfb31 Remove the "accepted" signal from PurpleMedia as it was redundant.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27712
diff changeset
977 gtk_widget_show(GTK_WIDGET(gtkmedia));
26324
065d865e7dd1 Use stream-info for reject instead of state-changed.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26319
diff changeset
978 }
065d865e7dd1 Use stream-info for reject instead of state-changed.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26319
diff changeset
979 }
065d865e7dd1 Use stream-info for reject instead of state-changed.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26319
diff changeset
980
065d865e7dd1 Use stream-info for reject instead of state-changed.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26319
diff changeset
981 static void
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
982 pidgin_media_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
983 {
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
984 PidginMedia *media;
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
985 g_return_if_fail(PIDGIN_IS_MEDIA(object));
23784
741a702033e0 Show a message when the remote end terminates a session.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23773
diff changeset
986
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
987 media = PIDGIN_MEDIA(object);
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
988 switch (prop_id) {
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
989 case PROP_MEDIA:
26033
366f68124622 Convert more PidginMedia signals to the newer API.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26032
diff changeset
990 {
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
991 if (media->priv->media)
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
992 g_object_unref(media->priv->media);
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
993 media->priv->media = g_value_get_object(value);
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
994 g_object_ref(media->priv->media);
26033
366f68124622 Convert more PidginMedia signals to the newer API.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26032
diff changeset
995
26384
bea334b214fa Add purple_media_is_initiator.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26382
diff changeset
996 if (purple_media_is_initiator(media->priv->media,
bea334b214fa Add purple_media_is_initiator.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26382
diff changeset
997 NULL, NULL) == TRUE)
26033
366f68124622 Convert more PidginMedia signals to the newer API.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26032
diff changeset
998 pidgin_media_set_state(media, PIDGIN_MEDIA_WAITING);
366f68124622 Convert more PidginMedia signals to the newer API.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26032
diff changeset
999 else
366f68124622 Convert more PidginMedia signals to the newer API.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26032
diff changeset
1000 pidgin_media_set_state(media, PIDGIN_MEDIA_REQUESTED);
366f68124622 Convert more PidginMedia signals to the newer API.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26032
diff changeset
1001
24982
0ad1b8e950d7 Add purple_media_error.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24977
diff changeset
1002 g_signal_connect(G_OBJECT(media->priv->media), "error",
0ad1b8e950d7 Add purple_media_error.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24977
diff changeset
1003 G_CALLBACK(pidgin_media_error_cb), media);
26032
2809a63dbadf Convert PidginMedia to use the state-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26026
diff changeset
1004 g_signal_connect(G_OBJECT(media->priv->media), "state-changed",
2809a63dbadf Convert PidginMedia to use the state-changed signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26026
diff changeset
1005 G_CALLBACK(pidgin_media_state_changed_cb), media);
26324
065d865e7dd1 Use stream-info for reject instead of state-changed.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26319
diff changeset
1006 g_signal_connect(G_OBJECT(media->priv->media), "stream-info",
065d865e7dd1 Use stream-info for reject instead of state-changed.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26319
diff changeset
1007 G_CALLBACK(pidgin_media_stream_info_cb), media);
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1008 break;
26033
366f68124622 Convert more PidginMedia signals to the newer API.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26032
diff changeset
1009 }
24984
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
1010 case PROP_SCREENNAME:
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
1011 if (media->priv->screenname)
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
1012 g_free(media->priv->screenname);
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
1013 media->priv->screenname = g_value_dup_string(value);
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
1014 break;
23787
92e71f6e10d4 Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23784
diff changeset
1015 default:
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1016 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1017 break;
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1018 }
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1019 }
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1020
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1021 static void
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1022 pidgin_media_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1023 {
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1024 PidginMedia *media;
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1025 g_return_if_fail(PIDGIN_IS_MEDIA(object));
23787
92e71f6e10d4 Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23784
diff changeset
1026
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1027 media = PIDGIN_MEDIA(object);
23787
92e71f6e10d4 Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23784
diff changeset
1028
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1029 switch (prop_id) {
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1030 case PROP_MEDIA:
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1031 g_value_set_object(value, media->priv->media);
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1032 break;
24984
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
1033 case PROP_SCREENNAME:
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
1034 g_value_set_string(value, media->priv->screenname);
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
1035 break;
23787
92e71f6e10d4 Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23784
diff changeset
1036 default:
92e71f6e10d4 Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23784
diff changeset
1037 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1038 break;
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1039 }
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1040 }
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1041
26364
e114ed3c8cfe No reason for this to be public API.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26358
diff changeset
1042 static GtkWidget *
24984
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
1043 pidgin_media_new(PurpleMedia *media, const gchar *screenname)
23787
92e71f6e10d4 Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23784
diff changeset
1044 {
23821
12a16471f94e Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23804
diff changeset
1045 PidginMedia *gtkmedia = g_object_new(pidgin_media_get_type(),
24984
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
1046 "media", media,
0829a08038c6 Remove the screenname attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24982
diff changeset
1047 "screenname", screenname, NULL);
23787
92e71f6e10d4 Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23784
diff changeset
1048 return GTK_WIDGET(gtkmedia);
92e71f6e10d4 Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23784
diff changeset
1049 }
92e71f6e10d4 Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23784
diff changeset
1050
23793
befeece4dd48 Change a few things:
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23787
diff changeset
1051 static void
23787
92e71f6e10d4 Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23784
diff changeset
1052 pidgin_media_set_state(PidginMedia *gtkmedia, PidginMediaState state)
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1053 {
23787
92e71f6e10d4 Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23784
diff changeset
1054 gtkmedia->priv->state = state;
23764
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1055 }
8067ba21fdd0 Missing files
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1056
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
1057 static gboolean
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
1058 pidgin_media_new_cb(PurpleMediaManager *manager, PurpleMedia *media,
26524
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26514
diff changeset
1059 PurpleAccount *account, gchar *screenname, gpointer nul)
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
1060 {
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
1061 PidginMedia *gtkmedia = PIDGIN_MEDIA(
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
1062 pidgin_media_new(media, screenname));
26524
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26514
diff changeset
1063 PurpleBuddy *buddy = purple_find_buddy(account, screenname);
31086
a8cc50c2279f Remove trailing whitespace
Richard Laager <rlaager@wiktel.com>
parents: 30949
diff changeset
1064 const gchar *alias = buddy ?
a8cc50c2279f Remove trailing whitespace
Richard Laager <rlaager@wiktel.com>
parents: 30949
diff changeset
1065 purple_buddy_get_contact_alias(buddy) : screenname;
26069
e6d548856fcd Use aliases for the media window title and the request window.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26067
diff changeset
1066 gtk_window_set_title(GTK_WINDOW(gtkmedia), alias);
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
1067
26384
bea334b214fa Add purple_media_is_initiator.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26382
diff changeset
1068 if (purple_media_is_initiator(media, NULL, NULL) == TRUE)
26067
a6e53d23bcbb Use request API for a media invitation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26066
diff changeset
1069 gtk_widget_show(GTK_WIDGET(gtkmedia));
a6e53d23bcbb Use request API for a media invitation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26066
diff changeset
1070
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
1071 return TRUE;
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
1072 }
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
1073
26083
0e8814c437b2 Add active elements to PurpleMediaManager. These are the elements that
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26082
diff changeset
1074 static GstElement *
26392
9c671fc1b351 Give more information to element creation functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26391
diff changeset
1075 create_default_video_src(PurpleMedia *media,
9c671fc1b351 Give more information to element creation functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26391
diff changeset
1076 const gchar *session_id, const gchar *participant)
26083
0e8814c437b2 Add active elements to PurpleMediaManager. These are the elements that
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26082
diff changeset
1077 {
31103
4ce69a55f2c6 Add a GstCapsFilter between every video source and the rest of the pipeline.
jakub.adam@ktknet.cz
parents: 31086
diff changeset
1078 GstElement *sendbin, *src;
26342
0c96ac2ea5f8 Remove purple_media_video_init_* functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26337
diff changeset
1079 GstPad *pad;
0c96ac2ea5f8 Remove purple_media_video_init_* functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26337
diff changeset
1080 GstPad *ghost;
26413
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1081
27886
2333ab5777eb Handle sources for Windows better.
maiku@pidgin.im
parents: 27864
diff changeset
1082 #ifdef _WIN32
2333ab5777eb Handle sources for Windows better.
maiku@pidgin.im
parents: 27864
diff changeset
1083 /* autovideosrc doesn't pick ksvideosrc for some reason */
2333ab5777eb Handle sources for Windows better.
maiku@pidgin.im
parents: 27864
diff changeset
1084 src = gst_element_factory_make("ksvideosrc", NULL);
2333ab5777eb Handle sources for Windows better.
maiku@pidgin.im
parents: 27864
diff changeset
1085 if (src == NULL)
2333ab5777eb Handle sources for Windows better.
maiku@pidgin.im
parents: 27864
diff changeset
1086 src = gst_element_factory_make("dshowvideosrc", NULL);
2333ab5777eb Handle sources for Windows better.
maiku@pidgin.im
parents: 27864
diff changeset
1087 if (src == NULL)
2333ab5777eb Handle sources for Windows better.
maiku@pidgin.im
parents: 27864
diff changeset
1088 src = gst_element_factory_make("autovideosrc", NULL);
32399
0c23f5856806 Allow compile of V/V on OSX without X11. Patch by Eion Robb.
eion@robbmob.com
parents: 32398
diff changeset
1089 #elif defined(__APPLE__)
0c23f5856806 Allow compile of V/V on OSX without X11. Patch by Eion Robb.
eion@robbmob.com
parents: 32398
diff changeset
1090 src = gst_element_factory_make("osxvideosrc", NULL);
0c23f5856806 Allow compile of V/V on OSX without X11. Patch by Eion Robb.
eion@robbmob.com
parents: 32398
diff changeset
1091 if (src == NULL)
0c23f5856806 Allow compile of V/V on OSX without X11. Patch by Eion Robb.
eion@robbmob.com
parents: 32398
diff changeset
1092 src = gst_element_factory_make("autovideosrc", NULL);
27886
2333ab5777eb Handle sources for Windows better.
maiku@pidgin.im
parents: 27864
diff changeset
1093 #else
26413
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1094 src = gst_element_factory_make("gconfvideosrc", NULL);
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1095 if (src == NULL)
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1096 src = gst_element_factory_make("autovideosrc", NULL);
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1097 if (src == NULL)
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1098 src = gst_element_factory_make("v4l2src", NULL);
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1099 if (src == NULL)
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1100 src = gst_element_factory_make("v4lsrc", NULL);
27886
2333ab5777eb Handle sources for Windows better.
maiku@pidgin.im
parents: 27864
diff changeset
1101 #endif
26413
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1102 if (src == NULL) {
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1103 purple_debug_error("gtkmedia", "Unable to find a suitable "
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1104 "element for the default video source.\n");
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1105 return NULL;
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1106 }
26342
0c96ac2ea5f8 Remove purple_media_video_init_* functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26337
diff changeset
1107
26377
452be048bded Unique elements ought to be named the same as their id.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26375
diff changeset
1108 sendbin = gst_bin_new("pidgindefaultvideosrc");
26342
0c96ac2ea5f8 Remove purple_media_video_init_* functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26337
diff changeset
1109
31103
4ce69a55f2c6 Add a GstCapsFilter between every video source and the rest of the pipeline.
jakub.adam@ktknet.cz
parents: 31086
diff changeset
1110 gst_bin_add(GST_BIN(sendbin), src);
26342
0c96ac2ea5f8 Remove purple_media_video_init_* functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26337
diff changeset
1111
31103
4ce69a55f2c6 Add a GstCapsFilter between every video source and the rest of the pipeline.
jakub.adam@ktknet.cz
parents: 31086
diff changeset
1112 pad = gst_element_get_static_pad(src, "src");
26342
0c96ac2ea5f8 Remove purple_media_video_init_* functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26337
diff changeset
1113 ghost = gst_ghost_pad_new("ghostsrc", pad);
0c96ac2ea5f8 Remove purple_media_video_init_* functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26337
diff changeset
1114 gst_object_unref(pad);
0c96ac2ea5f8 Remove purple_media_video_init_* functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26337
diff changeset
1115 gst_element_add_pad(sendbin, ghost);
0c96ac2ea5f8 Remove purple_media_video_init_* functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26337
diff changeset
1116
0c96ac2ea5f8 Remove purple_media_video_init_* functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26337
diff changeset
1117 return sendbin;
26083
0e8814c437b2 Add active elements to PurpleMediaManager. These are the elements that
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26082
diff changeset
1118 }
0e8814c437b2 Add active elements to PurpleMediaManager. These are the elements that
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26082
diff changeset
1119
0e8814c437b2 Add active elements to PurpleMediaManager. These are the elements that
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26082
diff changeset
1120 static GstElement *
26392
9c671fc1b351 Give more information to element creation functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26391
diff changeset
1121 create_default_video_sink(PurpleMedia *media,
9c671fc1b351 Give more information to element creation functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26391
diff changeset
1122 const gchar *session_id, const gchar *participant)
26083
0e8814c437b2 Add active elements to PurpleMediaManager. These are the elements that
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26082
diff changeset
1123 {
26413
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1124 GstElement *sink = gst_element_factory_make("gconfvideosink", NULL);
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1125 if (sink == NULL)
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1126 sink = gst_element_factory_make("autovideosink", NULL);
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1127 if (sink == NULL)
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1128 purple_debug_error("gtkmedia", "Unable to find a suitable "
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1129 "element for the default video sink.\n");
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1130 return sink;
26083
0e8814c437b2 Add active elements to PurpleMediaManager. These are the elements that
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26082
diff changeset
1131 }
0e8814c437b2 Add active elements to PurpleMediaManager. These are the elements that
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26082
diff changeset
1132
0e8814c437b2 Add active elements to PurpleMediaManager. These are the elements that
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26082
diff changeset
1133 static GstElement *
26392
9c671fc1b351 Give more information to element creation functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26391
diff changeset
1134 create_default_audio_src(PurpleMedia *media,
9c671fc1b351 Give more information to element creation functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26391
diff changeset
1135 const gchar *session_id, const gchar *participant)
26083
0e8814c437b2 Add active elements to PurpleMediaManager. These are the elements that
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26082
diff changeset
1136 {
27849
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
1137 GstElement *src;
26413
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1138 src = gst_element_factory_make("gconfaudiosrc", NULL);
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1139 if (src == NULL)
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1140 src = gst_element_factory_make("autoaudiosrc", NULL);
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1141 if (src == NULL)
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1142 src = gst_element_factory_make("alsasrc", NULL);
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1143 if (src == NULL)
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1144 src = gst_element_factory_make("osssrc", NULL);
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1145 if (src == NULL)
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1146 src = gst_element_factory_make("dshowaudiosrc", NULL);
32399
0c23f5856806 Allow compile of V/V on OSX without X11. Patch by Eion Robb.
eion@robbmob.com
parents: 32398
diff changeset
1147 if (src == NULL)
0c23f5856806 Allow compile of V/V on OSX without X11. Patch by Eion Robb.
eion@robbmob.com
parents: 32398
diff changeset
1148 src = gst_element_factory_make("osxaudiosrc", NULL);
26413
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1149 if (src == NULL) {
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1150 purple_debug_error("gtkmedia", "Unable to find a suitable "
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1151 "element for the default audio source.\n");
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1152 return NULL;
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1153 }
27849
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
1154 gst_element_set_name(src, "pidgindefaultaudiosrc");
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
1155 return src;
26083
0e8814c437b2 Add active elements to PurpleMediaManager. These are the elements that
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26082
diff changeset
1156 }
0e8814c437b2 Add active elements to PurpleMediaManager. These are the elements that
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26082
diff changeset
1157
0e8814c437b2 Add active elements to PurpleMediaManager. These are the elements that
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26082
diff changeset
1158 static GstElement *
26392
9c671fc1b351 Give more information to element creation functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26391
diff changeset
1159 create_default_audio_sink(PurpleMedia *media,
9c671fc1b351 Give more information to element creation functions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26391
diff changeset
1160 const gchar *session_id, const gchar *participant)
26083
0e8814c437b2 Add active elements to PurpleMediaManager. These are the elements that
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26082
diff changeset
1161 {
27849
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
1162 GstElement *sink;
26413
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1163 sink = gst_element_factory_make("gconfaudiosink", NULL);
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1164 if (sink == NULL)
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1165 sink = gst_element_factory_make("autoaudiosink",NULL);
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1166 if (sink == NULL) {
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1167 purple_debug_error("gtkmedia", "Unable to find a suitable "
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1168 "element for the default audio sink.\n");
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1169 return NULL;
a198f064a42c Use better choices for default elements and have fallbacks.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26410
diff changeset
1170 }
27849
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27835
diff changeset
1171 return sink;
26083
0e8814c437b2 Add active elements to PurpleMediaManager. These are the elements that
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26082
diff changeset
1172 }
26375
0ee10b3e8ee6 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26373
diff changeset
1173 #endif /* USE_VV */
26081
521366dfd8db Implement functions to register and unregister media elements for use in
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26079
diff changeset
1174
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
1175 void
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
1176 pidgin_medias_init(void)
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
1177 {
26375
0ee10b3e8ee6 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26373
diff changeset
1178 #ifdef USE_VV
26081
521366dfd8db Implement functions to register and unregister media elements for use in
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26079
diff changeset
1179 PurpleMediaManager *manager = purple_media_manager_get();
26402
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1180 PurpleMediaElementInfo *default_video_src =
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1181 g_object_new(PURPLE_TYPE_MEDIA_ELEMENT_INFO,
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1182 "id", "pidgindefaultvideosrc",
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1183 "name", "Pidgin Default Video Source",
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1184 "type", PURPLE_MEDIA_ELEMENT_VIDEO
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1185 | PURPLE_MEDIA_ELEMENT_SRC
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1186 | PURPLE_MEDIA_ELEMENT_ONE_SRC
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1187 | PURPLE_MEDIA_ELEMENT_UNIQUE,
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1188 "create-cb", create_default_video_src, NULL);
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1189 PurpleMediaElementInfo *default_video_sink =
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1190 g_object_new(PURPLE_TYPE_MEDIA_ELEMENT_INFO,
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1191 "id", "pidgindefaultvideosink",
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1192 "name", "Pidgin Default Video Sink",
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1193 "type", PURPLE_MEDIA_ELEMENT_VIDEO
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1194 | PURPLE_MEDIA_ELEMENT_SINK
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1195 | PURPLE_MEDIA_ELEMENT_ONE_SINK,
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1196 "create-cb", create_default_video_sink, NULL);
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1197 PurpleMediaElementInfo *default_audio_src =
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1198 g_object_new(PURPLE_TYPE_MEDIA_ELEMENT_INFO,
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1199 "id", "pidgindefaultaudiosrc",
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1200 "name", "Pidgin Default Audio Source",
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1201 "type", PURPLE_MEDIA_ELEMENT_AUDIO
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1202 | PURPLE_MEDIA_ELEMENT_SRC
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1203 | PURPLE_MEDIA_ELEMENT_ONE_SRC
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1204 | PURPLE_MEDIA_ELEMENT_UNIQUE,
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1205 "create-cb", create_default_audio_src, NULL);
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1206 PurpleMediaElementInfo *default_audio_sink =
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1207 g_object_new(PURPLE_TYPE_MEDIA_ELEMENT_INFO,
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1208 "id", "pidgindefaultaudiosink",
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1209 "name", "Pidgin Default Audio Sink",
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1210 "type", PURPLE_MEDIA_ELEMENT_AUDIO
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1211 | PURPLE_MEDIA_ELEMENT_SINK
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1212 | PURPLE_MEDIA_ELEMENT_ONE_SINK,
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1213 "create-cb", create_default_audio_sink, NULL);
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1214
26081
521366dfd8db Implement functions to register and unregister media elements for use in
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26079
diff changeset
1215 g_signal_connect(G_OBJECT(manager), "init-media",
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
1216 G_CALLBACK(pidgin_media_new_cb), NULL);
26081
521366dfd8db Implement functions to register and unregister media elements for use in
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26079
diff changeset
1217
31086
a8cc50c2279f Remove trailing whitespace
Richard Laager <rlaager@wiktel.com>
parents: 30949
diff changeset
1218 purple_media_manager_set_ui_caps(manager,
26391
24feaf9cfbf1 Declare which media caps Pidgin and Finch handle.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26384
diff changeset
1219 PURPLE_MEDIA_CAPS_AUDIO |
24feaf9cfbf1 Declare which media caps Pidgin and Finch handle.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26384
diff changeset
1220 PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION |
24feaf9cfbf1 Declare which media caps Pidgin and Finch handle.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26384
diff changeset
1221 PURPLE_MEDIA_CAPS_VIDEO |
24feaf9cfbf1 Declare which media caps Pidgin and Finch handle.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26384
diff changeset
1222 PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION |
24feaf9cfbf1 Declare which media caps Pidgin and Finch handle.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26384
diff changeset
1223 PURPLE_MEDIA_CAPS_AUDIO_VIDEO);
24feaf9cfbf1 Declare which media caps Pidgin and Finch handle.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26384
diff changeset
1224
26081
521366dfd8db Implement functions to register and unregister media elements for use in
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26079
diff changeset
1225 purple_debug_info("gtkmedia", "Registering media element types\n");
26402
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1226 purple_media_manager_set_active_element(manager, default_video_src);
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1227 purple_media_manager_set_active_element(manager, default_video_sink);
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1228 purple_media_manager_set_active_element(manager, default_audio_src);
081a819bc710 Hide and gobjectify PurpleMediaElementInfo.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26393
diff changeset
1229 purple_media_manager_set_active_element(manager, default_audio_sink);
26375
0ee10b3e8ee6 Fix compiling with --disable-vv.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26373
diff changeset
1230 #endif
26063
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
1231 }
685c8f5f85c7 Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26061
diff changeset
1232