Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

Improvements to Audio Recording II: Free up memory in SPAAACE!

justburner4e68745ba2f5
diff --git a/toonz/sources/toonz/audiorecordingpopup.cpp b/toonz/sources/toonz/audiorecordingpopup.cpp
index c00701322..f55a007a7 100644
--- a/toonz/sources/toonz/audiorecordingpopup.cpp
+++ b/toonz/sources/toonz/audiorecordingpopup.cpp
@@ -72,7 +72,6 @@ AudioRecordingPopup::AudioRecordingPopup()
m_playXSheetCB = new QCheckBox(tr("Sync with XSheet/Timeline"), this);
m_timer = new QElapsedTimer();
m_recordedLevels = QMap<qint64, double>();
- m_oldElapsed = 0;
m_player = new QMediaPlayer(this);
m_console = FlipConsole::getCurrent();
@@ -284,7 +283,6 @@ void AudioRecordingPopup::onRecordButtonPressed() {
m_comboSamplerate->setDisabled(true);
m_comboSamplefmt->setDisabled(true);
m_recordedLevels.clear();
- m_oldElapsed = 0;
m_pausedTime = 0;
m_startPause = 0;
m_endPause = 0;
@@ -309,6 +307,7 @@ void AudioRecordingPopup::onRecordButtonPressed() {
m_saveButton->setEnabled(true);
m_playButton->setEnabled(true);
}
+ m_audioWriterWAV->freeup();
m_audioLevelsDisplay->setLevel(-1);
m_recordButton->setIcon(m_recordIcon);
m_pauseRecordingButton->setDisabled(true);
@@ -616,6 +615,9 @@ void AudioRecordingPopup::hideEvent(QHideEvent *event) {
if (TSystem::doesExistFileOrLevel(TFilePath(m_filePath.getQString()))) {
TSystem::removeFileOrLevel(TFilePath(m_filePath.getQString()));
}
+ // Free up memory used in recording
+ m_recordedLevels.clear();
+ m_audioWriterWAV->freeup();
}
//-----------------------------------------------------------------------------
@@ -784,6 +786,8 @@ bool AudioWriterWAV::save(const QString &filename)
return true;
}
+void AudioWriterWAV::freeup() { m_barray.clear(); }
+
//-----------------------------------------------------------------------------
// AudioLevelsDisplay Class
//-----------------------------------------------------------------------------
diff --git a/toonz/sources/toonz/audiorecordingpopup.h b/toonz/sources/toonz/audiorecordingpopup.h
index c64f42850..ec3e3f884 100644
--- a/toonz/sources/toonz/audiorecordingpopup.h
+++ b/toonz/sources/toonz/audiorecordingpopup.h
@@ -18,7 +18,6 @@ class QPushButton;
class QLabel;
class AudioLevelsDisplay;
class FlipConsole;
-class QAudioProbe;
class QAudioBuffer;
class QMediaPlayer;
class QElapsedTimer;
@@ -42,13 +41,11 @@ class AudioRecordingPopup : public DVGui::Dialog {
QCheckBox *m_playXSheetCB;
int m_currentFrame;
AudioLevelsDisplay *m_audioLevelsDisplay;
- QAudioProbe *m_probe;
QMediaPlayer *m_player;
TFilePath m_filePath;
FlipConsole *m_console;
QElapsedTimer *m_timer;
QMap<qint64, double> m_recordedLevels;
- qint64 m_oldElapsed;
qint64 m_startPause = 0;
qint64 m_endPause = 0;
qint64 m_pausedTime = 0;
@@ -103,6 +100,7 @@ public:
void start();
void stop();
bool save(const QString &filename);
+ void freeup();
qint64 readData(char *data, qint64 maxlen) override;
qint64 writeData(const char *data, qint64 len) override;