--- qsampler/trunk/src/qsamplerChannelForm.cpp 2007/10/28 23:30:36 1461 +++ qsampler/trunk/src/qsamplerChannelForm.cpp 2007/11/21 19:57:18 1506 @@ -1,3 +1,25 @@ +// qsamplerChannelForm.cpp +// +/**************************************************************************** + Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2007, Christian Schoenebeck + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +*****************************************************************************/ + #include "qsamplerChannelForm.h" #include "qsamplerAbout.h" @@ -6,10 +28,13 @@ #include "qsamplerMainForm.h" #include "qsamplerInstrument.h" -#include -#include -#include -#include +#include +#include +#include +#include + +#include + namespace QSampler { @@ -22,19 +47,85 @@ m_iDirtySetup = 0; m_iDirtyCount = 0; - m_midiDevices.setAutoDelete(true); - m_audioDevices.setAutoDelete(true); +// m_midiDevices.setAutoDelete(true); +// m_audioDevices.setAutoDelete(true); m_pDeviceForm = NULL; // Try to restore normal window positioning. adjustSize(); + + ui.AudioRoutingTable->setModel(&routingModel); + ui.AudioRoutingTable->setItemDelegate(&routingDelegate); + ui.AudioRoutingTable->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch); + + QObject::connect(ui.EngineNameComboBox, + SIGNAL(activated(int)), + SLOT(optionsChanged())); + QObject::connect(ui.InstrumentFileComboBox, + SIGNAL(activated(const QString&)), + SLOT(updateInstrumentName())); + QObject::connect(ui.InstrumentFileToolButton, + SIGNAL(clicked()), + SLOT(openInstrumentFile())); + QObject::connect(ui.InstrumentNrComboBox, + SIGNAL(activated(int)), + SLOT(optionsChanged())); + QObject::connect(ui.MidiDriverComboBox, + SIGNAL(activated(const QString&)), + SLOT(selectMidiDriver(const QString&))); + QObject::connect(ui.MidiDeviceComboBox, + SIGNAL(activated(int)), + SLOT(selectMidiDevice(int))); + QObject::connect(ui.MidiPortSpinBox, + SIGNAL(valueChanged(int)), + SLOT(optionsChanged())); + QObject::connect(ui.MidiChannelComboBox, + SIGNAL(activated(int)), + SLOT(optionsChanged())); + QObject::connect(ui.MidiMapComboBox, + SIGNAL(activated(int)), + SLOT(optionsChanged())); + QObject::connect(ui.AudioDriverComboBox, + SIGNAL(activated(const QString&)), + SLOT(selectAudioDriver(const QString&))); + QObject::connect(ui.AudioDeviceComboBox, + SIGNAL(activated(int)), + SLOT(selectAudioDevice(int))); + QObject::connect(ui.OkPushButton, + SIGNAL(clicked()), + SLOT(accept())); + QObject::connect(ui.CancelPushButton, + SIGNAL(clicked()), + SLOT(reject())); + QObject::connect(ui.MidiDeviceToolButton, + SIGNAL(clicked()), + SLOT(setupMidiDevice())); + QObject::connect(ui.AudioDeviceToolButton, + SIGNAL(clicked()), + SLOT(setupAudioDevice())); + QObject::connect(&routingModel, + SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), + SLOT(optionsChanged())); + QObject::connect(&routingModel, + SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), + SLOT(updateTableCellRenderers(const QModelIndex&, const QModelIndex&))); + QObject::connect(&routingModel, + SIGNAL(modelReset()), + SLOT(updateTableCellRenderers())); } -ChannelForm::~ChannelForm() { +ChannelForm::~ChannelForm() +{ if (m_pDeviceForm) delete m_pDeviceForm; m_pDeviceForm = NULL; + + qDeleteAll(m_midiDevices); + m_midiDevices.clear(); + + qDeleteAll(m_audioDevices); + m_audioDevices.clear(); } @@ -51,7 +142,7 @@ // It can be a brand new channel, remember? bool bNew = (m_pChannel->channelID() < 0); - setCaption(QSAMPLER_TITLE ": " + m_pChannel->channelName()); + setWindowTitle(QSAMPLER_TITLE ": " + m_pChannel->channelName()); // Check if we're up and connected. MainForm *pMainForm = MainForm::getInstance(); @@ -70,32 +161,29 @@ // Load combo box history... pOptions->loadComboBoxHistory(ui.InstrumentFileComboBox); - // Notify.that we've just changed one audio route. - QObject::connect(ui.AudioRoutingTable, SIGNAL(valueChanged(int,int)), - this, SLOT(changeAudioRouting(int,int))); - // Populate Engines list. const char **ppszEngines = ::lscp_list_available_engines(pMainForm->client()); if (ppszEngines) { ui.EngineNameComboBox->clear(); for (int iEngine = 0; ppszEngines[iEngine]; iEngine++) - ui.EngineNameComboBox->insertItem(ppszEngines[iEngine]); + ui.EngineNameComboBox->addItem(QString(ppszEngines[iEngine])); } else m_pChannel->appendMessagesClient("lscp_list_available_engines"); // Populate Audio output type list. ui.AudioDriverComboBox->clear(); - ui.AudioDriverComboBox->insertStringList( + ui.AudioDriverComboBox->insertItems(0, qsamplerDevice::getDrivers(pMainForm->client(), qsamplerDevice::Audio)); // Populate MIDI input type list. ui.MidiDriverComboBox->clear(); - ui.MidiDriverComboBox->insertStringList( + ui.MidiDriverComboBox->insertItems(0, qsamplerDevice::getDrivers(pMainForm->client(), qsamplerDevice::Midi)); // Populate Maps list. ui.MidiMapComboBox->clear(); - ui.MidiMapComboBox->insertStringList(qsamplerInstrument::getMapNames()); + ui.MidiMapComboBox->insertItems(0, + qsamplerInstrument::getMapNames()); // Read proper channel information, // and populate the channel form fields. @@ -107,38 +195,46 @@ if (sEngineName.isEmpty()) sEngineName = qsamplerChannel::noEngineName(); if (ui.EngineNameComboBox->findText(sEngineName, - Qt::MatchExactly | Qt::MatchCaseSensitive) == 0) { - ui.EngineNameComboBox->insertItem(sEngineName); + Qt::MatchExactly | Qt::MatchCaseSensitive) < 0) { + ui.EngineNameComboBox->addItem(sEngineName); } - ui.EngineNameComboBox->setCurrentText(sEngineName); + ui.EngineNameComboBox->setCurrentIndex( + ui.EngineNameComboBox->findText(sEngineName, + Qt::MatchExactly | Qt::MatchCaseSensitive)); + // Instrument filename and index... QString sInstrumentFile = pChannel->instrumentFile(); if (sInstrumentFile.isEmpty()) sInstrumentFile = qsamplerChannel::noInstrumentName(); - ui.InstrumentFileComboBox->setCurrentText(sInstrumentFile); + ui.InstrumentFileComboBox->setEditText(sInstrumentFile); ui.InstrumentNrComboBox->clear(); - ui.InstrumentNrComboBox->insertStringList( + ui.InstrumentNrComboBox->insertItems(0, qsamplerChannel::getInstrumentList(sInstrumentFile, pOptions->bInstrumentNames)); - ui.InstrumentNrComboBox->setCurrentItem(pChannel->instrumentNr()); + ui.InstrumentNrComboBox->setCurrentIndex(pChannel->instrumentNr()); // MIDI input device... qsamplerDevice midiDevice(qsamplerDevice::Midi, m_pChannel->midiDevice()); // MIDI input driver... QString sMidiDriver = midiDevice.driverName(); if (sMidiDriver.isEmpty() || bNew) - sMidiDriver = pOptions->sMidiDriver.upper(); + sMidiDriver = pOptions->sMidiDriver.toUpper(); if (!sMidiDriver.isEmpty()) { if (ui.MidiDriverComboBox->findText(sMidiDriver, - Qt::MatchExactly | Qt::MatchCaseSensitive) == 0) { - ui.MidiDriverComboBox->insertItem(sMidiDriver); + Qt::MatchExactly | Qt::MatchCaseSensitive) < 0) { + ui.MidiDriverComboBox->insertItem(0, sMidiDriver); } - ui.MidiDriverComboBox->setCurrentText(sMidiDriver); + ui.MidiDriverComboBox->setItemText( + ui.MidiDriverComboBox->currentIndex(), + sMidiDriver); } selectMidiDriverItem(sMidiDriver); - if (!bNew) - ui.MidiDeviceComboBox->setCurrentText(midiDevice.deviceName()); - selectMidiDeviceItem(ui.MidiDeviceComboBox->currentItem()); + if (!bNew) { + ui.MidiDeviceComboBox->setItemText( + ui.MidiDeviceComboBox->currentIndex(), + midiDevice.deviceName()); + } + selectMidiDeviceItem(ui.MidiDeviceComboBox->currentIndex()); // MIDI input port... ui.MidiPortSpinBox->setValue(pChannel->midiPort()); // MIDI input channel... @@ -146,15 +242,18 @@ // When new, try to suggest a sensible MIDI channel... if (iMidiChannel < 0) iMidiChannel = (::lscp_get_channels(pMainForm->client()) % 16); - ui.MidiChannelComboBox->setCurrentItem(iMidiChannel); + ui.MidiChannelComboBox->setCurrentIndex(iMidiChannel); // MIDI instrument map... int iMidiMap = (bNew ? pOptions->iMidiMap : pChannel->midiMap()); // When new, try to suggest a sensible MIDI map... if (iMidiMap < 0) iMidiMap = 0; const QString& sMapName = qsamplerInstrument::getMapName(iMidiMap); - if (!sMapName.isEmpty()) - ui.MidiMapComboBox->setCurrentText(sMapName); + if (!sMapName.isEmpty()) { + ui.MidiMapComboBox->setItemText( + ui.MidiMapComboBox->currentIndex(), + sMapName); + } // It might be no maps around... bool bMidiMapEnabled = (ui.MidiMapComboBox->count() > 0); ui.MidiMapTextLabel->setEnabled(bMidiMapEnabled); @@ -165,18 +264,23 @@ // Audio output driver... QString sAudioDriver = audioDevice.driverName(); if (sAudioDriver.isEmpty() || bNew) - sAudioDriver = pOptions->sAudioDriver.upper(); + sAudioDriver = pOptions->sAudioDriver.toUpper(); if (!sAudioDriver.isEmpty()) { if (ui.AudioDriverComboBox->findText(sAudioDriver, - Qt::MatchExactly | Qt::MatchCaseSensitive) == 0) { - ui.AudioDriverComboBox->insertItem(sAudioDriver); + Qt::MatchExactly | Qt::MatchCaseSensitive) < 0) { + ui.AudioDriverComboBox->insertItem(0, sAudioDriver); } - ui.AudioDriverComboBox->setCurrentText(sAudioDriver); + ui.AudioDriverComboBox->setItemText( + ui.AudioDriverComboBox->currentIndex(), + sAudioDriver); } selectAudioDriverItem(sAudioDriver); - if (!bNew) - ui.AudioDeviceComboBox->setCurrentText(audioDevice.deviceName()); - selectAudioDeviceItem(ui.AudioDeviceComboBox->currentItem()); + if (!bNew) { + ui.AudioDeviceComboBox->setItemText( + ui.AudioDeviceComboBox->currentIndex(), + audioDevice.deviceName()); + } + selectAudioDeviceItem(ui.AudioDeviceComboBox->currentIndex()); // As convenient, make it ready on stabilizeForm() for // prompt acceptance, if we got the minimum required... @@ -219,17 +323,21 @@ if (!m_pChannel->setAudioDriver(ui.AudioDriverComboBox->currentText())) iErrors++; } else { - qsamplerDevice *pDevice = m_audioDevices.at(ui.AudioDeviceComboBox->currentItem()); + qsamplerDevice *pDevice = NULL; + int iAudioItem = ui.AudioDeviceComboBox->currentIndex(); + if (iAudioItem >= 0 && iAudioItem < m_audioDevices.count()) + pDevice = m_audioDevices.at(iAudioItem); + qsamplerChannelRoutingMap routingMap = routingModel.routingMap(); if (pDevice == NULL) iErrors++; else if (!m_pChannel->setAudioDevice(pDevice->deviceID())) iErrors++; - else if (!m_audioRouting.isEmpty()) { + else if (!routingMap.isEmpty()) { // Set the audio route changes... qsamplerChannelRoutingMap::ConstIterator iter; - for (iter = m_audioRouting.begin(); - iter != m_audioRouting.end(); ++iter) { - if (!m_pChannel->setAudioChannel(iter.key(), iter.data())) + for (iter = routingMap.begin(); + iter != routingMap.end(); ++iter) { + if (!m_pChannel->setAudioChannel(iter.key(), iter.value())) iErrors++; } } @@ -239,7 +347,10 @@ if (!m_pChannel->setMidiDriver(ui.MidiDriverComboBox->currentText())) iErrors++; } else { - qsamplerDevice *pDevice = m_midiDevices.at(ui.MidiDeviceComboBox->currentItem()); + qsamplerDevice *pDevice = NULL; + int iMidiItem = ui.MidiDeviceComboBox->currentIndex(); + if (iMidiItem >= 0 && iMidiItem < m_midiDevices.count()) + pDevice = m_midiDevices.at(iMidiItem); if (pDevice == NULL) iErrors++; else if (!m_pChannel->setMidiDevice(pDevice->deviceID())) @@ -249,7 +360,7 @@ if (!m_pChannel->setMidiPort(ui.MidiPortSpinBox->value())) iErrors++; // MIDI input channel... - if (!m_pChannel->setMidiChannel(ui.MidiChannelComboBox->currentItem())) + if (!m_pChannel->setMidiChannel(ui.MidiChannelComboBox->currentIndex())) iErrors++; // Engine name... if (!m_pChannel->loadEngine(ui.EngineNameComboBox->currentText())) @@ -257,11 +368,11 @@ // Instrument file and index... const QString& sPath = ui.InstrumentFileComboBox->currentText(); if (!sPath.isEmpty() && QFileInfo(sPath).exists()) { - if (!m_pChannel->loadInstrument(sPath, ui.InstrumentNrComboBox->currentItem())) + if (!m_pChannel->loadInstrument(sPath, ui.InstrumentNrComboBox->currentIndex())) iErrors++; } // MIDI intrument map... - if (!m_pChannel->setMidiMap(ui.MidiMapComboBox->currentItem())) + if (!m_pChannel->setMidiMap(ui.MidiMapComboBox->currentIndex())) iErrors++; // Show error messages? if (iErrors > 0) @@ -269,11 +380,12 @@ } // Save default engine name, instrument directory and history... - pOptions->sInstrumentDir = QFileInfo(ui.InstrumentFileComboBox->currentText()).dirPath(true); + pOptions->sInstrumentDir = QFileInfo( + ui.InstrumentFileComboBox->currentText()).dir().absolutePath(); pOptions->sEngineName = ui.EngineNameComboBox->currentText(); pOptions->sAudioDriver = ui.AudioDriverComboBox->currentText(); pOptions->sMidiDriver = ui.MidiDriverComboBox->currentText(); - pOptions->iMidiMap = ui.MidiMapComboBox->currentItem(); + pOptions->iMidiMap = ui.MidiMapComboBox->currentIndex(); pOptions->saveComboBoxHistory(ui.InstrumentFileComboBox); // Just go with dialog acceptance. @@ -324,17 +436,16 @@ // FIXME: the instrument file filters should be restricted, // depending on the current engine. - QString sInstrumentFile = QFileDialog::getOpenFileName( - pOptions->sInstrumentDir, // Start here. - tr("Instrument files") + " (*.gig *.dls)", // Filter (GIG and DLS files) - this, 0, // Parent and name (none) - QSAMPLER_TITLE ": " + tr("Instrument files") // Caption. + QString sInstrumentFile = QFileDialog::getOpenFileName(this, + QSAMPLER_TITLE ": " + tr("Instrument files"), // Caption. + pOptions->sInstrumentDir, // Start here. + tr("Instrument files") + " (*.gig *.dls)" // Filter (GIG and DLS files) ); if (sInstrumentFile.isEmpty()) return; - ui.InstrumentFileComboBox->setCurrentText(sInstrumentFile); + ui.InstrumentFileComboBox->setEditText(sInstrumentFile); updateInstrumentName(); } @@ -355,7 +466,7 @@ // Finally this better idea would be to use libgig // to retrieve the REAL instrument names. ui.InstrumentNrComboBox->clear(); - ui.InstrumentNrComboBox->insertStringList( + ui.InstrumentNrComboBox->insertItems(0, qsamplerChannel::getInstrumentList( ui.InstrumentFileComboBox->currentText(), pOptions->bInstrumentNames) @@ -370,6 +481,9 @@ qsamplerDevice::qsamplerDeviceType deviceTypeMode, const QString& sDriverName ) { + if (pDevice == NULL) + return; + MainForm *pMainForm = MainForm::getInstance(); if (pMainForm == NULL) return; @@ -404,26 +518,31 @@ if (pMainForm->client() == NULL) return; - const QString sDriverName = sMidiDriver.upper(); + const QString sDriverName = sMidiDriver.toUpper(); // Save current device id. + // Save current device id. int iDeviceID = 0; - qsamplerDevice *pDevice = m_midiDevices.at(ui.MidiDeviceComboBox->currentItem()); + qsamplerDevice *pDevice = NULL; + int iMidiItem = ui.MidiDeviceComboBox->currentIndex(); + if (iMidiItem >= 0 && iMidiItem < m_midiDevices.count()) + pDevice = m_midiDevices.at(iMidiItem); if (pDevice) iDeviceID = pDevice->deviceID(); // Clean maplist. ui.MidiDeviceComboBox->clear(); + qDeleteAll(m_midiDevices); m_midiDevices.clear(); // Populate with the current ones... - const QPixmap midiPixmap(":/qsampler/pixmaps/midi2.png"); + const QPixmap midiPixmap(":/icons/midi2.png"); int *piDeviceIDs = qsamplerDevice::getDevices(pMainForm->client(), qsamplerDevice::Midi); for (int i = 0; piDeviceIDs && piDeviceIDs[i] >= 0; i++) { pDevice = new qsamplerDevice(qsamplerDevice::Midi, piDeviceIDs[i]); - if (pDevice->driverName().upper() == sDriverName) { - ui.MidiDeviceComboBox->insertItem(midiPixmap, pDevice->deviceName()); + if (pDevice->driverName().toUpper() == sDriverName) { + ui.MidiDeviceComboBox->insertItem(0, midiPixmap, pDevice->deviceName()); m_midiDevices.append(pDevice); } else { delete pDevice; @@ -434,19 +553,19 @@ bool bEnabled = !m_midiDevices.isEmpty(); if (bEnabled) { // Select the previous current device... - int iMidiItem = 0; - for (pDevice = m_midiDevices.first(); - pDevice; - pDevice = m_midiDevices.next()) { + iMidiItem = 0; + QListIterator iter(m_midiDevices); + while (iter.hasNext()) { + pDevice = iter.next(); if (pDevice->deviceID() == iDeviceID) { - ui.MidiDeviceComboBox->setCurrentItem(iMidiItem); + ui.MidiDeviceComboBox->setCurrentIndex(iMidiItem); selectMidiDeviceItem(iMidiItem); break; } iMidiItem++; } } else { - ui.MidiDeviceComboBox->insertItem( + ui.MidiDeviceComboBox->insertItem(0, tr("(New MIDI %1 device)").arg(sMidiDriver)); } ui.MidiDeviceTextLabel->setEnabled(bEnabled); @@ -468,14 +587,16 @@ // Select MIDI device item. void ChannelForm::selectMidiDeviceItem ( int iMidiItem ) { - qsamplerDevice *pDevice = m_midiDevices.at(iMidiItem); + qsamplerDevice *pDevice = NULL; + if (iMidiItem >= 0 && iMidiItem < m_midiDevices.count()) + pDevice = m_midiDevices.at(iMidiItem); if (pDevice) { const qsamplerDeviceParamMap& params = pDevice->params(); int iPorts = params["PORTS"].value.toInt(); ui.MidiPortTextLabel->setEnabled(iPorts > 0); ui.MidiPortSpinBox->setEnabled(iPorts > 0); if (iPorts > 0) - ui.MidiPortSpinBox->setMaxValue(iPorts - 1); + ui.MidiPortSpinBox->setMaximum(iPorts - 1); } } @@ -494,7 +615,11 @@ // MIDI device options. void ChannelForm::setupMidiDevice (void) { - setupDevice(m_midiDevices.at(ui.MidiDeviceComboBox->currentItem()), + qsamplerDevice *pDevice = NULL; + int iMidiItem = ui.MidiDeviceComboBox->currentIndex(); + if (iMidiItem >= 0 && iMidiItem < m_midiDevices.count()) + pDevice = m_midiDevices.at(iMidiItem); + setupDevice(pDevice, qsamplerDevice::Midi, ui.MidiDriverComboBox->currentText()); } @@ -508,26 +633,30 @@ if (pMainForm->client() == NULL) return; - const QString sDriverName = sAudioDriver.upper(); + const QString sDriverName = sAudioDriver.toUpper(); // Save current device id. int iDeviceID = 0; - qsamplerDevice *pDevice = m_audioDevices.at(ui.AudioDeviceComboBox->currentItem()); + qsamplerDevice *pDevice = NULL; + int iAudioItem = ui.AudioDeviceComboBox->currentIndex(); + if (iAudioItem >= 0 && iAudioItem < m_audioDevices.count()) + pDevice = m_audioDevices.at(iAudioItem); if (pDevice) iDeviceID = pDevice->deviceID(); // Clean maplist. ui.AudioDeviceComboBox->clear(); + qDeleteAll(m_audioDevices); m_audioDevices.clear(); // Populate with the current ones... - const QPixmap audioPixmap(":/qsampler/pixmaps/audio2.png"); + const QPixmap audioPixmap(":/icons/audio2.png"); int *piDeviceIDs = qsamplerDevice::getDevices(pMainForm->client(), qsamplerDevice::Audio); for (int i = 0; piDeviceIDs && piDeviceIDs[i] >= 0; i++) { pDevice = new qsamplerDevice(qsamplerDevice::Audio, piDeviceIDs[i]); - if (pDevice->driverName().upper() == sDriverName) { - ui.AudioDeviceComboBox->insertItem(audioPixmap, pDevice->deviceName()); + if (pDevice->driverName().toUpper() == sDriverName) { + ui.AudioDeviceComboBox->insertItem(0, audioPixmap, pDevice->deviceName()); m_audioDevices.append(pDevice); } else { delete pDevice; @@ -538,19 +667,19 @@ bool bEnabled = !m_audioDevices.isEmpty(); if (bEnabled) { // Select the previous current device... - int iAudioItem = 0; - for (pDevice = m_audioDevices.first(); - pDevice; - pDevice = m_audioDevices.next()) { + iAudioItem = 0; + QListIterator iter(m_audioDevices); + while (iter.hasNext()) { + pDevice = iter.next(); if (pDevice->deviceID() == iDeviceID) { - ui.AudioDeviceComboBox->setCurrentItem(iAudioItem); + ui.AudioDeviceComboBox->setCurrentIndex(iAudioItem); selectAudioDeviceItem(iAudioItem); break; } iAudioItem++; } } else { - ui.AudioDeviceComboBox->insertItem( + ui.AudioDeviceComboBox->insertItem(0, tr("(New Audio %1 device)").arg(sAudioDriver)); //ui.AudioRoutingTable->setNumRows(0); } @@ -574,12 +703,14 @@ // Select Audio device item. void ChannelForm::selectAudioDeviceItem ( int iAudioItem ) { - qsamplerDevice *pDevice = m_audioDevices.at(iAudioItem); + qsamplerDevice *pDevice = NULL; + if (iAudioItem >= 0 && iAudioItem < m_audioDevices.count()) + pDevice = m_audioDevices.at(iAudioItem); if (pDevice) { // Refresh the audio routing table. routingModel.refresh(pDevice, m_pChannel->audioRouting()); // Reset routing change map. - m_audioRouting.clear(); + routingModel.clear(); } } @@ -598,36 +729,14 @@ // Audio device options. void ChannelForm::setupAudioDevice (void) { - setupDevice(m_audioDevices.at(ui.AudioDeviceComboBox->currentItem()), + qsamplerDevice *pDevice = NULL; + int iAudioItem = ui.AudioDeviceComboBox->currentIndex(); + if (iAudioItem >= 0 && iAudioItem < m_audioDevices.count()) + pDevice = m_audioDevices.at(iAudioItem); + setupDevice(pDevice, qsamplerDevice::Audio, ui.AudioDriverComboBox->currentText()); } - -// Audio routing change slot. -void ChannelForm::changeAudioRouting ( int iRow, int iCol ) -{ -#if 0 - if (m_iDirtySetup > 0) - return; - if (iRow < 0 || iCol < 0) - return; - - // Verify that this is a QComboTableItem (magic rtti == 1) - QTableItem *pItem = ui.AudioRoutingTable->item(iRow, iCol); - if (pItem == NULL) - return; - qsamplerChannelRoutingComboBox *pComboItem = - static_cast (pItem); - // FIXME: Its not garanteed that we must have - // iAudioOut == iRow on all times forth! - m_audioRouting[iRow] = pComboItem->currentItem(); - - // And let's get dirty... - optionsChanged(); -#endif -} - - // UPdate all device lists slot. void ChannelForm::updateDevices (void) { @@ -654,7 +763,10 @@ // Stabilize current form state. void ChannelForm::stabilizeForm (void) { - bool bValid = true; + const bool bValid = + ui.EngineNameComboBox->currentIndex() >= 0 && + ui.EngineNameComboBox->currentText() != + qsamplerChannel::noEngineName(); #if 0 const QString& sPath = InstrumentFileComboBox->currentText(); bValid = bValid && !sPath.isEmpty() && QFileInfo(sPath).exists(); @@ -662,5 +774,22 @@ ui.OkPushButton->setEnabled(m_iDirtyCount > 0 && bValid); } +void ChannelForm::updateTableCellRenderers() { + const int rows = routingModel.rowCount(); + const int cols = routingModel.columnCount(); + updateTableCellRenderers(routingModel.index(0,0),routingModel.index(rows-1,cols-1)); +} + +void ChannelForm::updateTableCellRenderers(const QModelIndex& topLeft, const QModelIndex& bottomRight) { + for (int r = topLeft.row(); r <= bottomRight.row(); r++) { + for (int c = topLeft.column(); c <= bottomRight.column(); c++) { + const QModelIndex index = routingModel.index(r,c); + ui.AudioRoutingTable->openPersistentEditor(index); + } + } +} } // namespace QSampler + + +// end of qsamplerChannelForm.cpp