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

Merge pull request #2321 from Wallacoloo/reserved-names

Browse Source 
Remove double-underscore variable prefixes & prefer static member variables over globals
This commit is contained in:
Dave French
2015-09-09 22:48:55 +01:00
parent 3f31b5ce25 db820e5255
commit d6dbc03ac9
9 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/InstrumentSoundShaping.h
View File

@@ -75,6 +75,8 @@ private:
FloatModel m_filterCutModel;
FloatModel m_filterResModel;
static const QString targetNames[InstrumentSoundShaping::NumTargets][3];
friend class InstrumentSoundShapingView;
friend class FlpImport;
@@ -82,7 +84,4 @@ private:
} ;
extern const QString __targetNames[InstrumentSoundShaping::NumTargets][3];
#endif

22
include/ProjectRenderer.h
View File

@@ -64,6 +64,14 @@ public:
}
} ;
struct FileEncodeDevice
{
ExportFileFormats m_fileFormat;
const char * m_description;
const char * m_extension;
AudioFileDeviceInstantiaton m_getDevInst;
} ;
ProjectRenderer( const Mixer::qualitySettings & _qs,
const OutputSettings & _os,
@@ -79,6 +87,8 @@ public:
static ExportFileFormats getFileFormatFromExtension(
const QString & _ext );
static const FileEncodeDevice fileEncodeDevices[];
public slots:
void startProcessing();
@@ -103,16 +113,4 @@ private:
} ;
struct FileEncodeDevice
{
ProjectRenderer::ExportFileFormats m_fileFormat;
const char * m_description;
const char * m_extension;
AudioFileDeviceInstantiaton m_getDevInst;
} ;
extern FileEncodeDevice __fileEncodeDevices[];
#endif

8
src/core/InstrumentSoundShaping.cpp
View File

