From 22e28216336da876e1fd17f380ce42eaf1446769 Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Mon, 17 Feb 2014 13:36:38 +0000
Subject: chasing indexing error

---
 rotord/src/rotor.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'rotord/src/rotor.h')

diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h
index 0053146..08d8734 100644
--- a/rotord/src/rotor.h
+++ b/rotord/src/rotor.h
@@ -796,7 +796,7 @@ namespace Rotor {
 				if (h>0&&h<721){
 					Poco::Path path(filename);
 					std::string stub(path.getBaseName()+".proxies/");
-					std::string suffix="mp4"; //(path.getExtension());
+					std::string suffix="mp4"; //(path.getExtension()); -always have to use mp4 incase of file with no suffix
 					std::string pathto="/";
 					for (int i=0;i<path.depth();i++){
 						pathto=pathto+path[i]+"/";
@@ -854,8 +854,8 @@ namespace Rotor {
 							Poco::Logger& logger = Poco::Logger::get(Log_name);
 							logger.error("Video_loader failed to seek frame "+toString(wanted)+" of "+attributes["filename"]->value);
 
-							if (image.w>0) return &image; //just return the previous frame if possible
-							else return nullptr;
+							if (image.w>0) return true; //just return the previous frame if possible
+							else return false;
 						}
 						image.setup_fromRGB(frame.w,frame.h,player.frame->Data[0],player.frame->Linesize[0]-(frame.w*3));
 					}
@@ -930,7 +930,7 @@ namespace Rotor {
 				if (!isLoaded&&isLoadable){
 					isLoaded=load(media_path+attributes["filename"]->value,frame.h);
 				}
-				Base_video::output(frame);
+				return Base_video::output(frame);
 			}
 			//void init_attribute(const string &attr){
 			//	if (attr=="filename") {
-- 
cgit v1.2.3