[Telepathy-commits] [telepathy-qt4/master] Added Stream-Engine to build system. It is currently needed by StreamEngine

[Stefan Eilers]

---
 TelepathyQt4/Prototype/Makefile.am       |   10 ++++++-
 TelepathyQt4/Prototype/all.xml           |    1 +
 TelepathyQt4/Prototype/stream-engine.xml |    9 ++++++
 spec/Stream_Engine.xml                   |   44 ++++++++++++++++++++++++++++++
 4 files changed, 63 insertions(+), 1 deletions(-)
 create mode 100644 TelepathyQt4/Prototype/stream-engine.xml
 create mode 100644 spec/Stream_Engine.xml

diff --git a/TelepathyQt4/Prototype/Makefile.am b/TelepathyQt4/Prototype/Makefile.am
index b2560d9..aa32f97 100644
--- a/TelepathyQt4/Prototype/Makefile.am
+++ b/TelepathyQt4/Prototype/Makefile.am
@@ -7,7 +7,8 @@ pkgconfig_DATA = TpQt4Prototype.pc
 
 EXTRA_DIST = \
     all.xml \
-    channel-handler.xml
+    channel-handler.xml \
+    stream-engine.xml
 
 lib_LTLIBRARIES = libtpqt4-prototype.la
 
@@ -33,6 +34,7 @@ libtpqt4_prototype_la_SOURCES = \
     PresenceManager.cpp \
     StreamedMediaChannel.cpp \
     cli-channel-handler.cpp \
+    cli-stream-engine.cpp \
     types.cpp
 
 nodist_libtpqt4_prototype_la_SOURCES = \
@@ -50,6 +52,8 @@ nodist_libtpqt4_prototype_la_SOURCES = \
     _gen/StreamedMediaChannel.h.moc \
     _gen/cli-channel-handler-body.hpp \
     _gen/cli-channel-handler.moc.hpp \
+    _gen/cli-stream-engine-body.hpp \
+    _gen/cli-stream-engine.moc.hpp \
     _gen/types-body.hpp
 
 protoinclude_HEADERS = \
@@ -76,6 +80,7 @@ protoclientinclude_HEADERS = \
 
 nodist_geninclude_HEADERS = \
     _gen/cli-channel-handler.h \
+    _gen/cli-stream-engine.h \
     _gen/constants.h \
     _gen/types.h
 
@@ -166,6 +171,9 @@ _gen/cli-%.h _gen/cli-%-body.hpp: _gen/spec-%.xml \
 		channel-handler) \
 			group='clientchannelhandler'; \
 			prettyinclude='ChannelHandler';; \
+		stream-engine) \
+			group='clientstreamengine'; \
+			prettyinclude='StreamEngine';; \
 	esac; \
 	$(PYTHON) $(top_srcdir)/tools/qt4-client-gen.py \
 		--group=$$group \
diff --git a/TelepathyQt4/Prototype/all.xml b/TelepathyQt4/Prototype/all.xml
index 011e479..a146300 100644
--- a/TelepathyQt4/Prototype/all.xml
+++ b/TelepathyQt4/Prototype/all.xml
@@ -5,5 +5,6 @@
   <tp:title>Prototype/transitional spec extensions</tp:title>
 
 <xi:include href="channel-handler.xml"/>
+<xi:include href="stream-engine.xml"/>
 
 </tp:spec>
diff --git a/TelepathyQt4/Prototype/stream-engine.xml b/TelepathyQt4/Prototype/stream-engine.xml
new file mode 100644
index 0000000..2217b98
--- /dev/null
+++ b/TelepathyQt4/Prototype/stream-engine.xml
@@ -0,0 +1,9 @@
+<tp:spec
+  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
+  xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<tp:title>Private stream engine interface</tp:title>
+
+<xi:include href="../../spec/Stream_Engine.xml"/>
+
+</tp:spec>
diff --git a/spec/Stream_Engine.xml b/spec/Stream_Engine.xml
new file mode 100644
index 0000000..0303a51
--- /dev/null
+++ b/spec/Stream_Engine.xml
@@ -0,0 +1,44 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/Stream_Engine">
+  <interface name="org.freedesktop.Telepathy.StreamEngine">
+    <method name="SetOutputVolume">
+      <arg direction="in" type="o" name="channel_path" />
+      <arg direction="in" type="u" name="stream_id" />
+      <arg direction="in" type="u" name="volume" />
+    </method>
+    <method name="MuteInput">
+      <arg direction="in" type="o" name="channel_path" />
+      <arg direction="in" type="u" name="stream_id" />
+      <arg direction="in" type="b" name="mute_state" />
+    </method>
+    <method name="MuteOutput">
+      <arg direction="in" type="o" name="channel_path" />
+      <arg direction="in" type="u" name="stream_id" />
+      <arg direction="in" type="b" name="mute_state" />
+    </method>
+    <method name="SetOutputWindow">
+      <arg direction="in" type="o" name="channel_path" />
+      <arg direction="in" type="u" name="stream_id" />
+      <arg direction="in" type="u" name="window" />
+    </method>
+    <method name="AddPreviewWindow">
+      <arg direction="in" type="u" name="window" />
+    </method>
+    <method name="RemovePreviewWindow">
+      <arg direction="in" type="u" name="window" />
+    </method>
+    <signal name="Receiving">
+      <arg type="o" name="channel_path" />
+      <arg type="u" name="stream_id" />
+      <arg type="b" name="state" />
+    </signal>
+    <signal name="StreamStateChanged">
+      <arg type="o" name="channel_path" />
+      <arg type="u" name="stream_id" />
+      <arg type="u" name="state" />
+      <arg type="u" name="direction" />
+    </signal>
+    <method name="Shutdown">
+    </method>
+  </interface>
+</node>
-- 
1.5.6.5