made STRINGIFY_PLUGIN_NAME from embed.h a generic macro STRINGIFY in lmms_basics.h

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1784 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-10-19 21:48:57 +00:00
parent 7f713f456b
commit 87ee43a079
30 changed files with 77 additions and 34 deletions

View File

@@ -1,5 +1,48 @@
2008-10-19 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* plugins/sid/sid_instrument.cpp:
* plugins/ladspa_effect/ladspa_effect.cpp:
* plugins/patman/patman.cpp:
* plugins/lb302/lb302.cpp:
* plugins/organic/organic.cpp:
* plugins/lb303/lb303.cpp:
* plugins/stereo_matrix/stereo_matrix.cpp:
* plugins/bass_booster/bass_booster.cpp:
* plugins/bit_invader/bit_invader.cpp:
* plugins/vst_effect/vst_effect.cpp:
* plugins/vibed/vibed.cpp:
* plugins/triple_oscillator/triple_oscillator.cpp:
* plugins/peak_controller_effect/peak_controller_effect.cpp:
* plugins/audio_file_processor/audio_file_processor.cpp:
* plugins/stk/mallets/mallets.cpp:
* plugins/stereo_enhancer/stereo_enhancer.cpp:
* plugins/papu/papu_instrument.cpp:
* plugins/sf2_player/sf2_player.cpp:
* plugins/vestige/vestige.cpp:
* plugins/vst_base/vst_base.cpp:
* plugins/ladspa_browser/ladspa_browser.cpp:
* plugins/spectrum_analyzer/spectrum_analyzer.cpp:
* plugins/kicker/kicker.cpp:
* plugins/flp_import/flp_import.cpp:
* plugins/midi_import/midi_import.cpp:
* include/embed.h:
* include/lmms_basics.h:
* include/plugin.h:
* src/gui/embed.cpp:
made STRINGIFY_PLUGIN_NAME from embed.h a generic macro STRINGIFY in
lmms_basics.h
* include/about_dialog.h:
* src/gui/about_dialog.cpp:
* src/gui/dialogs/about_dialog.ui:
designed-based about dialog
* src/gui/widgets/rename_dialog.cpp:
initially select whole string so it can be overwritten easily
* AUTHORS:
moved an item to lmms-extras/AUTHORS
* plugins/vst_base/vst_plugin.h:
* plugins/vst_base/vst_plugin.cpp:
* plugins/vst_effect/vst_effect_control_dialog.cpp:

View File

@@ -31,10 +31,7 @@
#include "export.h"
#define STRINGIFY_PLUGIN_NAME(s) STR(s)
#define STR(PN) #PN
#include "lmms_basics.h"
namespace embed
@@ -124,8 +121,7 @@ public:
virtual QString pixmapName( void ) const
{
return QString( STRINGIFY_PLUGIN_NAME(PLUGIN_NAME) ) +
"::" + m_name;
return QString( STRINGIFY(PLUGIN_NAME) ) + "::" + m_name;
}
} ;

View File

@@ -136,4 +136,9 @@ typedef sample_t surroundSampleFrame[SURROUND_CHANNELS];
typedef sample_t sampleFrameA[DEFAULT_CHANNELS] __attribute__((__aligned__(ALIGN_SIZE)));
#endif
#define STRINGIFY(s) STR(s)
#define STR(PN) #PN
#endif

View File

@@ -152,8 +152,7 @@ public:
// returns display-name out of descriptor
virtual QString displayName( void ) const
{
return model::displayName().isNull() ?
m_descriptor->displayName :
return m_descriptor ? m_descriptor->displayName :
model::displayName();
}

View File

