Merging conflict fix

conf/VACore.ini.proto

@@ -91,6 +91,7 @@ Driver = Portaudio
 #Device = ASIO MADIface USB
 #Device = Focusrite USB 2.0 Audio Driver
 #Device = M-Audio Fast Track Ultra ASIO
+#Device = Yamaha Steinberg USB ASIO
 Device = default
 
 # MANDATORY: Sampling rate [Hz]

src/Audiosignals/VAAudiofileSignalSource.cpp

@@ -7,6 +7,7 @@
 #include <ITAException.h>
 #include <ITABufferDataSource.h>
 #include <ITASampleFrame.h>
+#include <ITAAudioSample.h>
 
 #include <sstream>
 #include <assert.h>
@@ -43,7 +44,8 @@ CVAAudiofileSignalSource::CVAAudiofileSignalSource( const std::string& sFileName
 {
 	m_sbOutBuffer.Init( iBlockLength, true );
 
-	ITASampleFrame sfFileBuffer( sFileName );
+	CITAAudioSample sfFileBuffer(dSampleRate);
+	sfFileBuffer.LoadWithSampleRateConversion(sFileName);
 		
 	std::vector< float* > vfBufferPointer;
 	

src/Audiosignals/VATextToSpeechSignalSource.cpp

@@ -420,7 +420,7 @@ void CVATextToSpeechSignalSource::VisemeProcessing(CPRC_abuf * abuf, void * user
 			VA_INFO("CVATextToSpeechSignalSource", "ERROR: could not retrieve transcription at "+ std::to_string(i));
 		}
 	}	
-	data->lastEnd = endTime;
+	data->lastEnd += endTime;
 
 	//we basically append the data in abuf to the data in floatBuffer and on the way convert it from short to float (since that's what we need for the SoundSignal)
 	std::size_t bufferLength = CPRC_abuf_wav_sz(abuf);