Mercurial > pidgin

comparison libpurple/media.h @ 28834:2b9983e5cb8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove commas at end of enumerator lists because C++ -pedantic complains
author Paul Aurich <paul@darkrain42.org>
date Thu, 31 Dec 2009 18:02:58 +0000
parents 713987ae3215
children dcd52d2b1b97
comparison
equal deleted inserted replaced
28833:a158ef76d340 28834:2b9983e5cb8d
73 PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION = 1 << 1, 73 PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION = 1 << 1,
74 PURPLE_MEDIA_CAPS_VIDEO = 1 << 2, 74 PURPLE_MEDIA_CAPS_VIDEO = 1 << 2,
75 PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION = 1 << 3, 75 PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION = 1 << 3,
76 PURPLE_MEDIA_CAPS_AUDIO_VIDEO = 1 << 4, 76 PURPLE_MEDIA_CAPS_AUDIO_VIDEO = 1 << 4,
77 PURPLE_MEDIA_CAPS_MODIFY_SESSION = 1 << 5, 77 PURPLE_MEDIA_CAPS_MODIFY_SESSION = 1 << 5,
78 PURPLE_MEDIA_CAPS_CHANGE_DIRECTION = 1 << 6, 78 PURPLE_MEDIA_CAPS_CHANGE_DIRECTION = 1 << 6
79 } PurpleMediaCaps; 79 } PurpleMediaCaps;
80 80
81 /** Media session types */ 81 /** Media session types */
82 typedef enum { 82 typedef enum {
83 PURPLE_MEDIA_NONE = 0, 83 PURPLE_MEDIA_NONE = 0,
91 91
92 /** Media state-changed types */ 92 /** Media state-changed types */
93 typedef enum { 93 typedef enum {
94 PURPLE_MEDIA_STATE_NEW = 0, 94 PURPLE_MEDIA_STATE_NEW = 0,
95 PURPLE_MEDIA_STATE_CONNECTED, 95 PURPLE_MEDIA_STATE_CONNECTED,
96 PURPLE_MEDIA_STATE_END, 96 PURPLE_MEDIA_STATE_END
97 } PurpleMediaState; 97 } PurpleMediaState;
98 98
99 /** Media info types */ 99 /** Media info types */
100 typedef enum { 100 typedef enum {
101 PURPLE_MEDIA_INFO_HANGUP = 0, 101 PURPLE_MEDIA_INFO_HANGUP = 0,
104 PURPLE_MEDIA_INFO_MUTE, 104 PURPLE_MEDIA_INFO_MUTE,
105 PURPLE_MEDIA_INFO_UNMUTE, 105 PURPLE_MEDIA_INFO_UNMUTE,
106 PURPLE_MEDIA_INFO_PAUSE, 106 PURPLE_MEDIA_INFO_PAUSE,
107 PURPLE_MEDIA_INFO_UNPAUSE, 107 PURPLE_MEDIA_INFO_UNPAUSE,
108 PURPLE_MEDIA_INFO_HOLD, 108 PURPLE_MEDIA_INFO_HOLD,
109 PURPLE_MEDIA_INFO_UNHOLD, 109 PURPLE_MEDIA_INFO_UNHOLD
110 } PurpleMediaInfoType; 110 } PurpleMediaInfoType;
111 111
112 typedef enum { 112 typedef enum {
113 PURPLE_MEDIA_CANDIDATE_TYPE_HOST, 113 PURPLE_MEDIA_CANDIDATE_TYPE_HOST,
114 PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX, 114 PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX,
115 PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX, 115 PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX,
116 PURPLE_MEDIA_CANDIDATE_TYPE_RELAY, 116 PURPLE_MEDIA_CANDIDATE_TYPE_RELAY,
117 PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST, 117 PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST
118 } PurpleMediaCandidateType; 118 } PurpleMediaCandidateType;
119 119
120 typedef enum { 120 typedef enum {
121 PURPLE_MEDIA_COMPONENT_NONE = 0, 121 PURPLE_MEDIA_COMPONENT_NONE = 0,
122 PURPLE_MEDIA_COMPONENT_RTP = 1, 122 PURPLE_MEDIA_COMPONENT_RTP = 1,
123 PURPLE_MEDIA_COMPONENT_RTCP = 2, 123 PURPLE_MEDIA_COMPONENT_RTCP = 2
124 } PurpleMediaComponentType; 124 } PurpleMediaComponentType;
125 125
126 typedef enum { 126 typedef enum {
127 PURPLE_MEDIA_NETWORK_PROTOCOL_UDP, 127 PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
128 PURPLE_MEDIA_NETWORK_PROTOCOL_TCP, 128 PURPLE_MEDIA_NETWORK_PROTOCOL_TCP
129 } PurpleMediaNetworkProtocol; 129 } PurpleMediaNetworkProtocol;
130 130
131 #include "signals.h" 131 #include "signals.h"
132 #include "util.h" 132 #include "util.h"
133 133