mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-14 09:46:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up macros a bit (#6444)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

6
include/DrumSynth.h
View File

@@ -24,8 +24,8 @@
*/
#ifndef _DRUMSYNTH_H__
#define _DRUMSYNTH_H__
#ifndef DRUMSYNTH_H
#define DRUMSYNTH_H
#include <stdint.h>
#include "lmms_basics.h"
@@ -57,4 +57,4 @@ class DrumSynth {
} // namespace lmms
#endif
#endif // DRUMSYNTH_H

6
include/MicroTimer.h
View File

@@ -22,8 +22,8 @@
*
*/
#ifndef MICRO_TIMER
#define MICRO_TIMER
#ifndef MICRO_TIMER_H
#define MICRO_TIMER_H
#include <chrono>
@@ -48,4 +48,4 @@ private:
} // namespace lmms
#endif
#endif // MICRO_TIMER_H

1
include/RemotePluginBase.h
View File

@@ -38,7 +38,6 @@
#if !(defined(LMMS_HAVE_SYS_IPC_H) && defined(LMMS_HAVE_SEMAPHORE_H))
#define SYNC_WITH_SHM_FIFO
#define USE_QT_SEMAPHORES
#ifdef LMMS_HAVE_PROCESS_H
#include <process.h>

4
include/embed.h
View File

@@ -61,7 +61,7 @@ namespace PLUGIN_NAME
inline QPixmap getIconPixmap( const QString& _name,
int _w = -1, int _h = -1, const char** xpm = nullptr )
{
return embed::getIconPixmap(QString("%1/%2").arg(STRINGIFY(PLUGIN_NAME), _name), _w, _h, xpm);
return embed::getIconPixmap(QString("%1/%2").arg(LMMS_STRINGIFY(PLUGIN_NAME), _name), _w, _h, xpm);
}
//QString getText( const char * _name );
@@ -132,7 +132,7 @@ public:
QString pixmapName() const override
{
return QString( STRINGIFY(PLUGIN_NAME) ) + "::" + m_name;
return QString( LMMS_STRINGIFY(PLUGIN_NAME) ) + "::" + m_name;
}
} ;

4
include/lmms_basics.h
View File

@@ -136,8 +136,8 @@ using surroundSampleFrame = std::array<sample_t, SURROUND_CHANNELS>;
constexpr std::size_t LMMS_ALIGN_SIZE = 16;
#define STRINGIFY(s) STR(s)
#define STR(PN) #PN
#define LMMS_STRINGIFY(s) LMMS_STR(s)
#define LMMS_STR(PN) #PN
// Abstract away GUI CTRL key (linux/windows) vs ⌘ (apple)
constexpr const char* UI_CTRL_KEY =

2
include/versioninfo.h
View File

@@ -3,7 +3,7 @@
#ifdef __GNUC__
constexpr const char* LMMS_BUILDCONF_COMPILER_VERSION = "GCC " __VERSION__;
#elif defined(_MSC_VER)
constexpr const char* LMMS_BUILDCONF_COMPILER_VERSION = "MSVC " STRINGIFY(_MSC_FULL_VER);
constexpr const char* LMMS_BUILDCONF_COMPILER_VERSION = "MSVC " LMMS_STRINGIFY(_MSC_FULL_VER);
#else
constexpr const char* LMMS_BUILDCONF_COMPILER_VERSION = "unknown compiler";
#endif

2
plugins/Amplifier/Amplifier.cpp
View File

@@ -36,7 +36,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT amplifier_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Amplifier",
QT_TRANSLATE_NOOP( "PluginBrowser", "A native amplifier plugin" ),
"Vesa Kivimäki <contact/dot/diizy/at/nbl/dot/fi>",

2
plugins/AudioFileProcessor/AudioFileProcessor.cpp
View File

@@ -57,7 +57,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT audiofileprocessor_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"AudioFileProcessor",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Simple sampler with various settings for "

2
plugins/BassBooster/BassBooster.cpp
View File

@@ -36,7 +36,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT bassbooster_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"BassBooster",
QT_TRANSLATE_NOOP( "PluginBrowser", "Boost your bass the fast and simple way" ),
"Tobias Doerffel <tobydox/at/users.sf.net>",

2
plugins/BitInvader/BitInvader.cpp
View File

@@ -54,7 +54,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT bitinvader_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"BitInvader",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Customizable wavetable synthesizer" ),

2
plugins/Bitcrush/Bitcrush.cpp
View File