@@ -51,7 +51,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT audiofileprocessor_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"AudioFileProcessor",
QT_TRANSLATE_NOOP( "pluginBrowser",
"simple sampler with various settings for "

View File

@@ -35,7 +35,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT bassbooster_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"BassBooster Effect",
QT_TRANSLATE_NOOP( "pluginBrowser",
"plugin for boosting bass" ),

View File

@@ -47,7 +47,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT bitinvader_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"BitInvader",
QT_TRANSLATE_NOOP( "pluginBrowser",
"Customizable wavetable synthesizer" ),

View File

@@ -67,7 +67,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT flpimport_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"FLP Import",
QT_TRANSLATE_NOOP( "pluginBrowser",
"Filter for importing FL Studio projects into LMMS" ),

View File

@@ -42,7 +42,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT kicker_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"Kicker",
QT_TRANSLATE_NOOP( "pluginBrowser",
"versatile kick- & bassdrum-synthesizer" ),

View File

@@ -49,7 +49,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT ladspabrowser_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"LADSPA Plugin Browser",
QT_TRANSLATE_NOOP( "pluginBrowser",
"List installed LADSPA plugins" ),

View File

@@ -46,7 +46,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT ladspaeffect_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"LADSPA Effect",
QT_TRANSLATE_NOOP( "pluginBrowser",
"plugin for using arbitrary LADSPA-effects "

View File

@@ -83,7 +83,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT lb302_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"LB302",
QT_TRANSLATE_NOOP( "pluginBrowser",
"Incomplete monophonic immitation tb303" ),

View File

@@ -79,7 +79,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT lb303_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"LB303",
QT_TRANSLATE_NOOP( "pluginBrowser",
"Incomplete monophonic immitation tb303" ),

View File

@@ -54,7 +54,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT midiimport_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"MIDI Import",
QT_TRANSLATE_NOOP( "pluginBrowser",
"Filter for importing MIDI-files into LMMS" ),

View File

@@ -48,7 +48,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT organic_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"Organic",
QT_TRANSLATE_NOOP( "pluginBrowser",
"Additive Synthesizer for organ-like sounds" ),

View File

@@ -43,7 +43,7 @@ extern "C"
{
plugin::descriptor PLUGIN_EXPORT papu_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"FreeBoy",
QT_TRANSLATE_NOOP( "pluginBrowser", "Emulation of GameBoy (TM) APU" ),

View File

@@ -50,7 +50,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT patman_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"PatMan",
QT_TRANSLATE_NOOP( "pluginBrowser",
"GUS-compatible patch instrument" ),

View File

@@ -38,7 +38,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT peakcontrollereffect_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"Peak Controller",
QT_TRANSLATE_NOOP( "pluginBrowser",
"Plugin for controlling knobs with sound peaks" ),

View File

@@ -51,7 +51,7 @@ extern "C"
plugin::descriptor sf2player_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"Sf2 Player",
QT_TRANSLATE_NOOP( "pluginBrowser",
"Player for SoundFont files" ),

View File

@@ -69,7 +69,7 @@ extern "C"
{
plugin::descriptor PLUGIN_EXPORT sid_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"SID",
QT_TRANSLATE_NOOP( "pluginBrowser", "Emulation of the MOS6581 and MOS8580 "
"SID.\nThis chip was used in the Commodore 64 computer." ),

View File

@@ -35,7 +35,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT spectrumanalyzer_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"Spectrum Analyzer",
QT_TRANSLATE_NOOP( "pluginBrowser",
"plugin for using arbitrary VST-effects "

View File

@@ -35,7 +35,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT stereoenhancer_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"StereoEnhancer Effect",
QT_TRANSLATE_NOOP( "pluginBrowser",
"Plugin for enhancing stereo separation of a stereo input file" ),

View File

@@ -35,7 +35,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT stereomatrix_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"Stereophonic Matrix",
QT_TRANSLATE_NOOP( "pluginBrowser",
"Plugin for freely manipulating stereo output" ),

View File

@@ -44,7 +44,7 @@ extern "C"
plugin::descriptor malletsstk_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"Mallets",
QT_TRANSLATE_NOOP( "pluginBrowser",
"Tuneful things to bang on" ),

View File

@@ -49,7 +49,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT tripleoscillator_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"TripleOscillator",
QT_TRANSLATE_NOOP( "pluginBrowser",
"three powerful oscillators you can modulate "

View File

@@ -50,7 +50,7 @@ extern "C"
plugin::descriptor vestige_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"VeSTige",
QT_TRANSLATE_NOOP( "pluginBrowser",
"VST-host for using VST(i)-plugins within LMMS" ),

View File

@@ -49,7 +49,7 @@ extern "C"
plugin::descriptor PLUGIN_EXPORT vibedstrings_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"Vibed",
QT_TRANSLATE_NOOP( "pluginBrowser",
"Vibrating string modeler" ),

View File

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

View File

@@ -41,7 +41,7 @@ extern "C"
plugin::descriptor vsteffect_plugin_descriptor =
{
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ),
STRINGIFY( PLUGIN_NAME ),
"VST Effect",
QT_TRANSLATE_NOOP( "pluginBrowser",
"plugin for using arbitrary VST-effects "

View File

@@ -51,7 +51,7 @@ QPixmap getIconPixmap( const char * _name, int _w, int _h )
#ifdef PLUGIN_NAME
QPixmap p( configManager::inst()->artworkDir() + "plugins/" +
STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ) + "_" + name );
STRINGIFY( PLUGIN_NAME ) + "_" + name );
if( p.isNull() )
{
p = QPixmap( configManager::inst()->artworkDir() +