# HG changeset patch # User cannam # Date 1214394505 0 # Node ID d7dcc37161e6df9b5d579b71048e3ac0332958cc # Parent 2282b572c386bf031f5e24205dc649fd405e7cd5 * slightly more sensible placeholders; some minor textual changes diff -r 2282b572c386 -r d7dcc37161e6 examples/vamp-example-plugins.n3 --- a/examples/vamp-example-plugins.n3 Wed Jun 25 11:47:25 2008 +0000 +++ b/examples/vamp-example-plugins.n3 Wed Jun 25 11:48:25 2008 +0000 @@ -10,7 +10,7 @@ @prefix : <> . <> a vamp:PluginDescription ; - foaf:maker ; + foaf:maker ; foaf:maker ; foaf:primaryTopic . @@ -25,8 +25,8 @@ dc:title "Amplitude Follower" ; vamp:name "Amplitude Follower" ; dc:description "Track the amplitude of the audio signal" ; - foaf:maker [ foaf:name "Vamp SDK Example Plugins"] ; # FIXME could give plugin author's URI here - cc:license ; + foaf:maker [ foaf:name "Vamp SDK Example Plugins" ] ; # FIXME could give plugin author's URI here +# cc:license ; vamp:identifier "amplitudefollower" ; vamp:vamp_API_version vamp:api_version_1 ; owl:versionInfo "1" ; @@ -65,15 +65,15 @@ vamp:unit "V" ; vamp:bin_count 1 ; vamp:bin_names ( ""); - vamp:computes_feature_type ; - vamp:computes_event_type ; +# vamp:computes_feature_type ; +# vamp:computes_event_type ; . plugbase:percussiononsets a vamp:Plugin ; dc:title "Simple Percussion Onset Detector" ; vamp:name "Simple Percussion Onset Detector" ; dc:description "Detect percussive note onsets by identifying broadband energy rises" ; - foaf:maker [ foaf:name "Vamp SDK Example Plugins"] ; # FIXME could give plugin author's URI here - cc:license ; + foaf:maker [ foaf:name "Vamp SDK Example Plugins" ] ; # FIXME could give plugin author's URI here +# cc:license ; vamp:identifier "percussiononsets" ; vamp:vamp_API_version vamp:api_version_1 ; owl:versionInfo "2" ; @@ -115,8 +115,8 @@ vamp:bin_names (); vamp:sample_type vamp:VariableSampleRate ; vamp:sample_rate 44100 ; - vamp:computes_feature_type ; - vamp:computes_event_type ; +# vamp:computes_feature_type ; +# vamp:computes_event_type ; . plugbase:percussiononsets_output_detectionfunction a vamp:DenseOutput ; vamp:identifier "detectionfunction" ; @@ -128,15 +128,15 @@ vamp:quantize_step 1 ; vamp:bin_count 1 ; vamp:bin_names ( ""); - vamp:computes_feature_type ; - vamp:computes_event_type ; +# vamp:computes_feature_type ; +# vamp:computes_event_type ; . plugbase:spectralcentroid a vamp:Plugin ; dc:title "Spectral Centroid" ; vamp:name "Spectral Centroid" ; dc:description "Calculate the centroid frequency of the spectrum of the input signal" ; - foaf:maker [ foaf:name "Vamp SDK Example Plugins"] ; # FIXME could give plugin author's URI here - cc:license ; + foaf:maker [ foaf:name "Vamp SDK Example Plugins" ] ; # FIXME could give plugin author's URI here +# cc:license ; vamp:identifier "spectralcentroid" ; vamp:vamp_API_version vamp:api_version_1 ; owl:versionInfo "2" ; @@ -154,8 +154,8 @@ vamp:unit "Hz" ; vamp:bin_count 1 ; vamp:bin_names ( ""); - vamp:computes_feature_type ; - vamp:computes_event_type ; +# vamp:computes_feature_type ; +# vamp:computes_event_type ; . plugbase:spectralcentroid_output_linearcentroid a vamp:DenseOutput ; vamp:identifier "linearcentroid" ; @@ -165,15 +165,15 @@ vamp:unit "Hz" ; vamp:bin_count 1 ; vamp:bin_names ( ""); - vamp:computes_feature_type ; - vamp:computes_event_type ; +# vamp:computes_feature_type ; +# vamp:computes_event_type ; . plugbase:zerocrossing a vamp:Plugin ; dc:title "Zero Crossings" ; vamp:name "Zero Crossings" ; dc:description "Detect and count zero crossing points" ; - foaf:maker [ foaf:name "Vamp SDK Example Plugins"] ; # FIXME could give plugin author's URI here - cc:license ; + foaf:maker [ foaf:name "Vamp SDK Example Plugins" ] ; # FIXME could give plugin author's URI here +# cc:license ; vamp:identifier "zerocrossing" ; vamp:vamp_API_version vamp:api_version_1 ; owl:versionInfo "2" ; @@ -193,8 +193,8 @@ vamp:quantize_step 1 ; vamp:bin_count 1 ; vamp:bin_names ( ""); - vamp:computes_feature_type ; - vamp:computes_event_type ; +# vamp:computes_feature_type ; +# vamp:computes_event_type ; . plugbase:zerocrossing_output_zerocrossings a vamp:SparseOutput ; vamp:identifier "zerocrossings" ; @@ -208,7 +208,7 @@ vamp:bin_names (); vamp:sample_type vamp:VariableSampleRate ; vamp:sample_rate 44100 ; - vamp:computes_feature_type ; - vamp:computes_event_type ; +# vamp:computes_feature_type ; +# vamp:computes_event_type ; . diff -r 2282b572c386 -r d7dcc37161e6 rdf/generator/template-generator.cpp --- a/rdf/generator/template-generator.cpp Wed Jun 25 11:47:25 2008 +0000 +++ b/rdf/generator/template-generator.cpp Wed Jun 25 11:48:25 2008 +0000 @@ -94,8 +94,8 @@ dc:title \""+plugin->getName()+"\" ;\n\ vamp:name \""+plugin->getName()+"\" ;\n\ dc:description \""+plugin->getDescription()+"\" ;\n\ - foaf:maker [ foaf:name \""+plugin->getMaker()+"\"] ; # FIXME could give plugin author's URI here\n\ - cc:license ; \n\ + foaf:maker [ foaf:name \""+plugin->getMaker()+"\" ] ; # FIXME could give plugin author's URI here\n\ +# cc:license ; \n\ vamp:identifier \""+plugin->getIdentifier()+"\" ;\n\ vamp:vamp_API_version vamp:api_version_"+to_string(plugin->getVampApiVersion())+" ;\n\ owl:versionInfo \""+to_string(plugin->getPluginVersion())+"\" ;\n"; @@ -293,8 +293,8 @@ } //There is no way to know this in advance, but we can use the km a bit for this. - res+=" vamp:computes_feature_type ;\n"; - res+=" vamp:computes_event_type ;\n"; + res+="# vamp:computes_feature_type ;\n"; + res+="# vamp:computes_event_type ;\n"; res+=" .\n"; return res; diff -r 2282b572c386 -r d7dcc37161e6 rdf/vamp.n3 --- a/rdf/vamp.n3 Wed Jun 25 11:47:25 2008 +0000 +++ b/rdf/vamp.n3 Wed Jun 25 11:48:25 2008 +0000 @@ -142,7 +142,7 @@ vamp:TrackLevelOutput a owl:Class; - rdfs:label "track level output"; + rdfs:label "Track level output"; rdfs:subClassOf vamp:PluginOutput; rdfs:comment """ Specific output type for track level information. The Vamp API does not provide for this sort of output directly, so this will require a "hacky" interpretation of the feature timestamp to establish that it reflects track metadata instead of temporal data. @@ -200,7 +200,7 @@ ## be included in the domain of vamp:output because transforms need to ## be able to specify an output as well as a plugin. -##!!! lacking plugin version? +##!!! lacking plugin version? (in transform) vamp:parameter a rdf:Property;