LV2: fixed serious violations of coding style conventions
Unfortunately new LV2 code didn't respect coding style conventions so I fixed most of it and did various other cleanups. Still needs some work though.
This commit is contained in:
Tobias Doerffel
@@ -1,12 +1,10 @@
|
||||
/*
|
||||
* ladspa_manager.h - declaration of class lv2Manager
|
||||
* a class to manage
|
||||
* lv2 plugins
|
||||
* lv2_manager.h - declaration of class lv2Manager a class to manage lv2 plugins
|
||||
*
|
||||
* Copyright (c) 2005-2008 Danny McRae <khjklujn@netscape.net>
|
||||
* Copyright (c) 2009 Martin Andrews <mdda/at/users.sourceforge.net>
|
||||
*
|
||||
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
|
||||
*
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
@@ -28,11 +26,10 @@
|
||||
#ifndef _LV2_MANAGER_H
|
||||
#define _LV2_MANAGER_H
|
||||
|
||||
//#include <ladspa.h>
|
||||
#include "slv2/world.h"
|
||||
#include "slv2/plugin.h"
|
||||
#include "slv2/scalepoint.h"
|
||||
#include "slv2/scalepoints.h"
|
||||
#include <slv2/world.h>
|
||||
#include <slv2/plugin.h>
|
||||
#include <slv2/scalepoint.h>
|
||||
#include <slv2/scalepoints.h>
|
||||
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QPair>
|
||||
@@ -59,7 +56,7 @@ the filename the plug-in was loaded from and the label of the plug-in.
|
||||
The can be retrieved by using lv2_key_t (which is really just the LV2 URI) :
|
||||
|
||||
// lv2_key_t key( "lalala" )
|
||||
|
||||
|
||||
as the plug-in key. */
|
||||
|
||||
|
||||
@@ -99,10 +96,9 @@ enum lv2PluginType
|
||||
|
||||
typedef struct lv2ManagerStorage
|
||||
{
|
||||
SLV2Plugin plugin;
|
||||
// Uint32 index;
|
||||
QString uri;
|
||||
QString name;
|
||||
SLV2Plugin plugin;
|
||||
QString uri;
|
||||
QString name;
|
||||
lv2PluginType type;
|
||||
Uint16 inputChannels;
|
||||
Uint16 outputChannels;
|
||||
@@ -112,16 +108,15 @@ typedef struct lv2ManagerStorage
|
||||
class EXPORT lv2Manager
|
||||
{
|
||||
public:
|
||||
|
||||
lv2Manager( void );
|
||||
virtual ~lv2Manager();
|
||||
virtual ~lv2Manager();
|
||||
|
||||
void loadFromCacheFile();
|
||||
void saveToCacheFile();
|
||||
void loadFromCacheFile();
|
||||
void saveToCacheFile();
|
||||
|
||||
l_sortable_plugin_t getSortedPlugins();
|
||||
lv2ManagerDescription * getDescription( const lv2_key_t & _plugin );
|
||||
|
||||
|
||||
/* This identifier can be used as a unique, case-sensitive
|
||||
identifier for the plugin type within the plugin file. Plugin
|
||||
types should be identified by file and label rather than by index
|
||||
@@ -134,7 +129,7 @@ public:
|
||||
be cached or subject to significant latency. */
|
||||
// bool hasRealTimeDependency( const lv2_key_t & _plugin );
|
||||
|
||||
/* Indicates that the plugin may cease to work correctly if the
|
||||
/* Indicates that the plugin may cease to work correctly if the
|
||||
host elects to use the same data location for both input and output
|
||||
(see connectPort). */
|
||||
bool isInplaceBroken( const lv2_key_t & _plugin );
|
||||
@@ -169,13 +164,13 @@ public:
|
||||
/* Indicates that the port is an control. */
|
||||
bool isPortControl( const lv2_key_t & _plugin, Uint32 _port );
|
||||
|
||||
/* Indicates that any bounds specified should be interpreted as
|
||||
multiples of the sample rate. For instance, a frequency range from
|
||||
0Hz to the Nyquist frequency (half the sample rate) could be requested
|
||||
by this hint in conjunction with LowerBound = 0 and UpperBound = 0.5.
|
||||
/* Indicates that any bounds specified should be interpreted as
|
||||
multiples of the sample rate. For instance, a frequency range from
|
||||
0Hz to the Nyquist frequency (half the sample rate) could be requested
|
||||
by this hint in conjunction with LowerBound = 0 and UpperBound = 0.5.
|
||||
Hosts that support bounds at all must support this hint to retain
|
||||
meaning. */
|
||||
// bool areHintsSampleRateDependent( const ladspa_key_t & _plugin,
|
||||
// bool areHintsSampleRateDependent( const ladspa_key_t & _plugin,
|
||||
// Uint32 _port );
|
||||
|
||||
/* Returns the lower boundary value for the given port. If
|
||||
@@ -194,30 +189,30 @@ public:
|
||||
the given port. */
|
||||
float getDefaultSetting( const lv2_key_t & _plugin, Uint32 _port );
|
||||
|
||||
/* Indicates that a user interface would probably wish to provide a
|
||||
stepped control taking only integer values. Any bounds set should be
|
||||
/* Indicates that a user interface would probably wish to provide a
|
||||
stepped control taking only integer values. Any bounds set should be
|
||||
slightly wider than the actual integer range required to avoid floating
|
||||
point rounding errors. For instance, the integer set {0,1,2,3} might
|
||||
point rounding errors. For instance, the integer set {0,1,2,3} might
|
||||
be described as [-0.1, 3.1]. */
|
||||
bool isInteger( const lv2_key_t & _plugin, Uint32 _port );
|
||||
|
||||
|
||||
/* Indicates whether the given port should be considered 0 or 1
|
||||
boolean switch. */
|
||||
bool isPortToggled( const lv2_key_t & _plugin, Uint32 _port );
|
||||
|
||||
|
||||
/* return the labels to be applied on the UI */
|
||||
QStringList listEnumeration( const lv2_key_t & _plugin, Uint32 _port );
|
||||
QStringList listEnumeration( const lv2_key_t & _plugin, Uint32 _port );
|
||||
|
||||
/* Indicates that it is likely that the user will find it more
|
||||
intuitive to view values using a logarithmic scale. This is
|
||||
particularly useful for frequencies and gains. */
|
||||
// bool isLogarithmic( const ladspa_key_t & _plugin, Uint32 _port );
|
||||
|
||||
|
||||
|
||||
/* Returns the name of the port. */
|
||||
QString getPortName( const lv2_key_t & _plugin, Uint32 _port );
|
||||
|
||||
|
||||
|
||||
|
||||
/* This may be used by the plugin developer to pass any custom
|
||||
implementation data into an instantiate call. It must not be used
|
||||
or interpreted by the host. It is expected that most plugin
|
||||
@@ -225,24 +220,24 @@ public:
|
||||
used to hold instance data. */
|
||||
// const void * getImplementationData(
|
||||
// const ladspa_key_t & _plugin );
|
||||
|
||||
|
||||
|
||||
|
||||
/* Returns a pointer to the plug-in's descriptor from which control
|
||||
of the plug-in is accessible */
|
||||
// const LADSPA_Descriptor * getDescriptor(
|
||||
// const ladspa_key_t & _plugin );
|
||||
|
||||
|
||||
|
||||
|
||||
/* The following methods are convenience functions for use during
|
||||
development. A real instrument should use the getDescriptor()
|
||||
method and implement the plug-in manipulations internally to avoid
|
||||
the overhead associated with QMap lookups. */
|
||||
|
||||
|
||||
|
||||
|
||||
/* Returns a handle to an instantiation of the given plug-in. */
|
||||
//LADSPA_Handle instantiate( const ladspa_key_t & _plugin,
|
||||
//LADSPA_Handle instantiate( const ladspa_key_t & _plugin,
|
||||
// Uint32 _sample_rate );
|
||||
|
||||
|
||||
/* This method calls a function pointer that connects a port on an
|
||||
instantiated plugin to a memory location at which a block of data
|
||||
for the port will be read/written. The data location is expected
|
||||
@@ -260,11 +255,11 @@ public:
|
||||
|
||||
connectPort() must be called at least once for each port before
|
||||
run() or runAdding() is called. */
|
||||
// bool connectPort( const ladspa_key_t & _plugin,
|
||||
// LADSPA_Handle _instance,
|
||||
// bool connectPort( const ladspa_key_t & _plugin,
|
||||
// LADSPA_Handle _instance,
|
||||
// Uint32 _port,
|
||||
// LADSPA_Data * _data_location );
|
||||
|
||||
|
||||
/* This method calls a function pointer that initialises a plugin
|
||||
instance and activates it for use. This is separated from
|
||||
instantiate() to aid real-time support and so that hosts can
|
||||
@@ -297,7 +292,7 @@ public:
|
||||
before run() or run_adding(). If deactivate() is called for a
|
||||
plugin instance then the plugin instance may not be reused until
|
||||
activate() has been called again. */
|
||||
// bool run( const ladspa_key_t & _plugin,
|
||||
// bool run( const ladspa_key_t & _plugin,
|
||||
// LADSPA_Handle _instance,
|
||||
// Uint32 _sample_count );
|
||||
|
||||
@@ -350,7 +345,7 @@ public:
|
||||
/* Once an instance of a plugin has been finished with it can be
|
||||
deleted using the following function. The instance handle passed
|
||||
ceases to be valid after this call.
|
||||
|
||||
|
||||
If activate() was called for a plugin instance then a
|
||||
corresponding call to deactivate() must be made before cleanup()
|
||||
is called. */
|
||||
@@ -358,27 +353,29 @@ public:
|
||||
// LADSPA_Handle _instance );
|
||||
|
||||
private:
|
||||
void addPlugins( SLV2Plugin _plugin );
|
||||
void ensureLV2DataExists( lv2ManagerDescription *desc );
|
||||
void addPlugins( SLV2Plugin _plugin );
|
||||
void ensureLV2DataExists( lv2ManagerDescription *desc );
|
||||
|
||||
bool isPortClass( const lv2_key_t & _plugin,
|
||||
Uint32 _port, SLV2Value _class );
|
||||
bool isPortClass( const lv2_key_t & _plugin,
|
||||
Uint32 _port, SLV2Value _class );
|
||||
|
||||
void getRanges( const lv2_key_t & _plugin,
|
||||
Uint32 _port, float * _def, float * _min, float * _max );
|
||||
void getRanges( const lv2_key_t & _plugin,
|
||||
Uint32 _port, float * _def, float * _min, float * _max );
|
||||
|
||||
SLV2Plugins m_plugin_list;
|
||||
SLV2Plugins m_pluginList;
|
||||
typedef QMap<lv2_key_t, lv2ManagerDescription *> lv2ManagerMapType;
|
||||
lv2ManagerMapType m_lv2ManagerMap;
|
||||
l_sortable_plugin_t m_sortedPlugins;
|
||||
|
||||
LV2World m_lv2_bundle;
|
||||
LV2World m_lv2_bundle;
|
||||
|
||||
QString m_cacheFile;
|
||||
|
||||
QString m_cache_file;
|
||||
} ;
|
||||
|
||||
|
||||
// This is declared static in lv2_manager.cpp
|
||||
// TODO: integrate into LMMS engine
|
||||
extern lv2Manager * static_lv2_manager; // There is only one of these...
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user