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

(minor & style): Spaces to tabs.

Browse Source
This commit is contained in:
Shmuel H
2017-11-06 22:58:45 +02:00
parent ce020f6c23
commit 29d7237556
4 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/core/Mixer.cpp
View File

@@ -451,8 +451,8 @@ const surroundSampleFrame * Mixer::renderNextBuffer()
}
if( ( *it )->isFinished() )
{
if (( *it )->audioPort())
( *it )->audioPort()->removePlayHandle( ( *it ) );
if (( *it )->audioPort())
( *it )->audioPort()->removePlayHandle( ( *it ) );
if( ( *it )->type() == PlayHandle::TypeNotePlayHandle )
{
NotePlayHandleManager::release( (NotePlayHandle*) *it );
@@ -654,8 +654,8 @@ bool Mixer::addPlayHandle( PlayHandle* handle )
if( criticalXRuns() == false )
{
m_newPlayHandles.push( handle );
if (handle->audioPort())
handle->audioPort()->addPlayHandle( handle );
if (handle->audioPort())
handle->audioPort()->addPlayHandle( handle );
return true;
}
@@ -677,8 +677,8 @@ void Mixer::removePlayHandle( PlayHandle * _ph )
if( _ph->affinityMatters() &&
_ph->affinity() == QThread::currentThread() )
{
if (_ph->audioPort())
_ph->audioPort()->removePlayHandle( _ph );
if (_ph->audioPort())
_ph->audioPort()->removePlayHandle( _ph );
bool removedFromList = false;
// Check m_newPlayHandles first because doing it the other way around
// creates a race condition
@@ -738,8 +738,8 @@ void Mixer::removePlayHandlesOfTypes( Track * _track, const quint8 types )
{
if( ( *it )->isFromTrack( _track ) && ( ( *it )->type() & types ) )
{
if (( *it )->audioPort())
( *it )->audioPort()->removePlayHandle( ( *it ) );
if (( *it )->audioPort())
( *it )->audioPort()->removePlayHandle( ( *it ) );
if( ( *it )->type() == PlayHandle::TypeNotePlayHandle )
{
NotePlayHandleManager::release( (NotePlayHandle*) *it );
@@ -1040,15 +1040,15 @@ MidiClient * Mixer::tryMidiClients()
#endif
#ifdef LMMS_BUILD_APPLE
printf( "trying midi apple...\n" );
if( client_name == MidiApple::name() || client_name == "" )
{
MidiApple * mapple = new MidiApple;
m_midiClientName = MidiApple::name();
printf( "Returning midi apple\n" );
return mapple;
}
printf( "midi apple didn't work: client_name=%s\n", client_name.toUtf8().constData());
printf( "trying midi apple...\n" );
if( client_name == MidiApple::name() || client_name == "" )
{
MidiApple * mapple = new MidiApple;
m_midiClientName = MidiApple::name();
printf( "Returning midi apple\n" );
return mapple;
}
printf( "midi apple didn't work: client_name=%s\n", client_name.toUtf8().constData());
#endif
printf( "Couldn't create MIDI-client, neither with ALSA nor with "

4
src/core/PlayHandle.cpp
View File

@@ -38,8 +38,8 @@ PlayHandle::PlayHandle(const Type type, f_cnt_t offset) :
m_affinity(QThread::currentThread()),
m_playHandleBuffer(BufferManager::acquire()),
m_bufferReleased(true),
m_usesBuffer(true),
m_audioPort{nullptr}
m_usesBuffer(true),
m_audioPort{nullptr}
{
}

40
src/core/audio/AudioJack.cpp
View File

@@ -189,27 +189,27 @@ bool AudioJack::initJackClient()
JackPortIsOutput, 0 ) );
if( m_outputPorts.back() == NULL )
{
printf( "no more out JACK-ports available!\n" );
printf( "no more out JACK-ports available!\n" );
return false;
}
}
// Register In ports
for( ch_cnt_t ch = 0; ch < channels(); ++ch )
{
QString name = QString( "master in " ) +
( ( ch % 2 ) ? "R" : "L" ) +
QString::number( ch / 2 + 1 );
m_inputPorts.push_back( jack_port_register( m_client,
name.toLatin1().constData(),
JACK_DEFAULT_AUDIO_TYPE,
JackPortIsInput, 0 ) );
if( m_inputPorts.back() == NULL )
{
printf( "no more in JACK-ports available!\n" );
return false;
}
}
// Register In ports
for( ch_cnt_t ch = 0; ch < channels(); ++ch )
{
QString name = QString( "master in " ) +
( ( ch % 2 ) ? "R" : "L" ) +
QString::number( ch / 2 + 1 );
m_inputPorts.push_back( jack_port_register( m_client,
name.toLatin1().constData(),
JACK_DEFAULT_AUDIO_TYPE,
JackPortIsInput, 0 ) );
if( m_inputPorts.back() == NULL )
{
printf( "no more in JACK-ports available!\n" );
return false;
}
}
return true;
}
@@ -370,9 +370,9 @@ int AudioJack::processCallback( jack_nframes_t _nframes, void * _udata )
m_tempOutBufs[c] =
(jack_default_audio_sample_t *) jack_port_get_buffer(
m_outputPorts[c], _nframes );
m_tempInBufs[c] =
(jack_default_audio_sample_t *) jack_port_get_buffer(
m_inputPorts[c], _nframes );
m_tempInBufs[c] =
(jack_default_audio_sample_t *) jack_port_get_buffer(
m_inputPorts[c], _nframes );
}

12
src/tracks/SampleTrack.cpp
View File

@@ -355,9 +355,9 @@ void SampleTCOView::contextMenuEvent( QContextMenuEvent * _cme )
"Ctrl"),
#endif
m_tco, SLOT( toggleMute() ) );
contextMenu.addAction( embed::getIconPixmap( "record" ),
tr( "Set/clear record" ),
m_tco, SLOT( toggleRecord() ) );
contextMenu.addAction( embed::getIconPixmap( "record" ),
tr( "Set/clear record" ),
m_tco, SLOT( toggleRecord() ) );
constructContextMenu( &contextMenu );
contextMenu.exec( QCursor::pos() );
@@ -545,7 +545,7 @@ void SampleTCOView::paintEvent( QPaintEvent * pe )
// recording sample tracks is not possible at the moment
if( m_tco->isRecord() )
if( m_tco->isRecord() )
{
p.setFont( pointSize<7>( p.font() ) );
@@ -556,7 +556,7 @@ void SampleTCOView::paintEvent( QPaintEvent * pe )
p.setBrush( QBrush( textColor() ) );
p.drawEllipse( 4, 5, 4, 4 );
}
}
p.end();
@@ -770,7 +770,7 @@ SampleTrackView::SampleTrackView( SampleTrack * _t, TrackContainerView* tcv ) :
tlb->show();
m_volumeKnob = new Knob( knobSmall_17, getTrackSettingsWidget(),
tr( "Track volume" ) );
tr( "Track volume" ) );
m_volumeKnob->setVolumeKnob( true );
m_volumeKnob->setModel( &_t->m_volumeModel );
m_volumeKnob->setHintText( tr( "Channel volume:" ), "%" );