Develop and Download Open Source Software

ECHOES

Browse Subversion Repository

/[echoes]/trunk/echoes/EchoesStyleModel.cpp

Diff of /trunk/echoes/EchoesStyleModel.cpp

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

revision 100 by haruneko24, Fri Jan 25 00:58:52 2013 UTC revision 101 by haruneko24, Fri Feb 1 01:09:56 2013 UTC
# Line 71  void EchoesStyleModel::onRead() Line 71  void EchoesStyleModel::onRead()
71    
72  void EchoesStyleModel::_registerEnvelope(stand::model::TreeItem *e)  void EchoesStyleModel::_registerEnvelope(stand::model::TreeItem *e)
73  {  {
74      QString path = e->data(_Path, 0).toString();      QFileInfo info(this->path());
75        QString path = info.absoluteDir().absoluteFilePath(e->data(_Path, 0).toString());
76      QString name = e->name();      QString name = e->name();
77      stand::utility::envelope::Envelope *env = new stand::utility::envelope::Envelope();      stand::utility::envelope::Envelope *env = new stand::utility::envelope::Envelope();
78      if(!env->read(path.toLocal8Bit().data()))      if(!env->read(path.toLocal8Bit().data()))
79      {      {
80            qDebug("EchoesStyleModel::registerEnvelop(%s); // envelope not found", path.toUtf8().data());
81          delete env;          delete env;
82          return;          return;
83      }      }
# Line 92  void EchoesStyleModel::_registerPhrase(s Line 94  void EchoesStyleModel::_registerPhrase(s
94      }      }
95      if(!notes.empty())      if(!notes.empty())
96      {      {
97          appendPhrase(p->data(_PitchEnvelopeName, 0).toString(), p->data(_VolumeEnvelopeName, 0).toString(), notes);          EchoesPhrase phrase(notes);
98            _Data d = {envelope(p->data(_PitchEnvelopeName, 0).toString()), envelope(p->data(_VolumeEnvelopeName, 0).toString())};
99            _data.append(QPair<EchoesPhrase, _Data>(phrase, d));
100      }      }
101  }  }
102    
Legend:
Removed from v.100  
changed lines
  Added in v.101
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help