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

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

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

revision 299 by capela, Wed Nov 17 15:41:58 2004 UTC revision 344 by capela, Tue Jan 18 13:53:04 2005 UTC
# Line 2  Line 2 
2  //  //
3  // ui.h extension file, included from the uic-generated form implementation.  // ui.h extension file, included from the uic-generated form implementation.
4  /****************************************************************************  /****************************************************************************
5     Copyright (C) 2004, rncbc aka Rui Nuno Capela. All rights reserved.     Copyright (C) 2004-2005, rncbc aka Rui Nuno Capela. All rights reserved.
6    
7     This program is free software; you can redistribute it and/or     This program is free software; you can redistribute it and/or
8     modify it under the terms of the GNU General Public License     modify it under the terms of the GNU General Public License
# Line 123  void qsamplerChannelForm::setup ( qsampl Line 123  void qsamplerChannelForm::setup ( qsampl
123          sInstrumentFile = tr("(No instrument)");          sInstrumentFile = tr("(No instrument)");
124      InstrumentFileComboBox->setCurrentText(sInstrumentFile);      InstrumentFileComboBox->setCurrentText(sInstrumentFile);
125      InstrumentNrComboBox->clear();      InstrumentNrComboBox->clear();
126      InstrumentNrComboBox->insertStringList(qsamplerChannel::getInstrumentList(sInstrumentFile));      InstrumentNrComboBox->insertStringList(
127                    qsamplerChannel::getInstrumentList(sInstrumentFile,
128                    pOptions->bInstrumentNames));
129      InstrumentNrComboBox->setCurrentItem(pChannel->instrumentNr());      InstrumentNrComboBox->setCurrentItem(pChannel->instrumentNr());
130      // MIDI input driver...      // MIDI input driver...
131      QString sMidiDriver = pChannel->midiDriver();      QString sMidiDriver = pChannel->midiDriver();
# Line 260  void qsamplerChannelForm::openInstrument Line 262  void qsamplerChannelForm::openInstrument
262  // Refresh the actual instrument name.  // Refresh the actual instrument name.
263  void qsamplerChannelForm::updateInstrumentName (void)  void qsamplerChannelForm::updateInstrumentName (void)
264  {  {
265        qsamplerOptions *pOptions = m_pChannel->options();
266        if (pOptions == NULL)
267            return;
268    
269      // Finally this better idea would be to use libgig      // Finally this better idea would be to use libgig
270      // to retrieve the REAL instrument names.      // to retrieve the REAL instrument names.
271      InstrumentNrComboBox->clear();      InstrumentNrComboBox->clear();
272      InstrumentNrComboBox->insertStringList(      InstrumentNrComboBox->insertStringList(
273          qsamplerChannel::getInstrumentList(InstrumentFileComboBox->currentText())          qsamplerChannel::getInstrumentList(
274                            InstrumentFileComboBox->currentText(),
275                            pOptions->bInstrumentNames)
276      );      );
277    
278      optionsChanged();      optionsChanged();
Legend:
Removed from v.299  
changed lines
  Added in v.344
  ViewVC Help
Powered by ViewVC