# HG changeset patch
# User Chris Cannam
# Date 1241777387 0
# Node ID cbc884787a0870c3ed27730e5c9fd19564da5ceb
# Parent  bf1f6d68a142ab7597e1c144037dad4fe9dad58b
* If we have track metadata, write it out in a separate mo:Track associated
  with this audio file instead of incorrectly associating it with the Signal.
  Also, make the audio file encode the signal instead of having the signal
  "available_as" the audio file (apparently available_as is not in the domain
  of signals).

diff -r bf1f6d68a142 -r cbc884787a08 rdf/RDFFeatureWriter.cpp
--- a/rdf/RDFFeatureWriter.cpp	Fri May 08 09:48:07 2009 +0000
+++ b/rdf/RDFFeatureWriter.cpp	Fri May 08 10:09:47 2009 +0000
@@ -252,42 +252,60 @@
     if (m_trackSignalURIs.find(trackId) == m_trackSignalURIs.end()) {
         m_trackSignalURIs[trackId] = QString(":signal_%1").arg(signalCount);
     }
-    
+
     if (m_suri != NULL) {
         m_trackSignalURIs[trackId] = "<" + m_suri + ">";
     }
     QString signalURI = m_trackSignalURIs[trackId];
    
+    if (m_trackTrackURIs.find(trackId) == m_trackTrackURIs.end()) {
+        m_trackTrackURIs[trackId] = QString(":track_%1").arg(signalCount);
+    }
+    QString trackURI = m_trackTrackURIs[trackId];
+    
     if (m_trackTimelineURIs.find(trackId) == m_trackTimelineURIs.end()) {
         m_trackTimelineURIs[trackId] = QString(":signal_timeline_%1").arg(signalCount);
     }
     QString timelineURI = m_trackTimelineURIs[trackId];
 
+    if (m_metadata.find(trackId) != m_metadata.end()) {
+        TrackMetadata tm = m_metadata[trackId];
+        if (tm.title != "" || tm.maker != "") {
+            // We only write a Track at all if we have some
+            // title/artist metadata to put in it.  Otherwise we can't
+            // be sure that what we have is a Track, in the
+            // publication sense -- it may just be a fragment, a test
+            // file, whatever.  Since we'd have no metadata to
+            // associate with our Track, the only effect of including
+            // a Track would be to assert that this was one, which is
+            // the one thing we wouldn't know...
+            stream << trackURI << " a mo:Track ";
+            if (tm.title != "") {
+                stream << ";\n    dc:title \"\"\"" << tm.title << "\"\"\" ";
+            }
+            if (tm.maker != "") {
+                stream << ";\n    foaf:maker [ a mo:MusicArtist; foaf:name \"\"\"" << tm.maker << "\"\"\" ] ";
+            }
+            if (trackId != "") {
+                stream << ";\n    mo:available_as <" << url.toEncoded().data() << "> ";
+            }
+            stream << ".\n\n";
+        }
+    }
+
     if (trackId != "") {
-        stream << "\n<" << url.toEncoded().data() << "> a mo:AudioFile .\n\n";
+        stream << "<" << url.toEncoded().data() << "> a mo:AudioFile ;\n";
+        stream << "    mo:encodes " << signalURI << ".\n\n";
     }
 
     stream << signalURI << " a mo:Signal ;\n";
 
-    if (trackId != "") {
-        stream << "    mo:available_as <" << url.toEncoded().data()
-               << "> ;\n";
-    }
-
-    if (m_metadata.find(trackId) != m_metadata.end()) {
-        TrackMetadata tm = m_metadata[trackId];
-        if (tm.title != "") {
-            stream << "    dc:title \"\"\"" << tm.title << "\"\"\" ;\n";
-        }
-        if (tm.maker != "") {
-            stream << "    foaf:maker [ a mo:MusicArtist; foaf:name \"\"\"" << tm.maker << "\"\"\" ] ;\n";
-        }
-    }
-
     stream << "    mo:time [\n"
            << "        a tl:Interval ;\n"
            << "        tl:onTimeLine "
            << timelineURI << "\n    ] .\n\n";
+
+    stream << timelineURI << " a tl:Timeline .\n";
 } 
 
 void
diff -r bf1f6d68a142 -r cbc884787a08 rdf/RDFFeatureWriter.h
--- a/rdf/RDFFeatureWriter.h	Fri May 08 09:48:07 2009 +0000
+++ b/rdf/RDFFeatureWriter.h	Fri May 08 10:09:47 2009 +0000
@@ -101,6 +101,7 @@
 
     map<QTextStream *, set<Transform> > m_startedStreamTransforms;
 
+    map<QString, QString> m_trackTrackURIs;
     map<QString, QString> m_trackTimelineURIs;
     map<QString, QString> m_trackSignalURIs;