cleanups and coding-style fixes

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1450 0778d3d1-df1d-0410-868b-ea421aaaa00d

ChangeLog

@@ -1,5 +1,26 @@
 2008-08-20	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* include/controller.h:
+	* src/gui/widgets/knob.cpp:
+	only skip GUI-updates when connected to frequently changing controllers
+
+	* include/automatable_model.h:
+	when connected to controller and returning current value, respect
+	step-property of automatableModel
+
+	* src/gui/widgets/instrument_midi_io_view.cpp:
+	minor UI improvements
+
+	* include/midi_winmm.h:
+	* include/mixer.h:
+	* src/core/midi/midi_controller.cpp:
+	* src/core/midi/midi_port.cpp:
+	* src/core/midi/midi_winmm.cpp:
+	* src/core/mixer.cpp:
+	* src/gui/controller_connection_dialog.cpp:
+	* src/tracks/instrument_track.cpp:
+	cleanups and coding-style fixes
+
 	* src/core/midi/midi_alsa_seq.cpp:
 	* src/core/midi/midi_port.cpp:
 	- fixed crash when changing mode of midiPort

include/midi_winmm.h

@@ -113,11 +113,6 @@ public:
 		setupWidget( QWidget * _parent );
 		virtual ~setupWidget();
 
-		virtual void saveSettings( void );
-
-	private:
-		QLineEdit * m_device;
-
 	} ;
 
 

include/mixer.h

@@ -223,7 +223,7 @@ public:
 		return( m_midiClientName );
 	}
 
-	inline midiClient * getMIDIClient( void )
+	inline midiClient * getMidiClient( void )
 	{
 		return( m_midiClient );
 	}
@@ -417,7 +417,7 @@ private:
 
 
 	audioDevice * tryAudioDevices( void );
-	midiClient * tryMIDIClients( void );
+	midiClient * tryMidiClients( void );
 
 
 	const surroundSampleFrame * renderNextBuffer( void );

src/core/midi/midi_controller.cpp

@@ -42,7 +42,7 @@ midiController::midiController( model * _parent ) :
 	controller( MidiController, _parent, tr( "MIDI Controller" ) ),
 	midiEventProcessor(),
 	m_midiPort( tr( "unnamed_midi_controller" ),
-			engine::getMixer()->getMIDIClient(), this, this,
+			engine::getMixer()->getMidiClient(), this, this,
 							midiPort::Input ),
 	m_lastValue( 0.0f )
 {

src/core/midi/midi_port.cpp

@@ -326,8 +326,7 @@ void midiPort::updateReadablePorts( void )
 	}
 
 	m_readablePorts.clear();
-	const QStringList & wp = engine::getMixer()->getMIDIClient()->
-								readablePorts();
+	const QStringList & wp = m_midiClient->readablePorts();
 	// now insert new ports and restore selections
 	for( QStringList::const_iterator it = wp.begin(); it != wp.end(); ++it )
 	{
@@ -353,8 +352,7 @@ void midiPort::updateWriteablePorts( void )
 	}
 
 	m_writablePorts.clear();
