[Lmuse-cvs-traffic] muse/synti/deicsonze deicsonzeguibase.ui,1.10,1.11 Makefile.am,1.9,1.10 deicsonze.cpp,1.10,1.11 deicsonzegui.cpp,1.11,1.12 deicsonzegui.h,1.10,1.11 deicsonzepreset.cpp,1.6,1.7 deicsonzeguibase.ui3,1.1,NONE

[werner s. <wsc...@us...>]

Update of /cvsroot/lmuse/muse/synti/deicsonze
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv389/synti/deicsonze

Modified Files:
	Makefile.am deicsonze.cpp deicsonzegui.cpp deicsonzegui.h 
	deicsonzepreset.cpp 
Added Files:
	deicsonzeguibase.ui 
Removed Files:
	deicsonzeguibase.ui3 
Log Message:
qt4 port


Index: deicsonzepreset.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonzepreset.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** deicsonzepreset.cpp	14 Jul 2005 10:25:49 -0000	1.6
--- deicsonzepreset.cpp	4 Nov 2005 12:04:07 -0000	1.7
***************
*** 128,132 ****
      _category=NULL;
      _isUsed=false;
!     _subcategoryName=name;    
  }
  Subcategory::Subcategory(Category* cat, const std::string name, int lbank) {
--- 128,132 ----
      _category=NULL;
      _isUsed=false;
!     _subcategoryName=name;
  }
  Subcategory::Subcategory(Category* cat, const std::string name, int lbank) {
***************
*** 140,146 ****
      while(!_presetVector.empty()) delete(*_presetVector.begin());
      if(_category) {
! 	std::vector<Subcategory*>::iterator 
  	    iB=_category->_subcategoryVector.begin();
! 	std::vector<Subcategory*>::iterator 
  	    iE=_category->_subcategoryVector.end();
  	std::vector<Subcategory*>::iterator iS=std::find(iB, iE, this);
--- 140,146 ----
      while(!_presetVector.empty()) delete(*_presetVector.begin());
      if(_category) {
! 	std::vector<Subcategory*>::iterator
  	    iB=_category->_subcategoryVector.begin();
! 	std::vector<Subcategory*>::iterator
  	    iE=_category->_subcategoryVector.end();
  	std::vector<Subcategory*>::iterator iS=std::find(iB, iE, this);
***************
*** 429,433 ****
  	cFromSet->_categoryName=c->_categoryName;
  	//printf("Je merge la category %s\n", cFromSet->_categoryName.c_str());
! 	for(std::vector<Subcategory*>::iterator 
  		i=c->_subcategoryVector.begin();
  	    i!=c->_subcategoryVector.end(); i++) cFromSet->merge(*i);
--- 429,433 ----
  	cFromSet->_categoryName=c->_categoryName;
  	//printf("Je merge la category %s\n", cFromSet->_categoryName.c_str());
! 	for(std::vector<Subcategory*>::iterator
  		i=c->_subcategoryVector.begin();
  	    i!=c->_subcategoryVector.end(); i++) cFromSet->merge(*i);
***************
*** 435,439 ****
      }
  }
!    
  bool Category::isFreeLBank(int lbank) {
      if(findSubcategory(lbank)) return(false);
--- 435,439 ----
      }
  }
! 
  bool Category::isFreeLBank(int lbank) {
      if(findSubcategory(lbank)) return(false);
***************
*** 453,457 ****
  	sFromCat->_subcategoryName=s->_subcategoryName;
  	//printf("Je merge la subcategory %s\n", sFromCat->_subcategoryName.c_str());
! 	for(std::vector<Preset*>::iterator 
  		i=s->_presetVector.begin();
  	    i!=s->_presetVector.end(); i++) sFromCat->merge(*i);
--- 453,457 ----
  	sFromCat->_subcategoryName=s->_subcategoryName;
  	//printf("Je merge la subcategory %s\n", sFromCat->_subcategoryName.c_str());
! 	for(std::vector<Preset*>::iterator
  		i=s->_presetVector.begin();
  	    i!=s->_presetVector.end(); i++) sFromCat->merge(*i);
***************
*** 486,490 ****
  //---------------------------------------------------------
  // findCategory
! //  takes hbank a category and return the first category, 
  //  NULL if doesn't exist
  //---------------------------------------------------------
--- 486,490 ----
  //---------------------------------------------------------
  // findCategory
! //  takes hbank a category and return the first category,
  //  NULL if doesn't exist
  //---------------------------------------------------------
***************
*** 528,532 ****
  	    continue;
  	if (setEl.tagName() == "setName")
! 	    _setName=setEl.text().ascii();
  	if (setEl.tagName() == "deicsOnzeCategory") {
  	    //load category
--- 528,532 ----
  	    continue;
  	if (setEl.tagName() == "setName")
! 	    _setName=setEl.text().toAscii().data();
  	if (setEl.tagName() == "deicsOnzeCategory") {
  	    //load category
***************
*** 563,567 ****
  	    continue;
  	if (catEl.tagName() == "categoryName")
! 	    _categoryName=catEl.text().ascii();
  	if (catEl.tagName() == "hbank")
  	    _hbank=catEl.text().toInt();
--- 563,567 ----
  	    continue;
  	if (catEl.tagName() == "categoryName")
! 	    _categoryName=catEl.text().toAscii().data();
  	if (catEl.tagName() == "hbank")
  	    _hbank=catEl.text().toInt();
***************
*** 587,591 ****
  	xml->intTag("hbank", _hbank);
  	for(std::vector<Subcategory*>::iterator i=_subcategoryVector.begin();
! 	    i!=_subcategoryVector.end(); i++) 
  	    (*i)->writeSubcategory(xml, onlyUsed);
  	xml->etag("deicsOnzeCategory");
--- 587,591 ----
  	xml->intTag("hbank", _hbank);
  	for(std::vector<Subcategory*>::iterator i=_subcategoryVector.begin();
! 	    i!=_subcategoryVector.end(); i++)
  	    (*i)->writeSubcategory(xml, onlyUsed);
  	xml->etag("deicsOnzeCategory");
***************
*** 602,606 ****
  	    continue;
  	if (subEl.tagName() == "subcategoryName")
! 	    _subcategoryName=subEl.text().ascii();
  	if (subEl.tagName() == "lbank")
  	    _lbank=subEl.text().toInt();
--- 602,606 ----
  	    continue;
  	if (subEl.tagName() == "subcategoryName")
! 	    _subcategoryName=subEl.text().toAscii().data();
  	if (subEl.tagName() == "lbank")
  	    _lbank=subEl.text().toInt();
***************
*** 649,653 ****
  			    (presetEl.text()=="SEVENTH"? SEVENTH:EIGHTH)))))));
  	//feedback
