Mercurial > hg > svgui
comparison widgets/ModelDataTableDialog.cpp @ 946:36cddc3de023 alignment_view
Merge from default branch
author | Chris Cannam |
---|---|
date | Mon, 20 Apr 2015 09:19:52 +0100 |
parents | 4a578a360011 |
children | c02c51ae5238 a7df0d728020 |
comparison
equal
deleted
inserted
replaced
897:499b637f2a26 | 946:36cddc3de023 |
---|---|
166 { | 166 { |
167 delete m_table; | 167 delete m_table; |
168 } | 168 } |
169 | 169 |
170 void | 170 void |
171 ModelDataTableDialog::userScrolledToFrame(int frame) | 171 ModelDataTableDialog::userScrolledToFrame(sv_frame_t frame) |
172 { | 172 { |
173 QModelIndex index = m_table->getModelIndexForFrame(frame); | 173 QModelIndex index = m_table->getModelIndexForFrame(frame); |
174 makeCurrent(index.row()); | 174 makeCurrent(index.row()); |
175 } | 175 } |
176 | 176 |
177 void | 177 void |
178 ModelDataTableDialog::playbackScrolledToFrame(int frame) | 178 ModelDataTableDialog::playbackScrolledToFrame(sv_frame_t frame) |
179 { | 179 { |
180 if (m_trackPlayback) { | 180 if (m_trackPlayback) { |
181 QModelIndex index = m_table->getModelIndexForFrame(frame); | 181 QModelIndex index = m_table->getModelIndexForFrame(frame); |
182 makeCurrent(index.row()); | 182 makeCurrent(index.row()); |
183 } | 183 } |