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

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

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

revision 2722 by capela, Tue Mar 3 17:41:04 2015 UTC revision 3518 by capela, Sun Jun 30 16:58:30 2019 UTC
# Line 1  Line 1 
1  // qsamplerChannel.cpp  // qsamplerChannel.cpp
2  //  //
3  /****************************************************************************  /****************************************************************************
4     Copyright (C) 2004-2014, rncbc aka Rui Nuno Capela. All rights reserved.     Copyright (C) 2004-2019, rncbc aka Rui Nuno Capela. All rights reserved.
5     Copyright (C) 2007, 2008 Christian Schoenebeck     Copyright (C) 2007, 2008 Christian Schoenebeck
6    
7     This program is free software; you can redistribute it and/or     This program is free software; you can redistribute it and/or
# Line 237  bool Channel::setInstrument ( const QStr Line 237  bool Channel::setInstrument ( const QStr
237          m_sInstrumentFile = sInstrumentFile;          m_sInstrumentFile = sInstrumentFile;
238          m_iInstrumentNr = iInstrumentNr;          m_iInstrumentNr = iInstrumentNr;
239  #ifdef CONFIG_INSTRUMENT_NAME  #ifdef CONFIG_INSTRUMENT_NAME
240          m_sInstrumentName = QString::null;  // We'll get it, maybe later, on channel_info...          m_sInstrumentName.clear();  // We'll get it, maybe later, on channel_info...
241  #else  #else
242          m_sInstrumentName = getInstrumentName(sInstrumentFile, iInstrumentNr, true);          m_sInstrumentName = getInstrumentName(sInstrumentFile, iInstrumentNr, true);
243  #endif  #endif
# Line 632  bool Channel::updateChannelInfo (void) Line 632  bool Channel::updateChannelInfo (void)
632  #endif  #endif
633          // Some sanity checks.          // Some sanity checks.
634          if (m_sEngineName == "NONE" || m_sEngineName.isEmpty())          if (m_sEngineName == "NONE" || m_sEngineName.isEmpty())
635                  m_sEngineName = QString::null;                  m_sEngineName.clear();
636          if (m_sInstrumentFile == "NONE" || m_sInstrumentFile.isEmpty()) {          if (m_sInstrumentFile == "NONE" || m_sInstrumentFile.isEmpty()) {
637                  m_sInstrumentFile = QString::null;                  m_sInstrumentFile.clear();
638                  m_sInstrumentName = QString::null;                  m_sInstrumentName.clear();
639          }          }
640    
641          // Time for device info grabbing...          // Time for device info grabbing...
# Line 1110  QWidget* ChannelRoutingDelegate::createE Line 1110  QWidget* ChannelRoutingDelegate::createE
1110          pComboBox->addItems(item.options);          pComboBox->addItems(item.options);
1111          pComboBox->setCurrentIndex(item.selection);          pComboBox->setCurrentIndex(item.selection);
1112          pComboBox->setEnabled(true);          pComboBox->setEnabled(true);
1113            pComboBox->setEditable(true);
1114          pComboBox->setGeometry(option.rect);          pComboBox->setGeometry(option.rect);
1115          return pComboBox;          return pComboBox;
1116  }  }
Legend:
Removed from v.2722  
changed lines
  Added in v.3518
  ViewVC Help
Powered by ViewVC