@@ -43,7 +43,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT bitcrush_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Bitcrush",
QT_TRANSLATE_NOOP( "PluginBrowser", "An oversampling bitcrusher" ),
"Vesa Kivimäki <contact/dot/diizy/at/nbl/dot/fi>",

2
plugins/CarlaPatchbay/CarlaPatchbay.cpp
View File

@@ -37,7 +37,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT carlapatchbay_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Carla Patchbay",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Carla Patchbay Instrument" ),

2
plugins/CarlaRack/CarlaRack.cpp
View File

@@ -37,7 +37,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT carlarack_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Carla Rack",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Carla Rack Instrument" ),

2
plugins/Compressor/Compressor.cpp
View File

@@ -38,7 +38,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT compressor_plugin_descriptor =
{
STRINGIFY(PLUGIN_NAME),
LMMS_STRINGIFY(PLUGIN_NAME),
"Compressor",
QT_TRANSLATE_NOOP("PluginBrowser", "A dynamic range compressor."),
"Lost Robot <r94231@gmail.com>",

2
plugins/CrossoverEQ/CrossoverEQ.cpp
View File

@@ -38,7 +38,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT crossovereq_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Crossover Equalizer",
QT_TRANSLATE_NOOP( "PluginBrowser", "A 4-band Crossover Equalizer" ),
"Vesa Kivimäki <contact/dot/diizy/at/nbl/dot/fi>",

2
plugins/Delay/DelayEffect.cpp
View File

@@ -39,7 +39,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT delay_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Delay",
QT_TRANSLATE_NOOP( "PluginBrowser", "A native delay plugin" ),
"Dave French <contact/dot/dave/dot/french3/at/googlemail/dot/com>",

2
plugins/DualFilter/DualFilter.cpp
View File

@@ -38,7 +38,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT dualfilter_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Dual Filter",
QT_TRANSLATE_NOOP( "PluginBrowser", "A Dual filter plugin" ),
"Vesa Kivimäki <contact/dot/diizy/at/nbl/dot/fi>",

2
plugins/DynamicsProcessor/DynamicsProcessor.cpp
View File

@@ -41,7 +41,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT dynamicsprocessor_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Dynamics Processor",
QT_TRANSLATE_NOOP( "PluginBrowser",
"plugin for processing dynamics in a flexible way" ),

2
plugins/Eq/EqEffect.cpp
View File

@@ -39,7 +39,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT eq_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Equalizer",
QT_TRANSLATE_NOOP( "PluginBrowser", "A native eq plugin" ),
"Dave French <contact/dot/dave/dot/french3/at/googlemail/dot/com>",

2
plugins/Flanger/FlangerEffect.cpp
View File

@@ -37,7 +37,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT flanger_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Flanger",
QT_TRANSLATE_NOOP( "PluginBrowser", "A native flanger plugin" ),
"Dave French <contact/dot/dave/dot/french3/at/googlemail/dot/com>",

2
plugins/FreeBoy/FreeBoy.cpp
View File

@@ -52,7 +52,7 @@ extern "C"
{
Plugin::Descriptor PLUGIN_EXPORT freeboy_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"FreeBoy",
QT_TRANSLATE_NOOP( "PluginBrowser", "Emulation of GameBoy (TM) APU" ),

2
plugins/GigPlayer/GigPlayer.cpp
View File

@@ -64,7 +64,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT gigplayer_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"GIG Player",
QT_TRANSLATE_NOOP( "PluginBrowser", "Player for GIG files" ),
"Garrett Wilson <g/at/floft/dot/net>",

2
plugins/HydrogenImport/HydrogenImport.cpp
View File

@@ -24,7 +24,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT hydrogenimport_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Hydrogen Import",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Filter for importing Hydrogen files into LMMS" ),

2
plugins/Kicker/Kicker.cpp
View File

@@ -49,7 +49,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT kicker_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Kicker",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Versatile drum synthesizer" ),

2
plugins/LadspaBrowser/LadspaBrowser.cpp
View File

@@ -50,7 +50,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT ladspabrowser_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"LADSPA Plugin Browser",
QT_TRANSLATE_NOOP( "PluginBrowser",
"List installed LADSPA plugins" ),

2
plugins/LadspaEffect/LadspaEffect.cpp
View File

