Fri, 24 Apr 2015 14:54:21 -0700
Merge release-2.x.y branch into master.
FYI this is the command I used:
hg merge release-2.x.y
It's good to do this frequently when changes are made to the release-2.x.y
branch. If you wait a long time then the merge becomes difficult. There
could be many changes and if there are merge conflicts it's hard to know
which things should be kept.
In this case I think the changes in the release-2.x.y branch already
existed in master, so there are no changes. I believe that running the
merge command makes a note in the revision history that "changes from
release-2.x.y have been merged in master." So the next time someone does
the merge it'll start from this revision.
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
1 | /* purple |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2 | * |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
3 | * Purple is the legal property of its developers, whose names are too numerous |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
4 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
5 | * source distribution. |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
6 | * |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
7 | * This program is free software; you can redistribute it and/or modify |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
8 | * it under the terms of the GNU General Public License as published by |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
9 | * the Free Software Foundation; either version 2 of the License, or |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
10 | * (at your option) any later version. |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
11 | * |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
12 | * This program is distributed in the hope that it will be useful, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
15 | * GNU General Public License for more details. |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
16 | * |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
17 | * You should have received a copy of the GNU General Public License |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
18 | * along with this program; if not, write to the Free Software |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
20 | */ |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
21 | |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
22 | #ifndef _PURPLE_MEDIA_ENUM_TYPES_H_ |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
23 | #define _PURPLE_MEDIA_ENUM_TYPES_H_ |
|
35431
65668e608813
Add section blocks for libpurple/media/*.h
Ankit Vani <a@nevitus.org>
parents:
35396
diff
changeset
|
24 | /** |
|
65668e608813
Add section blocks for libpurple/media/*.h
Ankit Vani <a@nevitus.org>
parents:
35396
diff
changeset
|
25 | * SECTION:enum-types |
|
65668e608813
Add section blocks for libpurple/media/*.h
Ankit Vani <a@nevitus.org>
parents:
35396
diff
changeset
|
26 | * @section_id: libpurple-enum-types |
|
35436
a69d2e5604c5
Swap @title and @short_description roles
Ankit Vani <a@nevitus.org>
parents:
35431
diff
changeset
|
27 | * @short_description: <filename>media/enum-types.h</filename> |
|
a69d2e5604c5
Swap @title and @short_description roles
Ankit Vani <a@nevitus.org>
parents:
35431
diff
changeset
|
28 | * @title: Enum types for Media API |
|
35431
65668e608813
Add section blocks for libpurple/media/*.h
Ankit Vani <a@nevitus.org>
parents:
35396
diff
changeset
|
29 | */ |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
30 | |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
31 | #include <glib-object.h> |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
32 | |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
33 | G_BEGIN_DECLS |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
34 | |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
35 | #define PURPLE_TYPE_MEDIA_CANDIDATE_TYPE (purple_media_candidate_type_get_type()) |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
36 | #define PURPLE_MEDIA_TYPE_CAPS (purple_media_caps_get_type()) |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
37 | #define PURPLE_MEDIA_TYPE_INFO_TYPE (purple_media_info_type_get_type()) |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
38 | #define PURPLE_TYPE_MEDIA_NETWORK_PROTOCOL (purple_media_network_protocol_get_type()) |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
39 | #define PURPLE_TYPE_MEDIA_SESSION_TYPE (purple_media_session_type_get_type()) |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
40 | #define PURPLE_MEDIA_TYPE_STATE (purple_media_state_changed_get_type()) |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
41 | |
|
35396
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
42 | /** |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
43 | * PurpleMediaCandidateType: |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
44 | * |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
45 | * Media candidate types |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
46 | */ |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
47 | typedef enum { |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
48 | PURPLE_MEDIA_CANDIDATE_TYPE_HOST, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
49 | PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
50 | PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
51 | PURPLE_MEDIA_CANDIDATE_TYPE_RELAY, |
|
33217
7e266d890064
Remove trailing commas from enums.
David Michael <fedora.dm0@gmail.com>
parents:
29551
diff
changeset
|
52 | PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
53 | } PurpleMediaCandidateType; |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
54 | |
|
35396
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
55 | /** |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
56 | * PurpleMediaCaps: |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
57 | * |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
58 | * Media caps |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
59 | */ |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
60 | typedef enum { |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
61 | PURPLE_MEDIA_CAPS_NONE = 0, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
62 | PURPLE_MEDIA_CAPS_AUDIO = 1, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
63 | PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION = 1 << 1, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
64 | PURPLE_MEDIA_CAPS_VIDEO = 1 << 2, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
65 | PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION = 1 << 3, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
66 | PURPLE_MEDIA_CAPS_AUDIO_VIDEO = 1 << 4, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
67 | PURPLE_MEDIA_CAPS_MODIFY_SESSION = 1 << 5, |
|
33217
7e266d890064
Remove trailing commas from enums.
David Michael <fedora.dm0@gmail.com>
parents:
29551
diff
changeset
|
68 | PURPLE_MEDIA_CAPS_CHANGE_DIRECTION = 1 << 6 |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
69 | } PurpleMediaCaps; |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
70 | |
|
35396
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
71 | /** |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
72 | * PurpleMediaComponentType: |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
73 | * |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
74 | * Media component types |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
75 | */ |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
76 | typedef enum { |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
77 | PURPLE_MEDIA_COMPONENT_NONE = 0, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
78 | PURPLE_MEDIA_COMPONENT_RTP = 1, |
|
33217
7e266d890064
Remove trailing commas from enums.
David Michael <fedora.dm0@gmail.com>
parents:
29551
diff
changeset
|
79 | PURPLE_MEDIA_COMPONENT_RTCP = 2 |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
80 | } PurpleMediaComponentType; |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
81 | |
|
35396
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
82 | /** |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
83 | * PurpleMediaInfoType: |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
84 | * |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
85 | * Media info types |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
86 | */ |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
87 | typedef enum { |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
88 | PURPLE_MEDIA_INFO_HANGUP = 0, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
89 | PURPLE_MEDIA_INFO_ACCEPT, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
90 | PURPLE_MEDIA_INFO_REJECT, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
91 | PURPLE_MEDIA_INFO_MUTE, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
92 | PURPLE_MEDIA_INFO_UNMUTE, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
93 | PURPLE_MEDIA_INFO_PAUSE, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
94 | PURPLE_MEDIA_INFO_UNPAUSE, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
95 | PURPLE_MEDIA_INFO_HOLD, |
|
33217
7e266d890064
Remove trailing commas from enums.
David Michael <fedora.dm0@gmail.com>
parents:
29551
diff
changeset
|
96 | PURPLE_MEDIA_INFO_UNHOLD |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
97 | } PurpleMediaInfoType; |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
98 | |
|
35396
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
99 | /** |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
100 | * PurpleMediaNetworkProtocol: |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
101 | * |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
102 | * Media network protocols |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
103 | */ |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
104 | typedef enum { |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
105 | PURPLE_MEDIA_NETWORK_PROTOCOL_UDP, |
|
36317
fcecf7f838e2
Add MS-TURN TCP support
Jakub Adam <jakub.adam@ktknet.cz>
parents:
33217
diff
changeset
|
106 | PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_PASSIVE, |
|
fcecf7f838e2
Add MS-TURN TCP support
Jakub Adam <jakub.adam@ktknet.cz>
parents:
33217
diff
changeset
|
107 | PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_ACTIVE, |
|
fcecf7f838e2
Add MS-TURN TCP support
Jakub Adam <jakub.adam@ktknet.cz>
parents:
33217
diff
changeset
|
108 | PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_SO, |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
109 | } PurpleMediaNetworkProtocol; |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
110 | |
|
35396
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
111 | /** |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
112 | * PurpleMediaSessionType: |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
113 | * |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
114 | * Media session types |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
115 | */ |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
116 | typedef enum { |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
117 | PURPLE_MEDIA_NONE = 0, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
118 | PURPLE_MEDIA_RECV_AUDIO = 1 << 0, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
119 | PURPLE_MEDIA_SEND_AUDIO = 1 << 1, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
120 | PURPLE_MEDIA_RECV_VIDEO = 1 << 2, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
121 | PURPLE_MEDIA_SEND_VIDEO = 1 << 3, |
|
36333
4fe1034f3dce
Add application media type and APIs
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents:
36318
diff
changeset
|
122 | PURPLE_MEDIA_RECV_APPLICATION = 1 << 4, |
|
4fe1034f3dce
Add application media type and APIs
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents:
36318
diff
changeset
|
123 | PURPLE_MEDIA_SEND_APPLICATION = 1 << 5, |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
124 | PURPLE_MEDIA_AUDIO = PURPLE_MEDIA_RECV_AUDIO | PURPLE_MEDIA_SEND_AUDIO, |
|
36333
4fe1034f3dce
Add application media type and APIs
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents:
36318
diff
changeset
|
125 | PURPLE_MEDIA_VIDEO = PURPLE_MEDIA_RECV_VIDEO | PURPLE_MEDIA_SEND_VIDEO, |
|
4fe1034f3dce
Add application media type and APIs
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents:
36318
diff
changeset
|
126 | PURPLE_MEDIA_APPLICATION = PURPLE_MEDIA_RECV_APPLICATION | |
|
4fe1034f3dce
Add application media type and APIs
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents:
36318
diff
changeset
|
127 | PURPLE_MEDIA_SEND_APPLICATION |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
128 | } PurpleMediaSessionType; |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
129 | |
|
35396
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
130 | /** |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
131 | * PurpleMediaState: |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
132 | * |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
133 | * Media state-changed types |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
134 | */ |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
135 | typedef enum { |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
136 | PURPLE_MEDIA_STATE_NEW = 0, |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
137 | PURPLE_MEDIA_STATE_CONNECTED, |
|
33217
7e266d890064
Remove trailing commas from enums.
David Michael <fedora.dm0@gmail.com>
parents:
29551
diff
changeset
|
138 | PURPLE_MEDIA_STATE_END |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
139 | } PurpleMediaState; |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
140 | |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
141 | /** |
|
35396
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
142 | * purple_media_candidate_type_get_type: |
|
36318
a0906e7a6bae
Implement media encryption
Jakub Adam <jakub.adam@ktknet.cz>
parents:
36317
diff
changeset
|
143 | * |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
144 | * Gets the media candidate type's GType |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
145 | * |
|
35393
00f876b129bc
Initial replacements for gtk-doc style comments
Ankit Vani <a@nevitus.org>
parents:
33283
diff
changeset
|
146 | * Returns: The media candidate type's GType. |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
147 | */ |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
148 | GType purple_media_candidate_type_get_type(void); |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
149 | |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
150 | /** |
|
35396
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
151 | * purple_media_caps_get_type: |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
152 | * |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
153 | * Gets the type of the media caps flags |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
154 | * |
|
35393
00f876b129bc
Initial replacements for gtk-doc style comments
Ankit Vani <a@nevitus.org>
parents:
33283
diff
changeset
|
155 | * Returns: The media caps flags' GType |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
156 | */ |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
157 | GType purple_media_caps_get_type(void); |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
158 | |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
159 | /** |
|
35396
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
160 | * purple_media_info_type_get_type: |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
161 | * |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
162 | * Gets the type of the info type enum |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
163 | * |
|
35393
00f876b129bc
Initial replacements for gtk-doc style comments
Ankit Vani <a@nevitus.org>
parents:
33283
diff
changeset
|
164 | * Returns: The info type enum's GType |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
165 | */ |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
166 | GType purple_media_info_type_get_type(void); |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
167 | |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
168 | /** |
|
35396
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
169 | * purple_media_network_protocol_get_type: |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
170 | * |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
171 | * Gets the media network protocol's GType |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
172 | * |
|
35393
00f876b129bc
Initial replacements for gtk-doc style comments
Ankit Vani <a@nevitus.org>
parents:
33283
diff
changeset
|
173 | * Returns: The media network protocol's GType. |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
174 | */ |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
175 | GType purple_media_network_protocol_get_type(void); |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
176 | |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
177 | /** |
|
35396
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
178 | * purple_media_session_type_get_type: |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
179 | * |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
180 | * Gets the media session type's GType |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
181 | * |
|
35393
00f876b129bc
Initial replacements for gtk-doc style comments
Ankit Vani <a@nevitus.org>
parents:
33283
diff
changeset
|
182 | * Returns: The media session type's GType. |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
183 | */ |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
184 | GType purple_media_session_type_get_type(void); |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
185 | |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
186 | /** |
|
35396
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
187 | * purple_media_state_changed_get_type: |
|
7bfe75a37af7
Convert docs from doxygen to gtk-doc format for account*, blist*, media/*
Ankit Vani <a@nevitus.org>
parents:
35393
diff
changeset
|
188 | * |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
189 | * Gets the type of the state-changed enum |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
190 | * |
|
35393
00f876b129bc
Initial replacements for gtk-doc style comments
Ankit Vani <a@nevitus.org>
parents:
33283
diff
changeset
|
191 | * Returns: The state-changed enum's GType |
|
29551
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
192 | */ |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
193 | GType purple_media_state_changed_get_type(void); |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
194 | |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
195 | G_END_DECLS |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
196 | |
|
5208cf010a12
Split the media API's enum types out into its own file.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
197 | #endif /* _PURPLE_MEDIA_ENUM_TYPES_ */ |