From: Chrissy M. <chr...@ho...> - 2013-01-22 23:34:39
|
Hi Mike, I'm having problems applying the patch, ive tried with patch -p1 -i your.patch and the -p0 and just -i options but it fails even with me forcing the patch, heres the reject file below, this may help... I assume im applying this just on top of the previous patches ?? --- RemoteVstPlugin.cpp+++ RemoteVstPlugin.cpp@@ -380,7 +380,7 @@ break; } }- m_in->m_Timer = 0; //GetTickCount();+ m_in->m_Timer = GetTickCount(); } @@ -1373,11 +1373,11 @@ double RemoteVstPlugin::syncPPQLoop() {- double ppqdelt = ( __plugin->m_currentSamplePos - + double ppqdelt = ( GetTickCount() - __plugin->m_in->m_Timer ) * __plugin->m_bpm / - ( (float) 60 * __plugin->sampleRate() );+ ( (float) 60000 ); - __plugin->m_in->m_Timer = __plugin->m_currentSamplePos;+ __plugin->m_in->m_Timer = GetTickCount(); return ppqdelt; }@@ -1487,7 +1487,7 @@ _timeInfo.ppqPos = __plugin->m_in->ppqPos; _timeInfo.flags |= kVstTransportChanged; __plugin->m_in->m_Timer = - __plugin->m_currentSamplePos;+ GetTickCount(); __plugin->m_in->lastppqPos = __plugin->m_in->ppqPos; And this was the terminal output for the fail on the patch below:- mikobuntu@mikobuntu-Aspire-5332:~/lmms-experimental/lmms$ patch -p1 -i VST-Sync-update.patch patching file plugins/vst_base/RemoteVstPlugin.cppHunk #1 succeeded at 375 (offset -5 lines).Hunk #2 FAILED at 1373.patch unexpectedly ends in middle of lineHunk #3 FAILED at 1487.2 out of 3 hunks FAILED -- saving rejects to file plugins/vst_base/RemoteVstPlugin.cpp.rejmikobuntu@mikobuntu-Aspire-5332:~/lmms-experimental/lmms$ patch -p0 -i VST-Sync-update.patch can't find file to patch at input line 5Perhaps you used the wrong -p or --strip option?The text leading up to this was:--------------------------|diff --git a/plugins/vst_base/RemoteVstPlugin.cpp b/plugins/vst_base/RemoteVstPlugin.cpp|index 7846f24..9be8dd2 100644|--- a/plugins/vst_base/RemoteVstPlugin.cpp|+++ b/plugins/vst_base/RemoteVstPlugin.cpp-------------------------- thanks Mikobuntu ;) |