/[svn]/qsampler/trunk/src/qsamplerChannelForm.ui.h

Diff of /qsampler/trunk/src/qsamplerChannelForm.ui.h

Parent Directory | Revision Log | View Patch Patch

-revision 176 by capela,
Tue Jul  6 10:54:45 2004 UTC
+revision 344 by capela,
Tue Jan 18 13:53:04 2005 UTC
 Line 2
  //
  // ui.h extension file, included from the uic-generated form implementation.
  /****************************************************************************
-    Copyright (C) 2004, rncbc aka Rui Nuno Capela. All rights reserved.
+    Copyright (C) 2004-2005, 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
 Line 26
  #include <qfileinfo.h>
  #include <qlistbox.h>
- #include "qsamplerOptions.h"
- #include "qsamplerChannelStrip.h"
  #include "config.h"
-Line 53 
 void qsamplerChannelForm::destroy (void)
+Line 50 
 void qsamplerChannelForm::destroy (void)
  // Channel dialog setup formal initializer.
- void qsamplerChannelForm::setup ( qsamplerChannelStrip *pChannel, bool bNew )
+ void qsamplerChannelForm::setup ( qsamplerChannel *pChannel )
  {
      m_pChannel = pChannel;
-Line 63 
 void qsamplerChannelForm::setup ( qsampl
+Line 60 
 void qsamplerChannelForm::setup ( qsampl
      if (m_pChannel == NULL)
          return;
-     setCaption(m_pChannel->caption());
+     // It can be a brand new channel, remember?
+     bool bNew = (m_pChannel->channelID() < 0);
+     setCaption(m_pChannel->channelName());
      // Check if we're up and connected.
      if (m_pChannel->client() == NULL)
-Line 123 
 void qsamplerChannelForm::setup ( qsampl
+Line 122 
 void qsamplerChannelForm::setup ( qsampl
      if (sInstrumentFile.isEmpty())
          sInstrumentFile = tr("(No instrument)");
      InstrumentFileComboBox->setCurrentText(sInstrumentFile);
-     InstrumentNrSpinBox->setValue(pChannel->instrumentNr());
+     InstrumentNrComboBox->clear();
+     InstrumentNrComboBox->insertStringList(
+                 qsamplerChannel::getInstrumentList(sInstrumentFile,
+                 pOptions->bInstrumentNames));
+     InstrumentNrComboBox->setCurrentItem(pChannel->instrumentNr());
      // MIDI input driver...
      QString sMidiDriver = pChannel->midiDriver();
-     if (sMidiDriver.isEmpty() && bNew)
+     if (sMidiDriver.isEmpty() || bNew)
          sMidiDriver = pOptions->sMidiDriver;
      if (!sMidiDriver.isEmpty()) {
          if (MidiDriverComboBox->listBox()->findItem(sMidiDriver, Qt::ExactMatch) == NULL)
-Line 137 
 void qsamplerChannelForm::setup ( qsampl
+Line 140 
 void qsamplerChannelForm::setup ( qsampl
      MidiPortSpinBox->setValue(pChannel->midiPort());
      // MIDI input channel...
      int iMidiChannel = pChannel->midiChannel();
-     if (bNew)
+     // When new, try to suggest a sensible MIDI channel...
-         iMidiChannel = (pChannel->channelID() + 1) % 16;
+     if (iMidiChannel < 0)
-     MidiChannelSpinBox->setValue(iMidiChannel);
+         iMidiChannel = (::lscp_get_channels(m_pChannel->client()) % 16);
+     MidiChannelComboBox->setCurrentItem(iMidiChannel);
      // Audio output driver...
      QString sAudioDriver = pChannel->audioDriver();
-     if (sAudioDriver.isEmpty() && bNew)
+     if (sAudioDriver.isEmpty() || bNew)
          sAudioDriver = pOptions->sAudioDriver;
      if (!sAudioDriver.isEmpty()) {
          if (AudioDriverComboBox->listBox()->findItem(sAudioDriver, Qt::ExactMatch) == NULL)
-Line 168 
 void qsamplerChannelForm::accept (void)
+Line 172 
 void qsamplerChannelForm::accept (void)
      // We'll go for it!
      if (m_iDirtyCount > 0) {
          int iErrors = 0;
+         // Are we a new channel?
+         if (!m_pChannel->addChannel())
+             iErrors++;
          // Audio output driver type...
          if (!m_pChannel->setAudioDriver(AudioDriverComboBox->currentText()))
              iErrors++;
-Line 178 
 void qsamplerChannelForm::accept (void)
+Line 185 
 void qsamplerChannelForm::accept (void)
          if (!m_pChannel->setMidiPort(MidiPortSpinBox->value()))
              iErrors++;
          // MIDI input channel...
-         if (!m_pChannel->setMidiChannel(MidiChannelSpinBox->value()))
+         if (!m_pChannel->setMidiChannel(MidiChannelComboBox->currentItem()))
              iErrors++;
          // Engine name...
          if (!m_pChannel->loadEngine(EngineNameComboBox->currentText()))
              iErrors++;
          // Instrument file and index...
-         if (!m_pChannel->loadInstrument(InstrumentFileComboBox->currentText(), InstrumentNrSpinBox->value()))
+         if (!m_pChannel->loadInstrument(InstrumentFileComboBox->currentText(), InstrumentNrComboBox->currentItem()))
              iErrors++;
          // Show error messages?
          if (iErrors > 0)
-Line 255 
 void qsamplerChannelForm::openInstrument
+Line 262 
 void qsamplerChannelForm::openInstrument
  // Refresh the actual instrument name.
  void qsamplerChannelForm::updateInstrumentName (void)
  {
-     // FIXME: A better idea would be to use libgig
+     qsamplerOptions *pOptions = m_pChannel->options();
-     // to retrieve the REAL instrument name.
+     if (pOptions == NULL)
-     InstrumentNameTextLabel->setText(QFileInfo(InstrumentFileComboBox->currentText()).fileName()
+         return;
-         + " [" + QString::number(InstrumentNrSpinBox->value()) + "]");
+     // Finally this better idea would be to use libgig
+     // to retrieve the REAL instrument names.
+     InstrumentNrComboBox->clear();
+     InstrumentNrComboBox->insertStringList(
+         qsamplerChannel::getInstrumentList(
+                         InstrumentFileComboBox->currentText(),
+                         pOptions->bInstrumentNames)
+     );
      optionsChanged();
  }

 Legend:



Removed from v.176
 


changed lines


 
Added in v.344
 Legend:



Removed from v.176
 


changed lines


 
Added in v.344
-Removed from v.176
+Added in v.344

	ViewVC Help
Powered by ViewVC