installer work

4 files changed, 62 insertions, 16 deletions

diff --git a/install_dependencies_linux.sh b/install_dependencies_linux.sh
index 3901fc9..3cd16f2 100755
--- a/install_dependencies_linux.sh
+++ b/install_dependencies_linux.sh
@@ -1,12 +1,12 @@
-sudo apt-get install subversion
-sudo apt-get install git git-core
+sudo apt-get -y install subversion
+sudo apt-get -y install git git-core
 mkdir deps
 cd deps
 
-sudo apt-get install libgpac-dev
+sudo apt-get -y install libgpac-dev
 
 
-sudo apt-get install yasm 
+sudo apt-get -y install yasm 
 
 git clone git://git.videolan.org/x264.git
 cd x264
@@ -15,7 +15,7 @@ make
 sudo make install
 cd ..
 
-sudo apt-get install nasm
+sudo apt-get -y install nasm
 
 wget http://downloads.xvid.org/downloads/xvidcore-1.2.1.tar.gz
 tar xvfz xvidcore-1.2.1.tar.gz
@@ -24,14 +24,14 @@ cd xvidcore/build/generic
 make
 sudo make install
 cd ../../../../
-rm -r deps
+sudo rm -r deps
 
 
-sudo apt-get install libxvidcore-dev libxfixes-dev
+sudo apt-get -y install libxvidcore-dev libxfixes-dev
 
-sudo apt-get install libfaac-dev libfaad-dev libschroedinger-dev libtheora-dev libvorbis-dev libxv-dev libxvmc-dev
+sudo apt-get -y install libfaac-dev libfaad-dev libschroedinger-dev libtheora-dev libvorbis-dev libxv-dev libxvmc-dev
 
-sudo apt-get install libmp3lame-dev
+sudo apt-get -y install libmp3lame-dev
 
 #svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg
 
@@ -49,11 +49,11 @@ cd ..
 LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 sudo ldconfig
-sudo apt-get install colorgcc
-sudo apt-get install g++
-sudo apt-get install libpoco-dev libvamp-hostsdk3 vamp-plugin-sdk libsndfile1-dev  
-sudo apt-get install libnoise0 libnoise-dev
+sudo apt-get -y install colorgcc
+sudo apt-get -y install g++
+sudo apt-get -y install libpoco-dev libvamp-hostsdk3 vamp-plugin-sdk libsndfile1-dev  
+sudo apt-get -y install libnoise0 libnoise-dev
 
-sudo apt-get install libopencv-dev libopencv-core-dev libopencv-highgui-dev
+sudo apt-get -y install libopencv-dev libopencv-core-dev libopencv-highgui-dev
 
-sudo apt-get install libjsoncpp0 libjsoncpp-dev
+sudo apt-get -y install libjsoncpp0 libjsoncpp-dev
diff --git a/rotord/src/graph.cpp b/rotord/src/graph.cpp
index 162232f..e67d6f3 100644
--- a/rotord/src/graph.cpp
+++ b/rotord/src/graph.cpp
@@ -33,6 +33,10 @@ bool Graph::signal_render(string &signal_xml,const float framerate) {
 	return false;
 }
 */
+bool Graph::preview(xmlIO &XML,int w,int h){
+	return true;
+}
+
 bool Graph::video_render(const string &output_filename,const string &audio_filename,const float framerate,float& progress) {
 	vector<Node*> loaders=find_nodes("video_loader");
 	for (auto i:loaders){
@@ -89,7 +93,7 @@ bool Graph::loadFile(string &filename,string media_path){
 }
 bool Graph::parseJson(string &data,string &media_path){
 	//cerr<<data<<endl;
-	cerr<<"Trying to load JSON"<<endl;
+	//cerr<<"Trying to load JSON"<<endl;
 	Json::Value root;   // will contains the root value after parsing.
 	Json::Reader reader;
 	bool parsingSuccessful = reader.parse( data, root );
diff --git a/rotord/src/rendercontext.cpp b/rotord/src/rendercontext.cpp
index 47ff9c1..77adc71 100644
--- a/rotord/src/rendercontext.cpp
+++ b/rotord/src/rendercontext.cpp
@@ -295,6 +295,47 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H
 				XML.addValue("error","Bad request");
 			}
 		}
+		else {
+			status=HTTPResponse::HTTP_BAD_REQUEST;
+			logger.error("ERROR: Bad request");
+			XML.addValue("error","Bad request");
+		}
+	}
+	if (command.commands[1]=="preview") {
+		if (command.method=="GET") {
+			if(state==IDLE){
+				//parse json to get preview spec, return XML? this is a mess
+				string preview_node=command.commands[2];
+				Json::Value root;   // will contains the root value after parsing.
+				Json::Reader reader;
+				if (reader.parse( command.body, root )) {
+					int frame=root["frame"].asInt();
+					int width=root["width"].asInt();
+					int height=root["height"].asInt();
+					string resolution=root["resolution"].asString();
+					cerr<<"preview: "<<frame<<" "<<width<<" "<<height<<" "<<resolution<<endl;
+					//if (graph.preview(XML,frame,resolution))
+					status=HTTPResponse::HTTP_OK;
+				}
+				else {
+				    std::cout  << "Failed to parse preview request\n"
+				               << reader.getFormattedErrorMessages();
+				    status=HTTPResponse::HTTP_BAD_REQUEST;
+					logger.error("ERROR: Bad preview request");
+					XML.addValue("error","Bad preview request");
+				}
+			}
+			else {
+				status=HTTPResponse::HTTP_BAD_REQUEST;
+				logger.error("ERROR: Session busy");
+				XML.addValue("error","Session busy");
+		    }
+		}
+		else {
+				status=HTTPResponse::HTTP_BAD_REQUEST;
+				logger.error("ERROR: Bad request");
+				XML.addValue("error","Bad request");
+			}
 	}
 	if (command.commands[1]=="render") {
 		if (command.method=="GET") {
diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h
index 616fb5d..85124ce 100755
--- a/rotord/src/rotor.h
+++ b/rotord/src/rotor.h
@@ -1213,6 +1213,7 @@ namespace Rotor {
 			bool parseXml(string media_path);
 			bool parseJson(string &data,string &media_path);
 			bool set_resolution(int w,int h);
+			bool preview(xmlIO &XML,int w,int h);
 			bool loaded;
 			float duration;
 			const string toString();