Mercurial > hg > tony
changeset 403:cc33cdb114f6
Merge from cxx11 branch
| author | Chris Cannam |
|---|---|
| date | Mon, 23 Mar 2015 11:26:28 +0000 |
| parents | 1610b2b03203 (diff) a0eedd10dee3 (current diff) |
| children | 51a51a174fe7 5bedf83681ed |
| files | .hgsubstate src/Analyser.cpp src/Analyser.h src/MainWindow.cpp version.h |
| diffstat | 5 files changed, 35 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Mon Mar 23 10:33:32 2015 +0000 +++ b/.hgsubstate Mon Mar 23 11:26:28 2015 +0000 @@ -2,6 +2,6 @@ d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay 4cbbd87a8c7f95ccac8e7900eef4f08bbdbb032f pyin 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds -9429622647e63d68cd2aedf7c6c29ba6adaf4736 svapp -0559f25b99f2208ffb9ebb74ed173d3ec66f0e41 svcore -50be12cf280271763a61c8630e442fd5f6e4dcc6 svgui +aa6fb3516e281bae6f9f57f368427374b9138b05 svapp +5c5d4863b42849fdc0e2062858a0c4acc725047b svcore +26da827e8fb52d5fa599b05c01e9360481fdccb9 svgui
--- a/src/Analyser.cpp Mon Mar 23 10:33:32 2015 +0000 +++ b/src/Analyser.cpp Mon Mar 23 11:26:28 2015 +0000 @@ -420,8 +420,8 @@ if (params) params->setPlayPan(1); connect(flexiNoteLayer, SIGNAL(modelCompletionChanged()), this, SLOT(layerCompletionChanged())); - connect(flexiNoteLayer, SIGNAL(reAnalyseRegion(int, int, float, float)), - this, SLOT(reAnalyseRegion(int, int, float, float))); + connect(flexiNoteLayer, SIGNAL(reAnalyseRegion(sv_frame_t, sv_frame_t, float, float)), + this, SLOT(reAnalyseRegion(sv_frame_t, sv_frame_t, float, float))); connect(flexiNoteLayer, SIGNAL(materialiseReAnalysis()), this, SLOT(materialiseReAnalysis())); } @@ -430,7 +430,7 @@ } void -Analyser::reAnalyseRegion(int frame0, int frame1, float freq0, float freq1) +Analyser::reAnalyseRegion(sv_frame_t frame0, sv_frame_t frame1, float freq0, float freq1) { cerr << "Analyser::reAnalyseRegion(" << frame0 << ", " << frame1 << ", " << freq0 << ", " << freq1 << ")" << endl;
--- a/src/Analyser.h Mon Mar 23 10:33:32 2015 +0000 +++ b/src/Analyser.h Mon Mar 23 11:26:28 2015 +0000 @@ -218,7 +218,7 @@ protected slots: void layerAboutToBeDeleted(Layer *); void layerCompletionChanged(); - void reAnalyseRegion(int, int, float, float); + void reAnalyseRegion(sv_frame_t, sv_frame_t, float, float); void materialiseReAnalysis(); protected:
--- a/src/MainWindow.cpp Mon Mar 23 10:33:32 2015 +0000 +++ b/src/MainWindow.cpp Mon Mar 23 11:26:28 2015 +0000 @@ -2940,7 +2940,7 @@ } bool haveSelection = false; - int startFrame = 0, endFrame = 0; + sv_frame_t startFrame = 0, endFrame = 0; if (m_viewManager && m_viewManager->haveInProgressSelection()) { @@ -3344,34 +3344,35 @@ { if (!getMainModel()) return; - int frame = m_viewManager->getPlaybackFrame(); + sv_frame_t frame = m_viewManager->getPlaybackFrame(); ++frame; - size_t sr = getMainModel()->getSampleRate(); + sv_samplerate_t sr = getMainModel()->getSampleRate(); // The step is supposed to scale and be as wide as a step of // m_defaultFfwdRwdStep seconds at zoom level 720 and sr = 44100 - size_t framesPerPixel = m_viewManager->getGlobalZoom(); - size_t defaultZoom = (720 * 44100) / sr; - - float scaler = (framesPerPixel * 1.0f) / defaultZoom; - - + int framesPerPixel = m_viewManager->getGlobalZoom(); + + double defaultZoom = (720 * 44100) / sr; + double scaler = framesPerPixel / defaultZoom; + RealTime step = m_defaultFfwdRwdStep * scaler; + frame = RealTime::realTime2Frame - (RealTime::frame2RealTime(frame, sr) + m_defaultFfwdRwdStep * scaler, sr); - if (frame > int(getMainModel()->getEndFrame())) { + (RealTime::frame2RealTime(frame, sr) + step, sr); + + if (frame > getMainModel()->getEndFrame()) { frame = getMainModel()->getEndFrame(); } - + if (frame < 0) frame = 0; if (m_viewManager->getPlaySelectionMode()) { - frame = m_viewManager->constrainFrameToSelection(size_t(frame)); + frame = m_viewManager->constrainFrameToSelection(frame); } m_viewManager->setPlaybackFrame(frame); - if (frame == (int)getMainModel()->getEndFrame() && + if (frame == getMainModel()->getEndFrame() && m_playSource && m_playSource->isPlaying() && !m_viewManager->getPlayLoopMode()) { @@ -3384,27 +3385,30 @@ { if (!getMainModel()) return; - int frame = m_viewManager->getPlaybackFrame(); + sv_frame_t frame = m_viewManager->getPlaybackFrame(); if (frame > 0) --frame; - size_t sr = getMainModel()->getSampleRate(); + sv_samplerate_t sr = getMainModel()->getSampleRate(); // The step is supposed to scale and be as wide as a step of // m_defaultFfwdRwdStep seconds at zoom level 720 and sr = 44100 - size_t framesPerPixel = m_viewManager->getGlobalZoom(); - size_t defaultZoom = (720 * 44100) / sr; - - float scaler = (framesPerPixel * 1.0f) / defaultZoom; + int framesPerPixel = m_viewManager->getGlobalZoom(); + + double defaultZoom = (720 * 44100) / sr; + double scaler = framesPerPixel / defaultZoom; + RealTime step = m_defaultFfwdRwdStep * scaler; + frame = RealTime::realTime2Frame - (RealTime::frame2RealTime(frame, sr) - m_defaultFfwdRwdStep * scaler, sr); - if (frame < int(getMainModel()->getStartFrame())) { + (RealTime::frame2RealTime(frame, sr) - step, sr); + + if (frame < getMainModel()->getStartFrame()) { frame = getMainModel()->getStartFrame(); } if (frame < 0) frame = 0; if (m_viewManager->getPlaySelectionMode()) { - frame = m_viewManager->constrainFrameToSelection(size_t(frame)); + frame = m_viewManager->constrainFrameToSelection(frame); } m_viewManager->setPlaybackFrame(frame);