@@ -42,7 +42,7 @@ const float RES_PRECISION = 1000.0f;
// names for env- and lfo-targets - first is name being displayed to user
// and second one is used internally, e.g. for saving/restoring settings
const QString __targetNames[InstrumentSoundShaping::NumTargets][3] =
const QString InstrumentSoundShaping::targetNames[InstrumentSoundShaping::NumTargets][3] =
{
{ InstrumentSoundShaping::tr( "VOLUME" ), "vol",
InstrumentSoundShaping::tr( "Volume" ) },
@@ -76,7 +76,7 @@ InstrumentSoundShaping::InstrumentSoundShaping(
value_for_zero_amount,
this );
m_envLfoParameters[i]->setDisplayName(
tr( __targetNames[i][2].toUtf8().constData() ) );
tr( targetNames[i][2].toUtf8().constData() ) );
}
m_filterModel.addItem( tr( "LowPass" ), new PixmapLoader( "filter_lp" ) );
@@ -331,7 +331,7 @@ void InstrumentSoundShaping::saveSettings( QDomDocument & _doc, QDomElement & _t
{
m_envLfoParameters[i]->saveState( _doc, _this ).setTagName(
m_envLfoParameters[i]->nodeName() +
QString( __targetNames[i][1] ).toLower() );
QString( targetNames[i][1] ).toLower() );
}
}
@@ -354,7 +354,7 @@ void InstrumentSoundShaping::loadSettings( const QDomElement & _this )
{
if( node.nodeName() ==
m_envLfoParameters[i]->nodeName() +
QString( __targetNames[i][1] ).
QString( targetNames[i][1] ).
toLower() )
{
m_envLfoParameters[i]->restoreState( node.toElement() );

4
src/core/Plugin.cpp
View File

@@ -38,7 +38,7 @@
#include "Song.h"
static PixmapLoader __dummyLoader;
static PixmapLoader dummyLoader;
static Plugin::Descriptor dummyPluginDescriptor =
{
@@ -48,7 +48,7 @@ static Plugin::Descriptor dummyPluginDescriptor =
"Tobias Doerffel <tobydox/at/users.sf.net>",
0x0100,
Plugin::Undefined,
&__dummyLoader,
&dummyLoader,
NULL
} ;

12
src/core/ProjectRenderer.cpp
View File

@@ -37,7 +37,7 @@
#endif
#include <QMutexLocker>
FileEncodeDevice __fileEncodeDevices[] =
const ProjectRenderer::FileEncodeDevice ProjectRenderer::fileEncodeDevices[] =
{
{ ProjectRenderer::WaveFile,
@@ -73,13 +73,13 @@ ProjectRenderer::ProjectRenderer( const Mixer::qualitySettings & _qs,
m_progress( 0 ),
m_abort( false )
{
if( __fileEncodeDevices[_file_format].m_getDevInst == NULL )
if( fileEncodeDevices[_file_format].m_getDevInst == NULL )
{
return;
}
bool success_ful = false;
m_fileDev = __fileEncodeDevices[_file_format].m_getDevInst(
m_fileDev = fileEncodeDevices[_file_format].m_getDevInst(
_os.samplerate, DEFAULT_CHANNELS, success_ful,
_out_file, _os.vbr,
_os.bitrate, _os.bitrate - 64, _os.bitrate + 64,
@@ -109,11 +109,11 @@ ProjectRenderer::ExportFileFormats ProjectRenderer::getFileFormatFromExtension(
const QString & _ext )
{
int idx = 0;
while( __fileEncodeDevices[idx].m_fileFormat != NumFileFormats )
while( fileEncodeDevices[idx].m_fileFormat != NumFileFormats )
{
if( QString( __fileEncodeDevices[idx].m_extension ) == _ext )
if( QString( fileEncodeDevices[idx].m_extension ) == _ext )
{
return( __fileEncodeDevices[idx].m_fileFormat );
return( fileEncodeDevices[idx].m_fileFormat );
}
++idx;
}

6
src/core/Song.cpp
View File

@@ -1257,9 +1257,9 @@ void Song::exportProject( bool multiExport )
efd.setFileMode( FileDialog::AnyFile );
int idx = 0;
QStringList types;
while( __fileEncodeDevices[idx].m_fileFormat != ProjectRenderer::NumFileFormats )
while( ProjectRenderer::fileEncodeDevices[idx].m_fileFormat != ProjectRenderer::NumFileFormats )
{
types << tr( __fileEncodeDevices[idx].m_description );
types << tr( ProjectRenderer::fileEncodeDevices[idx].m_description );
++idx;
}
efd.setNameFilters( types );
@@ -1274,7 +1274,7 @@ void Song::exportProject( bool multiExport )
efd.setDirectory( ConfigManager::inst()->userProjectsDir() );
baseFilename = tr( "untitled" );
}
efd.selectFile( baseFilename + __fileEncodeDevices[0].m_extension );
efd.selectFile( baseFilename + ProjectRenderer::fileEncodeDevices[0].m_extension );
efd.setWindowTitle( tr( "Select file for project-export..." ) );
}

12
src/core/midi/MidiAlsaSeq.cpp
View File

@@ -38,7 +38,7 @@ const int EventPollTimeOut = 250;
// static helper functions
static QString __portName( snd_seq_client_info_t * _cinfo,
static QString portName( snd_seq_client_info_t * _cinfo,
snd_seq_port_info_t * _pinfo )
{
return QString( "%1:%2 %3:%4" ).
@@ -48,7 +48,7 @@ static QString __portName( snd_seq_client_info_t * _cinfo,
arg( snd_seq_port_info_get_name( _pinfo ) );
}
static QString __portName( snd_seq_t * _seq, const snd_seq_addr_t * _addr )
static QString portName( snd_seq_t * _seq, const snd_seq_addr_t * _addr )
{
snd_seq_client_info_t * cinfo;
snd_seq_port_info_t * pinfo;
@@ -59,7 +59,7 @@ static QString __portName( snd_seq_t * _seq, const snd_seq_addr_t * _addr )
snd_seq_get_any_port_info( _seq, _addr->client, _addr->port, pinfo );
snd_seq_get_any_client_info( _seq, _addr->client, cinfo );
const QString name = __portName( cinfo, pinfo );
const QString name = portName( cinfo, pinfo );
snd_seq_client_info_free( cinfo );
snd_seq_port_info_free( pinfo );
@@ -354,7 +354,7 @@ QString MidiAlsaSeq::sourcePortName( const MidiEvent & _event ) const
{
const snd_seq_addr_t * addr =
static_cast<const snd_seq_addr_t *>( _event.sourcePort() );
return __portName( m_seqHandle, addr );
return portName( m_seqHandle, addr );
}
return MidiClient::sourcePortName( _event );
}
@@ -666,7 +666,7 @@ void MidiAlsaSeq::updatePortList()
( SND_SEQ_PORT_CAP_READ |
SND_SEQ_PORT_CAP_SUBS_READ ) )
{
readablePorts.push_back( __portName( cinfo, pinfo ) );
readablePorts.push_back( portName( cinfo, pinfo ) );
}
if( ( snd_seq_port_info_get_capability( pinfo )
& ( SND_SEQ_PORT_CAP_WRITE |
@@ -674,7 +674,7 @@ void MidiAlsaSeq::updatePortList()
( SND_SEQ_PORT_CAP_WRITE |
SND_SEQ_PORT_CAP_SUBS_WRITE ) )
{
writablePorts.push_back( __portName( cinfo, pinfo ) );
writablePorts.push_back( portName( cinfo, pinfo ) );
}
}
}

12
src/gui/ExportProjectDialog.cpp
View File

@@ -58,14 +58,14 @@ ExportProjectDialog::ExportProjectDialog( const QString & _file_name,
int cbIndex = 0;
for( int i = 0; i < ProjectRenderer::NumFileFormats; ++i )
{
if( __fileEncodeDevices[i].m_getDevInst != NULL )
if( ProjectRenderer::fileEncodeDevices[i].m_getDevInst != NULL )
{
// get the extension of this format
QString renderExt = __fileEncodeDevices[i].m_extension;
QString renderExt = ProjectRenderer::fileEncodeDevices[i].m_extension;
// add to combo box
fileFormatCB->addItem( ProjectRenderer::tr(
__fileEncodeDevices[i].m_description ) );
ProjectRenderer::fileEncodeDevices[i].m_description ) );
// if this is our extension, select it
if( QString::compare( renderExt, fileExt,
@@ -302,10 +302,10 @@ void ExportProjectDialog::startBtnClicked()
{
if( fileFormatCB->currentText() ==
ProjectRenderer::tr(
__fileEncodeDevices[i].m_description ) )
ProjectRenderer::fileEncodeDevices[i].m_description ) )
{
m_ft = __fileEncodeDevices[i].m_fileFormat;
m_fileExtension = QString( QLatin1String( __fileEncodeDevices[i].m_extension ) );
m_ft = ProjectRenderer::fileEncodeDevices[i].m_fileFormat;
m_fileExtension = QString( QLatin1String( ProjectRenderer::fileEncodeDevices[i].m_extension ) );
break;
}
}

2
src/gui/widgets/InstrumentSoundShapingView.cpp
View File

@@ -76,7 +76,7 @@ InstrumentSoundShapingView::InstrumentSoundShapingView( QWidget * _parent ) :
{
m_envLfoViews[i] = new EnvelopeAndLfoView( m_targetsTabWidget );
m_targetsTabWidget->addTab( m_envLfoViews[i],
tr( __targetNames[i][0].toUtf8().constData() ) );
tr( InstrumentSoundShaping::targetNames[i][0].toUtf8().constData() ) );
}