hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

LV2: fixed serious violations of coding style conventions

Browse Source 
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
2009-04-30 00:53:03 +02:00
parent b40a9e1905
commit 324b5afb50
9 changed files with 384 additions and 957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
plugins/lv2_browser/lv2_browser.cpp
View File

@@ -1,9 +1,8 @@
/*
* lv2_browser.cpp - dialog to display information about installed LV2
* plugins
* lv2_browser.cpp - dialog to display information about installed LV2 plugins
*
* Copyright (c) 2009 Martin Andrews <mdda/at/users.sourceforge.net>
*
* Copyright (c) 2009-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
@@ -66,7 +65,7 @@ plugin::descriptor PLUGIN_EXPORT lv2browser_plugin_descriptor =
// neccessary for getting instance out of shared lib
plugin * PLUGIN_EXPORT lmms_plugin_main( model * _parent, void * _data )
{
return( new lv2Browser );
return new lv2Browser;
}
}
@@ -77,10 +76,10 @@ plugin * PLUGIN_EXPORT lmms_plugin_main( model * _parent, void * _data )
lv2Browser::lv2Browser( void ) :
tool( &lv2browser_plugin_descriptor, NULL )
{
if( static_lv2_manager == NULL )
{
static_lv2_manager=new lv2Manager();
}
if( static_lv2_manager == NULL )
{
static_lv2_manager = new lv2Manager();
}
}
@@ -88,10 +87,10 @@ lv2Browser::lv2Browser( void ) :
lv2Browser::~lv2Browser()
{
if( static_lv2_manager != NULL )
{
delete static_lv2_manager;
}
if( static_lv2_manager != NULL )
{
delete static_lv2_manager;
}
}
@@ -99,7 +98,7 @@ lv2Browser::~lv2Browser()
QString lv2Browser::nodeName( void ) const
{
return( lv2browser_plugin_descriptor.name );
return lv2browser_plugin_descriptor.name;
}
@@ -115,34 +114,34 @@ lv2BrowserView::lv2BrowserView( tool * _tool ) :
hlayout->setMargin( 0 );
m_tabBar = new tabBar( this, QBoxLayout::TopToBottom );
m_tabBar->setExclusive( TRUE );
m_tabBar->setExclusive( true );
m_tabBar->setFixedWidth( 72 );
QWidget * ws = new QWidget( this );
ws->setFixedSize( 500, 480 );
QWidget * available = createTab( ws, tr( "Available Effects" ), VALID );
QWidget * available = createTab( ws, tr( "Available Effects" ), VALID );
QWidget * unavailable = createTab( ws, tr( "Unavailable Effects" ), INVALID );
QWidget * instruments = createTab( ws, tr( "Instruments" ), SOURCE );
QWidget * analysis = createTab( ws, tr( "Analysis Tools" ), SINK );
QWidget * other = createTab( ws, tr( "Don't know" ), OTHER );
m_tabBar->addTab( available, tr( "Available Effects" ),
0, FALSE, TRUE
m_tabBar->addTab( available, tr( "Available Effects" ),
0, false, true
)->setIcon( embed::getIconPixmap( "setup_audio" ) );
m_tabBar->addTab( unavailable, tr( "Unavailable Effects" ),
1, FALSE, TRUE
m_tabBar->addTab( unavailable, tr( "Unavailable Effects" ),
1, false, true
)->setIcon( embed::getIconPixmap(
"unavailable_sound" ) );
m_tabBar->addTab( instruments, tr( "Instruments" ),
2, FALSE, TRUE
m_tabBar->addTab( instruments, tr( "Instruments" ),
2, false, true
)->setIcon( embed::getIconPixmap(
"setup_midi" ) );
m_tabBar->addTab( analysis, tr( "Analysis Tools" ),
3, FALSE, TRUE
m_tabBar->addTab( analysis, tr( "Analysis Tools" ),
3, false, true
)->setIcon( embed::getIconPixmap( "analysis" ) );
m_tabBar->addTab( other, tr( "Don't know" ),
4, TRUE, TRUE
m_tabBar->addTab( other, tr( "Don't know" ),
4, true, true
)->setIcon( embed::getIconPixmap( "uhoh" ) );
m_tabBar->setActiveTab( 0 );
@@ -186,7 +185,7 @@ lv2BrowserView::lv2BrowserView( tool * _tool ) :
parentWidget()->hide();
parentWidget()->layout()->setSizeConstraint(
QLayout::SetFixedSize );
Qt::WindowFlags flags = parentWidget()->windowFlags();
flags |= Qt::MSWindowsFixedSizeDialogHint;
flags &= ~Qt::WindowMaximizeButtonHint;
@@ -216,7 +215,7 @@ QWidget * lv2BrowserView::createTab( QWidget * _parent, const QString & _txt,
const QString type = "<b>" + tr( "Type:" ) + "</b> ";
QLabel * title = new QLabel( type + _txt, tab );
QFont f = title->font();
f.setBold( TRUE );
f.setBold( true );
title->setFont( pointSize<12>( f ) );
layout->addSpacing( 5 );
@@ -225,16 +224,18 @@ QWidget * lv2BrowserView::createTab( QWidget * _parent, const QString & _txt,
lv2Description * description = new lv2Description( tab, _type );
// Double-clicking on a row gives us a pop-up
// Double-clicking on a row gives us a pop-up
connect( description, SIGNAL( doubleClicked( const lv2_key_t & ) ),
SLOT( showPorts( const lv2_key_t & ) ) );
layout->addWidget( description, 1 );
layout->addWidget( description, 1 );
return( tab );
return tab;
}
void lv2BrowserView::showPorts( const lv2_key_t & _key )
{
lv2PortDialog ports( _key );
@@ -243,3 +244,4 @@ void lv2BrowserView::showPorts( const lv2_key_t & _key )
#include "moc_lv2_browser.cxx"

9
plugins/lv2_browser/lv2_browser.h
View File

@@ -1,9 +1,8 @@
/*
* ladspa_browser.h - dialog to display information about installed LADSPA
* plugins
* lv2_browser.h - dialog to display information about installed LV2 plugins
*
* Copyright (c) 2009 Martin Andrews <mdda/at/users.sourceforge.net>
*
* Copyright (c) 2009-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
@@ -64,7 +63,7 @@ public:
virtual pluginView * instantiateView( QWidget * )
{
return( new lv2BrowserView( this ) );
return new lv2BrowserView( this );
}
virtual QString nodeName( void ) const;

25
plugins/lv2_browser/lv2_description.cpp
View File

@@ -1,7 +1,7 @@
/*
* lv2_description.cpp - LV2 plugin description
*
* Copyright (c) 2007 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
* Copyright (c) 2009 Martin Andrews <mdda/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -35,7 +35,6 @@
#include "audio_device.h"
#include "engine.h"
// #include "ladspa_2_lmms.h"
#include "mixer.h"
@@ -45,9 +44,8 @@ lv2Description::lv2Description( QWidget * _parent,
lv2PluginType _type ) :
QWidget( _parent )
{
// ladspa2LMMS * manager = engine::getLADSPAManager();
lv2Manager * manager = static_lv2_manager;
/*
lv2Manager * manager = static_lv2_manager;
/*
switch( _type )
{
case SOURCE:
@@ -74,7 +72,7 @@ lv2Description::lv2Description( QWidget * _parent,
*/
// Simpler : Get all the plugins, and select based on the type...
l_sortable_plugin_t plugins = manager->getSortedPlugins();
QList<QString> pluginNames;
for( l_sortable_plugin_t::iterator it = plugins.begin();
it != plugins.end(); it++ )
@@ -82,11 +80,11 @@ lv2Description::lv2Description( QWidget * _parent,
lv2ManagerDescription * description=manager->getDescription( ( *it ).second );
if( description->type == _type &&
(
_type != VALID ||
description->inputChannels <= engine::getMixer()->audioDev()->channels()
_type != VALID ||
description->inputChannels <= engine::getMixer()->audioDev()->channels()
)
)
{
{
pluginNames.push_back( ( *it ).first );
m_pluginKeys.push_back( ( *it ).second );
}
@@ -139,8 +137,7 @@ void lv2Description::update( const lv2_key_t & _key )
QVBoxLayout * layout = new QVBoxLayout( description );
layout->setSizeConstraint( QLayout::SetFixedSize );
// ladspa2LMMS * manager = engine::getLADSPAManager();
lv2Manager * manager = static_lv2_manager;
lv2Manager * manager = static_lv2_manager;
QLabel * name = new QLabel( description );
name->setText( QWidget::tr( "Name: " ) + manager->getName( _key ) );
@@ -157,7 +154,7 @@ void lv2Description::update( const lv2_key_t & _key )
maker_label->setAlignment( Qt::AlignTop );
QLabel * maker_content = new QLabel( maker );
maker_content->setText( manager->getMaker( _key ) );
maker_content->setWordWrap( TRUE );
maker_content->setWordWrap( true );
makerLayout->addWidget( maker_label );
makerLayout->addWidget( maker_content, 1 );
@@ -174,7 +171,7 @@ void lv2Description::update( const lv2_key_t & _key )
QLabel * copyright_content = new QLabel( copyright );
copyright_content->setText( manager->getCopyright( _key ) );
copyright_content->setWordWrap( TRUE );
copyright_content->setWordWrap( true );
copyrightLayout->addWidget( copyright_label );
copyrightLayout->addWidget( copyright_content, 1 );
@@ -225,7 +222,7 @@ void lv2Description::rowChanged( int _pluginIndex )
void lv2Description::onDoubleClicked( QListWidgetItem * _item )
{
emit( doubleClicked( m_currentSelection ) );
emit doubleClicked( m_currentSelection );
}

2
plugins/lv2_browser/lv2_description.h
View File

@@ -1,7 +1,7 @@
/*
* lv2_description.h - LV2 plugin description Pane of Information
*
* Copyright (c) 2009-2009 Martin Andrews <mdda/at/users.sourceforge.net>
* Copyright (c) 2009 Martin Andrews <mdda/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*

42
plugins/lv2_browser/lv2_port_dialog.cpp
View File

@@ -1,8 +1,8 @@
/*
* lv2_port_dialog.cpp - dialog to test an LV2 plugin
*
* Copyright (c) 2009-2009 Martin Andrews <mdda/at/users.sourceforge.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
@@ -30,18 +30,16 @@
#include "embed.h"
#include "engine.h"
// #include "ladspa_2_lmms.h"
#include "mixer.h"
lv2PortDialog::lv2PortDialog( const lv2_key_t & _key )
{
// ladspa2LMMS * manager = engine::getLADSPAManager();
lv2Manager * manager = static_lv2_manager;
lv2Manager * manager = static_lv2_manager;
setWindowIcon( embed::getIconPixmap( "ports" ) );
setWindowTitle( tr( "Ports" ) );
setModal( TRUE );
setModal( true );
QVBoxLayout * vlayout = new QVBoxLayout( this );
vlayout->setSpacing( 0 );
@@ -59,7 +57,7 @@ lv2PortDialog::lv2PortDialog( const lv2_key_t & _key )
// ports.append( tr( "SR Dependent" ) );
QTableWidget * settings = new QTableWidget( pc, ports.size(), this );
settings->setHorizontalHeaderLabels( ports );
settings->setHorizontalHeaderLabels( ports );
for( Uint16 row = 0; row < pc; row++ )
{
@@ -82,25 +80,25 @@ lv2PortDialog::lv2PortDialog( const lv2_key_t & _key )
manager->isPortInput( _key, row ) ?
tr( "Input" ) : tr( "Output" ) );
QStringList values;
if( manager->isInteger( _key, row ) )
{
values = manager->listEnumeration( _key, row );
settings->item( row, col )->setText( values.join("|") );
}
else
{
settings->item( row, col )->setText( tr( "Float" ) );
}
col++;
QStringList values;
if( manager->isInteger( _key, row ) )
{
values = manager->listEnumeration( _key, row );
settings->item( row, col )->setText( values.join("|") );
}
else
{
settings->item( row, col )->setText( tr( "Float" ) );
}
col++;
/*
settings->item( row, col++ )->setText(
manager->isPortToggled( _key, row ) ? tr( "Toggled" ) :
manager->isInteger( _key, row ) ? tr( "Integer" ) :
tr( "Float" ) );
*/
float min = manager->getLowerBound( _key, row );
float max = manager->getUpperBound( _key, row );
float def = manager->getDefaultSetting( _key, row );
@@ -126,7 +124,7 @@ lv2PortDialog::lv2PortDialog( const lv2_key_t & _key )
}
else if( values.size() >0 )
{
// Don't have a minimum
// Don't have a minimum
// range += QString::number( static_cast<int>( min ) ) + " < ";
}
else
@@ -163,7 +161,7 @@ lv2PortDialog::lv2PortDialog( const lv2_key_t & _key )
{
range += QString::number( max );
}
settings->item( row, col++ )->setText( range );
/*

4
plugins/lv2_browser/lv2_port_dialog.h
View File

@@ -1,8 +1,8 @@
/*
* lv2_port_dialog.h - dialog to test an LV2 plugin
*
* Copyright (c) 2009-2009 Martin Andrews <mdda/at/users.sourceforge.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