Mercurial > hg > tony
comparison src/MainWindow.cpp @ 355:56109ef020b4 warnfix_no_size_t
Configure stuff and fixes for -Werror
author | Chris Cannam |
---|---|
date | Wed, 18 Jun 2014 09:13:25 +0100 |
parents | c66ec7f40acb |
children | 0f72797ecdef |
comparison
equal
deleted
inserted
replaced
354:11ba706b1e7a | 355:56109ef020b4 |
---|---|
86 #include <errno.h> | 86 #include <errno.h> |
87 | 87 |
88 using std::vector; | 88 using std::vector; |
89 | 89 |
90 | 90 |
91 MainWindow::MainWindow(bool withAudioOutput, bool withOSCSupport) : | 91 MainWindow::MainWindow(bool withAudioOutput) : |
92 MainWindowBase(withAudioOutput, false), | 92 MainWindowBase(withAudioOutput, false), |
93 m_overview(0), | 93 m_overview(0), |
94 m_mainMenusCreated(false), | 94 m_mainMenusCreated(false), |
95 m_playbackMenu(0), | 95 m_playbackMenu(0), |
96 m_recentFilesMenu(0), | 96 m_recentFilesMenu(0), |
180 // We have a pane stack: it comes with the territory. However, we | 180 // We have a pane stack: it comes with the territory. However, we |
181 // have a fixed and known number of panes in it -- it isn't | 181 // have a fixed and known number of panes in it -- it isn't |
182 // variable | 182 // variable |
183 m_paneStack->setLayoutStyle(PaneStack::NoPropertyStacks); | 183 m_paneStack->setLayoutStyle(PaneStack::NoPropertyStacks); |
184 m_paneStack->setShowPaneAccessories(false); | 184 m_paneStack->setShowPaneAccessories(false); |
185 connect(m_paneStack, SIGNAL(doubleClickSelectInvoked(size_t)), | 185 connect(m_paneStack, SIGNAL(doubleClickSelectInvoked(int)), |
186 this, SLOT(doubleClickSelectInvoked(size_t))); | 186 this, SLOT(doubleClickSelectInvoked(int))); |
187 scroll->setWidget(m_paneStack); | 187 scroll->setWidget(m_paneStack); |
188 | 188 |
189 m_overview = new Overview(frame); | 189 m_overview = new Overview(frame); |
190 m_overview->setViewManager(m_viewManager); | 190 m_overview->setViewManager(m_viewManager); |
191 m_overview->setFixedHeight(40); | 191 m_overview->setFixedHeight(40); |
1239 MainWindow::moveByOneNote(bool right, bool doSelect) | 1239 MainWindow::moveByOneNote(bool right, bool doSelect) |
1240 { | 1240 { |
1241 int frame = m_viewManager->getPlaybackFrame(); | 1241 int frame = m_viewManager->getPlaybackFrame(); |
1242 cerr << "MainWindow::moveByOneNote startframe: " << frame << endl; | 1242 cerr << "MainWindow::moveByOneNote startframe: " << frame << endl; |
1243 | 1243 |
1244 Pane *p = m_analyser->getPane(); | |
1245 | |
1246 bool isAtSelectionBoundary = false; | 1244 bool isAtSelectionBoundary = false; |
1247 MultiSelection::SelectionList selections = m_viewManager->getSelections(); | 1245 MultiSelection::SelectionList selections = m_viewManager->getSelections(); |
1248 if (!selections.empty()) { | 1246 if (!selections.empty()) { |
1249 Selection sel = *selections.begin(); | 1247 Selection sel = *selections.begin(); |
1250 isAtSelectionBoundary = (frame == sel.getStartFrame()) || (frame == sel.getEndFrame()); | 1248 isAtSelectionBoundary = (frame == sel.getStartFrame()) || (frame == sel.getEndFrame()); |
1343 (haveCurrentPane && | 1341 (haveCurrentPane && |
1344 (currentLayer != 0)); | 1342 (currentLayer != 0)); |
1345 bool haveSelection = | 1343 bool haveSelection = |
1346 (m_viewManager && | 1344 (m_viewManager && |
1347 !m_viewManager->getSelections().empty()); | 1345 !m_viewManager->getSelections().empty()); |
1348 bool haveCurrentEditableLayer = | |
1349 (haveCurrentLayer && | |
1350 currentLayer->isLayerEditable()); | |
1351 bool haveCurrentTimeInstantsLayer = | 1346 bool haveCurrentTimeInstantsLayer = |
1352 (haveCurrentLayer && | 1347 (haveCurrentLayer && |
1353 qobject_cast<TimeInstantLayer *>(currentLayer)); | 1348 qobject_cast<TimeInstantLayer *>(currentLayer)); |
1354 bool haveCurrentTimeValueLayer = | 1349 bool haveCurrentTimeValueLayer = |
1355 (haveCurrentLayer && | 1350 (haveCurrentLayer && |
1356 qobject_cast<TimeValueLayer *>(currentLayer)); | 1351 qobject_cast<TimeValueLayer *>(currentLayer)); |
1357 bool pitchCandidatesVisible = | 1352 bool pitchCandidatesVisible = |
1358 m_analyser->arePitchCandidatesShown(); | 1353 m_analyser->arePitchCandidatesShown(); |
1359 bool haveHigher = | |
1360 m_analyser->haveHigherPitchCandidate(); | |
1361 bool haveLower = | |
1362 m_analyser->haveLowerPitchCandidate(); | |
1363 | 1354 |
1364 emit canChangePlaybackSpeed(true); | 1355 emit canChangePlaybackSpeed(true); |
1365 int v = m_playSpeed->value(); | 1356 int v = m_playSpeed->value(); |
1366 emit canSpeedUpPlayback(v < m_playSpeed->maximum()); | 1357 emit canSpeedUpPlayback(v < m_playSpeed->maximum()); |
1367 emit canSlowDownPlayback(v > m_playSpeed->minimum()); | 1358 emit canSlowDownPlayback(v > m_playSpeed->minimum()); |
2267 emit activity(tr("Export layer to \"%1\"").arg(path)); | 2258 emit activity(tr("Export layer to \"%1\"").arg(path)); |
2268 } | 2259 } |
2269 } | 2260 } |
2270 | 2261 |
2271 void | 2262 void |
2272 MainWindow::doubleClickSelectInvoked(size_t frame) | 2263 MainWindow::doubleClickSelectInvoked(int frame) |
2273 { | 2264 { |
2274 size_t f0, f1; | 2265 int f0, f1; |
2275 m_analyser->getEnclosingSelectionScope(frame, f0, f1); | 2266 m_analyser->getEnclosingSelectionScope(frame, f0, f1); |
2276 | 2267 |
2277 cerr << "MainWindow::doubleClickSelectInvoked(" << frame << "): [" << f0 << "," << f1 << "]" << endl; | 2268 cerr << "MainWindow::doubleClickSelectInvoked(" << frame << "): [" << f0 << "," << f1 << "]" << endl; |
2278 | 2269 |
2279 Selection sel(f0, f1); | 2270 Selection sel(f0, f1); |
2569 | 2560 |
2570 CommandHistory::getInstance()->startCompoundOperation | 2561 CommandHistory::getInstance()->startCompoundOperation |
2571 (tr("Form Note from Selection"), true); | 2562 (tr("Form Note from Selection"), true); |
2572 for (MultiSelection::SelectionList::iterator k = selections.begin(); | 2563 for (MultiSelection::SelectionList::iterator k = selections.begin(); |
2573 k != selections.end(); ++k) { | 2564 k != selections.end(); ++k) { |
2574 if (!model->getNotes(k->getStartFrame(), k->getEndFrame()).empty()) { | 2565 if (!model->getNotesWithin(k->getStartFrame(), k->getEndFrame()).empty()) { |
2575 layer->splitNotesAt(m_analyser->getPane(), k->getStartFrame()); | 2566 layer->splitNotesAt(m_analyser->getPane(), k->getStartFrame()); |
2576 layer->splitNotesAt(m_analyser->getPane(), k->getEndFrame()); | 2567 layer->splitNotesAt(m_analyser->getPane(), k->getEndFrame()); |
2577 layer->mergeNotes(m_analyser->getPane(), *k, false); | 2568 layer->mergeNotes(m_analyser->getPane(), *k, false); |
2578 } else { | 2569 } else { |
2579 layer->addNoteOn(k->getStartFrame(), 100, 100); | 2570 layer->addNoteOn(k->getStartFrame(), 100, 100); |
2901 if (!getMainModel() || !p) { | 2892 if (!getMainModel() || !p) { |
2902 return; | 2893 return; |
2903 } | 2894 } |
2904 | 2895 |
2905 bool haveSelection = false; | 2896 bool haveSelection = false; |
2906 size_t startFrame = 0, endFrame = 0; | 2897 int startFrame = 0, endFrame = 0; |
2907 | 2898 |
2908 if (m_viewManager && m_viewManager->haveInProgressSelection()) { | 2899 if (m_viewManager && m_viewManager->haveInProgressSelection()) { |
2909 | 2900 |
2910 bool exclusive = false; | 2901 bool exclusive = false; |
2911 Selection s = m_viewManager->getInProgressSelection(exclusive); | 2902 Selection s = m_viewManager->getInProgressSelection(exclusive); |
2959 m_fader->setPeakLeft(left); | 2950 m_fader->setPeakLeft(left); |
2960 m_fader->setPeakRight(right); | 2951 m_fader->setPeakRight(right); |
2961 } | 2952 } |
2962 | 2953 |
2963 void | 2954 void |
2964 MainWindow::sampleRateMismatch(size_t requested, size_t actual, | 2955 MainWindow::sampleRateMismatch(int /* requested */, |
2965 bool willResample) | 2956 int /* actual */, |
2957 bool /* willResample */) | |
2966 { | 2958 { |
2967 updateDescriptionLabel(); | 2959 updateDescriptionLabel(); |
2968 } | 2960 } |
2969 | 2961 |
2970 void | 2962 void |
3130 QMessageBox::Ok); | 3122 QMessageBox::Ok); |
3131 } | 3123 } |
3132 } | 3124 } |
3133 | 3125 |
3134 void | 3126 void |
3135 MainWindow::modelGenerationWarning(QString transformName, QString message) | 3127 MainWindow::modelGenerationWarning(QString /* transformName */, QString message) |
3136 { | 3128 { |
3137 QMessageBox::warning | 3129 QMessageBox::warning |
3138 (this, tr("Warning"), message, QMessageBox::Ok); | 3130 (this, tr("Warning"), message, QMessageBox::Ok); |
3139 } | 3131 } |
3140 | 3132 |
3160 } | 3152 } |
3161 } | 3153 } |
3162 | 3154 |
3163 void | 3155 void |
3164 MainWindow::modelRegenerationWarning(QString layerName, | 3156 MainWindow::modelRegenerationWarning(QString layerName, |
3165 QString transformName, QString message) | 3157 QString /* transformName */, |
3158 QString message) | |
3166 { | 3159 { |
3167 QMessageBox::warning | 3160 QMessageBox::warning |
3168 (this, tr("Warning"), tr("<b>Warning when regenerating layer</b><p>When regenerating the derived layer \"%1\" using new data model as input:<p>%2").arg(layerName).arg(message), QMessageBox::Ok); | 3161 (this, tr("Warning"), tr("<b>Warning when regenerating layer</b><p>When regenerating the derived layer \"%1\" using new data model as input:<p>%2").arg(layerName).arg(message), QMessageBox::Ok); |
3169 } | 3162 } |
3170 | 3163 |
3186 m_paneStack->setCurrentPane(pane); | 3179 m_paneStack->setCurrentPane(pane); |
3187 m_rightButtonMenu->popup(position); | 3180 m_rightButtonMenu->popup(position); |
3188 } | 3181 } |
3189 | 3182 |
3190 void | 3183 void |
3191 MainWindow::handleOSCMessage(const OSCMessage &message) | 3184 MainWindow::handleOSCMessage(const OSCMessage &) |
3192 { | 3185 { |
3193 cerr << "MainWindow::handleOSCMessage: Not implemented" << endl; | 3186 cerr << "MainWindow::handleOSCMessage: Not implemented" << endl; |
3194 } | 3187 } |
3195 | 3188 |
3196 void | 3189 void |