@@ -53,7 +53,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT ladspaeffect_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"LADSPA",
QT_TRANSLATE_NOOP( "PluginBrowser",
"plugin for using arbitrary LADSPA-effects "

2
plugins/Lb302/Lb302.cpp
View File

@@ -80,7 +80,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT lb302_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"LB302",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Incomplete monophonic imitation TB-303" ),

6
plugins/Lb302/Lb302.h
View File

@@ -29,8 +29,8 @@
*/
#ifndef LB302_H_
#define LB302_H_
#ifndef LB302_H
#define LB302_H
#include "DspEffectLibrary.h"
#include "Instrument.h"
@@ -303,4 +303,4 @@ private:
} // namespace lmms
#endif
#endif // LB302_H

2
plugins/Lv2Effect/Lv2Effect.cpp
View File

@@ -40,7 +40,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT lv2effect_plugin_descriptor =
{
STRINGIFY(PLUGIN_NAME),
LMMS_STRINGIFY(PLUGIN_NAME),
"LV2",
QT_TRANSLATE_NOOP("PluginBrowser",
"plugin for using arbitrary LV2-effects inside LMMS."),

2
plugins/Lv2Instrument/Lv2Instrument.cpp
View File

@@ -49,7 +49,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT lv2instrument_plugin_descriptor =
{
STRINGIFY(PLUGIN_NAME),
LMMS_STRINGIFY(PLUGIN_NAME),
"LV2",
QT_TRANSLATE_NOOP("PluginBrowser",
"plugin for using arbitrary LV2 instruments inside LMMS."),

2
plugins/MidiExport/MidiExport.cpp
View File

@@ -44,7 +44,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT midiexport_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"MIDI Export",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Filter for exporting MIDI-files from LMMS" ),

2
plugins/MidiImport/MidiImport.cpp
View File

@@ -65,7 +65,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT midiimport_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"MIDI Import",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Filter for importing MIDI-files into LMMS" ),

2
plugins/Monstro/Monstro.cpp
View File

@@ -47,7 +47,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT monstro_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Monstro",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Monstrous 3-oscillator synth with modulation matrix" ),

2
plugins/MultitapEcho/MultitapEcho.cpp
View File

@@ -36,7 +36,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT multitapecho_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Multitap Echo",
QT_TRANSLATE_NOOP( "PluginBrowser", "A multitap echo delay plugin" ),
"Vesa Kivimäki <contact/dot/diizy/at/nbl/dot/fi>",

2
plugins/Nes/Nes.cpp
View File

@@ -45,7 +45,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT nes_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Nescaline",
QT_TRANSLATE_NOOP( "PluginBrowser",
"A NES-like synthesizer" ),

2
plugins/OpulenZ/OpulenZ.cpp
View File

@@ -67,7 +67,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT opulenz_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"OpulenZ",
QT_TRANSLATE_NOOP( "PluginBrowser",
"2-operator FM Synth" ),

2
plugins/Organic/Organic.cpp
View File

@@ -50,7 +50,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT organic_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Organic",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Additive Synthesizer for organ-like sounds" ),

2
plugins/Patman/Patman.cpp
View File

@@ -55,7 +55,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT patman_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"PatMan",
QT_TRANSLATE_NOOP( "PluginBrowser",
"GUS-compatible patch instrument" ),

6
plugins/Patman/Patman.h
View File

@@ -23,8 +23,8 @@
*/
#ifndef PATMAN_H_
#define PATMAN_H_
#ifndef PATMAN_H
#define PATMAN_H
#include "Instrument.h"
#include "InstrumentView.h"
@@ -162,4 +162,4 @@ private:
} // namespace lmms
#endif
#endif // PATMAN_H

2
plugins/PeakControllerEffect/PeakControllerEffect.cpp
View File

@@ -42,7 +42,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT peakcontrollereffect_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Peak Controller",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Plugin for controlling knobs with sound peaks" ),

2
plugins/ReverbSC/ReverbSC.cpp
View File

@@ -37,7 +37,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT reverbsc_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"ReverbSC",
QT_TRANSLATE_NOOP( "PluginBrowser", "Reverb algorithm by Sean Costello" ),
"Paul Batchelor",

2
plugins/Sf2Player/Sf2Player.cpp
View File

@@ -58,7 +58,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT sf2player_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Sf2 Player",
QT_TRANSLATE_NOOP( "PluginBrowser", "Player for SoundFont files" ),
"Paul Giblock <drfaygo/at/gmail/dot/com>",

2
plugins/Sfxr/Sfxr.cpp
View File

@@ -61,7 +61,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT sfxr_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"sfxr",
QT_TRANSLATE_NOOP( "PluginBrowser",
"LMMS port of sfxr" ),

2
plugins/Sid/SidInstrument.cpp
View File

