Mercurial > hg > svapp
comparison audio/AudioRecordTarget.cpp @ 500:dcd2afbc1bb7 3.0-integration
Merge, but dropping the last commit from the recording branch because I prefer the way it was done here
author | Chris Cannam |
---|---|
date | Wed, 14 Oct 2015 10:17:32 +0100 |
parents | cd9dec2f47e8 0ce24bb965a8 |
children | c82cae9a9e74 |
comparison
equal
deleted
inserted
replaced
499:a4d90cf2bb79 | 500:dcd2afbc1bb7 |
---|---|
39 { | 39 { |
40 QMutexLocker locker(&m_mutex); | 40 QMutexLocker locker(&m_mutex); |
41 } | 41 } |
42 | 42 |
43 void | 43 void |
44 AudioRecordTarget::setSystemRecordSource(breakfastquay::SystemRecordSource *s) | 44 AudioRecordTarget::setSystemRecordBlockSize(int) |
45 { | |
46 m_source = s; | |
47 } | |
48 | |
49 void | |
50 AudioRecordTarget::setSystemRecordBlockSize(int sz) | |
51 { | 45 { |
52 } | 46 } |
53 | 47 |
54 void | 48 void |
55 AudioRecordTarget::setSystemRecordSampleRate(int n) | 49 AudioRecordTarget::setSystemRecordSampleRate(int n) |
56 { | 50 { |
57 m_recordSampleRate = n; | 51 m_recordSampleRate = n; |
58 } | 52 } |
59 | 53 |
60 void | 54 void |
61 AudioRecordTarget::setSystemRecordLatency(int sz) | 55 AudioRecordTarget::setSystemRecordLatency(int) |
62 { | 56 { |
63 } | 57 } |
64 | 58 |
65 void | 59 void |
66 AudioRecordTarget::putSamples(int nframes, float **samples) | 60 AudioRecordTarget::putSamples(int nframes, float **samples) |
90 emit recordDurationChanged(frameToEmit, m_recordSampleRate); | 84 emit recordDurationChanged(frameToEmit, m_recordSampleRate); |
91 } | 85 } |
92 } | 86 } |
93 | 87 |
94 void | 88 void |
95 AudioRecordTarget::setInputLevels(float peakLeft, float peakRight) | 89 AudioRecordTarget::setInputLevels(float, float) |
96 { | 90 { |
97 } | 91 } |
98 | 92 |
99 void | 93 void |
100 AudioRecordTarget::modelAboutToBeDeleted() | 94 AudioRecordTarget::modelAboutToBeDeleted() |
120 } | 114 } |
121 | 115 |
122 WritableWaveFileModel * | 116 WritableWaveFileModel * |
123 AudioRecordTarget::startRecording() | 117 AudioRecordTarget::startRecording() |
124 { | 118 { |
125 if (m_source) m_source->resume(); | |
126 | |
127 { | 119 { |
128 QMutexLocker locker(&m_mutex); | 120 QMutexLocker locker(&m_mutex); |
129 | 121 |
130 if (m_recording) { | 122 if (m_recording) { |
131 cerr << "WARNING: AudioRecordTarget::startRecording: We are already recording" << endl; | 123 cerr << "WARNING: AudioRecordTarget::startRecording: We are already recording" << endl; |
179 m_model->setCompletion(100); | 171 m_model->setCompletion(100); |
180 m_model = 0; | 172 m_model = 0; |
181 m_recording = false; | 173 m_recording = false; |
182 } | 174 } |
183 | 175 |
184 if (m_source) m_source->suspend(); | |
185 | |
186 emit recordStatusChanged(false); | 176 emit recordStatusChanged(false); |
187 } | 177 } |
188 | 178 |
189 | 179 |