summaryrefslogtreecommitdiff
path: root/rotord/src
diff options
context:
space:
mode:
authorComment <tim@gray.(none)>2013-11-05 22:33:22 +0000
committerComment <tim@gray.(none)>2013-11-05 22:33:22 +0000
commit18a77356a424511e7ae1865d1554d20b4b5c51fb (patch)
tree15209fc88f1b8fd4fe2ced01ac804772c8f0a43b /rotord/src
parent9462492cae4d94157538f353d67f2f6daaa45259 (diff)
clean up compiler warnings
Diffstat (limited to 'rotord/src')
-rw-r--r--rotord/src/graph.cpp32
-rw-r--r--rotord/src/graph.h1
-rw-r--r--rotord/src/libavwrapper.cpp14
-rw-r--r--rotord/src/libavwrapper.h11
-rw-r--r--rotord/src/nodes_audio_analysis.cpp7
-rw-r--r--rotord/src/nodes_audio_analysis.h10
-rw-r--r--rotord/src/nodes_channels.h4
-rw-r--r--rotord/src/nodes_source.h2
-rw-r--r--rotord/src/nodes_transform.h2
-rw-r--r--rotord/src/rendercontext.cpp2
-rw-r--r--rotord/src/rotor.cpp2
-rw-r--r--rotord/src/rotor.h37
-rw-r--r--rotord/src/rotord.h2
-rw-r--r--rotord/src/vampHost.cpp4
-rw-r--r--rotord/src/xmlIO.cpp2
15 files changed, 54 insertions, 78 deletions
diff --git a/rotord/src/graph.cpp b/rotord/src/graph.cpp
index 23e2c93..e34ddec 100644
--- a/rotord/src/graph.cpp
+++ b/rotord/src/graph.cpp
@@ -70,12 +70,12 @@ bool Graph::preview(xmlIO &XML,string &node,string &_format,int frame,int w,int
if (dynamic_cast<Image_node*>(nodes[node])){
Frame_spec fs=Frame_spec(t,framerate,0.0f,w,h);
Image *img=dynamic_cast<Image_node*>(nodes[node])->get_image_output(fs);
- vector<uchar> buf;
+ vector<unsigned char> buf;
string format=(_format==""?".png":_format);
if (cv::imencode(format,img->rgb,buf)){ //, const vector<int>& params=vector<int>())
stringstream output;
Poco::Base64Encoder *enc=new Poco::Base64Encoder(output);
- enc->write(buf.data(),buf.size());
+ enc->write((char*)buf.data(),buf.size());
enc->close();
delete enc;
XML.addValue("image",output.str());
@@ -113,7 +113,6 @@ bool Graph::video_render(const string &output_filename,const float framerate,int
//
//setup defaults
- AVCodecID codecId=AV_CODEC_ID_H264; //MPEG4;
std::string container;
Poco::StringTokenizer t(output_filename,".");
if (t.count()>1){
@@ -124,7 +123,6 @@ bool Graph::video_render(const string &output_filename,const float framerate,int
//at the moment it crashes if you render before audio is loaded and also on 2nd render
libav::exporter exporter;
- float spct=100.0f/duration;
Image* i;
if (exporter.setup(outW,outH,bitRate,framerate,container,use_fragmentation)) { //codecId,
@@ -133,8 +131,7 @@ bool Graph::video_render(const string &output_filename,const float framerate,int
libav::audio_decoder audioloader;
bool usingaudio=audioloader.open(audio_filename);
- float *avframe=nullptr;
-
+
Logger& logger = Logger::get("Rotor");
logger.information("Video_output rendering "+output_filename+": "+toString(duration)+" seconds at "+toString(framerate)+" fps, audio frame size: "+toString(exporter.get_audio_framesize()));
//25fps video and 43.06640625fps audio? hmm
@@ -157,7 +154,6 @@ bool Graph::video_render(const string &output_filename,const float framerate,int
}
float vstep=1.0f/framerate;
- float v=0.0f;
float vf=start*vstep;
float af=start*vstep;
int aoffs=0;
@@ -317,7 +313,7 @@ bool Graph::parseJson(string &data,string &media_path){
check_audio(root["audio"].asString(),media_path);
init(root["ID"].asString(),root["description"].asString());
Json::Value jnodes = root["nodeDefinitions"];
- for ( int i = 0; i < jnodes.size(); ++i ) {
+ for ( uint32_t i = 0; i < jnodes.size(); ++i ) {
string nodeID=jnodes[i]["id"].asString();
//cerr<<"json found node: "<<jnodes[i]["type"].asString()<<endl;
map<string,string> settings;
@@ -326,7 +322,7 @@ bool Graph::parseJson(string &data,string &media_path){
//attributes
settings["media_path"]=media_path;
Node* node=factory.create(settings);
- for (int m=0;m<jnodes[i]["attributes"].size();m++){
+ for (uint32_t m=0;m<jnodes[i]["attributes"].size();m++){
string attribute=jnodes[i]["attributes"][m]["name"].asString();
if (node->attributes.find(attribute)!=node->attributes.end()){
Attribute *attr=node->attributes.find(attribute)->second;
@@ -337,7 +333,7 @@ bool Graph::parseJson(string &data,string &media_path){
else if (attr->type=="array"){
std::vector<std::string> vals;
- for (int i5 = 0; i5 < jnodes[i]["attributes"][m]["value"].size(); i5++ )
+ for (uint32_t i5 = 0; i5 < jnodes[i]["attributes"][m]["value"].size(); i5++ )
{
vals.push_back(jnodes[i]["attributes"][m]["value"][i5].asString());
}
@@ -357,7 +353,7 @@ bool Graph::parseJson(string &data,string &media_path){
cerr << "Rotor: creating node '"<<nodeID<<"': '"<< settings["type"] << "'" << endl;
nodes[nodeID]=node;
//signal inputs
- for (int j=0;j< jnodes[i]["signal_inputs"].size();j++){
+ for (uint32_t j=0;j< jnodes[i]["signal_inputs"].size();j++){
if ((nodes[nodeID])->inputs.size()>j) {
string fromID=jnodes[i]["signal_inputs"][j]["from"].asString();
if (fromID!=""){
@@ -390,7 +386,7 @@ bool Graph::parseJson(string &data,string &media_path){
}
- for (int k=0;k<jnodes[i]["image_inputs"].size();k++){
+ for (uint32_t k=0;k<jnodes[i]["image_inputs"].size();k++){
if (((Image_node*)nodes[nodeID])->image_inputs.size()<=k) {
if (nodes[nodeID]->duplicate_inputs) {
while(((Image_node*)nodes[nodeID])->image_inputs.size()<=k){
@@ -418,7 +414,7 @@ bool Graph::parseJson(string &data,string &media_path){
}
}
//parameters
- for (int l=0;l<jnodes[i]["parameters"].size();l++){
+ for (uint32_t l=0;l<jnodes[i]["parameters"].size();l++){
string parameter=jnodes[i]["parameters"][l]["name"].asString();
@@ -478,8 +474,8 @@ bool Graph::parseXml(string media_path){
cerr << "Rotor: creating node '"<<nodeID<<"': '"<< xml.getAttribute("node","type","",i1) << "'" << endl;
nodes[nodeID]=node;
if(xml.pushTag("node",i1)) {
- int n2=xml.getNumTags("signal_input");
- for (int i2=0;i2<n2;i2++){
+ uint32_t n2=xml.getNumTags("signal_input");
+ for (uint32_t i2=0;i2<n2;i2++){
//TODO expand
//nodes[nodeID]->create_signal_input(xml.getAttribute("signal_input","description","",i2),xml.getAttribute("signal_input","title","",i2));
if ((nodes[nodeID])->inputs.size()>i2) {
@@ -496,10 +492,10 @@ bool Graph::parseXml(string media_path){
else cerr << "Rotor: input " << i2 << " of node: '" << nodeID << "' does not exist" << endl;
}
- int n3=xml.getNumTags("image_input");
- for (int i3=0;i3<n3;i3++){
+ uint32_t n3=xml.getNumTags("image_input");
+ for (uint32_t i3=0;i3<n3;i3++){
//handle expandable inputs
- if (((Image_node*)nodes[nodeID])->image_inputs.size()<=i3&((Image_node*)nodes[nodeID])->duplicate_inputs){
+ if ((((Image_node*)nodes[nodeID])->image_inputs.size()<=i3)&&((Image_node*)nodes[nodeID])->duplicate_inputs){
string desc=((Image_node*)nodes[nodeID])->image_inputs[0]->description;
string title=((Image_node*)nodes[nodeID])->image_inputs[0]->title;
while(((Image_node*)nodes[nodeID])->image_inputs.size()<=i3){
diff --git a/rotord/src/graph.h b/rotord/src/graph.h
index 4dcd254..ad2c59d 100644
--- a/rotord/src/graph.h
+++ b/rotord/src/graph.h
@@ -147,7 +147,6 @@ namespace Rotor {
int channels= loader.get_number_channels();
int bits = loader.get_bit_depth();
at.init(channels,bits,samples,rate);
- bool finished=false;
uint16_t *audio=new uint16_t[1024*loader.get_number_channels()];
uint64_t sample=0;
while (loader.get_samples(audio,sample,1024)) {
diff --git a/rotord/src/libavwrapper.cpp b/rotord/src/libavwrapper.cpp
index 3276b16..c4d267a 100644
--- a/rotord/src/libavwrapper.cpp
+++ b/rotord/src/libavwrapper.cpp
@@ -1,7 +1,6 @@
#include "libavwrapper.h"
-extern Poco::Mutex mutex; //application wide mutex
-static Poco::Mutex mutex;
+Poco::Mutex mutex;
#include <stdexcept>
#include <iostream>
@@ -10,6 +9,9 @@ static Poco::Mutex mutex;
using namespace std;
using namespace Poco;
+static bool b_is_one_time_inited=false;
+static int sws_flags = SWS_BICUBIC;
+
void libav::maybeInitFFMpegLib()
{
if (b_is_one_time_inited)
@@ -42,7 +44,7 @@ bool libav::video_decoder::open(const std::string& filename){
Poco::StringTokenizer tokens(filename,".");
string idxfile="";
if (tokens.count()>1){
- for (int i=0;i<tokens.count()-1;i++){
+ for (uint32_t i=0;i<tokens.count()-1;i++){
idxfile+=tokens[i];
idxfile+=".";
}
@@ -92,8 +94,6 @@ bool libav::video_decoder::open(const std::string& filename){
std::cerr<<"ffmpegsource: "<<err.Buffer<<std::endl;
return false;
}
- int framenumber = 0; /* valid until next call to FFMS_GetFrame* on the same video object */
-
//std::cerr<<"ffmpegsource: successfully opened "<<filename<<std::endl;
loaded=true;
@@ -330,7 +330,7 @@ bool libav::exporter::encodeFrame(unsigned char *pixels,AVPacket *audio){
return true;
}
-bool libav::exporter::encodeFrame(unsigned char *pixels,bool keyframe=false){
+bool libav::exporter::encodeFrame(unsigned char *pixels,bool keyframe){
video_pts = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den;
write_video_frame(oc, video_st, pixels,keyframe);
frame->pts += av_rescale_q(1, video_st->codec->time_base, video_st->time_base);
@@ -621,7 +621,7 @@ bool libav::exporter::open_video(AVFormatContext *oc, AVCodec *codec, AVStream *
}
- void libav::exporter::write_video_frame(AVFormatContext *oc, AVStream *st, uint8_t *pixels, bool keyframe=false)
+ void libav::exporter::write_video_frame(AVFormatContext *oc, AVStream *st, uint8_t *pixels, bool keyframe)
{
int ret;
diff --git a/rotord/src/libavwrapper.h b/rotord/src/libavwrapper.h
index 0de9e74..7822323 100644
--- a/rotord/src/libavwrapper.h
+++ b/rotord/src/libavwrapper.h
@@ -1,7 +1,6 @@
#ifndef libavwrapper_H
#define libavwrapper_H
-
#ifndef UINT64_C
#define UINT64_C(c) (c ## ULL)
#endif
@@ -11,6 +10,8 @@
#include "Poco/StringTokenizer.h"
#include "Poco/File.h"
+extern Poco::Mutex mutex; //application wide mutex
+
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@@ -30,10 +31,8 @@ extern "C" {
namespace libav {
- static bool b_is_one_time_inited=false;
// Some libavcodec calls are not reentrant
void maybeInitFFMpegLib();
- static int sws_flags = SWS_BICUBIC;
class video_decoder
{
@@ -88,8 +87,8 @@ namespace libav {
}
FFMS_VideoSource *source;
- FFMS_VideoProperties *props;
- FFMS_Frame *frame;
+ const FFMS_VideoProperties *props;
+ const FFMS_Frame *frame;
FFMS_ErrorInfo err;
char errmsg[1024];
int pixfmts[2];
@@ -155,7 +154,7 @@ namespace libav {
}
FFMS_AudioSource *source;
- FFMS_AudioProperties *props;
+ const FFMS_AudioProperties *props;
FFMS_Frame *frame;
FFMS_ErrorInfo err;
char errmsg[1024];
diff --git a/rotord/src/nodes_audio_analysis.cpp b/rotord/src/nodes_audio_analysis.cpp
index a2a9c63..6ec1188 100644
--- a/rotord/src/nodes_audio_analysis.cpp
+++ b/rotord/src/nodes_audio_analysis.cpp
@@ -122,7 +122,7 @@ namespace Rotor{
cerr<<analysers["segmenter"].features.size()<<" segments"<<endl;
cerr<<analysers["tempo"].features.size()<<" tempo features"<<endl;
cerr<<analysers["intensity"].features.size()<<" intensity features"<<endl;
- int i=0;
+ uint32_t i=0;
float min_tempo=9999999.0f;
float min_intensity=9999999.0f;
float max_tempo=0.0f;
@@ -178,11 +178,10 @@ namespace Rotor{
}
//sort and convert to features
std::sort(totals.begin(),totals.end(),sortsegments);
- for (int i=0;i<totals.size();i++){
+ for (i=0;i<totals.size();i++){
vampHost::feature f;
f.values.push_back((float)i);
features[times[totals[i].first]]=f;
- }
- return true;
+ }
}
} \ No newline at end of file
diff --git a/rotord/src/nodes_audio_analysis.h b/rotord/src/nodes_audio_analysis.h
index a3fe5b8..4760962 100644
--- a/rotord/src/nodes_audio_analysis.h
+++ b/rotord/src/nodes_audio_analysis.h
@@ -11,13 +11,13 @@ namespace Rotor {
#define VAMPHOST_Values 4
class Audio_processor: public Signal_node {
public:
- virtual Audio_processor(){};
+ Audio_processor(){};
virtual ~Audio_processor(){};
virtual int process_frame(uint8_t *data,int samples)=0;
virtual bool init(int _channels,int _bits,int _samples,int _rate)=0;
virtual void cleanup()=0;
virtual void print_summary(){};
- virtual string get_features(){};
+ virtual string get_features(){return "";};
int channels,bits,samples,rate;
};
//actual nodes-------------------------------------------------
@@ -66,8 +66,6 @@ namespace Rotor {
float lk=i->first;
int ln=i->second.number;
if (i->second.values.size()) v1=i->second.values[0];
- int m=attributes["mode"]->intVal;
- //
switch (attributes["mode"]->intVal){
case VAMPHOST_Timeline:
return (((time.time-lk)/(uk-lk))+ln);
@@ -182,14 +180,14 @@ namespace Rotor {
vector<int> act_count;
for (int i=0;i<(int)parameters["acts"]->value;i++) act_count.push_back(0);
- if (features.size()<=(int)parameters["acts"]->value+1){
+ if (features.size()<=(uint32_t)parameters["acts"]->value+1){
//iteratively split segments and refresh durations
//this could work well on the original data
//pick the longest and split it in two
//refresh durations - this can be a function
//keep going
//finally copy out
- while (features.size()<(int)parameters["acts"]->value+1){
+ while (features.size()<(uint32_t)parameters["acts"]->value+1){
map<int,float> durations;
map<int,float> times;
int i=0;
diff --git a/rotord/src/nodes_channels.h b/rotord/src/nodes_channels.h
index e991660..d58c97c 100644
--- a/rotord/src/nodes_channels.h
+++ b/rotord/src/nodes_channels.h
@@ -260,7 +260,6 @@ namespace Rotor {
//get euclidean distance in HSV space
int dist,d;
- uint8_t m;
float weights[3] = {parameters["weight_h"]->value,parameters["weight_s"]->value,parameters["weight_v"]->value};
float weight_total=255.0f/pow(pow(weights[0]*255,2)+pow(weights[1]*255,2)+pow(weights[2]*255,2),0.5);
@@ -322,7 +321,6 @@ namespace Rotor {
//cerr<<"generating LUT: threshold "<<parameters["threshold"]->value<<", feather "<<parameters["feather"]->value<<endl;
if (LUT) delete[] LUT;
LUT=new uint8_t[256];
- float fltmax=(255.0f/256.0f);
float minf=max(0.0f,parameters["threshold"]->value-(parameters["feather"]->value*0.5f));
float maxf=min(1.0f,parameters["threshold"]->value+(parameters["feather"]->value*0.5f));
for (int i=0;i<256;i++){
@@ -438,7 +436,7 @@ namespace Rotor {
//total=interval*number;
}
}
- int thisframe=frame.frame();
+ int thisframe=((Time_spec)frame).frame();
//iterate cache and throw out any obsolete frames
auto i = std::begin(images);
while (i != std::end(images)) {
diff --git a/rotord/src/nodes_source.h b/rotord/src/nodes_source.h
index 37c3b61..6928f05 100644
--- a/rotord/src/nodes_source.h
+++ b/rotord/src/nodes_source.h
@@ -15,7 +15,7 @@ namespace Rotor {
};
Signal_colour(map<string,string> &settings):Signal_colour() {
base_settings(settings);
- for (int i=0;i<attributes["palette"]->value.size()/6;i++){
+ for (uint32_t i=0;i<attributes["palette"]->value.size()/6;i++){
palette.push_back(Colour(attributes["palette"]->value.substr(i*6,6)));
}
prevcol=-1;
diff --git a/rotord/src/nodes_transform.h b/rotord/src/nodes_transform.h
index 2eb680b..1b9834c 100644
--- a/rotord/src/nodes_transform.h
+++ b/rotord/src/nodes_transform.h
@@ -32,7 +32,7 @@ namespace Rotor {
//INTER_AREA - resampling using pixel area relation. It may be a preferred method for image decimation, as it gives moire’-free results. But when the image is zoomed, it is similar to the INTER_NEAREST method.
//INTER_CUBIC - a bicubic interpolation over 4x4 pixel neighborhood
//INTER_LANCZOS4 - a Lanczos interpolation over 8x8 pixel neighborhood
- int filtmode;
+ int filtmode=cv::INTER_NEAREST;
switch(attributes["filter"]->intVal){
case TRANSFORM_nearest:
filtmode=cv::INTER_NEAREST;
diff --git a/rotord/src/rendercontext.cpp b/rotord/src/rendercontext.cpp
index 779a1b7..2016395 100644
--- a/rotord/src/rendercontext.cpp
+++ b/rotord/src/rendercontext.cpp
@@ -85,8 +85,6 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H
s+=c;
s+=" ";
}
- //cerr<<"uid:"<<command.uid<<" method:"<<command.method<<" id:"<<command.id\
- //<<" commands:"<<s<<"body:"<<command.body<<endl;
Logger& logger = Logger::get("Rotor");
status=HTTPResponse::HTTP_BAD_REQUEST; //error by default
diff --git a/rotord/src/rotor.cpp b/rotord/src/rotor.cpp
index d6e445f..0947a89 100644
--- a/rotord/src/rotor.cpp
+++ b/rotord/src/rotor.cpp
@@ -196,7 +196,7 @@ Json::Value Node_factory::list_node(Rotor::Node* _node){
}
return node;
}
-void Node_factory::list_node(Rotor::Node* type,xmlIO XML,int i=0){
+void Node_factory::list_node(Rotor::Node* type,xmlIO XML,int i){
XML.addTag("node");
XML.addAttribute("node","type",type->type,i);
XML.addAttribute("node","inputs",type->duplicate_inputs?"expandable":"fixed",i);
diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h
index 6c03ea0..aa76491 100644
--- a/rotord/src/rotor.h
+++ b/rotord/src/rotor.h
@@ -212,7 +212,7 @@ namespace Rotor {
};
void init(const string &_key){ //inits int value from set::string vals index
value=_key;
- std::vector<std::string>::iterator it=it = find(vals.begin(),vals.end(),value);
+ std::vector<std::string>::iterator it= find(vals.begin(),vals.end(),value);
if (it!=vals.end()){
intVal = std::distance(vals.begin(),it)+1; //using 1-index for enums
}
@@ -224,9 +224,11 @@ namespace Rotor {
for (auto v:vals) s=s+v+" ";
cerr<<"array attribute "<<title<<": "<<s<<endl;
}
- string value,description,title,type;
- std::vector<std::string> vals;
+ string description,title,value;
int intVal;
+ string type;
+ std::vector<std::string> vals;
+
};
class Node{
public:
@@ -320,7 +322,7 @@ namespace Rotor {
update((Time_spec)frame);
return output(frame);
}
- virtual const Image *output(const Frame_spec &frame)=0;
+ virtual Image *output(const Frame_spec &frame)=0;
Image image;
private:
float image_time; //? could be used to detect image reuse?
@@ -398,16 +400,6 @@ namespace Rotor {
~Video_cycler(){};
bool load(const string &filename);
Image *output(const Frame_spec &frame){
- Frame_spec inframe=frame;
- /*
- switch (attributes["time_mode"]->intVal){
- case CYCLER_rel:
-
- break;
- case CYCLER_stretch:
- break;
- }
- */
if (attributes["mode"]->intVal==CYCLER_mix&&image_inputs.size()>1){
int im1=((int)inputs[0]->get((Time_spec)frame))%image_inputs.size();
int im2=(im1+1)%image_inputs.size();
@@ -428,7 +420,7 @@ namespace Rotor {
return nullptr;
}
//cut mode
- for (int i=0;i<image_inputs.size();i++){
+ for (uint32_t i=0;i<image_inputs.size();i++){
int whichinput=((int)inputs[0]->get((Time_spec)frame)+i)%image_inputs.size();
Image *in=image_inputs[whichinput]->get(frame);
if (in) return in;
@@ -511,12 +503,13 @@ namespace Rotor {
image.setup_fromRGB(frame.w,frame.h,player.frame->Data[0],player.frame->Linesize[0]-(frame.w*3));
}
}
+ return true;
}
Image *output(const Frame_spec &frame){
if (isLoaded){
float clipframerate=(parameters["framerate"]->value==0.0f?player.get_framerate():parameters["framerate"]->value);
float clipspeed=(clipframerate/frame.framerate)*parameters["speed"]->value;
- float wanted;
+ float wanted=0.0f;
if (inputs[0]->connection) {
//using playhead
//should speed affect it?
@@ -594,6 +587,8 @@ namespace Rotor {
description="Loads a banks of video files";
clip_loaded=-1;
isLoaded=false;
+ segment=-1;
+ segment_start=0.0f;
};
Video_bank(map<string,string> &settings): Video_bank() {
base_settings(settings);
@@ -629,7 +624,7 @@ namespace Rotor {
}
}
if (isLoaded){
- int wanted;
+ int wanted=0.0f;
switch (attributes["frame_mode"]->intVal){
case VIDEOTIME_play:
wanted=ph*player.get_number_frames();
@@ -650,9 +645,9 @@ namespace Rotor {
};
private:
int clip_loaded;
- int last_frame;
- float segment_duration; //to allow play within a segment at original speed
string media_path;
+ float segment_start;
+ int segment;
};
class Video_output: public Image_node {
//Video_output 'presents' the output movie. Aspect ratio, bars, fadein/fadeout would happen here
@@ -673,13 +668,13 @@ namespace Rotor {
~Video_output(){ };
void create_envelope(const vector<float> &audio){
if (audio.size()){
- int i=0;
+ uint32_t i=0;
while (i<audio.size()&&audio[i]<silence_threshold) i++;
start_silence=((float)i)/audio.size();
while (i<audio.size()&&audio[i]>audio[i-1]) i++;
start_peak=((float)i-1)/audio.size();
i=audio.size();
- while (i>-1&&audio[i]<silence_threshold) i--;
+ while (i>0&&audio[i]<silence_threshold) i--;
end_silence=((float)i)/audio.size();
while (i<audio.size()&&audio[i]>audio[i+1]) i--;
end_peak=((float)i+1)/audio.size();
diff --git a/rotord/src/rotord.h b/rotord/src/rotord.h
index dd6a25c..6324fd2 100644
--- a/rotord/src/rotord.h
+++ b/rotord/src/rotord.h
@@ -142,8 +142,6 @@ int main(int argc, char** argv)
AutoPtr<Formatter> formatter(new PatternFormatter("%d-%m-%Y %H:%M:%S %s: %t"));
AutoPtr<Channel> formattingChannel(new FormattingChannel(formatter, splitterChannel));
- Logger& sLog = Logger::create("Rotor", formattingChannel, Message::PRIO_TRACE);
-
Logger& logger = Logger::get("Rotor");
logger.information("starting rendering daemon");
diff --git a/rotord/src/vampHost.cpp b/rotord/src/vampHost.cpp
index 2ddc62f..08984cf 100644
--- a/rotord/src/vampHost.cpp
+++ b/rotord/src/vampHost.cpp
@@ -229,9 +229,6 @@ bool vampHost::Analyser::init(const string &soname,const string &id,const int &_
Plugin::OutputList outputs = plugin->getOutputDescriptors();
Plugin::OutputDescriptor od;
- int returnValue = 1;
- int prog = 0;
-
RealTime rt;
PluginWrapper *wrapper = 0;
RealTime adjustment = RealTime::zeroTime;
@@ -410,7 +407,6 @@ float vampHost::Analyser::get_value(const float &time) {
if (i->second.values.size()) v2=i->second.values[0];
i--;
float lk=i->first;
- int ln=i->second.number;
if (i->second.values.size()) v1=i->second.values[0];
return ((((time-lk)/(uk-lk))*(v2-v1))+v1);
diff --git a/rotord/src/xmlIO.cpp b/rotord/src/xmlIO.cpp
index f2abe27..be5efc0 100644
--- a/rotord/src/xmlIO.cpp
+++ b/rotord/src/xmlIO.cpp
@@ -272,7 +272,7 @@ int xmlIO::getNumTags(const string& tag){
//grab the handle from the level we are at
//normally this is the doc but could be a pushed node
- TiXmlHandle tagHandle = storedHandle;
+ //TiXmlHandle tagHandle = storedHandle;
int count = 0;