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

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

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

revision 470 by capela, Wed Mar 16 09:49:37 2005 UTC revision 471 by capela, Thu Mar 17 00:14:41 2005 UTC
# Line 491  void qsamplerDevicePort::setDevicePort ( Line 491  void qsamplerDevicePort::setDevicePort (
491          m_params.clear();          m_params.clear();
492    
493          // Retrieve device port/channel info, if any.          // Retrieve device port/channel info, if any.
         QString sPrefix = device.driverName() + ' ';  
494          lscp_device_port_info_t *pPortInfo = NULL;          lscp_device_port_info_t *pPortInfo = NULL;
495          switch (device.deviceType()) {          switch (device.deviceType()) {
496          case qsamplerDevice::Audio:          case qsamplerDevice::Audio:
                 sPrefix += QObject::tr("Channel");  
497                  pPortInfo = ::lscp_get_audio_channel_info(pClient, device.deviceID(), iPortID);                  pPortInfo = ::lscp_get_audio_channel_info(pClient, device.deviceID(), iPortID);
498                  break;                  break;
499          case qsamplerDevice::Midi:          case qsamplerDevice::Midi:
                 sPrefix += QObject::tr("Port");  
500                  pPortInfo = ::lscp_get_midi_port_info(pClient, device.deviceID(), iPortID);                  pPortInfo = ::lscp_get_midi_port_info(pClient, device.deviceID(), iPortID);
501                  break;                  break;
502          case qsamplerDevice::None:          case qsamplerDevice::None:
# Line 513  void qsamplerDevicePort::setDevicePort ( Line 510  void qsamplerDevicePort::setDevicePort (
510          }          }
511    
512          // Set device port/channel properties...          // Set device port/channel properties...
513          sPrefix += " %1:";          m_sPortName += device.driverName() + ' ' + pPortInfo->name;
         m_sPortName = sPrefix.arg(m_iPortID)  + ' ' + pPortInfo->name;  
514    
515          // Grab device port/channel parameters...          // Grab device port/channel parameters...
516          m_params.clear();          m_params.clear();
# Line 579  qsamplerDeviceItem::qsamplerDeviceItem ( Line 575  qsamplerDeviceItem::qsamplerDeviceItem (
575          switch(m_device.deviceType()) {          switch(m_device.deviceType()) {
576          case qsamplerDevice::Audio:          case qsamplerDevice::Audio:
577                  QListViewItem::setPixmap(0, QPixmap::fromMimeSource("audio1.png"));                  QListViewItem::setPixmap(0, QPixmap::fromMimeSource("audio1.png"));
578                  QListViewItem::setText(0, QObject::tr("Audio devices"));                  QListViewItem::setText(0, QObject::tr("Audio Devices"));
579                  break;                  break;
580          case qsamplerDevice::Midi:          case qsamplerDevice::Midi:
581                  QListViewItem::setPixmap(0, QPixmap::fromMimeSource("midi1.png"));                  QListViewItem::setPixmap(0, QPixmap::fromMimeSource("midi1.png"));
582                  QListViewItem::setText(0, QObject::tr("MIDI devices"));                  QListViewItem::setText(0, QObject::tr("MIDI Devices"));
583                  break;                  break;
584          case qsamplerDevice::None:          case qsamplerDevice::None:
585                  break;                  break;
Legend:
Removed from v.470  
changed lines
  Added in v.471
  ViewVC Help
Powered by ViewVC