* plugins and core: use new pluginPixmapLoader
* lmmsStyle-class: load stylesheet here * comboBox/comboBoxModel: use pixmapLoader-pointers rather than QPixmap-pointers * in plugin-descriptor, hold a pointer to pixmapLoader instead of QPixmap itself * embed-framework: introduced pixmapLoader and pluginPixmapLoader-classes for abstracting QPixmap-instantiation - models can hold pixmapLoaders without actually instantiating a QPixmap-object and views can access the pixmap * main-window: removed settings-menu and moved setup-dialog to edit-menu * config-manager: removed all the obsolete first-startup-wizard-code git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@999 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
@@ -25,10 +25,10 @@ SUBDIRS = \
|
||||
patman \
|
||||
sf2_player \
|
||||
$(SINGERBOT_DIR) \
|
||||
$(STK_DIR) \
|
||||
triple_oscillator \
|
||||
$(VST_DIRS) \
|
||||
vibed \
|
||||
stereo_enhancer \
|
||||
stereo_matrix \
|
||||
$(STK_DIR) \
|
||||
triple_oscillator \
|
||||
vibed \
|
||||
$(VST_DIRS) \
|
||||
$(EXTRA_PLUGINS)
|
||||
|
||||
@@ -61,7 +61,7 @@ plugin::descriptor audiofileprocessor_plugin_descriptor =
|
||||
"Tobias Doerffel <tobydox/at/users.sf.net>",
|
||||
0x0100,
|
||||
plugin::Instrument,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
new audioFileProcessor::subPluginFeatures( plugin::Instrument )
|
||||
} ;
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ plugin::descriptor bassbooster_plugin_descriptor =
|
||||
"Tobias Doerffel <tobydox/at/users.sf.net>",
|
||||
0x0100,
|
||||
plugin::Effect,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
NULL
|
||||
} ;
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@ plugin::descriptor bitinvader_plugin_descriptor =
|
||||
"Andreas Brandmaier <andreas/at/brandmaier/dot/de>",
|
||||
0x0100,
|
||||
plugin::Instrument,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
NULL
|
||||
} ;
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@
|
||||
#include "song.h"
|
||||
#include "tempo_sync_knob.h"
|
||||
#include "track_container.h"
|
||||
#include "embed.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
@@ -75,7 +76,7 @@ plugin::descriptor flpimport_plugin_descriptor =
|
||||
"Tobias Doerffel <tobydox/at/users/dot/sf/dot/net>",
|
||||
0x0100,
|
||||
plugin::ImportFilter,
|
||||
new QPixmap(),
|
||||
NULL,
|
||||
NULL
|
||||
} ;
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ plugin::descriptor kicker_plugin_descriptor =
|
||||
"Tobias Doerffel <tobydox/at/users.sf.net>",
|
||||
0x0100,
|
||||
plugin::Instrument,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
NULL
|
||||
} ;
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ plugin::descriptor ladspa_browser_plugin_descriptor =
|
||||
"Danny McRae <khjklujn/at/users.sourceforge.net>",
|
||||
0x0100,
|
||||
plugin::Tool,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
NULL
|
||||
} ;
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ plugin::descriptor ladspaeffect_plugin_descriptor =
|
||||
"Danny McRae <khjklujn/at/users.sourceforge.net>",
|
||||
0x0100,
|
||||
plugin::Effect,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
new ladspaSubPluginFeatures( plugin::Effect )
|
||||
} ;
|
||||
|
||||
|
||||
@@ -87,7 +87,7 @@ plugin::descriptor lb302_plugin_descriptor =
|
||||
"Paul Giblock <pgib/at/users.sf.net>",
|
||||
0x0100,
|
||||
plugin::Instrument,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
NULL
|
||||
};
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ plugin::descriptor live_tool_plugin_descriptor =
|
||||
"Javier Serrano Polo <jasp00/at/users.sourceforge.net>",
|
||||
0x0100,
|
||||
plugin::Tool,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
NULL
|
||||
} ;
|
||||
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
#include "level_object.h"
|
||||
#include "instrument.h"
|
||||
#include "debug.h"
|
||||
#include "embed.h"
|
||||
|
||||
|
||||
#define makeID(_c0, _c1, _c2, _c3) \
|
||||
@@ -55,7 +56,7 @@ plugin::descriptor midiimport_plugin_descriptor =
|
||||
"Tobias Doerffel <tobydox/at/users/dot/sf/dot/net>",
|
||||
0x0100,
|
||||
plugin::ImportFilter,
|
||||
new QPixmap(),
|
||||
NULL,
|
||||
NULL
|
||||
} ;
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ plugin::descriptor organic_plugin_descriptor =
|
||||
"Andreas Brandmaier <andreas/at/brandmaier.de>",
|
||||
0x0100,
|
||||
plugin::Instrument,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
NULL
|
||||
} ;
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ plugin::descriptor patman_plugin_descriptor =
|
||||
"Javier Serrano Polo <jasp00/at/users.sourceforge.net>",
|
||||
0x0100,
|
||||
plugin::Instrument,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
new patmanInstrument::subPluginFeatures( plugin::Instrument )
|
||||
} ;
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ plugin::descriptor sf2player_plugin_descriptor =
|
||||
"Paul Giblock <drfaygo/at/gmail/dot/com>",
|
||||
0x0100,
|
||||
plugin::Instrument,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
NULL
|
||||
} ;
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@ plugin::descriptor singerbot_plugin_descriptor =
|
||||
"Javier Serrano Polo <jasp00/at/users.sourceforge.net>",
|
||||
0x0100,
|
||||
plugin::Instrument,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
NULL
|
||||
} ;
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ plugin::descriptor stereoenhancer_plugin_descriptor =
|
||||
"Lou Herard <lherard/at/gmail.com>",
|
||||
0x0100,
|
||||
plugin::Effect,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
NULL
|
||||
} ;
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ plugin::descriptor stereomatrix_plugin_descriptor =
|
||||
"Paul Giblock <lherard/at/gmail.com>",
|
||||
0x0100,
|
||||
plugin::Effect,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
NULL
|
||||
} ;
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ plugin::descriptor malletsstk_plugin_descriptor =
|
||||
"Danny McRae <khjklujn/at/users.sf.net>",
|
||||
0x0100,
|
||||
plugin::Instrument,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
NULL
|
||||
} ;
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ plugin::descriptor tripleoscillator_plugin_descriptor =
|
||||
"Tobias Doerffel <tobydox/at/users.sf.net>",
|
||||
0x0110,
|
||||
plugin::Instrument,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
NULL
|
||||
} ;
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ plugin::descriptor vestige_plugin_descriptor =
|
||||
"Tobias Doerffel <tobydox/at/users.sf.net>",
|
||||
0x0100,
|
||||
plugin::Instrument,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
NULL
|
||||
} ;
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ plugin::descriptor vibedstrings_plugin_descriptor =
|
||||
"Danny McRae <khjklujn/at/yahoo/com>",
|
||||
0x0100,
|
||||
plugin::Instrument,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
NULL
|
||||
};
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* vst_base.cpp - VST-base-code to be used by any LMMS-plugins dealing with VST-
|
||||
* plugins
|
||||
*
|
||||
* Copyright (c) 2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
* Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
*
|
||||
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
|
||||
*
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
|
||||
#include "plugin.h"
|
||||
#include "embed.h"
|
||||
|
||||
|
||||
extern "C"
|
||||
|
||||
@@ -49,7 +49,7 @@ plugin::descriptor vsteffect_plugin_descriptor =
|
||||
"Tobias Doerffel <tobydox/at/users.sf.net>",
|
||||
0x0200,
|
||||
plugin::Effect,
|
||||
new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
|
||||
new pluginPixmapLoader( "logo" ),
|
||||
new vstSubPluginFeatures( plugin::Effect )
|
||||
} ;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user