mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-09 23:35:33 -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

28
plugins/AudioFileProcessor/AudioFileProcessor.cpp
View File

@@ -47,6 +47,11 @@
#include "embed.h"
#include "plugin_export.h"
namespace lmms
{
extern "C"
{
@@ -110,13 +115,6 @@ AudioFileProcessor::AudioFileProcessor( InstrumentTrack * _instrument_track ) :
AudioFileProcessor::~AudioFileProcessor()
{
}
void AudioFileProcessor::playNote( NotePlayHandle * _n,
sampleFrame * _working_buffer )
{
@@ -312,9 +310,9 @@ int AudioFileProcessor::getBeatLen( NotePlayHandle * _n ) const
PluginView * AudioFileProcessor::instantiateView( QWidget * _parent )
gui::PluginView* AudioFileProcessor::instantiateView( QWidget * _parent )
{
return new AudioFileProcessorView( this, _parent );
return new gui::AudioFileProcessorView( this, _parent );
}
@@ -442,6 +440,8 @@ void AudioFileProcessor::pointChanged( void )
namespace gui
{
QPixmap * AudioFileProcessorView::s_artwork = nullptr;
@@ -548,8 +548,8 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument,
m_waveView = 0;
newWaveView();
connect( castModel<AudioFileProcessor>(), SIGNAL( isPlaying( f_cnt_t ) ),
m_waveView, SLOT( isPlaying( f_cnt_t ) ) );
connect( castModel<AudioFileProcessor>(), SIGNAL( isPlaying( lmms::f_cnt_t ) ),
m_waveView, SLOT( isPlaying( lmms::f_cnt_t ) ) );
qRegisterMetaType<f_cnt_t>( "f_cnt_t" );
@@ -1242,7 +1242,7 @@ float AudioFileProcessorWaveView::knob::getValue( const QPoint & _p )
const double dec_fact = ! m_waveView ? 1 :
double( m_waveView->m_to - m_waveView->m_from )
/ m_waveView->m_sampleBuffer.frames();
const float inc = ::Knob::getValue( _p ) * dec_fact;
const float inc = Knob::getValue( _p ) * dec_fact;
return inc;
}
@@ -1273,6 +1273,7 @@ bool AudioFileProcessorWaveView::knob::checkBound( double _v ) const
}
} // namespace gui
@@ -1288,3 +1289,6 @@ PLUGIN_EXPORT Plugin * lmms_plugin_main(Model * model, void *)
}
} // namespace lmms