Merge branch 'master' into playlists

4 files changed, 36 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index d469f20..867ea6f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,14 @@
 all:
 
-GIT = git
-GZIP = gzip
-TAR = tar
-XSLTPROC = xsltproc --xinclude --nonet
-CANONXML = xmllint --nsclean --noblanks --c14n --nonet
+INSTALL ?= install
+XSLTPROC ?= xsltproc
+PYTHON ?= python
+XMLLINT ?= xmllint
+EGREP ?= egrep
+
+XSLTPROCCMD = $(XSLTPROC) --xinclude --nonet
 XML_LINEBREAKS = perl -pe 's/>/>\n/g'
 DROP_NAMESPACE = perl -pe '$$hash = chr(35); s{xmlns:tp="http://telepathy\.freedesktop\.org/wiki/DbusSpec$${hash}extensions-v0"}{}g'
-PYTHON = python
 
 XMLS = $(wildcard spec/*.xml)
 TEMPLATES = $(wildcard doc/templates/*)
@@ -16,8 +17,8 @@ INTROSPECT = $(INTERFACE_XMLS:spec/%.xml=introspect/%.xml)
 CANONICAL_NAMES = $(INTERFACE_XMLS:spec/%.xml=tmp/%.name)
 
 $(CANONICAL_NAMES): tmp/%.name: spec/%.xml tools/extract-nodename.py
-	@install -d tmp
-	python tools/extract-nodename.py $< > $@
+	@$(INSTALL) -d tmp
+	$(PYTHON) tools/extract-nodename.py $< > $@
 	tr a-z A-Z < $@ > $@.upper
 	tr A-Z a-z < $@ > $@.lower
 	tr -d _ < $@ > $@.camel
@@ -32,13 +33,13 @@ doc/spec.html: doc/templates/oldspec.html
 	cp $< $@
 
 doc/spec/index.html: $(XMLS) tools/doc-generator.py tools/specparser.py $(TEMPLATES)
-	@install -d doc
+	@$(INSTALL) -d doc
 	$(PYTHON) tools/doc-generator.py spec/all.xml doc/spec/ mpris-spec \
 		org.mpris
 
 $(INTROSPECT): introspect/%.xml: spec/%.xml tools/spec-to-introspect.xsl
-	@install -d introspect
-	$(XSLTPROC) tools/spec-to-introspect.xsl $< | $(DROP_NAMESPACE) > $@
+	@$(INSTALL) -d introspect
+	$(XSLTPROCCMD) tools/spec-to-introspect.xsl $< | $(DROP_NAMESPACE) > $@
 
 all: $(GENERATED_FILES)
 	@echo "Your spec HTML starts at:"
@@ -48,7 +49,7 @@ all: $(GENERATED_FILES)
 
 FIXME.out: $(XMLS)
 	@echo '  GEN   ' $@
-	@egrep -A 5 '[F]IXME|[T]ODO|[X]XX' $(XMLS) \
+	@$(EGREP) -A 5 '[F]IXME|[T]ODO|[X]XX' $(XMLS) \
 		> FIXME.out || true
 
 clean:
@@ -57,4 +58,5 @@ clean:
 	rm -fr introspect
 	rm -rf tmp
 	rm -rf doc/spec
+	rm -rf tools/*.pyc
 
diff --git a/spec/Player_Node.xml b/spec/Player_Node.xml
index 41d5398..4daa00c 100644
--- a/spec/Player_Node.xml
+++ b/spec/Player_Node.xml
@@ -429,6 +429,7 @@
     </property>
 
     <property name="Volume" type="d" tp:type="Volume" tp:name-for-bindings="Volume" access="readwrite">
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true" />
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The volume level.</p>
         <p>
@@ -440,6 +441,11 @@
           <strong>false</strong>, attempting to set this property should have
           no effect and raise an error.
         </p>
+        <p>
+          When this property changes, the
+          <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
+          signal is emited with the new value.
+        </p>
       </tp:docstring>
     </property>
 
diff --git a/spec/TrackList_Node.xml b/spec/TrackList_Node.xml
index 988dd24..82079b4 100644
--- a/spec/TrackList_Node.xml
+++ b/spec/TrackList_Node.xml
@@ -5,7 +5,11 @@
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>
         Provides access to a short list of tracks which were recently played or
-        will be played shortly.
+        will be played shortly.  This is intended to provide context to the
+        currently-playing track, rather than giving complete access to the
+        media player's playlist.
+      </p>
+      <p>
         Example use cases are the list of tracks from the same album as the
         currently playing song or the
         <a href="http://projects.gnome.org/rhythmbox/">Rhythmbox</a> play queue.
diff --git a/spec/all.xml b/spec/all.xml
index 3717b24..3a5db5a 100644
--- a/spec/all.xml
+++ b/spec/all.xml
@@ -134,6 +134,17 @@
     </tp:docstring>
   </tp:section>
 
+  <tp:section name="Corrections">
+    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+      <ul>
+        <li>
+          2010-09-26: Added EmitsChangedSignal annotation to Volume property
+          on the Player interface.
+        </li>
+      </ul>
+    </tp:docstring>
+  </tp:section>
+
   <tp:section name="Interfaces">
     <xi:include href="Root_Node.xml" />
     <xi:include href="TrackList_Node.xml" />