! 	else if(presetEl.tagName()==FEEDBACKSTR) 
  	    feedback=presetEl.text().toInt();
  	//lfo
--- 649,653 ----
  			    (presetEl.text()=="SEVENTH"? SEVENTH:EIGHTH)))))));
  	//feedback
! 	else if(presetEl.tagName()==FEEDBACKSTR)
  	    feedback=presetEl.text().toInt();
  	//lfo
***************
*** 662,674 ****
  			      (lfoEl.text()=="SQUARE"? SQUARE:
  			       (lfoEl.text()=="TRIANGL"? TRIANGL:SHOLD)));
! 		else if(lfoEl.tagName()==SPEEDSTR) 
  		    lfo.speed=lfoEl.text().toInt();
! 		else if(lfoEl.tagName()==DELAYSTR) 
  		    lfo.delay=lfoEl.text().toInt();
! 		else if(lfoEl.tagName()==PMODDEPTHSTR) 
  		    lfo.pModDepth=lfoEl.text().toInt();
! 		else if(lfoEl.tagName()==AMODDEPTHSTR) 
  		    lfo.aModDepth=lfoEl.text().toInt();
! 		else if(lfoEl.tagName()==SYNCSTR) 
  		    lfo.sync=(lfoEl.text()=="on"? true:false);
  		lfoNode = lfoNode.nextSibling();
--- 662,674 ----
  			      (lfoEl.text()=="SQUARE"? SQUARE:
  			       (lfoEl.text()=="TRIANGL"? TRIANGL:SHOLD)));
! 		else if(lfoEl.tagName()==SPEEDSTR)
  		    lfo.speed=lfoEl.text().toInt();
! 		else if(lfoEl.tagName()==DELAYSTR)
  		    lfo.delay=lfoEl.text().toInt();
! 		else if(lfoEl.tagName()==PMODDEPTHSTR)
  		    lfo.pModDepth=lfoEl.text().toInt();
! 		else if(lfoEl.tagName()==AMODDEPTHSTR)
  		    lfo.aModDepth=lfoEl.text().toInt();
! 		else if(lfoEl.tagName()==SYNCSTR)
  		    lfo.sync=(lfoEl.text()=="on"? true:false);
  		lfoNode = lfoNode.nextSibling();
***************
*** 683,687 ****
  		    continue;
  		QString st=sensitivityEl.tagName();
! 		if(st==PMODSENSSTR) 
  		    sensitivity.pitch=sensitivityEl.text().toInt();
  		else if(st==AMSSTR)
--- 683,687 ----
  		    continue;
  		QString st=sensitivityEl.tagName();
! 		if(st==PMODSENSSTR)
  		    sensitivity.pitch=sensitivityEl.text().toInt();
  		else if(st==AMSSTR)
***************
*** 829,872 ****
  		    continue;
  		QString ft=functionEl.tagName();
! 		if(ft==TRANSPOSESTR) 
  		    function.transpose=functionEl.text().toInt();
! 		else if(ft==POLYMODESTR) 
  		    function.mode=(functionEl.text()=="POLY"?POLY:MONO);
! 		else if(ft==PBENDRANGESTR) 
  		    function.pBendRange=functionEl.text().toInt();
! 		else if(ft==PORTAMODESTR) 
  		    function.portamento=
  			functionEl.text()=="FINGER"?FINGER:FULL;
! 		else if(ft==PORTATIMESTR) 
  		    function.portamentoTime=functionEl.text().toInt();
! 		else if(ft==FSWSTR) 
  		    function.footSw=(functionEl.text()=="POR"?POR:SUS);
  		else if(ft==FCVOLUMESTR)
  		    function.fcVolume=functionEl.text().toInt();
! 		else if(ft==FCPITCHSTR) 
  		    function.fcPitch=functionEl.text().toInt();
! 		else if(ft==FCAMPLITUDESTR) 
  		    function.fcAmplitude=functionEl.text().toInt();
! 		else if(ft==MWPITCHSTR) 
  		    function.mwPitch=functionEl.text().toInt();
! 		else if(ft==MWAMPLITUDESTR) 
  		    function.mwAmplitude=functionEl.text().toInt();
  		else if(ft==BCPITCHSTR)
  		    function.bcPitch=functionEl.text().toInt();
! 		else if(ft==BCAMPLITUDESTR) 
  		    function.bcAmplitude=functionEl.text().toInt();
  		else if(ft==BCPITCHBIASSTR)
  		    function.bcPitchBias=functionEl.text().toInt();
