diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-03-06 13:00:59 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-03-06 13:00:59 +0000 |
| commit | ac59c996e3648c7dace684e55fb956cb375c2e27 (patch) | |
| tree | 9241d506fd5dcd0368da74a67f007326a56ad2da | |
| parent | d2974b4b57d51c32698d9aec8ef39ac04b2cdf7c (diff) | |
Fix conflict: whitespace vs addition of Media_Session_Type, Media_Session_Handler_Info
| -rw-r--r-- | spec/Channel_Interface_Media_Signalling.xml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/spec/Channel_Interface_Media_Signalling.xml b/spec/Channel_Interface_Media_Signalling.xml index 36f0ccf5..cc7a7a95 100644 --- a/spec/Channel_Interface_Media_Signalling.xml +++ b/spec/Channel_Interface_Media_Signalling.xml @@ -21,6 +21,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <interface name="org.freedesktop.Telepathy.Channel.Interface.MediaSignalling"> <tp:requires interface="org.freedesktop.Telepathy.Channel"/> <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.StreamedMedia"/> + + <tp:simple-type name="Media_Session_Type" type="s"> + <tp:docstring>The type of a media session. Currently, the only supported + value is "rtp".</tp:docstring> + </tp:simple-type> + + <tp:struct name="Media_Session_Handler_Info" + array-name="Media_Session_Handler_Info_List"> + <tp:docstring>A struct representing a active session handler.</tp:docstring> + <tp:member type="o" name="Session_Handler"> + <tp:docstring>The object path of the session handler, which is on the + same bus name as the channel.</tp:docstring> + </tp:member> + <tp:member type="s" tp:type="Media_Session_Type" name="Media_Session_Type"> + <tp:docstring>The media session's type</tp:docstring> + </tp:member> + </tp:struct> + <method name="GetSessionHandlers"> <arg direction="out" type="a(os)" tp:type="Media_Session_Handler_Info[]"/> <tp:docstring> |