/[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 736 by schoenebeck, Tue Aug 16 10:19:25 2005 UTC revision 748 by capela, Wed Aug 17 23:03:26 2005 UTC
# Line 602  QStringList qsamplerChannel::getInstrume Line 602  QStringList qsamplerChannel::getInstrume
602          if (isInstrumentFile(sInstrumentFile)) {          if (isInstrumentFile(sInstrumentFile)) {
603  #ifdef CONFIG_LIBGIG  #ifdef CONFIG_LIBGIG
604                  if (bInstrumentNames) {                  if (bInstrumentNames) {
605                          RIFF::File *pRiff = new RIFF::File((const RIFF::String&) sInstrumentFile);                          RIFF::File *pRiff = new RIFF::File(sInstrumentFile.latin1());
606                          gig::File  *pGig  = new gig::File(pRiff);                          gig::File  *pGig  = new gig::File(pRiff);
607                          gig::Instrument *pInstrument = pGig->GetFirstInstrument();                          gig::Instrument *pInstrument = pGig->GetFirstInstrument();
608                          while (pInstrument) {                          while (pInstrument) {
# Line 633  QString qsamplerChannel::getInstrumentNa Line 633  QString qsamplerChannel::getInstrumentNa
633                  sInstrumentName = QFileInfo(sInstrumentFile).fileName();                  sInstrumentName = QFileInfo(sInstrumentFile).fileName();
634  #ifdef CONFIG_LIBGIG  #ifdef CONFIG_LIBGIG
635                  if (bInstrumentNames) {                  if (bInstrumentNames) {
636                          RIFF::File *pRiff = new RIFF::File((const RIFF::String&) sInstrumentFile);                          RIFF::File *pRiff = new RIFF::File(sInstrumentFile.latin1());
637                          gig::File  *pGig  = new gig::File(pRiff);                          gig::File  *pGig  = new gig::File(pRiff);
638                          int iIndex = 0;                          int iIndex = 0;
639                          gig::Instrument *pInstrument = pGig->GetFirstInstrument();                          gig::Instrument *pInstrument = pGig->GetFirstInstrument();

Legend:
Removed from v.736  
changed lines
  Added in v.748

  ViewVC Help
Powered by ViewVC