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

remove double-undercscore prefix from portName function

Browse Source
This commit is contained in:
Colin Wallace
2015-09-05 22:00:14 -07:00
parent b53e7a7fbe
commit 1944499fa3
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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/midi/MidiAlsaSeq.cpp
View File

@@ -41,7 +41,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" ).
@@ -51,7 +51,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;
@@ -62,7 +62,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 );
@@ -357,7 +357,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 );
}
@@ -669,7 +669,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 |
@@ -677,7 +677,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 ) );
}
}
}