! 		else if(ft==BCEGBIASSTR) 
  		    function.bcEgBias=functionEl.text().toInt();
  		else if(ft=="atPitch")
  		    function.atPitch=functionEl.text().toInt();
! 		else if(ft=="atAmplitude") 
  		    function.atAmplitude=functionEl.text().toInt();
  		else if(ft=="atPitchBias")
  		    function.atPitchBias=functionEl.text().toInt();
! 		else if(ft=="atEgBias") 
  		    function.atEgBias=functionEl.text().toInt();
! 		else if(ft==REVERBRATESTR) 
  		    function.reverbRate=functionEl.text().toInt();
  		functionNode=functionNode.nextSibling();
--- 829,872 ----
  		    continue;
  		QString ft=functionEl.tagName();
! 		if(ft==TRANSPOSESTR)
  		    function.transpose=functionEl.text().toInt();
! 		else if(ft==POLYMODESTR)
  		    function.mode=(functionEl.text()=="POLY"?POLY:MONO);
! 		else if(ft==PBENDRANGESTR)
  		    function.pBendRange=functionEl.text().toInt();
! 		else if(ft==PORTAMODESTR)
  		    function.portamento=
  			functionEl.text()=="FINGER"?FINGER:FULL;
! 		else if(ft==PORTATIMESTR)
  		    function.portamentoTime=functionEl.text().toInt();
! 		else if(ft==FSWSTR)
  		    function.footSw=(functionEl.text()=="POR"?POR:SUS);
  		else if(ft==FCVOLUMESTR)
  		    function.fcVolume=functionEl.text().toInt();
! 		else if(ft==FCPITCHSTR)
  		    function.fcPitch=functionEl.text().toInt();
! 		else if(ft==FCAMPLITUDESTR)
  		    function.fcAmplitude=functionEl.text().toInt();
! 		else if(ft==MWPITCHSTR)
  		    function.mwPitch=functionEl.text().toInt();
! 		else if(ft==MWAMPLITUDESTR)
  		    function.mwAmplitude=functionEl.text().toInt();
  		else if(ft==BCPITCHSTR)
  		    function.bcPitch=functionEl.text().toInt();
! 		else if(ft==BCAMPLITUDESTR)
  		    function.bcAmplitude=functionEl.text().toInt();
  		else if(ft==BCPITCHBIASSTR)
  		    function.bcPitchBias=functionEl.text().toInt();
! 		else if(ft==BCEGBIASSTR)
  		    function.bcEgBias=functionEl.text().toInt();
  		else if(ft=="atPitch")
  		    function.atPitch=functionEl.text().toInt();
! 		else if(ft=="atAmplitude")
  		    function.atAmplitude=functionEl.text().toInt();
  		else if(ft=="atPitchBias")
  		    function.atPitchBias=functionEl.text().toInt();
! 		else if(ft=="atEgBias")
  		    function.atEgBias=functionEl.text().toInt();
! 		else if(ft==REVERBRATESTR)
  		    function.reverbRate=functionEl.text().toInt();
  		functionNode=functionNode.nextSibling();
***************
*** 874,884 ****
  	}
  	//globalDetune
! 	else if(presetEl.tagName()=="globalDetune") 
  	    globalDetune=presetEl.text().toInt();
  	//Names
! 	else if(presetEl.tagName()=="name") 
! 	    name=presetEl.text().ascii();
  	//prog
! 	else if(presetEl.tagName()=="prog") 
  	    prog=presetEl.text().toInt();
  	presetNode = presetNode.nextSibling();
--- 874,884 ----
  	}
  	//globalDetune
! 	else if(presetEl.tagName()=="globalDetune")
  	    globalDetune=presetEl.text().toInt();
  	//Names
! 	else if(presetEl.tagName()=="name")
! 	    name=presetEl.text().toAscii().data();
  	//prog
! 	else if(presetEl.tagName()=="prog")
  	    prog=presetEl.text().toInt();
  	presetNode = presetNode.nextSibling();
***************
*** 1052,1056 ****
      }
  }
!     
  //---------------------------------------------------------
  // printPreset
--- 1052,1056 ----
      }
  }
! 
  //---------------------------------------------------------
  // printPreset

