Clean up macros a bit (#6444)

* Prefix `STRINGIFY` and `STR` macros with `LMMS_`

* Fix include guard macro names

* Remove unused macros
This commit is contained in:
Dominic Clark
2022-06-23 12:20:05 +01:00
committed by GitHub
parent c2fa2375dc
commit 96df9b006c
59 changed files with 66 additions and 94 deletions

View File

@@ -144,8 +144,6 @@ InstrumentMidiIOView::InstrumentMidiIOView( QWidget* parent ) :
midiOutputLayout->insertWidget( 0, m_wpBtn );
}
#define PROVIDE_CUSTOM_BASE_VELOCITY_UI
#ifdef PROVIDE_CUSTOM_BASE_VELOCITY_UI
GroupBox* baseVelocityGroupBox = new GroupBox( tr( "CUSTOM BASE VELOCITY" ) );
layout->addWidget( baseVelocityGroupBox );
@@ -166,7 +164,6 @@ InstrumentMidiIOView::InstrumentMidiIOView( QWidget* parent ) :
connect( baseVelocityGroupBox->ledButton(), SIGNAL( toggled( bool ) ),
m_baseVelocitySpinBox, SLOT( setEnabled( bool ) ) );
#endif
layout->addStretch();
}
@@ -195,9 +192,7 @@ void InstrumentMidiIOView::modelChanged()
m_fixedOutputNoteSpinBox->setModel( &mp->m_fixedOutputNoteModel );
m_outputProgramSpinBox->setModel( &mp->m_outputProgramModel );
#ifdef PROVIDE_CUSTOM_BASE_VELOCITY_UI
m_baseVelocitySpinBox->setModel( &mp->m_baseVelocityModel );
#endif
if( m_rpBtn )
{

View File

@@ -53,25 +53,3 @@
#cmakedefine LMMS_HAVE_STRING_H
#cmakedefine LMMS_HAVE_PROCESS_H
#cmakedefine LMMS_HAVE_LOCALE_H
/* defines for libsamplerate */
/* Target processor clips on negative float to int conversion. */
#cmakedefine CPU_CLIPS_NEGATIVE 1
#ifndef CPU_CLIPS_NEGATIVE
#define CPU_CLIPS_NEGATIVE 0
#endif
/* Target processor clips on positive float to int conversion. */
#cmakedefine CPU_CLIPS_POSITIVE 1
#ifndef CPU_CLIPS_POSITIVE
#define CPU_CLIPS_POSITIVE 0
#endif
/* Define if you have C99's lrint function. */
#cmakedefine HAVE_LRINT 1
/* Define if you have C99's lrintf function. */
#cmakedefine HAVE_LRINTF 1