@@ -75,7 +75,7 @@ extern "C"
{
Plugin::Descriptor PLUGIN_EXPORT sid_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"SID",
QT_TRANSLATE_NOOP( "PluginBrowser", "Emulation of the MOS6581 and MOS8580 "
"SID.\nThis chip was used in the Commodore 64 computer." ),

2
plugins/StereoEnhancer/StereoEnhancer.cpp
View File

@@ -37,7 +37,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT stereoenhancer_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"StereoEnhancer Effect",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Plugin for enhancing stereo separation of a stereo input file" ),

2
plugins/StereoMatrix/StereoMatrix.cpp
View File

@@ -37,7 +37,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT stereomatrix_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Stereo Matrix",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Plugin for freely manipulating stereo output" ),

2
plugins/Stk/Mallets/Mallets.cpp
View File

@@ -53,7 +53,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT malletsstk_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Mallets",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Tuneful things to bang on" ),

2
plugins/TripleOscillator/TripleOscillator.cpp
View File

@@ -50,7 +50,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT tripleoscillator_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"TripleOscillator",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Three powerful oscillators you can modulate "

2
plugins/Vectorscope/Vectorscope.cpp
View File

@@ -34,7 +34,7 @@ namespace lmms
extern "C" {
Plugin::Descriptor PLUGIN_EXPORT vectorscope_plugin_descriptor =
{
STRINGIFY(PLUGIN_NAME),
LMMS_STRINGIFY(PLUGIN_NAME),
"Vectorscope",
QT_TRANSLATE_NOOP("PluginBrowser", "A stereo field visualizer."),
"Martin Pavelek <he29/dot/HS/at/gmail/dot/com>",

2
plugins/Vestige/Vestige.cpp
View File

@@ -71,7 +71,7 @@ extern "C"
Plugin::Descriptor Q_DECL_EXPORT vestige_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"VeSTige",
QT_TRANSLATE_NOOP( "PluginBrowser",
"VST-host for using VST(i)-plugins within LMMS" ),

2
plugins/Vibed/Vibed.cpp
View File

@@ -52,7 +52,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT vibedstrings_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Vibed",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Vibrating string modeler" ),

2
plugins/VstBase/vst_base.cpp
View File

@@ -36,7 +36,7 @@ extern "C"
Plugin::Descriptor VSTBASE_EXPORT vstbase_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"VST Base",
"library for all LMMS plugins dealing with VST-plugins",
"Tobias Doerffel <tobydox/at/users/dot/sf/dot/net>",

2
plugins/VstEffect/VstEffect.cpp
View File

@@ -43,7 +43,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT vsteffect_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"VST",
QT_TRANSLATE_NOOP( "PluginBrowser",
"plugin for using arbitrary VST effects inside LMMS." ),

2
plugins/Watsyn/Watsyn.cpp
View File

@@ -46,7 +46,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT watsyn_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Watsyn",
QT_TRANSLATE_NOOP( "PluginBrowser",
"4-oscillator modulatable wavetable synth" ),

2
plugins/WaveShaper/WaveShaper.cpp
View File

@@ -40,7 +40,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT waveshaper_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"Waveshaper Effect",
QT_TRANSLATE_NOOP( "PluginBrowser",
"plugin for waveshaping" ),

2
plugins/Xpressive/Xpressive.cpp
View File

@@ -54,7 +54,7 @@ namespace lmms
extern "C" {
Plugin::Descriptor PLUGIN_EXPORT xpressive_plugin_descriptor = { STRINGIFY(
Plugin::Descriptor PLUGIN_EXPORT xpressive_plugin_descriptor = { LMMS_STRINGIFY(
PLUGIN_NAME), "Xpressive", QT_TRANSLATE_NOOP("PluginBrowser",
"Mathematical expression parser"), "Orr Dvori", 0x0100,
Plugin::Instrument, new PluginPixmapLoader("logo"), nullptr, nullptr };

2
plugins/ZynAddSubFx/ZynAddSubFx.cpp
View File

@@ -60,7 +60,7 @@ extern "C"
Plugin::Descriptor PLUGIN_EXPORT zynaddsubfx_plugin_descriptor =
{
STRINGIFY( PLUGIN_NAME ),
LMMS_STRINGIFY( PLUGIN_NAME ),
"ZynAddSubFX",
QT_TRANSLATE_NOOP( "PluginBrowser",
"Embedded ZynAddSubFX" ),

5
src/gui/instrument/InstrumentMidiIOView.cpp
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 )
{

22
src/lmmsconfig.h.in
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