[Lmuse-cvs-traffic] muse/synti/deicsonze Makefile.am,1.4,1.5 deicsonzegui.cpp,1.4,1.5 deicsonzeprese

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Modified Files:
	Makefile.am deicsonzegui.cpp deicsonzepreset.cpp 
	deicsonzepreset.h 
Log Message:
see ChangeLog

Index: deicsonzepreset.h
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonzepreset.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** deicsonzepreset.h	27 Dec 2004 01:34:51 -0000	1.2
--- deicsonzepreset.h	13 Jan 2005 21:16:26 -0000	1.3
***************
*** 31,36 ****
  #define __DEICSONZEPRESET_H

! #include <string>
! #include "muse/xml.h"

  #define NBROP 4 //do not change
--- 31,36 ----
  #define __DEICSONZEPRESET_H

! // #include <string>
! #include "al/xml.h"

  #define NBROP 4 //do not change
***************
*** 222,227 ****
      void printPreset();
      void initPreset();
!     void readPreset(Xml* xml);
!     void writePreset(Xml* xml);
  };

--- 222,227 ----
      void printPreset();
      void initPreset();
!     void readPreset(AL::Xml* xml);
!     void writePreset(AL::Xml* xml);
  };

***************
*** 234,239 ****
      std::vector<Preset*> _presetVector;
      Preset* findPreset(int lbank, int prog);
!     void readSubcategory(Xml* xml);
!     void writeSubcategory(Xml* xml);
      void printSubcategory();
      Subcategory(std::string name){_subcategoryName=name;}
--- 234,239 ----
      std::vector<Preset*> _presetVector;
      Preset* findPreset(int lbank, int prog);
!     void readSubcategory(AL::Xml* xml);
!     void writeSubcategory(AL::Xml* xml);
      void printSubcategory();
      Subcategory(std::string name){_subcategoryName=name;}
***************
*** 247,252 ****
      Subcategory* findSubcategory(std::string s);
      Preset* findPreset(int lbank, int prog);
!     void readCategory(Xml* xml);
!     void writeCategory(Xml* xml);
      void printCategory();
      Category(const std::string name){_categoryName=name;}
--- 247,252 ----
      Subcategory* findSubcategory(std::string s);
      Preset* findPreset(int lbank, int prog);
!     void readCategory(AL::Xml* xml);
!     void writeCategory(AL::Xml* xml);
      void printCategory();
      Category(const std::string name){_categoryName=name;}
***************
*** 260,265 ****
      Preset* findPreset(int lbank, int prog);
      Category* findCategory(std::string s);
!     void readSet(Xml* xml);
!     void writeSet(Xml* xml);
      void printSet();
      Set(const std::string name){_setName=name;}
--- 260,265 ----
      Preset* findPreset(int lbank, int prog);
      Category* findCategory(std::string s);
!     void readSet(AL::Xml* xml);
!     void writeSet(AL::Xml* xml);
      void printSet();
      Set(const std::string name){_setName=name;}

Index: deicsonzepreset.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonzepreset.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** deicsonzepreset.cpp	27 Dec 2004 01:34:51 -0000	1.2
--- deicsonzepreset.cpp	13 Jan 2005 21:16:25 -0000	1.3
***************
*** 31,35 ****
  #include <iostream>

- 
  //---------------------------------------------------------
  // initPreset
--- 31,34 ----
***************
*** 219,223 ****
  // readSet
  //---------------------------------------------------------
! void Set::readSet(Xml* xml) {
  }

--- 218,222 ----
  // readSet
  //---------------------------------------------------------
! void Set::readSet(AL::Xml* xml) {
  }

***************
*** 225,229 ****
  // writeSet
  //---------------------------------------------------------
