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

Use midiPort's loadSettings()/saveSettings() API.

Browse Source 
Changed MidiControlListener to use the built-in API to save and restore
the midiPort configuration instead and removed the old iterator.

Signed-off-by: Tobias Doerffel <tobias.doerffel@gmail.com>
This commit is contained in:
Achim Settelmeier
2009-05-31 01:44:48 +02:00
committed by Tobias Doerffel
parent 555d589354
commit 227de591bd
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/midi_control_listener.h
View File

@@ -134,6 +134,11 @@ public:
m_controlKeyCount = 0;
}
inline midiPort * getMidiPort( void )
{
return &m_port;
}
private:
static const QString configClass;
static QDomElement s_configTree;

26
src/core/midi/midi_control_listener.cpp
View File

@@ -187,18 +187,10 @@ void MidiControlListener::saveConfiguration( QDomDocument & doc )
conf.setAttribute( "useControlKey", m_useControlKey );
conf.setAttribute( "channel", m_channel + 1 );
// get subscribed MIDI device
midiPort::map map = m_port.readablePorts();
for( midiPort::map::iterator it = map.begin();
it != map.end(); ++it )
{
if( it.value() )
{
QDomElement device = doc.createElement( "device" );
device.appendChild( doc.createTextNode( it.key() ) );
conf.appendChild( device );
}
}
// save MIDI device settings
QDomElement devices = doc.createElement( "devices" );
confRoot.appendChild( devices );
m_port.saveSettings( doc, devices );
// add key actions
for( ActionMap::const_iterator it = m_actionMapKeys.begin();
@@ -306,14 +298,10 @@ void MidiControlListener::readConfiguration()
m_useControlKey = false;
}
for( QDomElement deviceNode = s_configTree.firstChildElement( "device" );
!deviceNode.isNull();
deviceNode = deviceNode.nextSiblingElement( "device" ) )
QDomElement devicesNode = s_configTree.firstChildElement( "devices" );
if( !devicesNode.isNull() )
{
if( deviceNode.text() != "" )
{
m_port.subscribeReadablePort( deviceNode.text(), true );
}
m_port.loadSettings( devicesNode );
}
}