ffmpegsource audio loading

1 files changed, 8 insertions, 8 deletions

diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h
index ff8675a..447ba51 100644
--- a/rotord/src/rotor.h
+++ b/rotord/src/rotor.h
@@ -933,10 +933,10 @@ namespace Rotor {
 			    isLoaded=player.open(filename);
 				if (isLoaded){
 					logger.information("Video_loader loaded "+filename+": "\
-						+toString(player.getNumberOfFrames())+" frames, "\
-						+toString(player.getFrameRate())+" fps, "\
-						+toString(player.getWidth())+"x"+toString(player.getHeight())\
-						+", channels:"+toString(player.getNumberOfChannels()));
+						+toString(player.get_number_frames())+" frames, "\
+						+toString(player.get_framerate())+" fps, "\
+						+toString(player.get_width())+"x"+toString(player.get_height())\
+						+", channels:"+toString(player.get_number_channels()));
 					return true;
 			   	}
 				logger.error("Video_loader failed to load "+filename);
@@ -944,11 +944,11 @@ namespace Rotor {
 			}
 			Image *output(const Frame_spec &frame){
 				if (isLoaded){
-					float clipframerate=(parameters["framerate"]->value==0.0f?player.getFrameRate():parameters["framerate"]->value);
+					float clipframerate=(parameters["framerate"]->value==0.0f?player.get_framerate():parameters["framerate"]->value);
 					float clipspeed=(clipframerate/frame.framerate)*parameters["speed"]->value;
-					int wanted=(((int) ((frame.time*frame.framerate)+0.5))%max(1,player.getNumberOfFrames()-1));
+					int wanted=(((int) ((frame.time*frame.framerate)+0.5))%max(1,player.get_number_frames()-1));
 					if (wanted!=lastframe){
-						if (!player.fetchFrame(frame.w,frame.h,wanted)) { //seek fail
+						if (!player.fetch_frame(frame.w,frame.h,wanted)) { //seek fail
 							Poco::Logger& logger = Poco::Logger::get("Rotor");
 							logger.error("Video_loader failed to seek frame "+toString(wanted)+" of "+attributes["filename"]->value);
 
@@ -966,7 +966,7 @@ namespace Rotor {
 			bool isLoaded;
 		private:
 			//ffmpegsource::decoder player;
-			libav::ffms2_decoder player;
+			libav::video_decoder player;
 			int lastframe;
 	};
 	class Video_output: public Image_node {