/[svn]/qsampler/trunk/src/qsamplerChannelForm.cpp
ViewVC logotype

Diff of /qsampler/trunk/src/qsamplerChannelForm.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1473 by capela, Thu Nov 1 19:25:10 2007 UTC revision 1474 by schoenebeck, Mon Nov 5 20:47:38 2007 UTC
# Line 56  ChannelForm::ChannelForm(QWidget* parent Line 56  ChannelForm::ChannelForm(QWidget* parent
56                  SIGNAL(activated(int)),                  SIGNAL(activated(int)),
57                  SLOT(optionsChanged()));                  SLOT(optionsChanged()));
58          QObject::connect(ui.InstrumentFileComboBox,          QObject::connect(ui.InstrumentFileComboBox,
59                  SIGNAL(activated(const QString&)),                  SIGNAL(activated(const QString&)),
60                  SLOT(updateInstrumentName()));                  SLOT(updateInstrumentName()));
61          QObject::connect(ui.InstrumentFileToolButton,          QObject::connect(ui.InstrumentFileToolButton,
62                  SIGNAL(clicked()),                  SIGNAL(clicked()),
# Line 65  ChannelForm::ChannelForm(QWidget* parent Line 65  ChannelForm::ChannelForm(QWidget* parent
65                  SIGNAL(activated(int)),                  SIGNAL(activated(int)),
66                  SLOT(optionsChanged()));                  SLOT(optionsChanged()));
67          QObject::connect(ui.MidiDriverComboBox,          QObject::connect(ui.MidiDriverComboBox,
68                  SIGNAL(activated(const QString&)),                  SIGNAL(activated(const QString&)),
69                  SLOT(selectMidiDriver(const QString&)));                  SLOT(selectMidiDriver(const QString&)));
70          QObject::connect(ui.MidiDeviceComboBox,          QObject::connect(ui.MidiDeviceComboBox,
71                  SIGNAL(activated(int)),                  SIGNAL(activated(int)),
72                  SLOT(selectMidiDevice(int)));                  SLOT(selectMidiDevice(int)));
# Line 80  ChannelForm::ChannelForm(QWidget* parent Line 80  ChannelForm::ChannelForm(QWidget* parent
80                  SIGNAL(activated(int)),                  SIGNAL(activated(int)),
81                  SLOT(optionsChanged()));                  SLOT(optionsChanged()));
82          QObject::connect(ui.AudioDriverComboBox,          QObject::connect(ui.AudioDriverComboBox,
83                  SIGNAL(activated(const QString&)),                  SIGNAL(activated(const QString&)),
84                  SLOT(selectAudioDriver(const QString&)));                  SLOT(selectAudioDriver(const QString&)));
85          QObject::connect(ui.AudioDeviceComboBox,          QObject::connect(ui.AudioDeviceComboBox,
86                  SIGNAL(activated(int)),                  SIGNAL(activated(int)),
87                  SLOT(selectAudioDevice(int)));                  SLOT(selectAudioDevice(int)));
# Line 147  void ChannelForm::setup ( qsamplerChanne Line 147  void ChannelForm::setup ( qsamplerChanne
147          if (ppszEngines) {          if (ppszEngines) {
148                  ui.EngineNameComboBox->clear();                  ui.EngineNameComboBox->clear();
149                  for (int iEngine = 0; ppszEngines[iEngine]; iEngine++)                  for (int iEngine = 0; ppszEngines[iEngine]; iEngine++)
150                          ui.EngineNameComboBox->insertItem(ppszEngines[iEngine]);                          ui.EngineNameComboBox->addItem(QString(ppszEngines[iEngine]));
151          }          }
152          else m_pChannel->appendMessagesClient("lscp_list_available_engines");          else m_pChannel->appendMessagesClient("lscp_list_available_engines");
153    
# Line 175  void ChannelForm::setup ( qsamplerChanne Line 175  void ChannelForm::setup ( qsamplerChanne
175          if (sEngineName.isEmpty())          if (sEngineName.isEmpty())
176                  sEngineName = qsamplerChannel::noEngineName();                  sEngineName = qsamplerChannel::noEngineName();
177          if (ui.EngineNameComboBox->findText(sEngineName,          if (ui.EngineNameComboBox->findText(sEngineName,
178                          Qt::MatchExactly | Qt::MatchCaseSensitive) == 0) {                          Qt::MatchExactly | Qt::MatchCaseSensitive) < 0) {
179                  ui.EngineNameComboBox->insertItem(sEngineName);                  ui.EngineNameComboBox->addItem(sEngineName);
180          }          }
181          ui.EngineNameComboBox->setCurrentText(sEngineName);          ui.EngineNameComboBox->setCurrentIndex(
182                    ui.EngineNameComboBox->findText(sEngineName,
183                            Qt::MatchExactly | Qt::MatchCaseSensitive));
184          // Instrument filename and index...          // Instrument filename and index...
185          QString sInstrumentFile = pChannel->instrumentFile();          QString sInstrumentFile = pChannel->instrumentFile();
186          if (sInstrumentFile.isEmpty())          if (sInstrumentFile.isEmpty())
# Line 198  void ChannelForm::setup ( qsamplerChanne Line 200  void ChannelForm::setup ( qsamplerChanne
200                  sMidiDriver = pOptions->sMidiDriver.upper();                  sMidiDriver = pOptions->sMidiDriver.upper();
201          if (!sMidiDriver.isEmpty()) {          if (!sMidiDriver.isEmpty()) {
202                  if (ui.MidiDriverComboBox->findText(sMidiDriver,                  if (ui.MidiDriverComboBox->findText(sMidiDriver,
203                                  Qt::MatchExactly | Qt::MatchCaseSensitive) == 0) {                                  Qt::MatchExactly | Qt::MatchCaseSensitive) < 0) {
204                          ui.MidiDriverComboBox->insertItem(sMidiDriver);                          ui.MidiDriverComboBox->insertItem(sMidiDriver);
205                  }                  }
206                  ui.MidiDriverComboBox->setCurrentText(sMidiDriver);                  ui.MidiDriverComboBox->setCurrentText(sMidiDriver);
# Line 236  void ChannelForm::setup ( qsamplerChanne Line 238  void ChannelForm::setup ( qsamplerChanne
238                  sAudioDriver = pOptions->sAudioDriver.upper();                  sAudioDriver = pOptions->sAudioDriver.upper();
239          if (!sAudioDriver.isEmpty()) {          if (!sAudioDriver.isEmpty()) {
240                  if (ui.AudioDriverComboBox->findText(sAudioDriver,                  if (ui.AudioDriverComboBox->findText(sAudioDriver,
241                                  Qt::MatchExactly | Qt::MatchCaseSensitive) == 0) {                                  Qt::MatchExactly | Qt::MatchCaseSensitive) < 0) {
242                          ui.AudioDriverComboBox->insertItem(sAudioDriver);                          ui.AudioDriverComboBox->insertItem(sAudioDriver);
243                  }                  }
244                  ui.AudioDriverComboBox->setCurrentText(sAudioDriver);                  ui.AudioDriverComboBox->setCurrentText(sAudioDriver);

Legend:
Removed from v.1473  
changed lines
  Added in v.1474

  ViewVC Help
Powered by ViewVC