! void Set::writeSet(Xml* xml) {
      xml->tag("deicsOnzeSet version=\"1.0\"");
      xml->tag(_setName.c_str());
--- 224,228 ----
  // writeSet
  //---------------------------------------------------------
! void Set::writeSet(AL::Xml* xml) {
      xml->tag("deicsOnzeSet version=\"1.0\"");
      xml->tag(_setName.c_str());
***************
*** 237,241 ****
  // readCategory
  //---------------------------------------------------------
! void Category::readCategory(Xml* xml) {
  }

--- 236,240 ----
  // readCategory
  //---------------------------------------------------------
! void Category::readCategory(AL::Xml* xml) {
  }

***************
*** 243,247 ****
  // writeCategory
  //---------------------------------------------------------
! void Category::writeCategory(Xml* xml) {
      xml->tag("deicsOnzeCategory version=\"1.0\"");
      xml->tag(_categoryName.c_str());
--- 242,246 ----
  // writeCategory
  //---------------------------------------------------------
! void Category::writeCategory(AL::Xml* xml) {
      xml->tag("deicsOnzeCategory version=\"1.0\"");
      xml->tag(_categoryName.c_str());
***************
*** 255,259 ****
  // readSubcategory
  //---------------------------------------------------------
! void Subcategory::readSubcategory(Xml* xml) {
  }

--- 254,258 ----
  // readSubcategory
  //---------------------------------------------------------
! void Subcategory::readSubcategory(AL::Xml* xml) {
  }

***************
*** 261,265 ****
  // writeSubcategory
  //---------------------------------------------------------
! void Subcategory::writeSubcategory(Xml* xml) {
      xml->tag("deicsOnzeSubcategory version=\"1.0\"");
      xml->tag(_subcategoryName.c_str());
--- 260,264 ----
  // writeSubcategory
  //---------------------------------------------------------
! void Subcategory::writeSubcategory(AL::Xml* xml) {
      xml->tag("deicsOnzeSubcategory version=\"1.0\"");
      xml->tag(_subcategoryName.c_str());
***************
*** 273,277 ****
  // readPreset
  //---------------------------------------------------------
! void Preset::readPreset(Xml* xml) {
  }

--- 272,276 ----
  // readPreset
  //---------------------------------------------------------
! void Preset::readPreset(AL::Xml* xml) {
  }

***************
*** 279,287 ****
  // witePreset
  //---------------------------------------------------------
! void Preset::writePreset(Xml* xml) {
      char s[MAXCHARTAG];

      xml->tag("deicsOnzePreset version=\"1.0\"");
!     
      //algorithm
      xml->strTag("algorithm", (algorithm==FIRST? "FIRST":
--- 278,286 ----
  // witePreset
  //---------------------------------------------------------
! void Preset::writePreset(AL::Xml* xml) {
      char s[MAXCHARTAG];

      xml->tag("deicsOnzePreset version=\"1.0\"");
! 
      //algorithm
      xml->strTag("algorithm", (algorithm==FIRST? "FIRST":

Index: deicsonzegui.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonzegui.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** deicsonzegui.cpp	27 Dec 2004 01:34:50 -0000	1.4
--- deicsonzegui.cpp	13 Jan 2005 21:16:25 -0000	1.5
***************
*** 94,106 ****
  	    this, SLOT(setLfoDelay(int)));
      connect(PModDepthSlider, SIGNAL(valueChanged(int)),
! 	    this, SLOT(setLfoPModDepth(int)));   
      connect(PModSensSlider, SIGNAL(valueChanged(int)),
! 	    this, SLOT(setLfoPitchSens(int)));   
      connect(AModDepthSlider, SIGNAL(valueChanged(int)),
! 	    this, SLOT(setLfoAModDepth(int)));   
      connect(AModSensSlider, SIGNAL(valueChanged(int)),
! 	    this, SLOT(setLfoAmpSens(int)));   
      connect(transposeSlider, SIGNAL(valueChanged(int)),
! 	    this, SLOT(setTranspose(int)));   
      connect(globalDetuneSlider, SIGNAL(valueChanged(int)),
  	    this, SLOT(setGlobalDetune(int)));
--- 94,106 ----
  	    this, SLOT(setLfoDelay(int)));
      connect(PModDepthSlider, SIGNAL(valueChanged(int)),
! 	    this, SLOT(setLfoPModDepth(int)));
      connect(PModSensSlider, SIGNAL(valueChanged(int)),
! 	    this, SLOT(setLfoPitchSens(int)));
      connect(AModDepthSlider, SIGNAL(valueChanged(int)),
! 	    this, SLOT(setLfoAModDepth(int)));
      connect(AModSensSlider, SIGNAL(valueChanged(int)),
! 	    this, SLOT(setLfoAmpSens(int)));
      connect(transposeSlider, SIGNAL(valueChanged(int)),
! 	    this, SLOT(setTranspose(int)));
      connect(globalDetuneSlider, SIGNAL(valueChanged(int)),
  	    this, SLOT(setGlobalDetune(int)));
***************
*** 108,112 ****
  	    this, SLOT(setAlgorithm(const QString&)));
      connect(PitchBendRangeSlider, SIGNAL(valueChanged(int)),
! 	    this, SLOT(setPitchBendRange(int)));    
      //envelope
      connect(AR1Slider, SIGNAL(valueChanged(int)), this, SLOT(setAR1(int)));
--- 108,112 ----
  	    this, SLOT(setAlgorithm(const QString&)));
      connect(PitchBendRangeSlider, SIGNAL(valueChanged(int)),
! 	    this, SLOT(setPitchBendRange(int)));
      //envelope
      connect(AR1Slider, SIGNAL(valueChanged(int)), this, SLOT(setAR1(int)));
***************
*** 145,174 ****
      connect(Vol4Slider, SIGNAL(valueChanged(int)), this, SLOT(setVol4(int)));
      //Ratio and Frequency
!     connect(CoarseRatio1SpinBox, SIGNAL(valueChanged(int)), 
  	    this, SLOT(setCoarseRatio1(int)));
!     connect(FineRatio1SpinBox, SIGNAL(valueChanged(int)), 
  	    this, SLOT(setFineRatio1(int)));
!     connect(Freq1SpinBox, SIGNAL(valueChanged(int)), 
  	    this, SLOT(setFreq1(int)));
      connect(Fix1CheckBox, SIGNAL(toggled(bool)), this, SLOT(setFix1(bool)));
!     connect(CoarseRatio2SpinBox, SIGNAL(valueChanged(int)), 
  	    this, SLOT(setCoarseRatio2(int)));
!     connect(FineRatio2SpinBox, SIGNAL(valueChanged(int)), 
  	    this, SLOT(setFineRatio2(int)));
!     connect(Freq2SpinBox, SIGNAL(valueChanged(int)), 
  	    this, SLOT(setFreq2(int)));
      connect(Fix2CheckBox, SIGNAL(toggled(bool)), this, SLOT(setFix2(bool)));
!     connect(CoarseRatio3SpinBox, SIGNAL(valueChanged(int)), 
  	    this, SLOT(setCoarseRatio3(int)));
!     connect(FineRatio3SpinBox, SIGNAL(valueChanged(int)), 
  	    this, SLOT(setFineRatio3(int)));
!     connect(Freq3SpinBox, SIGNAL(valueChanged(int)), 
  	    this, SLOT(setFreq3(int)));
      connect(Fix3CheckBox, SIGNAL(toggled(bool)), this, SLOT(setFix3(bool)));
!     connect(CoarseRatio4SpinBox, SIGNAL(valueChanged(int)), 
  	    this, SLOT(setCoarseRatio4(int)));
!     connect(FineRatio4SpinBox, SIGNAL(valueChanged(int)), 
  	    this, SLOT(setFineRatio4(int)));
!     connect(Freq4SpinBox, SIGNAL(valueChanged(int)), 
  	    this, SLOT(setFreq4(int)));
      connect(Fix4CheckBox, SIGNAL(toggled(bool)), this, SLOT(setFix4(bool)));
--- 145,174 ----
      connect(Vol4Slider, SIGNAL(valueChanged(int)), this, SLOT(setVol4(int)));
      //Ratio and Frequency
!     connect(CoarseRatio1SpinBox, SIGNAL(valueChanged(int)),
  	    this, SLOT(setCoarseRatio1(int)));
!     connect(FineRatio1SpinBox, SIGNAL(valueChanged(int)),
  	    this, SLOT(setFineRatio1(int)));
!     connect(Freq1SpinBox, SIGNAL(valueChanged(int)),
  	    this, SLOT(setFreq1(int)));
      connect(Fix1CheckBox, SIGNAL(toggled(bool)), this, SLOT(setFix1(bool)));
!     connect(CoarseRatio2SpinBox, SIGNAL(valueChanged(int)),
  	    this, SLOT(setCoarseRatio2(int)));
!     connect(FineRatio2SpinBox, SIGNAL(valueChanged(int)),
  	    this, SLOT(setFineRatio2(int)));
!     connect(Freq2SpinBox, SIGNAL(valueChanged(int)),
  	    this, SLOT(setFreq2(int)));
      connect(Fix2CheckBox, SIGNAL(toggled(bool)), this, SLOT(setFix2(bool)));
!     connect(CoarseRatio3SpinBox, SIGNAL(valueChanged(int)),
  	    this, SLOT(setCoarseRatio3(int)));
!     connect(FineRatio3SpinBox, SIGNAL(valueChanged(int)),
  	    this, SLOT(setFineRatio3(int)));
!     connect(Freq3SpinBox, SIGNAL(valueChanged(int)),
  	    this, SLOT(setFreq3(int)));
      connect(Fix3CheckBox, SIGNAL(toggled(bool)), this, SLOT(setFix3(bool)));
!     connect(CoarseRatio4SpinBox, SIGNAL(valueChanged(int)),
  	    this, SLOT(setCoarseRatio4(int)));
!     connect(FineRatio4SpinBox, SIGNAL(valueChanged(int)),
  	    this, SLOT(setFineRatio4(int)));
!     connect(Freq4SpinBox, SIGNAL(valueChanged(int)),
  	    this, SLOT(setFreq4(int)));
      connect(Fix4CheckBox, SIGNAL(toggled(bool)), this, SLOT(setFix4(bool)));
***************
*** 217,221 ****
      for(std::vector<Category*>::iterator
  	    i=_deicsOnze->_set->_categoryVector.begin();
! 	i!=_deicsOnze->_set->_categoryVector.end(); i++) 
  	(void) new QListViewItemCategory
  	    (categoryListView, (*i)->_categoryName, i);
--- 217,221 ----
      for(std::vector<Category*>::iterator
  	    i=_deicsOnze->_set->_categoryVector.begin();
! 	i!=_deicsOnze->_set->_categoryVector.end(); i++)
  	(void) new QListViewItemCategory
  	    (categoryListView, (*i)->_categoryName, i);
***************
*** 228,235 ****
  void DeicsOnzeGui::newPresetDialog() {
      NewPreset* newpreset = new NewPreset(0, "newPreset");
!     if(_currentQLVICategory) 
  	newpreset->categoryNPLineEdit->setText((*_currentQLVICategory
  						->i_c)->_categoryName);
!     if(_currentQLVISubcategory) 
  	newpreset->subcategoryNPLineEdit->setText((*_currentQLVISubcategory
  						   ->i_s)->_subcategoryName);
--- 228,235 ----
  void DeicsOnzeGui::newPresetDialog() {
      NewPreset* newpreset = new NewPreset(0, "newPreset");
!     if(_currentQLVICategory)
  	newpreset->categoryNPLineEdit->setText((*_currentQLVICategory
  						->i_c)->_categoryName);
!     if(_currentQLVISubcategory)
  	newpreset->subcategoryNPLineEdit->setText((*_currentQLVISubcategory
  						   ->i_s)->_subcategoryName);
***************
*** 268,277 ****
  				     tr("Load preset dialog"),
  				     tr("Choose preset"));
!     
      QDomDocument doc;
!     
  /*    QFile qf(fi.fileName());
      qf.open(IO_ReadOnly, f);
!     
      int line, column;
      QString err;
--- 268,277 ----
  				     tr("Load preset dialog"),
  				     tr("Choose preset"));
! 
      QDomDocument doc;
! 
  /*    QFile qf(fi.fileName());
      qf.open(IO_ReadOnly, f);
! 
      int line, column;
      QString err;
***************
*** 285,289 ****
      }
      QDomNode node = doc.documentElement();
!     
      while (!node.isNull()) {
  	QDomElement e = node.toElement();
--- 285,289 ----
      }
      QDomNode node = doc.documentElement();
! 
      while (!node.isNull()) {
  	QDomElement e = node.toElement();
***************
*** 299,305 ****

      //Preset* tempPreset=new Preset();
!     
      //if(filename) tempPreset->loadPreset(filename);
!     
      /*subcategorySet* subcatS = _deicsOnze->_categorySet
  	->findSubcategorySet(tempPreset->categoryName);
--- 299,305 ----

      //Preset* tempPreset=new Preset();
! 
      //if(filename) tempPreset->loadPreset(filename);
! 
      /*subcategorySet* subcatS = _deicsOnze->_categorySet
  	->findSubcategorySet(tempPreset->categoryName);
***************
*** 322,331 ****
  				     tr("Save set dialog"),
  				     tr("Choose file"));
!     
      if(filename) {
  	FILE* f;
  	f = fopen(filename.ascii(), "w");

! 	Xml* xml = new Xml(f);
  	xml->header();
  	_deicsOnze->_set->writeSet(xml);
--- 322,331 ----
  				     tr("Save set dialog"),
  				     tr("Choose file"));
! 
      if(filename) {
  	FILE* f;
  	f = fopen(filename.ascii(), "w");

! 	AL::Xml* xml = new AL::Xml(f);
  	xml->header();
  	_deicsOnze->_set->writeSet(xml);
***************
*** 376,381 ****
  	    FILE* f;
  	    f = fopen(filename.ascii(), "w");
! 	    
! 	    Xml* xml = new Xml(f);
  	    xml->header();
  	    (*_currentQLVICategory->i_c)->writeCategory(xml);
--- 376,381 ----
  	    FILE* f;
  	    f = fopen(filename.ascii(), "w");
! 	
! 	    AL::Xml* xml = new AL::Xml(f);
  	    xml->header();
  	    (*_currentQLVICategory->i_c)->writeCategory(xml);
***************
*** 392,396 ****
  //-----------------------------------------------------------
  void DeicsOnzeGui::deleteSubcategoryDialog() {
!     if(_currentQLVISubcategory && 
         subcategoryListView->isSelected(_currentQLVISubcategory)) {
  	std::vector<Subcategory*>::iterator i=_currentQLVISubcategory->i_s;
--- 392,396 ----
  //-----------------------------------------------------------
  void DeicsOnzeGui::deleteSubcategoryDialog() {
!     if(_currentQLVISubcategory &&
         subcategoryListView->isSelected(_currentQLVISubcategory)) {
  	std::vector<Subcategory*>::iterator i=_currentQLVISubcategory->i_s;
***************
*** 429,434 ****
  	    FILE* f;
  	    f = fopen(filename.ascii(), "w");
! 	    
! 	    Xml* xml = new Xml(f);
  	    xml->header();
  	    (*_currentQLVISubcategory->i_s)->writeSubcategory(xml);
--- 429,434 ----
  	    FILE* f;
  	    f = fopen(filename.ascii(), "w");
! 	
! 	    AL::Xml* xml = new AL::Xml(f);
  	    xml->header();
  	    (*_currentQLVISubcategory->i_s)->writeSubcategory(xml);
***************
*** 486,491 ****
  	    FILE* f;
  	    f = fopen(filename.ascii(), "w");
! 	    
! 	    Xml* xml = new Xml(f);
  	    xml->header();
  	    (*i)->writePreset(xml);
--- 486,491 ----
  	    FILE* f;
  	    f = fopen(filename.ascii(), "w");
! 	
! 	    AL::Xml* xml = new AL::Xml(f);
  	    xml->header();
  	    (*i)->writePreset(xml);
***************
*** 778,782 ****
  	_currentQLVISubcategory=NULL;
  	subcategoryListView->clear();
! 	for(std::vector<Subcategory*>::iterator 
  		i=(*_currentQLVICategory->i_c)->_subcategoryVector.begin();
  	    i!=(*_currentQLVICategory->i_c)->_subcategoryVector.end();i++)
--- 778,782 ----
  	_currentQLVISubcategory=NULL;
  	subcategoryListView->clear();
! 	for(std::vector<Subcategory*>::iterator
  		i=(*_currentQLVICategory->i_c)->_subcategoryVector.begin();
  	    i!=(*_currentQLVICategory->i_c)->_subcategoryVector.end();i++)
***************
*** 793,797 ****
  	_currentQLVISubcategory=(QListViewItemSubcategory*)subcat;
  	presetsListView->clear();
! 	for(std::vector<Preset*>::iterator 
  		i=(*_currentQLVISubcategory->i_s)->_presetVector.begin();
  	    i!=(*_currentQLVISubcategory->i_s)->_presetVector.end(); i++)
--- 793,797 ----
  	_currentQLVISubcategory=(QListViewItemSubcategory*)subcat;
  	presetsListView->clear();
! 	for(std::vector<Preset*>::iterator
  		i=(*_currentQLVISubcategory->i_s)->_presetVector.begin();
  	    i!=(*_currentQLVISubcategory->i_s)->_presetVector.end(); i++)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/deicsonze/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am	27 Dec 2004 01:34:50 -0000	1.4
--- Makefile.am	13 Jan 2005 21:16:25 -0000	1.5
***************
*** 9,19 ****
                           deicsonzepreset.cpp deicsonzepreset.h \
                           deicsonzegui.cpp deicsonzegui.h \
!                          deicsonzeguibase.ui newpreset.ui \
!                          $(top_srcdir)/muse/xml.cpp
! 

  nodist_deicsonze_la_SOURCES = moc_deicsonzegui.cpp

! deicsonze_la_LIBADD    = ../libsynti/libsynti.la
  deicsonze_la_LDFLAGS   = -module -avoid-version

--- 9,17 ----
                           deicsonzepreset.cpp deicsonzepreset.h \
                           deicsonzegui.cpp deicsonzegui.h \
!                          deicsonzeguibase.ui newpreset.ui

  nodist_deicsonze_la_SOURCES = moc_deicsonzegui.cpp

! deicsonze_la_LIBADD    = ../libsynti/libsynti.la -L$(top_srcdir)/al -lal
  deicsonze_la_LDFLAGS   = -module -avoid-version

[Lmuse-cvs-traffic] muse/synti/deicsonze Makefile.am,1.4,1.5 deicsonzegui.cpp,1.4,1.5 deicsonzeprese

[Lmuse-cvs-traffic] muse/synti/deicsonze Makefile.am,1.4,1.5 deicsonzegui.cpp,1.4,1.5 deicsonzepreset.cpp,1.2,1.3 deicsonzepreset.h,1.2,1.3