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

* do not create a instrument track window just for calling dragEnterEvent() - use a static method instead

Browse Source 
* limit panning in processAudioBuffer()



git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1944 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-12-16 16:50:24 +00:00
parent 4ee609a8cd
commit 221bf906ba
2 changed files with 46 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/instrument_track.h
View File

@@ -338,6 +338,8 @@ public:
m_itv = _tv;
}
static void dragEnterEventGeneric( QDragEnterEvent * _dee );
virtual void dragEnterEvent( QDragEnterEvent * _dee );
virtual void dropEvent( QDropEvent * _de );

105
src/tracks/instrument_track.cpp
View File

@@ -1,5 +1,3 @@
#ifndef SINGLE_SOURCE_COMPILE
/*
* instrument_track.cpp - implementation of instrument-track-class
* (window + data-structures)
@@ -181,11 +179,14 @@ void instrumentTrack::processAudioBuffer( sampleFrame * _buf,
if( _n != NULL )
{
panning += _n->getPanning();
panning = tLimit<int>( panning, PanningLeft, PanningRight );
}
engine::getMixer()->bufferToPort( _buf, ( _n != NULL ) ? qMin<f_cnt_t>(_n->framesLeftForCurrentPeriod(), _frames ) :
engine::getMixer()->bufferToPort( _buf, ( _n != NULL ) ?
qMin<f_cnt_t>(_n->framesLeftForCurrentPeriod(), _frames ) :
_frames,
( _n != NULL ) ? _n->offset() : 0,
panningToVolumeVector( panning, v_scale ), &m_audioPort );
panningToVolumeVector( panning, v_scale ),
&m_audioPort );
}
@@ -228,7 +229,7 @@ void instrumentTrack::processInEvent( const midiEvent & _me,
"manualchannelpiano" ).toInt() )
{
m_piano.setKeyState(
_me.key(), TRUE );
_me.key(), true );
}
// create temporary note
note n;
@@ -306,13 +307,13 @@ void instrumentTrack::processInEvent( const midiEvent & _me,
case MidiNotePanning:
if( m_notes[_me.key()] != NULL )
{
m_notes[_me.key()]->setPanning( _me.getPanning() );
m_instrument->updatePanning( m_notes[_me.key()] );
m_notes[_me.key()]->setPanning( _me.getPanning() );
}
break;
default:
printf( "instrument-track: unhandled "
"MIDI meta event: %i\n", _me.m_metaEvent );
"MIDI meta event: %i\n",
_me.m_metaEvent );
break;
}
break;
@@ -342,7 +343,7 @@ void instrumentTrack::processOutEvent( const midiEvent & _me,
if( !configManager::inst()->value( "ui",
"manualchannelpiano" ).toInt() )
{
m_piano.setKeyState( _me.key(), TRUE );
m_piano.setKeyState( _me.key(), true );
}
if( !configManager::inst()->value( "ui",
"disablechannelactivityindicators" ).toInt() )
@@ -371,7 +372,7 @@ void instrumentTrack::processOutEvent( const midiEvent & _me,
if( !configManager::inst()->value( "ui",
"manualchannelpiano" ).toInt() )
{
m_piano.setKeyState( _me.key(), FALSE );
m_piano.setKeyState( _me.key(), false );
}
k = masterKey( _me.key() );
if( k >= 0 && k < NumKeys &&
@@ -406,10 +407,10 @@ f_cnt_t instrumentTrack::beatLen( notePlayHandle * _n ) const
const f_cnt_t len = m_instrument->beatLen( _n );
if( len > 0 )
{
return( len );
return len;
}
}
return( m_soundShaping.envFrames() );
return m_soundShaping.envFrames();
}
@@ -437,9 +438,9 @@ QString instrumentTrack::instrumentName( void ) const
{
if( m_instrument != NULL )
{
return( m_instrument->displayName() );
return m_instrument->displayName();
}
return( QString::null );
return QString::null;
}
@@ -522,8 +523,7 @@ void instrumentTrack::updatePitch( void )
int instrumentTrack::masterKey( int _midi_key ) const
{
int key = m_baseNoteModel.value() + engine::getSong()->masterPitch();
return( tLimit<int>( _midi_key -
( key - DefaultKey ), 0, NumKeys ) );
return tLimit<int>( _midi_key - ( key - DefaultKey ), 0, NumKeys );
}
@@ -568,10 +568,10 @@ bool instrumentTrack::play( const midiTime & _start,
if ( tcos.size() == 0 )
{
return( FALSE );
return false;
}
bool played_a_note = FALSE; // will be return variable
bool played_a_note = false; // will be return variable
for( tcoVector::iterator it = tcos.begin(); it != tcos.end(); ++it )
{
@@ -598,7 +598,7 @@ bool instrumentTrack::play( const midiTime & _start,
handle->setOffset( _offset );
// send it to the mixer
engine::getMixer()->addPlayHandle( handle );
played_a_note = TRUE;
played_a_note = true;
continue;
}
@@ -649,7 +649,7 @@ bool instrumentTrack::play( const midiTime & _start,
#endif
engine::getMixer()->addPlayHandle(
note_play_handle );
played_a_note = TRUE;
played_a_note = true;
#if LMMS_SINGERBOT_SUPPORT
++note_idx;
#endif
@@ -657,7 +657,7 @@ bool instrumentTrack::play( const midiTime & _start,
++it;
}
}
return( played_a_note );
return played_a_note;
}
@@ -665,7 +665,7 @@ bool instrumentTrack::play( const midiTime & _start,
trackContentObject * instrumentTrack::createTCO( const midiTime & )
{
return( new pattern( this ) );
return new pattern( this );
}
@@ -673,7 +673,7 @@ trackContentObject * instrumentTrack::createTCO( const midiTime & )
trackView * instrumentTrack::createView( trackContainerView * _tcv )
{
return( new instrumentTrackView( this, _tcv ) );
return new instrumentTrackView( this, _tcv );
}
@@ -824,7 +824,7 @@ instrument * instrumentTrack::loadInstrument( const QString & _plugin_name )
emit instrumentChanged();
return( m_instrument );
return m_instrument;
}
@@ -860,11 +860,11 @@ instrumentTrackView::instrumentTrackView( instrumentTrack * _it,
trackView( _it, _tcv ),
m_window( NULL )
{
setAcceptDrops( TRUE );
setAcceptDrops( true );
setFixedHeight( 32 );
m_tlb = new trackLabelButton( this, getTrackSettingsWidget() );
m_tlb->setCheckable( TRUE );
m_tlb->setCheckable( true );
m_tlb->setIcon( embed::getIconPixmap( "instrument_track" ) );
m_tlb->move( 3, 1 );
m_tlb->show();
@@ -878,7 +878,7 @@ instrumentTrackView::instrumentTrackView( instrumentTrack * _it,
// creation of widgets for track-settings-widget
m_volumeKnob = new knob( knobSmall_17, getTrackSettingsWidget(),
tr( "Volume" ) );
m_volumeKnob->setVolumeKnob( TRUE );
m_volumeKnob->setVolumeKnob( true );
m_volumeKnob->setModel( &_it->m_volumeModel );
m_volumeKnob->setHintText( tr( "Volume:" ) + " ", "%" );
m_volumeKnob->move( DEFAULT_SETTINGS_WIDGET_WIDTH-24*2, 4 );
@@ -917,8 +917,8 @@ instrumentTrackView::instrumentTrackView( instrumentTrack * _it,
{
m_midiInputAction = m_midiMenu->addAction( "" );
m_midiOutputAction = m_midiMenu->addAction( "" );
m_midiInputAction->setCheckable( TRUE );
m_midiOutputAction->setCheckable( TRUE );
m_midiInputAction->setCheckable( true );
m_midiOutputAction->setCheckable( true );
connect( m_midiInputAction, SIGNAL( changed() ), this,
SLOT( midiInSelected() ) );
connect( m_midiOutputAction, SIGNAL( changed() ), this,
@@ -1020,7 +1020,7 @@ instrumentTrackWindow * instrumentTrackView::getInstrumentTrackWindow( void )
m_window = new instrumentTrackWindow( this );
}
return( m_window );
return m_window;
}
@@ -1028,7 +1028,7 @@ instrumentTrackWindow * instrumentTrackView::getInstrumentTrackWindow( void )
void instrumentTrackView::dragEnterEvent( QDragEnterEvent * _dee )
{
getInstrumentTrackWindow()->dragEnterEvent( _dee );
instrumentTrackWindow::dragEnterEventGeneric( _dee );
if( !_dee->isAccepted() )
{
trackView::dragEnterEvent( _dee );
@@ -1140,7 +1140,7 @@ instrumentTrackWindow::instrumentTrackWindow( instrumentTrackView * _itv ) :
m_itv( _itv ),
m_instrumentView( NULL )
{
setAcceptDrops( TRUE );
setAcceptDrops( true );
// init own layout + widgets
setFocusPolicy( Qt::StrongFocus );
@@ -1164,7 +1164,7 @@ instrumentTrackWindow::instrumentTrackWindow( instrumentTrackView * _itv ) :
// setup volume-knob
m_volumeKnob = new knob( knobBright_26, m_generalSettingsWidget,
tr( "Instrument volume" ) );
m_volumeKnob->setVolumeKnob( TRUE );
m_volumeKnob->setVolumeKnob( true );
m_volumeKnob->move( 10, 44 );
m_volumeKnob->setHintText( tr( "Volume:" ) + " ", "%" );
m_volumeKnob->setLabel( tr( "VOL" ) );
@@ -1420,7 +1420,7 @@ void instrumentTrackWindow::closeEvent( QCloseEvent * _ce )
{
hide();
}
m_itv->m_tlb->setChecked( FALSE );
m_itv->m_tlb->setChecked( false );
}
@@ -1434,7 +1434,7 @@ void instrumentTrackWindow::focusInEvent( QFocusEvent * )
void instrumentTrackWindow::dragEnterEvent( QDragEnterEvent * _dee )
void instrumentTrackWindow::dragEnterEventGeneric( QDragEnterEvent * _dee )
{
stringPairDrag::processDragEnterEvent( _dee, "instrument,presetfile" );
}
@@ -1442,6 +1442,14 @@ void instrumentTrackWindow::dragEnterEvent( QDragEnterEvent * _dee )
void instrumentTrackWindow::dragEnterEvent( QDragEnterEvent * _dee )
{
dragEnterEventGeneric( _dee );
}
void instrumentTrackWindow::dropEvent( QDropEvent * _de )
{
QString type = stringPairDrag::decodeKey( _de );
@@ -1482,38 +1490,13 @@ void instrumentTrackWindow::loadSettings( const QDomElement & _this )
mainWindow::restoreWidgetState( this, _this );
if( isVisible() )
{
m_itv->m_tlb->setChecked( TRUE );
m_itv->m_tlb->setChecked( true );
}
}
/*void instrumentTrackButton::paintEvent( QPaintEvent * _pe )
{
QPushButton::paintEvent( _pe );
QPainter p( this );
const QString in = m_instrumentTrackView->model()->instrumentName() +
":";
const QString n = m_instrumentTrackView->model()->name();
int extra = isChecked() ? -1 : -3;
p.setFont( pointSize<7>( p.font() ) );
p.setPen( QApplication::palette().buttonText().color() );
p.drawText( ( width() - QFontMetrics( p.font() ).width( in ) ) / 2 +
extra, height() / 2 + extra, in );
p.setPen( QColor( 0, 0, 0 ) );
p.drawText( ( width() - QFontMetrics( p.font() ).width( n ) ) /
2 + extra, height() / 2 - 2 +
QFontMetrics( p.font() ).height() + extra, n );
}*/
#include "moc_instrument_track.cxx"
#endif