-	const QStringList & wp = engine::getMixer()->getMIDIClient()->
-							writeablePorts();
+	const QStringList & wp = m_midiClient->writeablePorts();
 	// now insert new ports and restore selections
 	for( QStringList::const_iterator it = wp.begin(); it != wp.end(); ++it )
 	{

src/core/midi/midi_winmm.cpp

@@ -62,23 +62,6 @@ midiWinMM::~midiWinMM()
 
 
 
-QString midiWinMM::probeDevice( void )
-{
-	QString dev = configManager::inst()->value( "midiwinmm", "device" );
-	if( dev == "" )
-	{
-		if( getenv( "MIDIDEV" ) != NULL )
-		{
-			return( getenv( "MIDIDEV" ) );
-		}
-		return( "default" );
-	}
-	return( dev );
-}
-
-
-
-
 void midiWinMM::processOutEvent( const midiEvent & _me,
 						const midiTime & _time,
 						const midiPort * _port )
@@ -183,7 +166,7 @@ void midiWinMM::subscribeWriteablePort( midiPort * _port,
 void midiWinMM::inputCallback( HMIDIIN _hm, UINT _msg, DWORD_PTR _inst,
 					DWORD_PTR _param1, DWORD_PTR _param2 )
 {
-	printf("callback: %d %d\n", _msg, _param1 );
+	printf( "callback: %d %d\n", _msg, _param1 );
 	if( _msg == MIM_DATA )
 	{
 		( (midiWinMM *) _inst )->handleInputEvent( _hm, _param1 );
@@ -317,12 +300,6 @@ void midiWinMM::openDevices( void )
 midiWinMM::setupWidget::setupWidget( QWidget * _parent ) :
 	midiClient::setupWidget( midiWinMM::name(), _parent )
 {
-	m_device = new QLineEdit( midiWinMM::probeDevice(), this );
-	m_device->setGeometry( 10, 20, 160, 20 );
-
-	QLabel * dev_lbl = new QLabel( tr( "DEVICE" ), this );
-	dev_lbl->setFont( pointSize<6>( dev_lbl->font() ) );
-	dev_lbl->setGeometry( 10, 40, 160, 10 );
 }
 
 
@@ -335,13 +312,6 @@ midiWinMM::setupWidget::~setupWidget()
 
 
 
-void midiWinMM::setupWidget::saveSettings( void )
-{
-	configManager::inst()->setValue( "midiwinmm", "device",
-							m_device->text() );
-}
-
-
 #include "moc_midi_winmm.cxx"
 
 

src/core/mixer.cpp

@@ -386,7 +386,7 @@ mixer::~mixer()
 void mixer::initDevices( void )
 {
 	m_audioDev = tryAudioDevices();
-	m_midiClient = tryMIDIClients();
+	m_midiClient = tryMidiClients();
 }
 
 
@@ -1004,7 +1004,7 @@ audioDevice * mixer::tryAudioDevices( void )
 
 
 
-midiClient * mixer::tryMIDIClients( void )
+midiClient * mixer::tryMidiClients( void )
 {
 	QString client_name = configManager::inst()->value( "mixer",
 								"mididev" );

src/gui/controller_connection_dialog.cpp

@@ -160,7 +160,7 @@ controllerConnectionDialog::controllerConnectionDialog( QWidget * _parent,
 
 	// when using with non-raw-clients we can provide buttons showing
 	// our port-menus when being clicked
-	if( !engine::getMixer()->getMIDIClient()->isRaw() )
+	if( !engine::getMixer()->getMidiClient()->isRaw() )
 	{
 		m_readablePorts = new midiPortMenu( midiPort::Input );
 

src/tracks/instrument_track.cpp

@@ -95,7 +95,7 @@ instrumentTrack::instrumentTrack( trackContainer * _tc ) :
 	track( InstrumentTrack, _tc ),
 	midiEventProcessor(),
 	m_audioPort( tr( "unnamed_track" ) ),
-	m_midiPort( tr( "unnamed_track" ), engine::getMixer()->getMIDIClient(),
+	m_midiPort( tr( "unnamed_track" ), engine::getMixer()->getMidiClient(),
 								this, this ),
 	m_notes(),
 	m_baseNoteModel( 0, 0, KeysPerOctave * NumOctaves - 1, this ),
@@ -811,7 +811,7 @@ instrumentTrackView::instrumentTrackView( instrumentTrack * _it,
 	m_midiMenu = new QMenu( tr( "MIDI" ), this );
 
 	// sequenced MIDI?
-	if( !engine::getMixer()->getMIDIClient()->isRaw() )
+	if( !engine::getMixer()->getMidiClient()->isRaw() )
 	{
 		_it->m_midiPort.m_readablePortsMenu = new midiPortMenu(
 							midiPort::Input );