Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
a1b3558
Allow sub plugins for instruments aswell
JohannesLorenz Dec 27, 2018
4d64c42
Fix Engine.cpp not compiling on some compilers
JohannesLorenz Dec 27, 2018
fcd1a7e
Fix or remove wrong or useless debug printfs
JohannesLorenz Dec 27, 2018
f3b2383
Fix missing IntrumentTrack header
JohannesLorenz Dec 27, 2018
d5dcebe
Use QString for SubPluginFeatures' virtuals
JohannesLorenz Jan 18, 2019
31dc8e1
Test deployment preparation in regular builds (#4847)
jasp00 Feb 25, 2019
e34f75a
Add needed macOS shortcuts (#4851)
tresf Feb 25, 2019
ad1fa16
Move apt_mingw_cache out of build directory (#4842)
jasp00 Feb 25, 2019
a233291
Add missing include
lukas-w Feb 27, 2019
05d5e20
Fix DrumSynth sscanf (#4869)
M374LX Mar 3, 2019
e54969c
Add /sbin to AppImage search path
tresf Mar 5, 2019
009a451
Fix AudioFileProcessor tooltip (#4868)
M374LX Mar 5, 2019
991ffcd
Disable soundio on macOS
tresf Mar 5, 2019
9e6ce06
Blacklist $HOME as VST directory
tresf Mar 7, 2019
cdd1ddb
Sync Debian version (#4840)
jasp00 Mar 7, 2019
9148ce1
Fix loading 32bit VSTs when loading LMMS in the build directory
PhysSong Mar 10, 2019
17e87c1
Fix MidiJack crash on exit
lukas-w Mar 10, 2019
2a72808
Fix #3926: QCursor in AFP
michaelgregorius Mar 3, 2019
9a91848
Fix CONTRIBUTORS override
PhysSong Mar 11, 2019
9280568
Debian integration: update build dependencies
PhysSong Mar 11, 2019
97502a1
Debian: don't bundle CALF LADSPA library separately anymore
PhysSong Mar 11, 2019
af40c76
Better Wine detection and support
PhysSong Mar 11, 2019
8c4514f
Check if winegcc works before building RemoteVstPlugin
PhysSong Mar 11, 2019
ae4e40d
Modify VST build systems to make debian integration work correctly
PhysSong Mar 11, 2019
5eb6b13
Allow creating AppImages on systems newer than linuxdeployqt official…
PhysSong Mar 11, 2019
61c3f87
Support FX Mixer for sample tracks and add controls to sample track w…
PhysSong Mar 11, 2019
04768ee
Fix zyn pitch on project load/export
tresf Mar 11, 2019
37290ac
Add info about LadspaControls::m_noLink
JohannesLorenz Mar 11, 2019
97d5529
Fix compilation on Qt4
tresf Mar 12, 2019
295b899
Avoid shallow clones in all Debian sid builds (#4888)
jasp00 Mar 13, 2019
17f6235
Add VST always-on-top config option
DomClark Mar 3, 2019
6fef905
Ensure VST windows show properly in taskbar
DomClark Mar 3, 2019
205b575
Don't show error when loading empty VeSTige instance
DomClark Mar 3, 2019
3aeacca
Fix layout of VstSyncData struct
DomClark Mar 3, 2019
2d71d61
Rework after code reading
JohannesLorenz Mar 15, 2019
f8ba88d
Make instrument window's piano optional
JohannesLorenz Mar 16, 2019
aac516e
Forbid copying the Knob class
JohannesLorenz Mar 16, 2019
7e75a82
Always instantiate at least a dummy plugin
JohannesLorenz Mar 16, 2019
4129be8
Add explenation for LadspaControls::m_noLink
JohannesLorenz Mar 17, 2019
ef6bac6
Merge branch 'misc-lv2-preparation'
JohannesLorenz Mar 17, 2019
0c3db10
Fix Blackman-Harris window formula (#4895)
he29-net Mar 17, 2019
dd6c18e
Automation Editor: Don't accept drag events when there's no pattern
lukas-w Mar 9, 2019
e1adfc3
TCO drag: Fix Ctrl+Drag crash
lukas-w Mar 1, 2019
7952416
Bump zyn submodule
tresf Mar 18, 2019
ea5cbe6
Allow new Zyn bank creation on Linux (#4905)
tresf Mar 18, 2019
f79c292
Fix empty editors after closing them and creating a new project (#4891)
necrashter Mar 19, 2019
1adf160
Make instrument window's piano optional
JohannesLorenz Mar 21, 2019
2061d6c
Merge branch 'master' into instr-sub-plugins
JohannesLorenz Mar 22, 2019
52d1f55
Remove useless include
JohannesLorenz Mar 22, 2019
3483581
Fix invalid display names
JohannesLorenz Mar 22, 2019
82cf453
Allow sub plugins for instruments aswell
JohannesLorenz Mar 22, 2019
032c324
Travis: use carla instead of carla-git
PhysSong Mar 25, 2019
7984bb9
Merge branch 'stable-1.2'
PhysSong Mar 26, 2019
f18efb4
Travis: fix shellcheck warnings for the Debian sid script
PhysSong Mar 26, 2019
4dce466
Remove some Qt4 compatibility code
PhysSong Mar 26, 2019
93ec816
SetupDialog: fix file dialog not opening for theme directory
PhysSong Mar 28, 2019
3ef33db
PluginBrowser: Tree layout and search bar
Mar 30, 2019
ac257f0
PluginBrowser: Tree layout and search bar (#4759)
JohannesLorenz Apr 3, 2019
07dcea1
Replace Monstro icons
LostRobotMusic Apr 13, 2019
be31a55
Shrink ComboBox arrow section slightly
LostRobotMusic Apr 13, 2019
b3461e2
Merge pull request #4943 from RoxasKH/new-monstro-icons
LostRobotMusic Apr 13, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rework after code reading
* Fix possible segfault in `SubPluginFeatures::displayName`
* Minor fixes
  • Loading branch information
JohannesLorenz committed Mar 15, 2019
commit 2d71d6163bf9bb3bbdc715a265209397d58c8c1c
6 changes: 3 additions & 3 deletions include/Plugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -202,19 +202,19 @@ class LMMS_EXPORT Plugin : public Model, public JournallingObject

virtual QString additionalFileExtensions(const Key&) const
{
return nullptr;
return QString();
}

virtual QString displayName(const Key& k) const
{
return k.isValid()
? k.desc->displayName
: k.name.toUtf8().data();
: k.name;
}

virtual QString description(const Key& k) const
{
return k.isValid() ? k.desc->description : "";
return k.isValid() ? k.desc->description : QString();
}

virtual const PixmapLoader* logo(const Key& k) const
Expand Down
4 changes: 2 additions & 2 deletions src/core/Plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ QString Plugin::Descriptor::SubPluginFeatures::Key::additionalFileExtensions() c
return desc->subPluginFeatures
// get from sub plugin
? desc->subPluginFeatures->additionalFileExtensions(*this)
// get from plugin
: nullptr;
// no sub plugin, so no *additional* file extensions
: QString();
}


Expand Down
23 changes: 11 additions & 12 deletions src/core/PluginFactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,6 @@ void PluginFactory::discoverPlugins()
continue;
}
}
else
{
//qDebug() << "Ignoring" << file.absoluteFilePath() << "(no lmms_plugin_main())";
}

if(pluginDescriptor)
{
Expand All @@ -199,15 +195,18 @@ void PluginFactory::discoverPlugins()
const Plugin::Descriptor::SubPluginFeatures::Key* key = nullptr)
{
if(!supportedFileTypes.isNull())
for (const QString& ext : supportedFileTypes.split(','))
{
//qDebug() << "Plugin " << info.name() << "supports" << ext;
PluginInfoAndKey infoAndKey;
infoAndKey.info = info;
infoAndKey.key = key
? *key
: Plugin::Descriptor::SubPluginFeatures::Key();
m_pluginByExt.insert(ext, infoAndKey);
for (const QString& ext : supportedFileTypes.split(','))
{
//qDebug() << "Plugin " << info.name()
// << "supports" << ext;
PluginInfoAndKey infoAndKey;
infoAndKey.info = info;
infoAndKey.key = key
? *key
: Plugin::Descriptor::SubPluginFeatures::Key();
m_pluginByExt.insert(ext, infoAndKey);
}
}
};

Expand Down