changed to NODEID

12 files changed, 101 insertions, 65 deletions

diff --git a/rotord/src/graph.h b/rotord/src/graph.h
index 93cff05..a231c29 100644
--- a/rotord/src/graph.h
+++ b/rotord/src/graph.h
@@ -25,7 +25,7 @@ copy nodes `
 namespace Rotor {
 	class Graph{
 		public:
-			Graph(){duration=20.0f;loaded = false;audio_loaded=false;bitRate=25000;outW=640;outH=360;audio_thumb=new Audio_thumbnailer();use_fragmentation=false;analysis_seed=0;};
+			Graph(){duration=20.0f;loaded = false;audio_loaded=false;bitRate=0;outW=640;outH=360;audio_thumb=new Audio_thumbnailer();use_fragmentation=false;analysis_seed=0;};
 			Graph(const string& _uid,const string& _desc){
 				Graph();
 				init(_uid,_desc);
diff --git a/rotord/src/libavwrapper.cpp b/rotord/src/libavwrapper.cpp
index e70fddc..225d01e 100644
--- a/rotord/src/libavwrapper.cpp
+++ b/rotord/src/libavwrapper.cpp
@@ -207,15 +207,16 @@ bool libav::exporter::record(std::string filename){
     video_st->codec->gop_size = 75; /* emit one intra frame every 75 frames */
     video_st->codec->pix_fmt = PIX_FMT_YUV420P;
 
-    cerr<<"Libav::exporter setting bitrate to "<<bitRate<<endl;
+    if (bitRate){
+        cerr<<"Libav::exporter setting bitrate to "<<bitRate<<endl;
 
+        video_st->codec->bit_rate = bitRate; //need to deal with resolution etc
+        video_st->codec->rc_max_rate = bitRate; 
+        video_st->codec->rc_min_rate = 0; 
 
-    video_st->codec->bit_rate = bitRate; //need to deal with resolution etc
-    video_st->codec->rc_max_rate = bitRate; 
-    video_st->codec->rc_min_rate = 0; 
-
-    //added 131113
-    video_st->codec->rc_buffer_size = bitRate * 2;
+        //added 131113
+        video_st->codec->rc_buffer_size = bitRate * 2;
+    }
 
     //av_dict_set(&options, "profile", "baseline", 0);
     //video_st->codec->flags2 = CODEC_FLAG2_FASTPSKIP;
diff --git a/rotord/src/nodes_audio_analysis.h b/rotord/src/nodes_audio_analysis.h
index 4760962..5b0a9c8 100644
--- a/rotord/src/nodes_audio_analysis.h
+++ b/rotord/src/nodes_audio_analysis.h
@@ -102,7 +102,7 @@ namespace Rotor {
 					create_parameter("outputNo","number","Plugin output to use","Output number",0.0f);
 					//title="Audio analysis";
 					//description="Analyse audio and output";
-					UID="b769f54e-2d0b-11e3-87dd-f73fc7b1c636";
+					NODEID="b769f54e-2d0b-11e3-87dd-f73fc7b1c636";
 				};
 				Audio_analysis(map<string,string> &settings):Audio_analysis() {
 					base_settings(settings);
@@ -124,7 +124,7 @@ namespace Rotor {
 					create_parameter("outputNo","number","Plugin output to use","Output number",0.0f);
 					title="Audio analysis";
 					description="Analyse audio and output";
-					UID="b769f54e-2d0b-11e3-87dd-f73fc7b1c636";
+					NODEID="b769f54e-2d0b-11e3-87dd-f73fc7b1c636";
 					plugins.push_back(make_pair("qm-adaptivespectrogram","qm-vamp-plugins"));
 					plugins.push_back(make_pair("qm-barbeattracker","qm-vamp-plugins"));
 					plugins.push_back(make_pair("qm-chromagram","qm-vamp-plugins"));
@@ -164,7 +164,7 @@ namespace Rotor {
 				create_parameter("acts","number","Number of acts defined","Acts",1.0f);
 				title="Act manager";
 				description="Applies a ruleset to manage acts based on segments";
-				UID="c55359a2-2d0b-11e3-8a3d-53fa9c2b8859";
+				NODEID="c55359a2-2d0b-11e3-8a3d-53fa9c2b8859";
 			};
 			Act_segmenter(map<string,string> &settings):Act_segmenter() {
 				base_settings(settings);
@@ -282,7 +282,7 @@ namespace Rotor {
 			Intensity_segmenter(){
 				title="Intensity segmenter";
 				description="Combines the output of segmentation, tempo, and intensity analysis plugins";
-				UID="6ce236b6-4080-11e3-90b7-74d02b29f6a6";
+				NODEID="6ce236b6-4080-11e3-90b7-74d02b29f6a6";
 				analysers["segmenter"]=vampHost::Analyser();
 				analysers["tempo"]=vampHost::Analyser();
 				analysers["intensity"]=vampHost::Analyser();
diff --git a/rotord/src/nodes_channels.h b/rotord/src/nodes_channels.h
index d58c97c..faab712 100644
--- a/rotord/src/nodes_channels.h
+++ b/rotord/src/nodes_channels.h
@@ -11,7 +11,7 @@ namespace Rotor {
 				create_parameter("invert","number","Invert when greater than 0.0","Negative",1.0f,0.0f,1.0f);
 				title="Negative";
 				description="Inverts the input picture";
-				UID="8676c25c-2d09-11e3-80a7-db36c774523c";
+				NODEID="8676c25c-2d09-11e3-80a7-db36c774523c";
 			};
 			Invert(map<string,string> &settings) :Invert() {
 				base_settings(settings);
@@ -39,7 +39,7 @@ namespace Rotor {
 				create_image_input("image input","Image input");
 				title="Monochrome";
 				description="Render video greyscale";
-				UID="2c3cb12e-2d0a-11e3-a46b-a34e44493cef";
+				NODEID="2c3cb12e-2d0a-11e3-a46b-a34e44493cef";
 			};
 			Monochrome(map<string,string> &settings):Monochrome() {
 				base_settings(settings);
@@ -79,7 +79,7 @@ namespace Rotor {
 				create_attribute("mode","Blend mode","Blend mode","blend",{"blend","screen","multiply","alpha","wrap","xor","overlay"});
 				title ="Blend";
 				description="Blend images in various modes";
-				UID="12ed7af0-2d0a-11e3-ae32-2b44203b93c9";
+				NODEID="12ed7af0-2d0a-11e3-ae32-2b44203b93c9";
 			};
 			Blend(map<string,string> &settings):Blend() {
 				base_settings(settings);
@@ -148,7 +148,7 @@ namespace Rotor {
 				create_attribute("operator","operator for image","Operator","+",{"+","-","*","/"});
 				title="Image arithmetic";
 				description="Performs arithmetic on an image with a signal or value";
-				UID="bc3b633e-2d09-11e3-86b2-7fbba3d71604";
+				NODEID="bc3b633e-2d09-11e3-86b2-7fbba3d71604";
 			};
 			Image_arithmetic(map<string,string> &settings):Image_arithmetic() {
 				base_settings(settings);
@@ -188,7 +188,7 @@ namespace Rotor {
 				create_image_input("alpha input","Alpha input");
 				title="Alpha merge";
 				description="Alpha merge two images";
-				UID="3f5e3eee-2d0a-11e3-8679-1374154a9fa8";
+				NODEID="3f5e3eee-2d0a-11e3-8679-1374154a9fa8";
 			};
 			Alpha_merge(map<string,string> &settings):Alpha_merge() {
 				base_settings(settings);
@@ -227,7 +227,7 @@ namespace Rotor {
 				title="Difference matte";
 				description="Create an alpha channel using a background reference picture";
 				LUT=nullptr;
-				UID="4db4d2c8-2d0a-11e3-b08b-7fb00f8c562a";
+				NODEID="4db4d2c8-2d0a-11e3-b08b-7fb00f8c562a";
 			};
 			Difference_matte(map<string,string> &settings):Difference_matte() {
 				base_settings(settings);
@@ -346,7 +346,7 @@ namespace Rotor {
 				title="Luma levels";
 				description="Remap luma values of image";
 				LUT=nullptr;
-				UID="4e500576-2d0b-11e3-b234-cf74b6a122e4";
+				NODEID="4e500576-2d0b-11e3-b234-cf74b6a122e4";
 			};
 			Luma_levels(map<string,string> &settings):Luma_levels() {
 				base_settings(settings);
@@ -415,7 +415,7 @@ namespace Rotor {
 				create_attribute("mode","blend mode for echoes","Blend mode","screen",{"screen","wrap"});
 				title="Echo trails";
 				description="Draw trail frames additively that fade off over time";
-				UID="5b1ab684-2d0b-11e3-8fa2-970be8c360dd";
+				NODEID="5b1ab684-2d0b-11e3-8fa2-970be8c360dd";
 				lastframe=-1;
 			};
 			Echo_trails(map<string,string> &settings):Echo_trails() {
@@ -520,7 +520,7 @@ namespace Rotor {
 				title="RGB levels";
 				description="Remap RGB values of image";
 				LUT=nullptr;
-				UID="68522cba-2d0b-11e3-8767-8f3c605e9bed";
+				NODEID="68522cba-2d0b-11e3-8767-8f3c605e9bed";
 			};
 			RGB_levels(map<string,string> &settings):RGB_levels() {
 				base_settings(settings);
diff --git a/rotord/src/nodes_drawing.h b/rotord/src/nodes_drawing.h
index de4270c..84c9122 100644
--- a/rotord/src/nodes_drawing.h
+++ b/rotord/src/nodes_drawing.h
@@ -58,30 +58,22 @@ namespace Rotor {
 		private:
 
 	};
-	class Text: public Draw_node {
+	class Text_base: public Draw_node {
 		public:
-			Text(){
-				title="Text";
-				description="Draws text";
-				create_attribute("text","Text to draw","Text","hello, world!");
+			Text_base(){
 				create_attribute("colour","Colour to fill","Colour","FFFFFF");
 				create_attribute("font","font to use","Font","Sans",{"Sans","Sans Mono","Serif"});
-				create_parameter("number","number","Number to draw","Number",-99999999.0f);
 				create_parameter("size","number","Point size of font","size",50.0f);
-				UID="7da93b94-2d0b-11e3-8940-77bce0f9d3e8";
+				NODEID="7da93b94-2d0b-11e3-8940-77bce0f9d3e8";
 			};
-			Text(map<string,string> &settings):Text() {
+			Text_base(map<string,string> &settings):Text_base() {
 				base_settings(settings);
 			};
-			~Text(){};
-			Text* clone(map<string,string> &_settings) { return new Text(_settings);};
+			~Text_base(){};
+			Text_base* clone(map<string,string> &_settings) { return new Text_base(_settings);};
 			void vector_output(cairo_t * cr,const Frame_spec &frame){
 				colour=Colour(attributes["colour"]->value);
-				string text;
-				if (parameters["number"]->value>-99999998.0f){
-					text=toString(parameters["number"]->value,4);
-				}
-				else text=attributes["text"]->value;
+				string text=select_text(frame);
 				cairo_text_extents_t te;
 				cairo_set_source_rgb(cr, colour.Rfloat(),colour.Gfloat(),colour.Bfloat());
 				cairo_select_font_face (cr, ("DejaVu "+attributes["font"]->value).c_str(),
@@ -92,6 +84,49 @@ namespace Rotor {
 				cairo_show_text (cr, text.c_str());
 				cairo_fill(cr);
 			}
+			virtual string select_text(const Frame_spec &frame){
+				return "hello, world!";
+			}
+		private:
+	};
+	class Text: public Text_base {
+		public:
+			Text(){
+				title="Text";
+				description="Draws text";
+				create_attribute("text","Text to draw","Text","hello, world!");
+				create_parameter("number","number","Number to draw","Number",-99999999.0f);
+				NODEID="fdea0b88-4de7-11e3-9235-74d02b29f6a6";
+			};
+			Text(map<string,string> &settings):Text() {
+				base_settings(settings);
+			};
+			~Text(){};
+			Text* clone(map<string,string> &_settings) { return new Text(_settings);};
+			string select_text(const Frame_spec &frame){
+				if (parameters["number"]->value>-99999998.0f){
+					return toString(parameters["number"]->value,4);
+				}
+				else return attributes["text"]->value;
+			}
+		private:
+	};
+	class Lyrics_text: public Text_base {
+		public:
+			Lyrics_text(){
+				title="Lyrics text";
+				description="Draws lyrics text";
+				create_attribute("lyrics","Lyrics to draw","Lyrics","hello, world!");
+				NODEID="ac4318b8-4de9-11e3-b2eb-74d02b29f6a6";
+			};
+			Lyrics_text(map<string,string> &settings):Lyrics_text() {
+				base_settings(settings);
+			};
+			~Lyrics_text(){};
+			Lyrics_text* clone(map<string,string> &_settings) { return new Lyrics_text(_settings);};
+			string select_text(const Frame_spec &frame){
+				return "Hello, world!";
+			}
 		private:
 	};
 #define SHAPE_circle 1
@@ -104,7 +139,7 @@ namespace Rotor {
 				description="Draws filled shapes";
 				create_attribute("shape","Shape to draw","Shape","square",{"circle","square","triangle"});
 				create_attribute("colour","Colour to fill","Colour","FFFFFF");
-				UID="88c30140-2d0b-11e3-8db2-679d596166c1";
+				NODEID="88c30140-2d0b-11e3-8db2-679d596166c1";
 			};
 			Shape(map<string,string> &settings):Shape() {
 				base_settings(settings);
@@ -169,7 +204,7 @@ namespace Rotor {
 			Waves(){
 				title="Waves";
 				description="Draws audio waveforms";
-				UID="4dd50c56-3b2d-11e3-8691-74d02b29f6a6";
+				NODEID="4dd50c56-3b2d-11e3-8691-74d02b29f6a6";
 				create_attribute("stroke","Colour of line stroke","Stroke","FFFFFF");
 				create_attribute("fill","Colour of line fill","Fill","11AA11");
 				create_attribute("mode","Drawing mode","Mode","line",{"line","fill","both"});
@@ -229,7 +264,7 @@ namespace Rotor {
 				title="SVG";
 				description="Draws svg files";
 				create_attribute("filename","SVG file to draw","Filename","");
-				UID="88c30140-2d0b-11e3-8db2-679d596166c1";
+				NODEID="88c30140-2d0b-11e3-8db2-679d596166c1";
 				rsvg=nullptr;
 				//g_type_init(); //does this have to be done only once?
 			};
diff --git a/rotord/src/nodes_filters.h b/rotord/src/nodes_filters.h
index 2c9cea1..a1e020a 100644
--- a/rotord/src/nodes_filters.h
+++ b/rotord/src/nodes_filters.h
@@ -11,7 +11,7 @@ namespace Rotor {
 				description="Gaussian blur filter";
 				create_parameter("size","number","Blur window size","Size",1.0f);
 				create_image_input("image input","Image input");
-				UID="3650f412-2d0b-11e3-b86b-a31ab5838db2";
+				NODEID="3650f412-2d0b-11e3-b86b-a31ab5838db2";
 			};
 			Blur(map<string,string> &settings):Blur() {
 				base_settings(settings);
@@ -39,7 +39,7 @@ namespace Rotor {
 				description="VHS degradation filter";
 				create_parameter("generation_loss","number","VHS generation loss amount","Generation loss",1.0f);
 				create_image_input("image input","Image input");
-				UID="3f62bdb0-2d0b-11e3-a4eb-a712839b837d";
+				NODEID="3f62bdb0-2d0b-11e3-a4eb-a712839b837d";
 			};
 			VHS(map<string,string> &settings):VHS() {
 				base_settings(settings);
diff --git a/rotord/src/nodes_maths.h b/rotord/src/nodes_maths.h
index 2696b2e..4c81f7b 100644
--- a/rotord/src/nodes_maths.h
+++ b/rotord/src/nodes_maths.h
@@ -23,7 +23,7 @@ namespace Rotor {
 				create_attribute("operator","Operator for comparison","operator","==",{"==","!=",">","<",">=","<="});
 				title="Comparison";
 				description="Compares the signal with a value or signal according to the operator";
-				UID="e568b918-2d0a-11e3-bc3b-8ff3658b7e6c";
+				NODEID="e568b918-2d0a-11e3-bc3b-8ff3658b7e6c";
 			};
 			Comparison(map<string,string> &settings):Comparison() {
 				base_settings(settings);
@@ -77,7 +77,7 @@ namespace Rotor {
 				create_attribute("operator","operator for image","Operator","+",{"+","-","*","/","%","^","sin","cos","ease","jolt","floor","2pow","reciprocal"});
 				title="Arithmetic";
 				description="Performs arithmetic on a signal with a signal or value";
-				UID="f35e5f82-2d0a-11e3-83d8-0fed336db813";
+				NODEID="f35e5f82-2d0a-11e3-83d8-0fed336db813";
 			};
 			Arithmetic(map<string,string> &settings):Arithmetic() {
 				base_settings(settings);
@@ -148,7 +148,7 @@ namespace Rotor {
 				title="New integer";
 				description="Outputs 1 on the frame that a signal becomes a new integer";
 				create_signal_input("signal","Signal");
-				UID="03320e0e-2d0b-11e3-93b2-5f9cfa67d27b";
+				NODEID="03320e0e-2d0b-11e3-93b2-5f9cfa67d27b";
 			};
 			Is_new_integer(map<string,string> &settings):Is_new_integer() {
 				base_settings(settings);
@@ -167,7 +167,7 @@ namespace Rotor {
 				title="On off";
 				description="Outputs 1 if the integer floor of the signal is even";
 				create_signal_input("signal","Signal");
-				UID="13c6e212-2d0b-11e3-a3c8-6ffea774de32";
+				NODEID="13c6e212-2d0b-11e3-a3c8-6ffea774de32";
 			};
 			On_off(map<string,string> &settings):On_off() {
 				base_settings(settings);
@@ -213,7 +213,7 @@ namespace Rotor {
 				description="Randomises integer part of signal (seedable)";
 				create_signal_input("signal","Signal");
 				create_parameter("seed","number","Seed value","Seed",1.0f);
-				UID="1de86932-2d0b-11e3-96d3-77aa4558e6cd";
+				NODEID="1de86932-2d0b-11e3-96d3-77aa4558e6cd";
 			};
 			Random(map<string,string> &settings):Random() {
 				base_settings(settings);
@@ -238,7 +238,7 @@ namespace Rotor {
 				create_parameter("octaves","number","Octaves of noise","octaves",6.0f);
 				create_parameter("frequency","number","Frequency of noise","frequency",1.0f);
 				create_parameter("scale","number","scale of noise","scale",1.0f);
-				UID="28b3c154-2d0b-11e3-bdf2-1b9b2678a2f6";
+				NODEID="28b3c154-2d0b-11e3-bdf2-1b9b2678a2f6";
 			};
 			Noise(map<string,string> &settings):Noise() {
 				base_settings(settings);
diff --git a/rotord/src/nodes_signals.h b/rotord/src/nodes_signals.h
index bcc2769..a351170 100644
--- a/rotord/src/nodes_signals.h
+++ b/rotord/src/nodes_signals.h
@@ -9,7 +9,7 @@ namespace Rotor {
 			Time(){
 				title="Time";
 				description="Outputs the time in seconds as a signal";
-				UID="432b0d1e-2d09-11e3-a8b9-e3affcfd2b31";
+				NODEID="432b0d1e-2d09-11e3-a8b9-e3affcfd2b31";
 			};
 			Time(map<string,string> &settings): Time() {
 				base_settings(settings);
@@ -24,7 +24,7 @@ namespace Rotor {
 			Track_time(){
 				title="Track time";
 				description="Outputs the fraction of the track as a signal";
-				UID="5892933e-2d09-11e3-8f2e-47c1defdb1d7";
+				NODEID="5892933e-2d09-11e3-8f2e-47c1defdb1d7";
 			};
 			Track_time(map<string,string> &settings): Track_time() {
 				base_settings(settings);
@@ -41,7 +41,7 @@ namespace Rotor {
 				create_parameter("time","number","Track time to evaluate","Time",0.0f);
 				title="@Track time";
 				description="Gets input from a different point in the track";
-				UID="6a3edb9c-2d09-11e3-975c-df9df6d19f0a";
+				NODEID="6a3edb9c-2d09-11e3-975c-df9df6d19f0a";
 			};
 			At_track_time(map<string,string> &settings): At_track_time() {
 				base_settings(settings);
@@ -58,7 +58,7 @@ namespace Rotor {
 				create_signal_input("signal","Signal Input");
 				title="Signal output";
 				description="Outputs a signal to xml for testing";
-				UID="74773190-2d09-11e3-ae26-7f2bb9af632c";
+				NODEID="74773190-2d09-11e3-ae26-7f2bb9af632c";
 			};
 			Signal_output(map<string,string> &settings): Signal_output() {
 				base_settings(settings);
diff --git a/rotord/src/nodes_source.h b/rotord/src/nodes_source.h
index 6928f05..7a699e3 100644
--- a/rotord/src/nodes_source.h
+++ b/rotord/src/nodes_source.h
@@ -11,7 +11,7 @@ namespace Rotor {
 				create_attribute("palette","palette list of web colours","Colour palette","000000");
 				title="Signal colour";
 				description="Cycles through a palette of background colours according to selector signal";
-				UID="a2183fe0-2d09-11e3-9a64-538ee2cf40bc";
+				NODEID="a2183fe0-2d09-11e3-9a64-538ee2cf40bc";
 			};
 			Signal_colour(map<string,string> &settings):Signal_colour() {
 				base_settings(settings);
@@ -48,7 +48,7 @@ namespace Rotor {
 				create_signal_input("Signal","Signal input");
 				title="Signal greyscale";
 				description="Renders signal level as greyscale background";
-				UID="ae91b8a0-2d09-11e3-aa7d-8b7f1ef1a439";
+				NODEID="ae91b8a0-2d09-11e3-aa7d-8b7f1ef1a439";
 			};
 			Signal_greyscale(map<string,string> &settings):Signal_greyscale() {
 				base_settings(settings);
diff --git a/rotord/src/nodes_transform.h b/rotord/src/nodes_transform.h
index 1b9834c..ea8f474 100644
--- a/rotord/src/nodes_transform.h
+++ b/rotord/src/nodes_transform.h
@@ -148,7 +148,7 @@ namespace Rotor {
 				create_image_input("image input","Image input");
 				title="Transform";
 				description="Apply 2D transformation";
-				UID="c798586c-2d0a-11e3-a736-6f81df06fd1b";
+				NODEID="c798586c-2d0a-11e3-a736-6f81df06fd1b";
 			};
 			Transform(map<string,string> &settings):Transform() {
 				base_settings(settings);
@@ -168,7 +168,7 @@ namespace Rotor {
 				create_attribute("media_id","media_id","media_id","media_id");
 				title="Still image";
 				description="Load a still image and apply 2D transformation";
-				UID="d464b0d6-2d0a-11e3-acb7-6be231762445";
+				NODEID="d464b0d6-2d0a-11e3-acb7-6be231762445";
 			};
 			Still_image(map<string,string> &settings):Still_image() {
 				base_settings(settings);
@@ -203,7 +203,7 @@ namespace Rotor {
 				create_attribute("mode","Mirror mode","Mirror mode","horiz",{"horiz","vert","horizR","vertR"});
 				title="Mirror";
 				description="Mirror video across a central axis";
-				UID="1fed5b26-2d0a-11e3-9901-4b5ea78a005d";
+				NODEID="1fed5b26-2d0a-11e3-9901-4b5ea78a005d";
 			};
 			Mirror(map<string,string> &settings):Mirror() {
 				base_settings(settings);
diff --git a/rotord/src/rotor.cpp b/rotord/src/rotor.cpp
index 0947a89..e9f8595 100644
--- a/rotord/src/rotor.cpp
+++ b/rotord/src/rotor.cpp
@@ -133,7 +133,7 @@ Json::Value Node_factory::list_node(Rotor::Node* _node){
 	if (dynamic_cast<Signal_node*> (_node)!=nullptr) node["output"]="signal";
 	if (dynamic_cast<Image_node*> (_node)!=nullptr) node["output"]="image";
 	node["description"]=_node->description;
-	node["UID"]=_node->UID;
+	node["NODEID"]=_node->NODEID;
 	if (_node->inputs.size()){
 		node["signal_inputs"]=Json::arrayValue;
 		for (auto& input: _node->inputs) {
@@ -202,7 +202,7 @@ void Node_factory::list_node(Rotor::Node* type,xmlIO XML,int i){
 		XML.addAttribute("node","inputs",type->duplicate_inputs?"expandable":"fixed",i);
 		XML.addAttribute("node","title",type->title,i);
 		XML.addAttribute("node","description",type->description,i);
-		XML.addAttribute("node","UID",type->UID,i);
+		XML.addAttribute("node","NODEID",type->NODEID,i);
 		if (dynamic_cast<Signal_node*> (type)!=nullptr) XML.addAttribute("node","output","signal",i);
 		if (dynamic_cast<Image_node*> (type)!=nullptr) XML.addAttribute("node","output","image",i);
 		XML.pushTag("node",i);
diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h
index 9d621e2..a2c33d2 100644
--- a/rotord/src/rotor.h
+++ b/rotord/src/rotor.h
@@ -271,7 +271,7 @@ namespace Rotor {
 			string description;
 			string type;
 			string ID;
-			string UID;
+			string NODEID;
 			string title;
 			bool duplicate_inputs;
 			string find_setting(map<string,string> &settings,string key,string def=""){ if (settings.find(key)!=settings.end()) return settings[key]; else return def;};
@@ -403,7 +403,7 @@ namespace Rotor {
 				title="Video cycler";
 				description="Cycles through video inputs according to selector signal";
 				duplicate_inputs=true;
-				UID="93dd9d76-2d09-11e3-9589-5bbbeea1b304";
+				NODEID="93dd9d76-2d09-11e3-9589-5bbbeea1b304";
 				segment=0;
 				segment_start=segment_end=0.0f;
 				prevseg=0;
@@ -566,7 +566,7 @@ namespace Rotor {
 				create_attribute("frame_mode","frame mode","Frame mode","frame",{"frame","blend"});
 				create_attribute("time_mode","time mode","Time mode","play",{"play","stretch"});
 				create_attribute("media_id","media_id","media_id","media_id"); //for rotorW
-				UID="e92255a0-447a-11e3-b0ce-3fc7ff4bdac9";
+				NODEID="e92255a0-447a-11e3-b0ce-3fc7ff4bdac9";
 				isLoaded=false;
 			};
 			bool load(const string &filename){
@@ -676,7 +676,7 @@ namespace Rotor {
 				//create_attribute("media_path","media_path","media_path","media_path"); //for rotorW? NO
 				title="Video loader";
 				description="Loads a video file";
-				UID="5b64b8ca-2d0a-11e3-92ed-4b7420b40040";
+				NODEID="5b64b8ca-2d0a-11e3-92ed-4b7420b40040";
 			};
 			Video_loader(map<string,string> &settings): Video_loader() {
 				base_settings(settings);
@@ -707,7 +707,7 @@ namespace Rotor {
 			//is there any way to re-use the parts which prepare frames
 			Video_bank(){
 				create_attribute("filenames","names of video files to load","File names","",{},"array");
-				UID="73616e66-4306-11e3-981e-74d02b29f6a6";
+				NODEID="73616e66-4306-11e3-981e-74d02b29f6a6";
 				title="Video bank";
 				description="Loads a banks of video files";
 				clip_loaded=-1;
@@ -816,7 +816,7 @@ namespace Rotor {
 				description="Output to video";
 				start_silence=start_peak=end_silence=end_peak=-1.0f;
 				silence_threshold=0.01f;
-				UID="693d2220-2d0a-11e3-9312-232908c3cc33";
+				NODEID="693d2220-2d0a-11e3-9312-232908c3cc33";
 			};
 			Video_output(map<string,string> &settings):Video_output() {
 				base_settings(settings);
@@ -888,7 +888,7 @@ namespace Rotor {
 				title="Video feedback";
 				description="Repeats output of the last frame";
 				feedback=nullptr;
-				UID="78edfa28-2d0a-11e3-86c7-9f266fabb10c";
+				NODEID="78edfa28-2d0a-11e3-86c7-9f266fabb10c";
 			};
 			Video_feedback(map<string,string> &settings):Video_feedback() {
 				base_settings(settings);