--- qsampler/trunk/src/qsamplerMainForm.ui.h 2005/06/17 22:43:56 661 +++ qsampler/trunk/src/qsamplerMainForm.ui.h 2007/01/08 16:52:48 1013 @@ -2,7 +2,7 @@ // // ui.h extension file, included from the uic-generated form implementation. /**************************************************************************** - Copyright (C) 2004-2005, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -14,9 +14,9 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + 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. *****************************************************************************/ @@ -41,12 +41,12 @@ #include "qsamplerMessages.h" #include "qsamplerChannelStrip.h" +#include "qsamplerInstrumentList.h" +#include "qsamplerInstrumentListForm.h" #include "qsamplerDeviceForm.h" #include "qsamplerOptionsForm.h" -#include "config.h" - #ifdef HAVE_SIGNAL_H #include #endif @@ -104,14 +104,22 @@ //------------------------------------------------------------------------- // qsamplerMainForm -- Main window form implementation. +// Kind of singleton reference. +qsamplerMainForm *qsamplerMainForm::g_pMainForm = NULL; + + // Kind of constructor. void qsamplerMainForm::init (void) { + // Pseudo-singleton reference setup. + g_pMainForm = this; + // Initialize some pointer references. m_pOptions = NULL; // All child forms are to be created later, not earlier than setup. - m_pMessages = NULL; + m_pMessages = NULL; + m_pInstrumentListForm = NULL; m_pDeviceForm = NULL; // We'll start clean. @@ -188,6 +196,8 @@ // Finally drop any widgets around... if (m_pDeviceForm) delete m_pDeviceForm; + if (m_pInstrumentListForm) + delete m_pInstrumentListForm; if (m_pMessages) delete m_pMessages; if (m_pWorkspace) @@ -206,6 +216,9 @@ // Delete recentfiles menu. if (m_pRecentFilesMenu) delete m_pRecentFilesMenu; + + // Pseudo-singleton reference shut-down. + g_pMainForm = NULL; } @@ -216,19 +229,33 @@ m_pOptions = pOptions; // What style do we create these forms? - WFlags wflags = Qt::WType_TopLevel; + Qt::WFlags wflags = Qt::WStyle_Customize + | Qt::WStyle_NormalBorder + | Qt::WStyle_Title + | Qt::WStyle_SysMenu + | Qt::WStyle_MinMax + | Qt::WType_TopLevel; if (m_pOptions->bKeepOnTop) wflags |= Qt::WStyle_Tool; // Some child forms are to be created right now. m_pMessages = new qsamplerMessages(this); m_pDeviceForm = new qsamplerDeviceForm(this, 0, wflags); - m_pDeviceForm->setMainForm(this); // An important life immutable! +#ifdef CONFIG_MIDI_INSTRUMENT + m_pInstrumentListForm = new qsamplerInstrumentListForm(this, 0, wflags); + QObject::connect(m_pInstrumentListForm->InstrumentList, + SIGNAL(instrumentsChanged()), + SLOT(sessionDirty())); +#else + viewInstrumentsAction->setEnabled(false); +#endif // Set message defaults... updateMessagesFont(); updateMessagesLimit(); updateMessagesCapture(); // Set the visibility signal. - QObject::connect(m_pMessages, SIGNAL(visibilityChanged(bool)), this, SLOT(stabilizeForm())); + QObject::connect(m_pMessages, + SIGNAL(visibilityChanged(bool)), + SLOT(stabilizeForm())); // Initial decorations toggle state. viewMenubarAction->setOn(m_pOptions->bMenubar); @@ -253,6 +280,7 @@ } // Try to restore old window positioning and initial visibility. m_pOptions->loadWidgetGeometry(this); + m_pOptions->loadWidgetGeometry(m_pInstrumentListForm); m_pOptions->loadWidgetGeometry(m_pDeviceForm); // Final startup stabilization... @@ -293,8 +321,11 @@ m_pOptions->settings().writeEntry("/Layout/DockWindows", sDockables); // And the children, and the main windows state,. m_pOptions->saveWidgetGeometry(m_pDeviceForm); + m_pOptions->saveWidgetGeometry(m_pInstrumentListForm); m_pOptions->saveWidgetGeometry(this); // Close popup widgets. + if (m_pInstrumentListForm) + m_pInstrumentListForm->close(); if (m_pDeviceForm) m_pDeviceForm->close(); // Stop client and/or server, gracefully. @@ -353,7 +384,7 @@ const QString& sPath = *iter; if (qsamplerChannel::isInstrumentFile(sPath)) { // Try to create a new channel from instrument file... - qsamplerChannel *pChannel = new qsamplerChannel(this); + qsamplerChannel *pChannel = new qsamplerChannel(); if (pChannel == NULL) return; // Start setting the instrument filename... @@ -373,8 +404,10 @@ m_iDirtyCount++; stabilizeForm(); } // Otherwise, load an usual session file (LSCP script)... - else if (closeSession(true)) + else if (closeSession(true)) { loadSessionFile(sPath); + break; + } // Make it look responsive...:) QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput); } @@ -387,9 +420,16 @@ // For the time being, just pump it to messages. if (pCustomEvent->type() == QSAMPLER_CUSTOM_EVENT) { qsamplerCustomEvent *pEvent = (qsamplerCustomEvent *) pCustomEvent; - appendMessagesColor(tr("Notify event: %1 data: %2") - .arg(::lscp_event_to_text(pEvent->event())) - .arg(pEvent->data()), "#996699"); + if (pEvent->event() == LSCP_EVENT_CHANNEL_INFO) { + int iChannelID = pEvent->data().toInt(); + qsamplerChannelStrip *pChannelStrip = channelStrip(iChannelID); + if (pChannelStrip) + channelStripChanged(pChannelStrip); + } else { + appendMessagesColor(tr("Notify event: %1 data: %2") + .arg(::lscp_event_to_text(pEvent->event())) + .arg(pEvent->data()), "#996699"); + } } } @@ -412,6 +452,7 @@ return m_pOptions; } + // The LSCP client descriptor property. lscp_client_t *qsamplerMainForm::client (void) { @@ -419,6 +460,13 @@ } +// The pseudo-singleton instance accessor. +qsamplerMainForm *qsamplerMainForm::getInstance (void) +{ + return g_pMainForm; +} + + //------------------------------------------------------------------------- // qsamplerMainForm -- Session file stuff. @@ -466,10 +514,10 @@ // Ask for the filename to open... QString sFilename = QFileDialog::getOpenFileName( - m_pOptions->sSessionDir, // Start here. - tr("LSCP Session files") + " (*.lscp)", // Filter (LSCP files) - this, 0, // Parent and name (none) - tr("Open Session") // Caption. + m_pOptions->sSessionDir, // Start here. + tr("LSCP Session files") + " (*.lscp)", // Filter (LSCP files) + this, 0, // Parent and name (none) + QSAMPLER_TITLE ": " + tr("Open Session") // Caption. ); // Have we cancelled? @@ -500,10 +548,10 @@ sFilename = m_pOptions->sSessionDir; // Prompt the guy... sFilename = QFileDialog::getSaveFileName( - sFilename, // Start here. - tr("LSCP Session files") + " (*.lscp)", // Filter (LSCP files) - this, 0, // Parent and name (none) - tr("Save Session") // Caption. + sFilename, // Start here. + tr("LSCP Session files") + " (*.lscp)", // Filter (LSCP files) + this, 0, // Parent and name (none) + QSAMPLER_TITLE ": " + tr("Save Session") // Caption. ); // Have we cancelled it? if (sFilename.isEmpty()) @@ -513,7 +561,8 @@ sFilename += ".lscp"; // Check if already exists... if (sFilename != m_sFilename && QFileInfo(sFilename).exists()) { - if (QMessageBox::warning(this, tr("Warning"), + if (QMessageBox::warning(this, + QSAMPLER_TITLE ": " + tr("Warning"), tr("The file already exists:\n\n" "\"%1\"\n\n" "Do you want to replace it?") @@ -535,7 +584,8 @@ // Are we dirty enough to prompt it? if (m_iDirtyCount > 0) { - switch (QMessageBox::warning(this, tr("Warning"), + switch (QMessageBox::warning(this, + QSAMPLER_TITLE ": " + tr("Warning"), tr("The current session has been changed:\n\n" "\"%1\"\n\n" "Do you want to save the changes?") @@ -588,22 +638,29 @@ return false; } + // Tell the world we'll take some time... + QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); + // Read the file. + int iLine = 0; int iErrors = 0; QTextStream ts(&file); while (!ts.atEnd()) { // Read the line. - QString sCommand = ts.readLine().simplifyWhiteSpace(); + QString sCommand = ts.readLine().stripWhiteSpace(); + iLine++; // If not empty, nor a comment, call the server... if (!sCommand.isEmpty() && sCommand[0] != '#') { - appendMessagesColor(sCommand, "#996633"); - // Remember that, no matter what, - // all LSCP commands are CR/LF terminated. - sCommand += "\r\n"; - if (::lscp_client_query(m_pClient, sCommand.latin1()) != LSCP_OK) { - appendMessagesClient("lscp_client_query"); - iErrors++; - } + // Remember that, no matter what, + // all LSCP commands are CR/LF terminated. + sCommand += "\r\n"; + if (::lscp_client_query(m_pClient, sCommand.latin1()) != LSCP_OK) { + appendMessagesColor(QString("%1(%2): %3") + .arg(QFileInfo(sFilename).fileName()).arg(iLine) + .arg(sCommand.simplifyWhiteSpace()), "#996633"); + appendMessagesClient("lscp_client_query"); + iErrors++; + } } // Try to make it snappy :) QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput); @@ -615,6 +672,9 @@ // Now we'll try to create (update) the whole GUI session. updateSession(); + // We're fornerly done. + QApplication::restoreOverrideCursor(); + // Have we any errors? if (iErrors > 0) appendMessagesError(tr("Session loaded with errors\nfrom \"%1\".\n\nSorry.").arg(sFilename)); @@ -638,6 +698,15 @@ // Save current session to specific file path. bool qsamplerMainForm::saveSessionFile ( const QString& sFilename ) { + if (m_pClient == NULL) + return false; + + // Check whether server is apparently OK... + if (::lscp_get_channels(m_pClient) < 0) { + appendMessagesClient("lscp_get_channels"); + return false; + } + // Open and write into real file. QFile file(sFilename); if (!file.open(IO_WriteOnly | IO_Truncate)) { @@ -645,6 +714,9 @@ return false; } + // Tell the world we'll take some time... + QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); + // Write the file. int iErrors = 0; QTextStream ts(&file); @@ -661,17 +733,19 @@ << " " << QTime::currentTime().toString("hh:mm:ss") << endl; ts << "#" << endl; ts << endl; + // It is assumed that this new kind of device+session file - // will be loaded from a complete + // will be loaded from a complete initialized server... int *piDeviceIDs; int iDevice; ts << "RESET" << endl; + // Audio device mapping. QMap audioDeviceMap; piDeviceIDs = qsamplerDevice::getDevices(m_pClient, qsamplerDevice::Audio); for (iDevice = 0; piDeviceIDs && piDeviceIDs[iDevice] >= 0; iDevice++) { ts << endl; - qsamplerDevice device(this, qsamplerDevice::Audio, piDeviceIDs[iDevice]); + qsamplerDevice device(qsamplerDevice::Audio, piDeviceIDs[iDevice]); // Audio device specification... ts << "# " << device.deviceTypeName() << " " << device.driverName() << " " << tr("Device") << " " << iDevice << endl; @@ -703,15 +777,16 @@ } // Audio device index/id mapping. audioDeviceMap[device.deviceID()] = iDevice; - // Try to keep it snappy :) - QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput); + // Try to keep it snappy :) + QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput); } + // MIDI device mapping. QMap midiDeviceMap; piDeviceIDs = qsamplerDevice::getDevices(m_pClient, qsamplerDevice::Midi); for (iDevice = 0; piDeviceIDs && piDeviceIDs[iDevice] >= 0; iDevice++) { ts << endl; - qsamplerDevice device(this, qsamplerDevice::Midi, piDeviceIDs[iDevice]); + qsamplerDevice device(qsamplerDevice::Midi, piDeviceIDs[iDevice]); // MIDI device specification... ts << "# " << device.deviceTypeName() << " " << device.driverName() << " " << tr("Device") << " " << iDevice << endl; @@ -743,10 +818,82 @@ } // MIDI device index/id mapping. midiDeviceMap[device.deviceID()] = iDevice; - // Try to keep it snappy :) - QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput); + // Try to keep it snappy :) + QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput); } ts << endl; + +#ifdef CONFIG_MIDI_INSTRUMENT + // MIDI instrument mapping... + QMap midiInstrumentMap; + int *piMaps = ::lscp_list_midi_instrument_maps(m_pClient); + for (int iMap = 0; piMaps && piMaps[iMap] >= 0; iMap++) { + int iMidiMap = piMaps[iMap]; + const char *pszMapName + = ::lscp_get_midi_instrument_map_name(m_pClient, iMidiMap); + ts << "# " << tr("MIDI instrument map") << " " << iMap; + if (pszMapName) + ts << " - " << pszMapName; + ts << endl; + ts << "ADD MIDI_INSTRUMENT_MAP"; + if (pszMapName) + ts << " '" << pszMapName << "'"; + ts << endl; + // MIDI instrument mapping... + lscp_midi_instrument_t *pInstrs + = ::lscp_list_midi_instruments(m_pClient, iMidiMap); + for (int iInstr = 0; pInstrs && pInstrs[iInstr].map >= 0; iInstr++) { + lscp_midi_instrument_info_t *pInstrInfo + = ::lscp_get_midi_instrument_info(m_pClient, &pInstrs[iInstr]); + if (pInstrInfo) { + ts << "MAP MIDI_INSTRUMENT " + << iMap << " " + << pInstrs[iInstr].bank << " " + << pInstrs[iInstr].prog << " " + << pInstrInfo->engine_name << " '" + << pInstrInfo->instrument_file << "' " + << pInstrInfo->instrument_nr << " " + << pInstrInfo->volume << " "; + switch (pInstrInfo->load_mode) { + case LSCP_LOAD_PERSISTENT: + ts << "PERSISTENT"; + break; + case LSCP_LOAD_ON_DEMAND_HOLD: + ts << "ON_DEMAND_HOLD"; + break; + case LSCP_LOAD_ON_DEMAND: + case LSCP_LOAD_DEFAULT: + default: + ts << "ON_DEMAND"; + break; + } + if (pInstrInfo->name) + ts << " '" << pInstrInfo->name << "'"; + ts << endl; + } // Check for errors... + else if (::lscp_client_get_errno(m_pClient)) { + appendMessagesClient("lscp_get_midi_instrument_info"); + iErrors++; + } + // Try to keep it snappy :) + QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput); + } + ts << endl; + // Check for errors... + if (pInstrs == NULL && ::lscp_client_get_errno(m_pClient)) { + appendMessagesClient("lscp_list_midi_instruments"); + iErrors++; + } + // MIDI strument index/id mapping. + midiInstrumentMap[iMidiMap] = iMap; + } + // Check for errors... + if (piMaps == NULL && ::lscp_client_get_errno(m_pClient)) { + appendMessagesClient("lscp_list_midi_instrument_maps"); + iErrors++; + } +#endif // CONFIG_MIDI_INSTRUMENT + // Sampler channel mapping. QWidgetList wlist = m_pWorkspace->windowList(); for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) { @@ -779,8 +926,29 @@ ts << pChannel->midiChannel(); ts << endl; ts << "LOAD ENGINE " << pChannel->engineName() << " " << iChannel << endl; - ts << "LOAD INSTRUMENT NON_MODAL '" << pChannel->instrumentFile() << "' " << pChannel->instrumentNr() << " " << iChannel << endl; - ts << "SET CHANNEL VOLUME " << iChannel << " " << pChannel->volume() << endl; + if (pChannel->instrumentStatus() < 100) ts << "# "; + ts << "LOAD INSTRUMENT NON_MODAL '" << pChannel->instrumentFile() << "' " + << pChannel->instrumentNr() << " " << iChannel << endl; + qsamplerChannelRoutingMap::ConstIterator audioRoute; + for (audioRoute = pChannel->audioRouting().begin(); + audioRoute != pChannel->audioRouting().end(); + ++audioRoute) { + ts << "SET CHANNEL AUDIO_OUTPUT_CHANNEL " << iChannel + << " " << audioRoute.key() + << " " << audioRoute.data() << endl; + } + ts << "SET CHANNEL VOLUME " << iChannel + << " " << pChannel->volume() << endl; + if (pChannel->channelMute()) + ts << "SET CHANNEL MUTE " << iChannel << " 1" << endl; + if (pChannel->channelSolo()) + ts << "SET CHANNEL SOLO " << iChannel << " 1" << endl; +#ifdef CONFIG_MIDI_INSTRUMENT + if (pChannel->midiMap() >= 0) { + ts << "SET CHANNEL MIDI_INSTRUMENT_MAP " << iChannel + << " " << midiInstrumentMap[pChannel->midiMap()] << endl; + } +#endif ts << endl; } } @@ -791,6 +959,9 @@ // Ok. we've wrote it. file.close(); + // We're fornerly done. + QApplication::restoreOverrideCursor(); + // Have we any errors? if (iErrors > 0) appendMessagesError(tr("Some settings could not be saved\nto \"%1\" session file.\n\nSorry.").arg(sFilename)); @@ -872,7 +1043,8 @@ return; // Ask user whether he/she want's an internal sampler reset... - if (QMessageBox::warning(this, tr("Warning"), + if (QMessageBox::warning(this, + QSAMPLER_TITLE ": " + tr("Warning"), tr("Resetting the sampler instance will close\n" "all device and channel configurations.\n\n" "Please note that this operation may cause\n" @@ -881,12 +1053,17 @@ tr("Reset"), tr("Cancel")) > 0) return; + // Trye closing the current session, first... + if (!closeSession(true)) + return; + // Just do the reset, after closing down current session... - if (closeSession(true) && ::lscp_reset_sampler(m_pClient) != LSCP_OK) { - appendMessagesClient("lscp_reset_sampler"); - appendMessagesError(tr("Could not reset sampler instance.\n\nSorry.")); - return; - } + // Do the actual sampler reset... + if (::lscp_reset_sampler(m_pClient) != LSCP_OK) { + appendMessagesClient("lscp_reset_sampler"); + appendMessagesError(tr("Could not reset sampler instance.\n\nSorry.")); + return; + } // Log this. appendMessages(tr("Sampler reset.")); @@ -907,7 +1084,8 @@ // Ask user whether he/she want's a complete restart... // (if we're currently up and running) if (bRestart && m_pClient) { - bRestart = (QMessageBox::warning(this, tr("Warning"), + bRestart = (QMessageBox::warning(this, + QSAMPLER_TITLE ": " + tr("Warning"), tr("New settings will be effective after\n" "restarting the client/server connection.\n\n" "Please note that this operation may cause\n" @@ -944,7 +1122,7 @@ return; // Just create the channel instance... - qsamplerChannel *pChannel = new qsamplerChannel(this); + qsamplerChannel *pChannel = new qsamplerChannel(); if (pChannel == NULL) return; @@ -983,7 +1161,8 @@ // Prompt user if he/she's sure about this... if (m_pOptions && m_pOptions->bConfirmRemove) { - if (QMessageBox::warning(this, tr("Warning"), + if (QMessageBox::warning(this, + QSAMPLER_TITLE ": " + tr("Warning"), tr("About to remove channel:\n\n" "%1\n\n" "Are you sure?") @@ -1106,6 +1285,25 @@ } +// Show/hide the MIDI instrument list-view form. +void qsamplerMainForm::viewInstruments (void) +{ + if (m_pOptions == NULL) + return; + + if (m_pInstrumentListForm) { + m_pOptions->saveWidgetGeometry(m_pInstrumentListForm); + if (m_pInstrumentListForm->isVisible()) { + m_pInstrumentListForm->hide(); + } else { + m_pInstrumentListForm->show(); + m_pInstrumentListForm->raise(); + m_pInstrumentListForm->setActiveWindow(); + } + } +} + + // Show/hide the device configurator form. void qsamplerMainForm::viewDevices (void) { @@ -1114,7 +1312,6 @@ if (m_pDeviceForm) { m_pOptions->saveWidgetGeometry(m_pDeviceForm); - m_pDeviceForm->setClient(m_pClient); if (m_pDeviceForm->isVisible()) { m_pDeviceForm->hide(); } else { @@ -1166,7 +1363,8 @@ (!bOldStdoutCapture && m_pOptions->bStdoutCapture) || ( bOldKeepOnTop && !m_pOptions->bKeepOnTop) || (!bOldKeepOnTop && m_pOptions->bKeepOnTop)) { - QMessageBox::information(this, tr("Information"), + QMessageBox::information(this, + QSAMPLER_TITLE ": " + tr("Information"), tr("Some settings may be only effective\n" "next time you start this program."), tr("OK")); updateMessagesCapture(); @@ -1294,6 +1492,16 @@ sText += tr("LSCP (liblscp) instrument_name support disabled."); sText += "
"; #endif +#ifndef CONFIG_MUTE_SOLO + sText += ""; + sText += tr("Sampler channel Mute/Solo support disabled."); + sText += "
"; +#endif +#ifndef CONFIG_MIDI_INSTRUMENT + sText += ""; + sText += tr("MIDI instrument mapping support disabled."); + sText += "
"; +#endif sText += "
\n"; sText += tr("Using") + ": "; sText += ::lscp_client_package(); @@ -1301,9 +1509,9 @@ sText += ::lscp_client_version(); #ifdef CONFIG_LIBGIG sText += ", "; - sText += gig::libraryName(); + sText += gig::libraryName().c_str(); sText += " "; - sText += gig::libraryVersion(); + sText += gig::libraryVersion().c_str(); #endif sText += "
\n"; sText += "
\n"; @@ -1329,7 +1537,7 @@ // Update the main application caption... QString sSessionName = sessionName(m_sFilename); if (m_iDirtyCount > 0) - sSessionName += '*'; + sSessionName += " *"; setCaption(tr(QSAMPLER_TITLE " - [%1]").arg(sSessionName)); // Update the main menu state... @@ -1348,7 +1556,13 @@ editResetChannelAction->setEnabled(bHasChannel); editResetAllChannelsAction->setEnabled(bHasChannel); viewMessagesAction->setOn(m_pMessages && m_pMessages->isVisible()); - viewDevicesAction->setOn(m_pDeviceForm && m_pDeviceForm->isVisible()); +#ifdef CONFIG_MIDI_INSTRUMENT + viewInstrumentsAction->setOn(m_pInstrumentListForm + && m_pInstrumentListForm->isVisible()); + viewInstrumentsAction->setEnabled(bHasClient); +#endif + viewDevicesAction->setOn(m_pDeviceForm + && m_pDeviceForm->isVisible()); viewDevicesAction->setEnabled(bHasClient); channelsArrangeAction->setEnabled(bHasChannel); @@ -1399,6 +1613,17 @@ // Grab and restore current sampler channels session. void qsamplerMainForm::updateSession (void) { +#ifdef CONFIG_MIDI_INSTRUMENT + // FIXME: Make some room for default instrument maps... + int iMaps = ::lscp_get_midi_instrument_maps(m_pClient); + if (iMaps < 0) + appendMessagesClient("lscp_get_midi_instrument_maps"); + else if (iMaps < 1) { + ::lscp_add_midi_instrument_map(m_pClient, tr("Chromatic").latin1()); + ::lscp_add_midi_instrument_map(m_pClient, tr("Drum Kits").latin1()); + } +#endif + // Retrieve the current channel list. int *piChannelIDs = ::lscp_list_channels(m_pClient); if (piChannelIDs == NULL) { @@ -1406,21 +1631,24 @@ appendMessagesClient("lscp_list_channels"); appendMessagesError(tr("Could not get current list of channels.\n\nSorry.")); } - return; + } else { + // Try to (re)create each channel. + m_pWorkspace->setUpdatesEnabled(false); + for (int iChannel = 0; piChannelIDs[iChannel] >= 0; iChannel++) { + // Check if theres already a channel strip for this one... + if (!channelStrip(piChannelIDs[iChannel])) + createChannelStrip(new qsamplerChannel(piChannelIDs[iChannel])); + } + m_pWorkspace->setUpdatesEnabled(true); } - // Try to (re)create each channel. - m_pWorkspace->setUpdatesEnabled(false); - for (int iChannel = 0; piChannelIDs[iChannel] >= 0; iChannel++) { - // Check if theres already a channel strip for this one... - if (!channelStrip(piChannelIDs[iChannel])) - createChannelStrip(new qsamplerChannel(this, piChannelIDs[iChannel])); - // Make it visibly responsive... - QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput); - } - m_pWorkspace->setUpdatesEnabled(true); - - // Remember to refresh devices + // Do we auto-arrange? + if (m_pOptions && m_pOptions->bAutoArrange) + channelsArrange(); + + // Remember to refresh devices and instruments... + if (m_pInstrumentListForm) + m_pInstrumentListForm->refreshInstruments(); if (m_pDeviceForm) m_pDeviceForm->refreshDevices(); } @@ -1593,7 +1821,11 @@ appendMessagesColor(s.simplifyWhiteSpace(), "#ff0000"); - QMessageBox::critical(this, tr("Error"), s, tr("Cancel")); + // Make it look responsive...:) + QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput); + + QMessageBox::critical(this, + QSAMPLER_TITLE ": " + tr("Error"), s, tr("Cancel")); } @@ -1606,6 +1838,9 @@ appendMessagesColor(s + QString(": %1 (errno=%2)") .arg(::lscp_client_get_result(m_pClient)) .arg(::lscp_client_get_errno(m_pClient)), "#996666"); + + // Make it look responsive...:) + QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput); } @@ -1817,25 +2052,30 @@ } } - // Refresh each channel usage, on each period... - if (m_pClient && (m_changedStrips.count() > 0 || m_pOptions->bAutoRefresh)) { - m_iTimerSlot += QSAMPLER_TIMER_MSECS; - if (m_iTimerSlot >= m_pOptions->iAutoRefreshTime && m_pWorkspace->isUpdatesEnabled()) { - m_iTimerSlot = 0; - // Update the channel information for each pending strip... + if (m_pClient) { + // Update the channel information for each pending strip... + if (m_changedStrips.count() > 0) { for (qsamplerChannelStrip *pChannelStrip = m_changedStrips.first(); - pChannelStrip; - pChannelStrip = m_changedStrips.next()) { + pChannelStrip; pChannelStrip = m_changedStrips.next()) { // If successfull, remove from pending list... if (pChannelStrip->updateChannelInfo()) m_changedStrips.remove(pChannelStrip); } - // Update the channel stream usage for each strip... - QWidgetList wlist = m_pWorkspace->windowList(); - for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) { - qsamplerChannelStrip *pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel); - if (pChannelStrip && pChannelStrip->isVisible()) - pChannelStrip->updateChannelUsage(); + } + // Refresh each channel usage, on each period... + if (m_pOptions->bAutoRefresh) { + m_iTimerSlot += QSAMPLER_TIMER_MSECS; + if (m_iTimerSlot >= m_pOptions->iAutoRefreshTime) { + m_iTimerSlot = 0; + // Update the channel stream usage for each strip... + QWidgetList wlist = m_pWorkspace->windowList(); + for (int iChannel = 0; + iChannel < (int) wlist.count(); iChannel++) { + qsamplerChannelStrip *pChannelStrip + = (qsamplerChannelStrip *) wlist.at(iChannel); + if (pChannelStrip && pChannelStrip->isVisible()) + pChannelStrip->updateChannelUsage(); + } } } } @@ -1860,7 +2100,8 @@ // Is the server process instance still here? if (m_pServer) { - switch (QMessageBox::warning(this, tr("Warning"), + switch (QMessageBox::warning(this, + QSAMPLER_TITLE ": " + tr("Warning"), tr("Could not start the LinuxSampler server.\n\n" "Maybe it ss already started."), tr("Stop"), tr("Kill"), tr("Cancel"))) { @@ -2019,6 +2260,10 @@ ::lscp_client_set_timeout(m_pClient, m_pOptions->iServerTimeout); appendMessages(tr("Client receive timeout is set to %1 msec.").arg(::lscp_client_get_timeout(m_pClient))); + // Subscribe to channel info change notifications... + if (::lscp_client_subscribe(m_pClient, LSCP_EVENT_CHANNEL_INFO) != LSCP_OK) + appendMessagesClient("lscp_client_subscribe"); + // We may stop scheduling around. stopSchedule(); @@ -2028,11 +2273,13 @@ // Log success here. appendMessages(tr("Client connected.")); - // Hard-notify device configuration form, + // Hard-notify instrumnet and device configuration forms, // if visible, that we're ready... - if (m_pDeviceForm && m_pDeviceForm->isVisible()) - m_pDeviceForm->setClient(m_pClient); - + if (m_pInstrumentListForm) + m_pInstrumentListForm->refreshInstruments(); + if (m_pDeviceForm) + m_pDeviceForm->refreshDevices(); + // Is any session pending to be loaded? if (!m_pOptions->sSessionFile.isEmpty()) { // Just load the prabably startup session... @@ -2053,11 +2300,6 @@ if (m_pClient == NULL) return; - // Hard-notify device configuration form, - // if visible, that we're running out... - if (m_pDeviceForm && m_pDeviceForm->isVisible()) - m_pDeviceForm->setClient(NULL); - // Log prepare here. appendMessages(tr("Client disconnecting...")); @@ -2074,9 +2316,17 @@ closeSession(false); // Close us as a client... - lscp_client_destroy(m_pClient); + ::lscp_client_unsubscribe(m_pClient, LSCP_EVENT_CHANNEL_INFO); + ::lscp_client_destroy(m_pClient); m_pClient = NULL; + // Hard-notify instrumnet and device configuration forms, + // if visible, that we're running out... + if (m_pInstrumentListForm) + m_pInstrumentListForm->refreshInstruments(); + if (m_pDeviceForm) + m_pDeviceForm->refreshDevices(); + // Log final here. appendMessages(tr("Client disconnected."));