Mercurial > hg > svgui
comparison view/ViewManager.cpp @ 972:1011ffb1b6d5 osx-retina
Merge from default branch
author | Chris Cannam |
---|---|
date | Wed, 10 Jun 2015 13:38:02 +0100 |
parents | 4d54882bbf73 |
children | f2c63ec85901 |
comparison
equal
deleted
inserted
replaced
969:0aac065f09f9 | 972:1011ffb1b6d5 |
---|---|
164 } | 164 } |
165 | 165 |
166 void | 166 void |
167 ViewManager::setPlaybackFrame(sv_frame_t f) | 167 ViewManager::setPlaybackFrame(sv_frame_t f) |
168 { | 168 { |
169 if (f < 0) f = 0; | |
169 if (m_playbackFrame != f) { | 170 if (m_playbackFrame != f) { |
170 m_playbackFrame = f; | 171 m_playbackFrame = f; |
171 emit playbackFrameChanged(f); | 172 emit playbackFrameChanged(f); |
172 if (m_playSource && m_playSource->isPlaying()) { | 173 if (m_playSource && m_playSource->isPlaying()) { |
173 m_playSource->play(f); | 174 m_playSource->play(f); |