mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-18 03:35:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Namespace lmms (#6174)

Browse Source 
This PR places all LMMS symbols into namespaces to eliminate any potential future name collisions between LMMS and third-party modules.

Also, this PR changes back `LmmsCore` to `Engine`, reverting c519921306 .

Co-authored-by: allejok96 <allejok96@gmail.com>
This commit is contained in:
Levin Oehlmann
2022-06-19 20:08:46 +02:00
committed by GitHub
parent 371f7f506d
commit 7227c89847
804 changed files with 6609 additions and 1478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/SampleBuffer.cpp
View File

@@ -61,6 +61,8 @@
#include "FileDialog.h"
namespace lmms
{
SampleBuffer::SampleBuffer() :
m_userAntiAliasWaveTable(nullptr),
@@ -367,7 +369,7 @@ void SampleBuffer::update(bool keepSettings)
QString message = tr("Audio files are limited to %1 MB "
"in size and %2 minutes of playing time"
).arg(fileSizeMax).arg(sampleLengthMax);
if (getGUI() != nullptr)
if (gui::getGUI() != nullptr)
{
QMessageBox::information(nullptr,
title, message, QMessageBox::Ok);
@@ -1121,7 +1123,7 @@ void SampleBuffer::visualize(
QString SampleBuffer::openAudioFile() const
{
FileDialog ofd(nullptr, tr("Open audio file"));
gui::FileDialog ofd(nullptr, tr("Open audio file"));
QString dir;
if (!m_audioFile.isEmpty())
@@ -1144,7 +1146,7 @@ QString SampleBuffer::openAudioFile() const
}
// change dir to position of previously opened file
ofd.setDirectory(dir);
ofd.setFileMode(FileDialog::ExistingFiles);
ofd.setFileMode(gui::FileDialog::ExistingFiles);
// set filters
QStringList types;
@@ -1587,3 +1589,5 @@ SampleBuffer::handleState::~handleState()
{
src_delete(m_resamplingData);
}
} // namespace lmms