Mercurial > hg > svcore
comparison data/fft/FFTDataServer.cpp @ 1045:1a73618b0b67 cxx11
More type fixes, primarily in the spectrogram
author | Chris Cannam |
---|---|
date | Tue, 10 Mar 2015 10:31:27 +0000 |
parents | cc27f35aa75c |
children | 027d8b943be5 |
comparison
equal
deleted
inserted
replaced
1044:31f01931b781 | 1045:1a73618b0b67 |
---|---|
53 int windowSize, | 53 int windowSize, |
54 int windowIncrement, | 54 int windowIncrement, |
55 int fftSize, | 55 int fftSize, |
56 bool polar, | 56 bool polar, |
57 StorageAdviser::Criteria criteria, | 57 StorageAdviser::Criteria criteria, |
58 int fillFromColumn) | 58 sv_frame_t fillFromFrame) |
59 { | 59 { |
60 QString n = generateFileBasename(model, | 60 QString n = generateFileBasename(model, |
61 channel, | 61 channel, |
62 windowType, | 62 windowType, |
63 windowSize, | 63 windowSize, |
93 windowSize, | 93 windowSize, |
94 windowIncrement, | 94 windowIncrement, |
95 fftSize, | 95 fftSize, |
96 polar, | 96 polar, |
97 criteria, | 97 criteria, |
98 fillFromColumn); | 98 fillFromFrame); |
99 } catch (InsufficientDiscSpace) { | 99 } catch (InsufficientDiscSpace) { |
100 delete server; | 100 delete server; |
101 server = 0; | 101 server = 0; |
102 } | 102 } |
103 | 103 |
115 int windowSize, | 115 int windowSize, |
116 int windowIncrement, | 116 int windowIncrement, |
117 int fftSize, | 117 int fftSize, |
118 bool polar, | 118 bool polar, |
119 StorageAdviser::Criteria criteria, | 119 StorageAdviser::Criteria criteria, |
120 int fillFromColumn) | 120 sv_frame_t fillFromFrame) |
121 { | 121 { |
122 // Fuzzy matching: | 122 // Fuzzy matching: |
123 // | 123 // |
124 // -- if we're asked for polar and have non-polar, use it (and | 124 // -- if we're asked for polar and have non-polar, use it (and |
125 // vice versa). This one is vital, and we do it for non-fuzzy as | 125 // vice versa). This one is vital, and we do it for non-fuzzy as |
221 windowSize, | 221 windowSize, |
222 windowIncrement, | 222 windowIncrement, |
223 fftSize, | 223 fftSize, |
224 polar, | 224 polar, |
225 criteria, | 225 criteria, |
226 fillFromColumn); | 226 fillFromFrame); |
227 } | 227 } |
228 | 228 |
229 FFTDataServer * | 229 FFTDataServer * |
230 FFTDataServer::findServer(QString n) | 230 FFTDataServer::findServer(QString n) |
231 { | 231 { |
488 int windowSize, | 488 int windowSize, |
489 int windowIncrement, | 489 int windowIncrement, |
490 int fftSize, | 490 int fftSize, |
491 bool polar, | 491 bool polar, |
492 StorageAdviser::Criteria criteria, | 492 StorageAdviser::Criteria criteria, |
493 int fillFromColumn) : | 493 sv_frame_t fillFromFrame) : |
494 m_fileBaseName(fileBaseName), | 494 m_fileBaseName(fileBaseName), |
495 m_model(model), | 495 m_model(model), |
496 m_channel(channel), | 496 m_channel(channel), |
497 m_windower(windowType, windowSize), | 497 m_windower(windowType, windowSize), |
498 m_windowSize(windowSize), | 498 m_windowSize(windowSize), |
585 if (!m_fftPlan) { | 585 if (!m_fftPlan) { |
586 cerr << "ERROR: fftf_plan_dft_r2c_1d(" << m_windowSize << ") failed!" << endl; | 586 cerr << "ERROR: fftf_plan_dft_r2c_1d(" << m_windowSize << ") failed!" << endl; |
587 throw(0); | 587 throw(0); |
588 } | 588 } |
589 | 589 |
590 m_fillThread = new FillThread(*this, fillFromColumn); | 590 m_fillThread = new FillThread(*this, fillFromFrame); |
591 } | 591 } |
592 | 592 |
593 FFTDataServer::~FFTDataServer() | 593 FFTDataServer::~FFTDataServer() |
594 { | 594 { |
595 #ifdef DEBUG_FFT_SERVER | 595 #ifdef DEBUG_FFT_SERVER |