Index: deicsonzegui.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonzegui.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** deicsonzegui.cpp	4 Oct 2005 21:39:58 -0000	1.11
--- deicsonzegui.cpp	4 Nov 2005 12:04:07 -0000	1.12
***************
*** 1124,1128 ****
        /*}
  	  else printf("Wrong set version : %s\n",
! 		      version.latin1());
  	}
  	node = node.nextSibling();
--- 1124,1128 ----
        /*}
  	  else printf("Wrong set version : %s\n",
! 		      version.toLatin1().data());
  	}
  	node = node.nextSibling();
***************
*** 1219,1225 ****
  		}
  		else printf("unsupported *.dei file version %s\n",
! 			    version.latin1());
  	    }
! 	    else printf("DeicsOnze: %s not supported\n", e.tagName().latin1());
  	    node = node.nextSibling();
  	}
--- 1219,1225 ----
  		}
  		else printf("unsupported *.dei file version %s\n",
! 			    version.toLatin1().data());
  	    }
! 	    else printf("DeicsOnze: %s not supported\n", e.tagName().toLatin1().data());
  	    node = node.nextSibling();
  	}
***************
*** 1241,1245 ****
  	if(!filename.endsWith(".dei")) filename+=".dei";
  	FILE* f;
! 	f = fopen(filename.ascii(), "w");
  	
  	AL::Xml* xml = new AL::Xml(f);
--- 1241,1245 ----
  	if(!filename.endsWith(".dei")) filename+=".dei";
  	FILE* f;
! 	f = fopen(filename.toAscii().data(), "w");
  	
  	AL::Xml* xml = new AL::Xml(f);
***************
*** 1444,1450 ****
  		}
  		else printf("unsupported *.dec file version %s\n",
! 			    version.latin1());
  	    }
! 	    else printf("DeicsOnze: %s not supported\n", e.tagName().latin1());
  	    node = node.nextSibling();
  	}
--- 1444,1450 ----
  		}
  		else printf("unsupported *.dec file version %s\n",
! 			    version.toLatin1().data());
  	    }
! 	    else printf("DeicsOnze: %s not supported\n", e.tagName().toLatin1().data());
  	    node = node.nextSibling();
  	}
***************
*** 1467,1471 ****
  	    if(!filename.endsWith(".dec")) filename+=".dec";
  	    FILE* f;
! 	    f = fopen(filename.ascii(), "w");
  	
  	    AL::Xml* xml = new AL::Xml(f);
--- 1467,1471 ----
  	    if(!filename.endsWith(".dec")) filename+=".dec";
  	    FILE* f;
! 	    f = fopen(filename.toAscii().data(), "w");
  	
  	    AL::Xml* xml = new AL::Xml(f);
***************
*** 1609,1615 ****
  		}
  		else printf("unsupported *.des file version %s\n",
! 			    version.latin1());
  	    }
! 	    else printf("DeicsOnze: %s not supported\n", e.tagName().latin1());
  	    node = node.nextSibling();
  	}
--- 1609,1615 ----
  		}
  		else printf("unsupported *.des file version %s\n",
! 			    version.toLatin1().data());
  	    }
! 	    else printf("DeicsOnze: %s not supported\n", e.tagName().toLatin1().data());
  	    node = node.nextSibling();
  	}
***************
*** 1632,1636 ****
  	    if(!filename.endsWith(".des")) filename+=".des";
  	    FILE* f;
! 	    f = fopen(filename.ascii(), "w");
  	
  	    AL::Xml* xml = new AL::Xml(f);
--- 1632,1636 ----
  	    if(!filename.endsWith(".des")) filename+=".des";
  	    FILE* f;
! 	    f = fopen(filename.toAscii().data(), "w");
  	
  	    AL::Xml* xml = new AL::Xml(f);
***************
*** 1774,1780 ****
  		}
  		else printf("unsupported *.dep file version %s\n",
! 			    version.latin1());
  	    }
! 	    else printf("DeicsOnze: %s not supported\n", e.tagName().latin1());
  	    node = node.nextSibling();
  	}
--- 1774,1780 ----
  		}
  		else printf("unsupported *.dep file version %s\n",
! 			    version.toLatin1().data());
  	    }
! 	    else printf("DeicsOnze: %s not supported\n", e.tagName().toLatin1().data());
  	    node = node.nextSibling();
  	}
***************
*** 1798,1802 ****
  	    if(!filename.endsWith(".dep")) filename+=".dep";
  	    FILE* f;
! 	    f = fopen(filename.ascii(), "w");
  	
  	    AL::Xml* xml = new AL::Xml(f);
--- 1798,1802 ----
  	    if(!filename.endsWith(".dep")) filename+=".dep";
  	    FILE* f;
! 	    f = fopen(filename.toAscii().data(), "w");
  	
  	    AL::Xml* xml = new AL::Xml(f);
***************
*** 1816,1833 ****
  void DeicsOnzeGui::setPresetName(const QString& n) {
      if(_currentQLVPreset) {
! 	_deicsOnze->_preset->name=n.ascii();//must be changed with SysEx
! 	_currentQLVPreset->setText(1,n.ascii());
      }
  }
  void DeicsOnzeGui::setSubcategoryName(const QString& s) {
      if(_currentQLVSubcategory) {//must be changed with SysEx
! 	_currentQLVSubcategory->_subcategory->_subcategoryName=s.ascii();
! 	_currentQLVSubcategory->setText(1, s.ascii());
      }
  }
  void DeicsOnzeGui::setCategoryName(const QString& c) {
      if(_currentQLVCategory) {//must be changed with SysEx
! 	_currentQLVCategory->_category->_categoryName=c.ascii();
! 	_currentQLVCategory->setText(1, c.ascii());
      }
  }
--- 1816,1833 ----
  void DeicsOnzeGui::setPresetName(const QString& n) {
      if(_currentQLVPreset) {
! 	_deicsOnze->_preset->name=n.toAscii().data();//must be changed with SysEx
! 	_currentQLVPreset->setText(1,n.toAscii().data());
      }
  }
  void DeicsOnzeGui::setSubcategoryName(const QString& s) {
      if(_currentQLVSubcategory) {//must be changed with SysEx
! 	_currentQLVSubcategory->_subcategory->_subcategoryName=s.toAscii().data();
! 	_currentQLVSubcategory->setText(1, s.toAscii().data());
      }
  }
  void DeicsOnzeGui::setCategoryName(const QString& c) {
      if(_currentQLVCategory) {//must be changed with SysEx
! 	_currentQLVCategory->_category->_categoryName=c.toAscii().data();
! 	_currentQLVCategory->setText(1, c.toAscii().data());
      }
  }

--- deicsonzeguibase.ui3 DELETED ---

Index: Makefile.am
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/deicsonze/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.am	1 Oct 2005 12:49:51 -0000	1.9
--- Makefile.am	4 Nov 2005 12:04:07 -0000	1.10
***************
*** 5,9 ****
  
  MOCBASES = deicsonzegui
! UIC3BASES = deicsonzeguibase
  
  synthi_LTLIBRARIES = deicsonze.la
--- 5,9 ----
  
  MOCBASES = deicsonzegui
! UICBASES = deicsonzeguibase
  
  synthi_LTLIBRARIES = deicsonze.la

Index: deicsonzegui.h
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonzegui.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** deicsonzegui.h	4 Oct 2005 21:39:59 -0000	1.10
--- deicsonzegui.h	4 Nov 2005 12:04:07 -0000	1.11
***************
*** 80,103 ****
  class QFrameEnvelope;
  
! class QListViewCategory:public Q3ListViewItem {
   public:
      Category* _category;
!     QListViewCategory(Q3ListView* p, QString shbank, QString l, Category* c)
! 	:Q3ListViewItem(p, shbank, l) {_category=c;};
  };
  
! class QListViewSubcategory:public Q3ListViewItem {
   public:
      Subcategory* _subcategory;
!     QListViewSubcategory(Q3ListView* p, QString slbank,
  			     QString l, Subcategory* s)
! 	:Q3ListViewItem(p, slbank, l) {_subcategory=s;};
  };
  
! class QListViewPreset:public Q3ListViewItem {
   public:
      Preset* _preset;
!     QListViewPreset(Q3ListView* pa, QString sprog, QString l, Preset* p)
! 	:Q3ListViewItem(pa, sprog, l) {_preset=p;};
  };
  
--- 80,103 ----
  class QFrameEnvelope;
  
! class QListViewCategory:public QListWidgetItem {
   public:
      Category* _category;
!     QListViewCategory(QListWidget* p, QString shbank, QString l, Category* c)
! 	:QListWidgetItem(p, shbank, l) {_category=c;};
  };
  
! class QListViewSubcategory:public QListWidgetItem {
   public:
      Subcategory* _subcategory;
!     QListViewSubcategory(QListWidget* p, QString slbank,
  			     QString l, Subcategory* s)
! 	:QListWidgetItem(p, slbank, l) {_subcategory=s;};
  };
  
! class QListViewPreset:public QListWidgetItem {
   public:
      Preset* _preset;
!     QListViewPreset(QListWidget* pa, QString sprog, QString l, Preset* p)
! 	:QListWidgetItem(pa, sprog, l) {_preset=p;};
  };
  
***************
*** 127,131 ****
      void setGreenColor(int);
      void setBlueColor(int);
!     void setRGBSliders(Q3ListBoxItem*);
      void setTextColor(const QColor &);
      void setBackgroundColor(const QColor &);
--- 127,131 ----
      void setGreenColor(int);
      void setBlueColor(int);
!     void setRGBSliders(QListWidgetItem*);
      void setTextColor(const QColor &);
      void setBackgroundColor(const QColor &);
***************
*** 149,155 ****
      void savePresetDialog();
      //popupMenu
!     void categoryPopupMenu(Q3ListViewItem*);
!     void subcategoryPopupMenu(Q3ListViewItem*);
!     void presetPopupMenu(Q3ListViewItem*);
      //Preset and bank
      void setPresetName(const QString&);
--- 149,155 ----
      void savePresetDialog();
      //popupMenu
!     void categoryPopupMenu(QListWidgetItem*);
!     void subcategoryPopupMenu(QListWidgetItem*);
!     void presetPopupMenu(QListWidgetItem*);
      //Preset and bank
      void setPresetName(const QString&);
***************
*** 179,183 ****
      void setPR1(int);
      void setPR2(int);
!     void setPR3(int);    
      //Function
      void setFcVolume(int);
--- 179,183 ----
      void setPR1(int);
      void setPR2(int);
!     void setPR3(int);
      //Function
      void setFcVolume(int);
***************
*** 273,280 ****
      void setSet(void); //display the set, that is the category list
      void setCategory(Category*);
!     void setCategory(Q3ListViewItem*);
      void setSubcategory(Subcategory*);
!     void setSubcategory(Q3ListViewItem*);
!     void setPreset(Q3ListViewItem*);
   public:
      virtual void processEvent(const MidiEvent&);
--- 273,280 ----
      void setSet(void); //display the set, that is the category list
      void setCategory(Category*);
!     void setCategory(QListWidgetItem*);
      void setSubcategory(Subcategory*);
!     void setSubcategory(QListWidgetItem*);
!     void setPreset(QListWidgetItem*);
   public:
      virtual void processEvent(const MidiEvent&);
***************
*** 353,357 ****
      QString num3Digits(int);
      DeicsOnzeGui(DeicsOnze*);
!     
      QColor* tColor; //text color
      QColor* bColor; //background color
--- 353,357 ----
      QString num3Digits(int);
      DeicsOnzeGui(DeicsOnze*);
! 
      QColor* tColor; //text color
      QColor* bColor; //background color
***************
*** 363,367 ****
  };
  
! class QFramePitchEnvelope:private Q3Frame {   
    QPoint startlinkP1, //first point
      P1linkP2, //point linking P1 to P2
--- 363,367 ----
  };
  
! class QFramePitchEnvelope:private QFrame {
    QPoint startlinkP1, //first point
      P1linkP2, //point linking P1 to P2
***************
*** 374,378 ****
   public:
      DeicsOnzeGui* _deicsOnzeGui;
!     QFramePitchEnvelope(QWidget* parent, DeicsOnzeGui* dog):Q3Frame(parent){
        _deicsOnzeGui = dog;
        isStartlinkP1Edit=false;
--- 374,378 ----
   public:
      DeicsOnzeGui* _deicsOnzeGui;
!     QFramePitchEnvelope(QWidget* parent, DeicsOnzeGui* dog):QFrame(parent){
        _deicsOnzeGui = dog;
        isStartlinkP1Edit=false;
***************
*** 392,396 ****
  };
  
! class QFrameEnvelope:private Q3Frame {   
      unsigned char op; //operator number, between 0 and 3
      QPoint startlinkAR, //first point
--- 392,396 ----
  };
  
! class QFrameEnvelope:private QFrame {
      unsigned char op; //operator number, between 0 and 3
      QPoint startlinkAR, //first point
***************
*** 405,409 ****
   public:
      DeicsOnzeGui* _deicsOnzeGui;
!     QFrameEnvelope(QWidget* parent, DeicsOnzeGui* dog, unsigned char k):Q3Frame(parent){
  	_deicsOnzeGui = dog;
  	isARlinkD1Edit=false;
--- 405,409 ----
   public:
      DeicsOnzeGui* _deicsOnzeGui;
!     QFrameEnvelope(QWidget* parent, DeicsOnzeGui* dog, unsigned char k):QFrame(parent){
  	_deicsOnzeGui = dog;
  	isARlinkD1Edit=false;

Index: deicsonze.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonze.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** deicsonze.cpp	22 Sep 2005 20:14:49 -0000	1.10
--- deicsonze.cpp	4 Nov 2005 12:04:07 -0000	1.11
***************
*** 102,106 ****
  
    _gui = new DeicsOnzeGui(this);
!   _gui->setCaption(QString("DeicsOnze"));
    _gui->show();
  }
--- 102,106 ----
  
    _gui = new DeicsOnzeGui(this);
!   _gui->setWindowTitle(QString("DeicsOnze"));
    _gui->show();
  }
***************
*** 160,213 ****
      int i=0;
      for(int k=0; k<NBROP; k++) {
! 	_ctrl[i].name=(QString(ARSTR)+QString::number(k+1)).ascii();
  	_ctrl[i].num=CTRL_AR+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXAR;
! 	_ctrl[i].name=(QString(D1RSTR)+QString::number(k+1)).ascii();
  	_ctrl[i].num=CTRL_D1R+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXD1R;
! 	_ctrl[i].name=(QString(D2RSTR)+QString::number(k+1)).ascii();
  	_ctrl[i].num=CTRL_D2R+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXD2R;
! 	_ctrl[i].name=(QString(RRSTR)+QString::number(k+1)).ascii();
  	_ctrl[i].num=CTRL_RR+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXRR;
! 	_ctrl[i].name=(QString(D1LSTR)+QString::number(k+1)).ascii();
  	_ctrl[i].num=CTRL_D1L+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXD1L;
! 	_ctrl[i].name=(QString(LSSTR)+QString::number(k+1)).ascii();
  	_ctrl[i].num=CTRL_LS+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXLS;
! 	_ctrl[i].name=(QString(RSSTR)+QString::number(k+1)).ascii();
  	_ctrl[i].num=CTRL_RS+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXRS;
! 	_ctrl[i].name=(QString(EBSSTR)+QString::number(k+1)).ascii();
  	_ctrl[i].num=CTRL_EBS+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXEBS;
! 	_ctrl[i].name=(QString(AMESTR)+QString::number(k+1)).ascii();
  	_ctrl[i].num=CTRL_AME+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=1;
! 	_ctrl[i].name=(QString(KVSSTR)+QString::number(k+1)).ascii();
  	_ctrl[i].num=CTRL_KVS+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXKVS;
! 	_ctrl[i].name=(QString(OUTSTR)+QString::number(k+1)).ascii();
  	_ctrl[i].num=CTRL_OUT+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXOUT;
  	_ctrl[i].name=(QString("Centi")+QString(RATIOSTR)+QString::number(k+1))
! 	    .ascii();
  	_ctrl[i].num=CTRL_RATIO+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXRATIO*100;
! 	_ctrl[i].name=(QString(DETSTR)+QString::number(k+1)).ascii();
  	_ctrl[i].num=CTRL_DET+k*DECAPAR1;
  	_ctrl[i].min=-MAXDET;
--- 160,213 ----
      int i=0;
      for(int k=0; k<NBROP; k++) {
! 	_ctrl[i].name=(QString(ARSTR)+QString::number(k+1)).toAscii().data();
  	_ctrl[i].num=CTRL_AR+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXAR;
! 	_ctrl[i].name=(QString(D1RSTR)+QString::number(k+1)).toAscii().data();
  	_ctrl[i].num=CTRL_D1R+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXD1R;
! 	_ctrl[i].name=(QString(D2RSTR)+QString::number(k+1)).toAscii().data();
  	_ctrl[i].num=CTRL_D2R+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXD2R;
! 	_ctrl[i].name=(QString(RRSTR)+QString::number(k+1)).toAscii().data();
  	_ctrl[i].num=CTRL_RR+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXRR;
! 	_ctrl[i].name=(QString(D1LSTR)+QString::number(k+1)).toAscii().data();
  	_ctrl[i].num=CTRL_D1L+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXD1L;
! 	_ctrl[i].name=(QString(LSSTR)+QString::number(k+1)).toAscii().data();
  	_ctrl[i].num=CTRL_LS+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXLS;
! 	_ctrl[i].name=(QString(RSSTR)+QString::number(k+1)).toAscii().data();
  	_ctrl[i].num=CTRL_RS+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXRS;
! 	_ctrl[i].name=(QString(EBSSTR)+QString::number(k+1)).toAscii().data();
  	_ctrl[i].num=CTRL_EBS+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXEBS;
! 	_ctrl[i].name=(QString(AMESTR)+QString::number(k+1)).toAscii().data();
  	_ctrl[i].num=CTRL_AME+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=1;
! 	_ctrl[i].name=(QString(KVSSTR)+QString::number(k+1)).toAscii().data();
  	_ctrl[i].num=CTRL_KVS+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXKVS;
! 	_ctrl[i].name=(QString(OUTSTR)+QString::number(k+1)).toAscii().data();
  	_ctrl[i].num=CTRL_OUT+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXOUT;
  	_ctrl[i].name=(QString("Centi")+QString(RATIOSTR)+QString::number(k+1))
! 	    .toAscii().data();
  	_ctrl[i].num=CTRL_RATIO+k*DECAPAR1;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXRATIO*100;
! 	_ctrl[i].name=(QString(DETSTR)+QString::number(k+1)).toAscii().data();
  	_ctrl[i].num=CTRL_DET+k*DECAPAR1;
  	_ctrl[i].min=-MAXDET;
***************
*** 347,364 ****
      _ctrl[i++].max=MAXPL;
      for(int k=0; k<NBROP; k++) {
! 	_ctrl[i].name=(QString(FIXSTR)+QString::number(k+1)).ascii();
  	_ctrl[i].num=CTRL_FIX+k*DECAPAR2;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=1;
  	_ctrl[i].name=(QString("Centi")+QString(FIXRANGESTR)
! 		       +QString::number(k+1)).ascii();
  	_ctrl[i].num=CTRL_FIXRANGE+k*DECAPAR2;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXFIXRANGE*100;
! 	_ctrl[i].name=(QString(OSWSTR)+QString::number(k+1)).ascii();
  	_ctrl[i].num=CTRL_OSW+k*DECAPAR2;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXOSW;
!     	_ctrl[i].name=(QString(SHFTSTR)+QString::number(k+1)).ascii();
  	_ctrl[i].num=CTRL_SHFT+k*DECAPAR2;
  	_ctrl[i].min=0;
--- 347,364 ----
      _ctrl[i++].max=MAXPL;
      for(int k=0; k<NBROP; k++) {
! 	_ctrl[i].name=(QString(FIXSTR)+QString::number(k+1)).toAscii().data();
  	_ctrl[i].num=CTRL_FIX+k*DECAPAR2;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=1;
  	_ctrl[i].name=(QString("Centi")+QString(FIXRANGESTR)
! 		       +QString::number(k+1)).toAscii().data();
  	_ctrl[i].num=CTRL_FIXRANGE+k*DECAPAR2;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXFIXRANGE*100;
! 	_ctrl[i].name=(QString(OSWSTR)+QString::number(k+1)).toAscii().data();
  	_ctrl[i].num=CTRL_OSW+k*DECAPAR2;
  	_ctrl[i].min=0;
  	_ctrl[i++].max=MAXOSW;
!     	_ctrl[i].name=(QString(SHFTSTR)+QString::number(k+1)).toAscii().data();
  	_ctrl[i].num=CTRL_SHFT+k*DECAPAR2;
  	_ctrl[i].min=0;
***************
*** 604,611 ****
      presetPath += "/share/muse-0.8/presets/deicsonze/ARCH_ALIN";
  
!     file = fopen (presetPath.latin1(), "rt");
      if (file == NULL) {
  	printf("can't open ");
! 	printf(presetPath.latin1());
  	printf("\n");
      }
--- 604,611 ----
      presetPath += "/share/muse-0.8/presets/deicsonze/ARCH_ALIN";
  
!     file = fopen (presetPath.toLatin1().data(), "rt");
      if (file == NULL) {
  	printf("can't open ");
! 	printf(presetPath.toLatin1().data());
  	printf("\n");
      }
***************
*** 858,862 ****
  inline void lfoUpdate(Preset* p, Global* p_g, float* wt) {
    double delayCoef;
!   
    if(p_g->lfoIndex==0)
      {
--- 858,862 ----
  inline void lfoUpdate(Preset* p, Global* p_g, float* wt) {
    double delayCoef;
! 
    if(p_g->lfoIndex==0)
      {
***************
*** 881,885 ****
  	  }
      }
!   
    switch(p->lfo.wave)
      {
--- 881,885 ----
  	  }
      }
! 
    switch(p->lfo.wave)
      {
***************
*** 988,992 ****
    double dt;//such that amp(t+dt)=amp(t)/2
    double alpha;//such that amp(t)=exp(alpha*t)
!   
    if(d1r==0) return 1.0;
    else
--- 988,992 ----
    double dt;//such that amp(t+dt)=amp(t)/2
    double alpha;//such that amp(t)=exp(alpha*t)
! 
    if(d1r==0) return 1.0;
    else
***************
*** 994,998 ****
        //dt has been determined with the fitting function of gnuplot
        dt=9.80715*exp(-0.356053*(double)d1r);
!       
        //amp(0)=1
        //amp(t+dt)=amp(t)/2
--- 994,998 ----
        //dt has been determined with the fitting function of gnuplot
        dt=9.80715*exp(-0.356053*(double)d1r);
! 
        //amp(0)=1
        //amp(t+dt)=amp(t)/2
***************
*** 1013,1020 ****
    double dt;//such that amp(t+dt)=amp(t)/2
    double alpha;//such that amp(t)=exp(alpha*t)
!   
    //dt has been determined with the fitting function of gnuplot
    dt=7.06636*exp(-0.697606*(double)rr);
!   
    //amp(0)=1
    //amp(t+dt)=amp(t)/2
--- 1013,1020 ----
    double dt;//such that amp(t+dt)=amp(t)/2
    double alpha;//such that amp(t)=exp(alpha*t)
! 
    //dt has been determined with the fitting function of gnuplot
    dt=7.06636*exp(-0.697606*(double)rr);
! 
    //amp(0)=1
    //amp(t+dt)=amp(t)/2
***************
*** 1153,1162 ****
      comptmp=tempnam("/tmp", "DeicsOnze");
      cmd+=comptmp;
!     tmp=popen(cmd, "w");
      AL::Xml* xml=new AL::Xml(tmp);
      xml->header();
      _set->writeSet(xml, _saveOnlyUsed);
      pclose(tmp);
!     
      //save the set
      FILE* comptmpf=fopen(comptmp, "r");
--- 1153,1162 ----
      comptmp=tempnam("/tmp", "DeicsOnze");
      cmd+=comptmp;
!     tmp=popen(cmd.toAscii().data(), "w");
      AL::Xml* xml=new AL::Xml(tmp);
      xml->header();
      _set->writeSet(xml, _saveOnlyUsed);
      pclose(tmp);
! 
      //save the set
      FILE* comptmpf=fopen(comptmp, "r");
***************
*** 1199,1203 ****
      QString rmcmd="rm ";
      rmcmd+=comptmp;
!     system(rmcmd);
      free(comptmp);
      //printf("Taille en save : %d\n", *length);
--- 1199,1203 ----
      QString rmcmd="rm ";
      rmcmd+=comptmp;
!     system(rmcmd.toAscii().data());
      free(comptmp);
      //printf("Taille en save : %d\n", *length);
***************
*** 1224,1228 ****
  	    }
  	    MidiEvent evSysexColor(0, ME_SYSEX,
! 				   (const unsigned char*)dataColorGui, 
  				   SYSEX_COLORLENGTH+1);
  	    _gui->writeEvent(evSysexColor);
--- 1224,1228 ----
  	    }
  	    MidiEvent evSysexColor(0, ME_SYSEX,
! 				   (const unsigned char*)dataColorGui,
  				   SYSEX_COLORLENGTH+1);
  	    _gui->writeEvent(evSysexColor);
***************
*** 1256,1261 ****
  	cmd+=" -c > ";
  	cmd+=uncompname;
! 	system(cmd);
!         
  	//load the set
  	// read the XML file and create DOM tree
--- 1256,1261 ----
  	cmd+=" -c > ";
  	cmd+=uncompname;
! 	system(cmd.toAscii().data());
! 
  	//load the set
  	// read the XML file and create DOM tree
***************
*** 1284,1288 ****
  	      else {
  		//printf("Huge\n");
! 		while(!_set->_categoryVector.empty()) 
  		  delete(*_set->_categoryVector.begin());
  		//updateSaveOnlyUsed(false);
--- 1284,1288 ----
  	      else {
  		//printf("Huge\n");
! 		while(!_set->_categoryVector.empty())
  		  delete(*_set->_categoryVector.begin());
  		//updateSaveOnlyUsed(false);
***************
*** 1293,1297 ****
  	    }
  	    else printf("Wrong set version : %s\n",
! 			version.latin1());
  	  }
  	  node = node.nextSibling();
--- 1293,1297 ----
  	    }
  	    else printf("Wrong set version : %s\n",
! 			version.toLatin1().data());
  	  }
  	  node = node.nextSibling();
***************
*** 1319,1323 ****
  	rmfile="rm ";
  	rmfile+=tmpname;
! 	system(rmfile);
  
      }
--- 1319,1323 ----
  	rmfile="rm ";
  	rmfile+=tmpname;
! 	system(rmfile.toAscii().data());
  
      }

--- NEW FILE: deicsonzeguibase.ui ---
<ui version="4.0" >
 <author>Nil Geisweiller</author>
 <comment></comment>
 <exportmacro></exportmacro>
 <class>DeicsOnzeGuiBase</class>
 <widget class="QDialog" name="DeicsOnzeGuiBase" >
  <property name="geometry" >
   <rect>
    <x>0</x>
    <y>0</y>
    <width>786</width>
    <height>543</height>
   </rect>
  </property>
  <property name="windowTitle" >
   <string>DeicsOnze</string>
  </property>
  <property name="sizeGripEnabled" >
   <bool>false</bool>
[...6925 lines suppressed...]
  <tabstop>DET3SpinBox</tabstop>
  <tabstop>Fix4CheckBox</tabstop>
  <tabstop>CoarseRatio4SpinBox</tabstop>
  <tabstop>FineRatio4SpinBox</tabstop>
  <tabstop>Freq4SpinBox</tabstop>
  <tabstop>LS4SpinBox</tabstop>
  <tabstop>RS4SpinBox</tabstop>
  <tabstop>OUT4SpinBox</tabstop>
  <tabstop>EBS4SpinBox</tabstop>
  <tabstop>KVS4SpinBox</tabstop>
  <tabstop>DET4SpinBox</tabstop>
  <tabstop>AR4SpinBox</tabstop>
  <tabstop>D1R4SpinBox</tabstop>
  <tabstop>D1L4SpinBox</tabstop>
  <tabstop>D2R4SpinBox</tabstop>
  <tabstop>RR4SpinBox</tabstop>
 </tabstops>
 <resources/>
 <connections/>
</ui>