summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author <robert.mcqueen@collabora.co.uk>2006-04-09 10:19:49 +0000
committer <robert.mcqueen@collabora.co.uk>2006-04-09 10:19:49 +0000
commitc53d5c387b68a99bf5598e604b8905d25503fa5d (patch)
tree38c564b237ed72f8313122b0a7e9371848482aef
parentb54f177978fa29005d6a9157d2f16468c38d6701 (diff)
cleanups to new StreamedMedia interfaces/docs
-rw-r--r--telepathy/server/channel.py24
1 files changed, 18 insertions, 6 deletions
diff --git a/telepathy/server/channel.py b/telepathy/server/channel.py
index 469af8c..8b80783 100644
--- a/telepathy/server/channel.py
+++ b/telepathy/server/channel.py
@@ -314,8 +314,9 @@ class ChannelTypeStreamedMedia(Channel):
"""
Returns an array of structs of contact handles, stream identifiers
accompanying stream types and the current state of the stream.
- Stream identifiers are unsigned interegers and are unique for
+ Stream identifiers are unsigned integers and are unique for
each contact.
+
Stream types are identified by the following values:
MEDIA_STREAM_TYPE_AUDIO = 0
MEDIA_STREAM_TYPE_VIDEO = 1
@@ -330,14 +331,16 @@ class ChannelTypeStreamedMedia(Channel):
@dbus.service.signal(CHANNEL_TYPE_STREAMED_MEDIA, signature='uuu')
def StreamStateChanged(self, contact_handle, stream_id, stream_state):
"""
- Signal emitted when a memeber's stream's state changes.
- stream_id is as returned in GetStreams
- stream_state is as defined in GetStreams
+ Signal emitted when a memeber's stream's state changes, as defined
+ in GetStreams
+
+ Parameters:
+ stream_id - stream ID as returned by GetStreams
+ stream_state - new stream state
"""
pass
-
class MediaSessionHandler(dbus.service.Object):
"""
A media session handler is an object that handles a number of synchronised
@@ -523,7 +526,16 @@ class MediaStreamHandler(dbus.service.Object):
"""
Inform the connection manager of the current codec choice.
"""
- pass
+ pass
+
+ @dbus.service.method(MEDIA_STREAM_HANDLER, in_signature='u',
+ out_signature='')
+ def StreamState(self, state):
+ """
+ Informs the connection manager of the stream's current state
+ State is as specified in ChannelTypeStreamedMedia::GetStreams.
+ """
+ pass
@dbus.service.method(MEDIA_STREAM_HANDLER, in_signature='a(usuuua{ss})',
out_signature='')