diff --git a/ChangeLog b/ChangeLog index d15976f47..76304200f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,26 @@ 2008-08-20 Tobias Doerffel + * 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 diff --git a/include/midi_winmm.h b/include/midi_winmm.h index 797c0e8af..b11f589d3 100644 --- a/include/midi_winmm.h +++ b/include/midi_winmm.h @@ -113,11 +113,6 @@ public: setupWidget( QWidget * _parent ); virtual ~setupWidget(); - virtual void saveSettings( void ); - - private: - QLineEdit * m_device; - } ; diff --git a/include/mixer.h b/include/mixer.h index c82ab8a3e..cb9b26950 100644 --- a/include/mixer.h +++ b/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 ); diff --git a/src/core/midi/midi_controller.cpp b/src/core/midi/midi_controller.cpp index 519ebd3fe..1c65416ca 100644 --- a/src/core/midi/midi_controller.cpp +++ b/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 ) { diff --git a/src/core/midi/midi_port.cpp b/src/core/midi/midi_port.cpp index 493abb4c8..d9dba78d0 100644 --- a/src/core/midi/midi_port.cpp +++ b/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 ) { diff --git a/src/core/midi/midi_winmm.cpp b/src/core/midi/midi_winmm.cpp index 7e81ab07e..4e27cdc4b 100644 --- a/src/core/midi/midi_winmm.cpp +++ b/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" diff --git a/src/core/mixer.cpp b/src/core/mixer.cpp index f69c357bc..6982f603b 100644 --- a/src/core/mixer.cpp +++ b/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" ); diff --git a/src/gui/controller_connection_dialog.cpp b/src/gui/controller_connection_dialog.cpp index 19e6775cb..e2c6e0bcb 100644 --- a/src/gui/controller_connection_dialog.cpp +++ b/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 ); diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp index 9f34fb51b..06c5ddf91 100644 --- a/src/tracks/instrument_track.cpp +++ b/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 );