[Lmuse-cvs-traffic] muse/synti/deicsonze deicsonze.cpp,1.7,1.8 deicsonzegui.cpp,1.7,1.8 deicsonzegui.h,1.6,1.7

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

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

Modified Files:
	deicsonze.cpp deicsonzegui.cpp deicsonzegui.h 
Log Message:
updates for midi plugin


Index: deicsonzegui.h
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonzegui.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** deicsonzegui.h	12 Feb 2005 23:00:37 -0000	1.6
--- deicsonzegui.h	11 May 2005 14:18:47 -0000	1.7
***************
*** 50,54 ****
   public:
      Subcategory* _subcategory;
!     QListViewItemSubcategory(QListView* p, QString slbank, 
  			     QString l, Subcategory* s)
  	:QListViewItem(p, slbank, l) {_subcategory=s;};
--- 50,54 ----
   public:
      Subcategory* _subcategory;
!     QListViewItemSubcategory(QListView* p, QString slbank,
  			     QString l, Subcategory* s)
  	:QListViewItem(p, slbank, l) {_subcategory=s;};
***************
*** 72,76 ****
      QListViewItemSubcategory* _currentQLVISubcategory;
      QListViewItemPreset* _currentQLVIPreset;
!     
      Q_OBJECT
      QString lastDir;
--- 72,76 ----
      QListViewItemSubcategory* _currentQLVISubcategory;
      QListViewItemPreset* _currentQLVIPreset;
! 
      Q_OBJECT
      QString lastDir;
***************
*** 200,204 ****
      void setPreset(QListViewItem*);
   public:
!     virtual void processEvent(const MidiPlayEvent&);
      void setPreset(int hbank, int lbank, int prog);
      //update the gui
--- 200,204 ----
      void setPreset(QListViewItem*);
   public:
!     virtual void processEvent(const MidiEvent&);
      void setPreset(int hbank, int lbank, int prog);
      //update the gui

Index: deicsonze.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonze.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** deicsonze.cpp	3 May 2005 16:57:56 -0000	1.7
--- deicsonze.cpp	11 May 2005 14:18:45 -0000	1.8
***************
*** 1151,1155 ****
  	    _preset->eg[k].ar=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_AR+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
--- 1151,1155 ----
  	    _preset->eg[k].ar=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_AR+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1158,1162 ****
  	    _preset->eg[k].d1r=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_D1R+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
--- 1158,1162 ----
  	    _preset->eg[k].d1r=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_D1R+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1165,1169 ****
  	    _preset->eg[k].d2r=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_D2R+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
--- 1165,1169 ----
  	    _preset->eg[k].d2r=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_D2R+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1172,1176 ****
  	    _preset->eg[k].rr=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_RR+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
--- 1172,1176 ----
  	    _preset->eg[k].rr=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_RR+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1179,1183 ****
  	    _preset->eg[k].d1l=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_D1L+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
--- 1179,1183 ----
  	    _preset->eg[k].d1l=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_D1L+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1186,1190 ****
  	    _preset->scaling.level[k]=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_LS+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
--- 1186,1190 ----
  	    _preset->scaling.level[k]=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_LS+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1193,1197 ****
  	    _preset->scaling.rate[k]=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_RS+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
--- 1193,1197 ----
  	    _preset->scaling.rate[k]=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_RS+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1200,1204 ****
  	    _preset->sensitivity.egBias[k]=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_EBS+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
--- 1200,1204 ----
  	    _preset->sensitivity.egBias[k]=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_EBS+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1207,1211 ****
  	    _preset->sensitivity.ampOn[k]=val==1;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_AME+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
--- 1207,1211 ----
  	    _preset->sensitivity.ampOn[k]=val==1;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_AME+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1214,1218 ****
  	    _preset->sensitivity.keyVelocity[k]=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_KVS+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
--- 1214,1218 ----
  	    _preset->sensitivity.keyVelocity[k]=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_KVS+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1221,1225 ****
  	    _preset->outLevel[k]=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_OUT+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
--- 1221,1225 ----
  	    _preset->outLevel[k]=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_OUT+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1228,1232 ****
  	    _preset->frequency[k].ratio=((double)val)/100.0;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,
  				 CTRL_RATIO+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
--- 1228,1232 ----
  	    _preset->frequency[k].ratio=((double)val)/100.0;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,
  				 CTRL_RATIO+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
***************
*** 1236,1240 ****
  	    _preset->detune[k]=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_DET+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
--- 1236,1240 ----
  	    _preset->detune[k]=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_DET+k*DECAPAR1,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1243,1247 ****
  	    _preset->algorithm=(Algorithm)val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_ALG,val);
  		_gui->writeEvent(ev);
  	    }
--- 1243,1247 ----
  	    _preset->algorithm=(Algorithm)val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_ALG,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1251,1255 ****
  	    setFeedback();
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_FEEDBACK,val);
  		_gui->writeEvent(ev);
  	    }
--- 1251,1255 ----
  	    setFeedback();
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_FEEDBACK,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1259,1263 ****
  	    setLfo();
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_SPEED,val);
  		_gui->writeEvent(ev);
  	    }
--- 1259,1263 ----
  	    setLfo();
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_SPEED,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1267,1271 ****
  	    setLfo();
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_DELAY,val);
  		_gui->writeEvent(ev);
  	    }
--- 1267,1271 ----
  	    setLfo();
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_DELAY,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1275,1279 ****
  	    setLfo();
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_PMODDEPTH,val);
  		_gui->writeEvent(ev);
  	    }
--- 1275,1279 ----
  	    setLfo();
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_PMODDEPTH,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1283,1287 ****
  	    setLfo();
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_AMODDEPTH,val);
  		_gui->writeEvent(ev);
  	    }
--- 1283,1287 ----
  	    setLfo();
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_AMODDEPTH,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1291,1295 ****
  	    setLfo();
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_SYNC,val);
  		_gui->writeEvent(ev);
  	    }
--- 1291,1295 ----
  	    setLfo();
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_SYNC,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1299,1303 ****
  	    setLfo();
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_WAVE,val);
  		_gui->writeEvent(ev);
  	    }
--- 1299,1303 ----
  	    setLfo();
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_WAVE,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1307,1311 ****
  	    setLfo();
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_PMODSENS,val);
  		_gui->writeEvent(ev);
  	    }
--- 1307,1311 ----
  	    setLfo();
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_PMODSENS,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1315,1319 ****
  	    setLfo();
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_AMS,val);
  		_gui->writeEvent(ev);
  	    }
--- 1315,1319 ----
  	    setLfo();
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_AMS,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1322,1326 ****
  	    _preset->function.transpose=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_TRANSPOSE,val);
  		_gui->writeEvent(ev);
  	    }
--- 1322,1326 ----
  	    _preset->function.transpose=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_TRANSPOSE,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1329,1333 ****
  	    _preset->function.mode=(Mode)val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_POLYMODE,val);
  		_gui->writeEvent(ev);
  	    }
--- 1329,1333 ----
  	    _preset->function.mode=(Mode)val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_POLYMODE,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1336,1340 ****
  	    _preset->function.pBendRange=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_PBENDRANGE,val);
  		_gui->writeEvent(ev);
  	    }
--- 1336,1340 ----
  	    _preset->function.pBendRange=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_PBENDRANGE,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1343,1347 ****
  	    _preset->function.portamento=(Portamento)val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_PORTAMODE,val);
  		_gui->writeEvent(ev);
  	    }
--- 1343,1347 ----
  	    _preset->function.portamento=(Portamento)val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_PORTAMODE,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1350,1354 ****
  	    _preset->function.portamentoTime=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_PORTATIME,val);
  		_gui->writeEvent(ev);
  	    }
--- 1350,1354 ----
  	    _preset->function.portamentoTime=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_PORTATIME,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1357,1361 ****
  	    _preset->function.fcVolume=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_FCVOLUME,val);
  		_gui->writeEvent(ev);
  	    }
--- 1357,1361 ----
  	    _preset->function.fcVolume=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_FCVOLUME,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1364,1368 ****
  	    _preset->function.footSw=(FootSw)val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_FSW,val);
  		_gui->writeEvent(ev);
  	    }
--- 1364,1368 ----
  	    _preset->function.footSw=(FootSw)val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_FSW,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1371,1375 ****
  	    _preset->function.mwPitch=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_MWPITCH,val);
  		_gui->writeEvent(ev);
  	    }
--- 1371,1375 ----
  	    _preset->function.mwPitch=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_MWPITCH,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1378,1382 ****
  	    _preset->function.mwAmplitude=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_MWAMPLITUDE,val);
  		_gui->writeEvent(ev);
  	    }
--- 1378,1382 ----
  	    _preset->function.mwAmplitude=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_MWAMPLITUDE,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1385,1389 ****
  	    _preset->function.bcPitch=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_BCPITCH,val);
  		_gui->writeEvent(ev);
  	    }
--- 1385,1389 ----
  	    _preset->function.bcPitch=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_BCPITCH,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1392,1396 ****
  	    _preset->function.bcAmplitude=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_BCAMPLITUDE,val);
  		_gui->writeEvent(ev);
  	    }
--- 1392,1396 ----
  	    _preset->function.bcAmplitude=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_BCAMPLITUDE,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1399,1403 ****
  	    _preset->function.bcPitchBias=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_BCPITCHBIAS,val);
  		_gui->writeEvent(ev);
  	    }
--- 1399,1403 ----
  	    _preset->function.bcPitchBias=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_BCPITCHBIAS,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1406,1410 ****
  	    _preset->function.bcEgBias=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_BCEGBIAS,val);
  		_gui->writeEvent(ev);
  	    }
--- 1406,1410 ----
  	    _preset->function.bcEgBias=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_BCEGBIAS,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1413,1417 ****
  	    _preset->pitchEg.pr1=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_PR1,val);
  		_gui->writeEvent(ev);
  	    }
--- 1413,1417 ----
  	    _preset->pitchEg.pr1=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_PR1,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1420,1424 ****
  	    _preset->pitchEg.pr2=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_PR2,val);
  		_gui->writeEvent(ev);
  	    }
--- 1420,1424 ----
  	    _preset->pitchEg.pr2=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_PR2,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1427,1431 ****
  	    _preset->pitchEg.pr3=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_PR3,val);
  		_gui->writeEvent(ev);
  	    }
--- 1427,1431 ----
  	    _preset->pitchEg.pr3=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_PR3,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1434,1438 ****
  	    _preset->pitchEg.pr1=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_PL1,val);
  		_gui->writeEvent(ev);
  	    }
--- 1434,1438 ----
  	    _preset->pitchEg.pr1=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_PL1,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1441,1445 ****
  	    _preset->pitchEg.pr2=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_PL2,val);
  		_gui->writeEvent(ev);
  	    }
--- 1441,1445 ----
  	    _preset->pitchEg.pr2=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_PL2,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1448,1452 ****
  	    _preset->pitchEg.pr3=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_PL3,val);
  		_gui->writeEvent(ev);
  	    }
--- 1448,1452 ----
  	    _preset->pitchEg.pr3=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_PL3,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1455,1459 ****
  	    _preset->frequency[k].isFix=val==1;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_FIX+k*DECAPAR2,val);
  		_gui->writeEvent(ev);
  	    }	
--- 1455,1459 ----
  	    _preset->frequency[k].isFix=val==1;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_FIX+k*DECAPAR2,val);
  		_gui->writeEvent(ev);
  	    }	
***************
*** 1462,1466 ****
  	    _preset->frequency[k].freq=((double)val)/100.0;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,
  				 CTRL_FIXRANGE+k*DECAPAR2,val);
  		_gui->writeEvent(ev);
--- 1462,1466 ----
  	    _preset->frequency[k].freq=((double)val)/100.0;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,
  				 CTRL_FIXRANGE+k*DECAPAR2,val);
  		_gui->writeEvent(ev);
***************
*** 1470,1474 ****
  	    _preset->oscWave[k]=(OscWave)val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_OSW+k*DECAPAR2,val);
  		_gui->writeEvent(ev);
  	    }	
--- 1470,1474 ----
  	    _preset->oscWave[k]=(OscWave)val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_OSW+k*DECAPAR2,val);
  		_gui->writeEvent(ev);
  	    }	
***************
*** 1477,1481 ****
  	    _preset->eg[k].egShift=(egShiftValue)val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_SHFT+k*DECAPAR2,val);
  		_gui->writeEvent(ev);
  	    }	
--- 1477,1481 ----
  	    _preset->eg[k].egShift=(egShiftValue)val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_SHFT+k*DECAPAR2,val);
  		_gui->writeEvent(ev);
  	    }	
***************
*** 1484,1488 ****
  	    _preset->function.reverbRate=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_REVERBRATE,val);
  		_gui->writeEvent(ev);
  	    }
--- 1484,1488 ----
  	    _preset->function.reverbRate=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_REVERBRATE,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1491,1495 ****
  	    _preset->function.fcPitch=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_FCPITCH,val);
  		_gui->writeEvent(ev);
  	    }
--- 1491,1495 ----
  	    _preset->function.fcPitch=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_FCPITCH,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1498,1502 ****
  	    _preset->function.fcAmplitude=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_FCAMPLITUDE,val);
  		_gui->writeEvent(ev);
  	    }
--- 1498,1502 ----
  	    _preset->function.fcAmplitude=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_FCAMPLITUDE,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1505,1509 ****
  	    _preset->globalDetune=val;
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_GLOBALDETUNE,val);
  		_gui->writeEvent(ev);
  	    }
--- 1505,1509 ----
  	    _preset->globalDetune=val;
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_GLOBALDETUNE,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1512,1516 ****
  	    setMasterVol(val);
  	    if(!fromGui) {
! 		MidiPlayEvent ev(0,0,ME_CONTROLLER,CTRL_MASTERVOLUME,val);
  		_gui->writeEvent(ev);
  	    }
--- 1512,1516 ----
  	    setMasterVol(val);
  	    if(!fromGui) {
! 		MidiEvent ev(0,0,ME_CONTROLLER,CTRL_MASTERVOLUME,val);
  		_gui->writeEvent(ev);
  	    }
***************
*** 1526,1530 ****
  	    programSelect(hbank, lbank, prog);
  	    //if(!fromGui) {
! 	    MidiPlayEvent ev(0, 0, ME_CONTROLLER, CTRL_PROGRAM, val);
  	    _gui->writeEvent(ev);
  	    //}
--- 1526,1530 ----
  	    programSelect(hbank, lbank, prog);
  	    //if(!fromGui) {
! 	    MidiEvent ev(0, 0, ME_CONTROLLER, CTRL_PROGRAM, val);
  	    _gui->writeEvent(ev);
  	    //}
***************
*** 1704,1708 ****
      //Process messages from the gui
      while (_gui->fifoSize()) {
! 	MidiPlayEvent ev = _gui->readEvent();
  	if (ev.type() == ME_SYSEX) {
  	    sysex(ev.len(), ev.data());
--- 1704,1708 ----
      //Process messages from the gui
      while (_gui->fifoSize()) {
! 	MidiEvent ev = _gui->readEvent();
  	if (ev.type() == ME_SYSEX) {
  	    sysex(ev.len(), ev.data());

Index: deicsonzegui.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonzegui.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** deicsonzegui.cpp	12 Feb 2005 23:00:37 -0000	1.7
--- deicsonzegui.cpp	11 May 2005 14:18:46 -0000	1.8
***************
*** 36,40 ****
  #include <qlcdnumber.h>
  #include <qlistview.h>
! #include <qpopupmenu.h> 
  #include <qspinbox.h>
  #include <qlayout.h>
--- 36,40 ----
  #include <qlcdnumber.h>
  #include <qlistview.h>
! #include <qpopupmenu.h>
  #include <qspinbox.h>
  #include <qlayout.h>
***************
*** 58,68 ****
      lastDir= "";
      //PopupMenu Category Subcategory Preset
!     connect(categoryListView, SIGNAL(rightButtonClicked(QListViewItem*, 
  							const QPoint &, int)),
  	    this, SLOT(categoryPopupMenu(QListViewItem*)));
!     connect(subcategoryListView, SIGNAL(rightButtonClicked(QListViewItem*, 
  							const QPoint &, int)),
  	    this, SLOT(subcategoryPopupMenu(QListViewItem*)));
!     connect(presetListView, SIGNAL(rightButtonClicked(QListViewItem*, 
  							const QPoint &, int)),
  	    this, SLOT(presetPopupMenu(QListViewItem*)));
--- 58,68 ----
      lastDir= "";
      //PopupMenu Category Subcategory Preset
!     connect(categoryListView, SIGNAL(rightButtonClicked(QListViewItem*,
  							const QPoint &, int)),
  	    this, SLOT(categoryPopupMenu(QListViewItem*)));
!     connect(subcategoryListView, SIGNAL(rightButtonClicked(QListViewItem*,
  							const QPoint &, int)),
  	    this, SLOT(subcategoryPopupMenu(QListViewItem*)));
!     connect(presetListView, SIGNAL(rightButtonClicked(QListViewItem*,
  							const QPoint &, int)),
  	    this, SLOT(presetPopupMenu(QListViewItem*)));
***************
*** 74,80 ****
      connect(categoryLineEdit, SIGNAL(textChanged(const QString&)),
  	    this, SLOT(setCategoryName(const QString&)));
!     connect(hbankSpinBox, SIGNAL(valueChanged(int)), 
  	    this, SLOT(setHBank(int)));
!     connect(lbankSpinBox, SIGNAL(valueChanged(int)), 
  	    this, SLOT(setLBank(int)));
      connect(progSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setProg(int)));
--- 74,80 ----
      connect(categoryLineEdit, SIGNAL(textChanged(const QString&)),
  	    this, SLOT(setCategoryName(const QString&)));
!     connect(hbankSpinBox, SIGNAL(valueChanged(int)),
  	    this, SLOT(setHBank(int)));
!     connect(lbankSpinBox, SIGNAL(valueChanged(int)),
  	    this, SLOT(setLBank(int)));
      connect(progSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setProg(int)));
***************
*** 213,224 ****
      QSocketNotifier* s = new QSocketNotifier(readFd, QSocketNotifier::Read);
      connect(s, SIGNAL(activated(int)), SLOT(readMessage(int)));
!     
      setSet();
  };
  
  //-----------------------------------------------------------
! // processEvent(const MidiPlayEvent&);
  //-----------------------------------------------------------
! void DeicsOnzeGui::processEvent(const MidiPlayEvent& ev) {
      if (ev.type() == ME_CONTROLLER) {
  	int id=ev.dataA();
--- 213,224 ----
      QSocketNotifier* s = new QSocketNotifier(readFd, QSocketNotifier::Read);
      connect(s, SIGNAL(activated(int)), SLOT(readMessage(int)));
! 
      setSet();
  };
  
  //-----------------------------------------------------------
! // processEvent(const MidiEvent&);
  //-----------------------------------------------------------
! void DeicsOnzeGui::processEvent(const MidiEvent& ev) {
      if (ev.type() == ME_CONTROLLER) {
  	int id=ev.dataA();
***************
*** 345,349 ****
  	    case CTRL_MASTERVOLUME: updateMASTERVOLUME(val);
  		break;
! 	    case CTRL_PROGRAM :	    
  		int hbank = (val & 0xff0000) >> 16;
  		int lbank = (val & 0xff00) >> 8;
--- 345,349 ----
  	    case CTRL_MASTERVOLUME: updateMASTERVOLUME(val);
  		break;
! 	    case CTRL_PROGRAM :	
  		int hbank = (val & 0xff0000) >> 16;
  		int lbank = (val & 0xff00) >> 8;
***************
*** 387,391 ****
  				     tr("Load set dialog"),
  				     tr("Choose set"));
!     
      // read the XML file and create DOM tree
      if(fileName) {
--- 387,391 ----
  				     tr("Load set dialog"),
  				     tr("Choose set"));
! 
      // read the XML file and create DOM tree
      if(fileName) {
***************
*** 458,465 ****
      QPopupMenu *categoryMenu = new QPopupMenu;
      categoryMenu->insertItem(tr("New"), this, SLOT(newCategoryDialog()));
!     int deleteItem = categoryMenu->insertItem(tr("Delete"), this, 
  					      SLOT(deleteCategoryDialog()));
      categoryMenu->insertItem(tr("Load"), this, SLOT(loadCategoryDialog()));
!     int saveItem = categoryMenu->insertItem(tr("Save"), this, 
  					    SLOT(saveCategoryDialog()));
      if(!cat) {
--- 458,465 ----
      QPopupMenu *categoryMenu = new QPopupMenu;
      categoryMenu->insertItem(tr("New"), this, SLOT(newCategoryDialog()));
!     int deleteItem = categoryMenu->insertItem(tr("Delete"), this,
  					      SLOT(deleteCategoryDialog()));
      categoryMenu->insertItem(tr("Load"), this, SLOT(loadCategoryDialog()));
!     int saveItem = categoryMenu->insertItem(tr("Save"), this,
  					    SLOT(saveCategoryDialog()));
      if(!cat) {
***************
*** 473,481 ****
      int newItem = subcategoryMenu->insertItem(tr("New"), this,
  					      SLOT(newSubcategoryDialog()));
!     int deleteItem = subcategoryMenu->insertItem(tr("Delete"), this, 
  					     SLOT(deleteSubcategoryDialog()));
!     int loadItem = subcategoryMenu->insertItem(tr("Load"), this, 
  					       SLOT(loadSubcategoryDialog()));
!     int saveItem = subcategoryMenu->insertItem(tr("Save"), this, 
  					       SLOT(saveSubcategoryDialog()));
      if(!sub) {
--- 473,481 ----
      int newItem = subcategoryMenu->insertItem(tr("New"), this,
  					      SLOT(newSubcategoryDialog()));
!     int deleteItem = subcategoryMenu->insertItem(tr("Delete"), this,
  					     SLOT(deleteSubcategoryDialog()));
!     int loadItem = subcategoryMenu->insertItem(tr("Load"), this,
  					       SLOT(loadSubcategoryDialog()));
!     int saveItem = subcategoryMenu->insertItem(tr("Save"), this,
  					       SLOT(saveSubcategoryDialog()));
      if(!sub) {
***************
*** 483,487 ****
  	subcategoryMenu->setItemEnabled(saveItem, false);	
      }
!     if(!_currentQLVICategory 
         || !categoryListView->isSelected(_currentQLVICategory)) {
  	subcategoryMenu->setItemEnabled(newItem, false);
--- 483,487 ----
  	subcategoryMenu->setItemEnabled(saveItem, false);	
      }
!     if(!_currentQLVICategory
         || !categoryListView->isSelected(_currentQLVICategory)) {
  	subcategoryMenu->setItemEnabled(newItem, false);
***************
*** 494,511 ****
      QListViewItemPreset* preQ=(QListViewItemPreset*)pre;
      QPopupMenu *presetMenu = new QPopupMenu;
!     int newItem = presetMenu->insertItem(tr("New"), this, 
  					 SLOT(newPresetDialog()));
!     int deleteItem = presetMenu->insertItem(tr("Delete"), this, 
  					    SLOT(deletePresetDialog()));
!     int loadItem = presetMenu->insertItem(tr("Load"), this, 
  					  SLOT(loadPresetDialog()));
!     int saveItem = presetMenu->insertItem(tr("Save"), this, 
  					  SLOT(savePresetDialog()));
!     
      if(!preQ) {
  	presetMenu->setItemEnabled(deleteItem, false);
  	presetMenu->setItemEnabled(saveItem, false);	
      }
!     if(!_currentQLVISubcategory 
         || !subcategoryListView->isSelected(_currentQLVISubcategory)) {
  	presetMenu->setItemEnabled(newItem, false);
--- 494,511 ----
      QListViewItemPreset* preQ=(QListViewItemPreset*)pre;
      QPopupMenu *presetMenu = new QPopupMenu;
!     int newItem = presetMenu->insertItem(tr("New"), this,
  					 SLOT(newPresetDialog()));
!     int deleteItem = presetMenu->insertItem(tr("Delete"), this,
  					    SLOT(deletePresetDialog()));
!     int loadItem = presetMenu->insertItem(tr("Load"), this,
  					  SLOT(loadPresetDialog()));
!     int saveItem = presetMenu->insertItem(tr("Save"), this,
  					  SLOT(savePresetDialog()));
! 
      if(!preQ) {
  	presetMenu->setItemEnabled(deleteItem, false);
  	presetMenu->setItemEnabled(saveItem, false);	
      }
!     if(!_currentQLVISubcategory
         || !subcategoryListView->isSelected(_currentQLVISubcategory)) {
  	presetMenu->setItemEnabled(newItem, false);
***************
*** 520,525 ****
  void DeicsOnzeGui::newCategoryDialog() {
      int nhbank=_deicsOnze->_set->firstFreeHBank();
!     if(nhbank==-1) 
! 	QMessageBox::information(this, 
  				 tr("No more category supported"),
  				 tr("You can not add more categories"),
--- 520,525 ----
  void DeicsOnzeGui::newCategoryDialog() {
      int nhbank=_deicsOnze->_set->firstFreeHBank();
!     if(nhbank==-1)
! 	QMessageBox::information(this,
  				 tr("No more category supported"),
  				 tr("You can not add more categories"),
***************
*** 572,576 ****
  				     tr("Load category dialog"),
  				     tr("Choose preset"));
!     
      // read the XML file and create DOM tree
      if(fileName) {
--- 572,576 ----
  				     tr("Load category dialog"),
  				     tr("Choose preset"));
! 
      // read the XML file and create DOM tree
      if(fileName) {
***************
*** 649,653 ****
  	int nlbank=_currentQLVICategory->_category->firstFreeLBank();
  	if(nlbank==-1)
! 	    QMessageBox::information(this, 
  				     tr("No more subcategory supported"),
  				     tr("You can not add more subcategories"),
--- 649,653 ----
  	int nlbank=_currentQLVICategory->_category->firstFreeLBank();
  	if(nlbank==-1)
! 	    QMessageBox::information(this,
  				     tr("No more subcategory supported"),
  				     tr("You can not add more subcategories"),
***************
*** 703,707 ****
  				     tr("Load subcategory dialog"),
  				     tr("Choose subcategory"));
!     
      // read the XML file and create DOM tree
      if(fileName) {
--- 703,707 ----
  				     tr("Load subcategory dialog"),
  				     tr("Choose subcategory"));
! 
      // read the XML file and create DOM tree
      if(fileName) {
***************
*** 782,786 ****
  	int nprog=_currentQLVISubcategory->_subcategory->firstFreeProg();
  	if(nprog==-1)
! 	    QMessageBox::information(this, 
  				     tr("No more preset supported"),
  				     tr("You can not add more presets"),
--- 782,786 ----
  	int nprog=_currentQLVISubcategory->_subcategory->firstFreeProg();
  	if(nprog==-1)
! 	    QMessageBox::information(this,
  				     tr("No more preset supported"),
  				     tr("You can not add more presets"),
***************
*** 836,840 ****
  				     tr("Load preset dialog"),
  				     tr("Choose preset"));
!     
      // read the XML file and create DOM tree
      if(fileName) {
--- 836,840 ----
  				     tr("Load preset dialog"),
  				     tr("Choose preset"));
! 
      // read the XML file and create DOM tree
      if(fileName) {
***************
*** 1214,1218 ****
      for(std::vector<Category*>::iterator
  	    i=_deicsOnze->_set->_categoryVector.begin();
! 	i!=_deicsOnze->_set->_categoryVector.end(); i++) 
  	(void) new QListViewItemCategory
  	    (categoryListView, num3Digits((*i)->_hbank+1),
--- 1214,1218 ----
      for(std::vector<Category*>::iterator
  	    i=_deicsOnze->_set->_categoryVector.begin();
! 	i!=_deicsOnze->_set->_categoryVector.end(); i++)
  	(void) new QListViewItemCategory
  	    (categoryListView, num3Digits((*i)->_hbank+1),
***************
*** 1930,1934 ****
  	    Freq1SpinBox->blockSignals(true);
  	    Freq1SpinBox->setValue(val/100);
!                          //val/100 because it is still a coarse display 
  	    Freq1SpinBox->blockSignals(false);
  	    break;
--- 1930,1934 ----
  	    Freq1SpinBox->blockSignals(true);
  	    Freq1SpinBox->setValue(val/100);
!                          //val/100 because it is still a coarse display
  	    Freq1SpinBox->blockSignals(false);
  	    break;
***************
*** 2136,2140 ****
  	}
      }
!     else { 
  	updateSubcategoryName(QString("NONE"), false);
  	updateLBank(lbank, false);
--- 2136,2140 ----
  	}
      }
!     else {
  	updateSubcategoryName(QString("NONE"), false);
  	updateLBank(lbank, false);
***************
*** 2153,2157 ****
  	    _currentQLVIPreset=(QListViewItemPreset*) qpre;
  	}
! 	else {    
  	    updatePresetName(QString("INITVOICE"), false);
  	    updateProg(prog, false);
--- 2153,2157 ----
  	    _currentQLVIPreset=(QListViewItemPreset*) qpre;
  	}
! 	else {
  	    updatePresetName(QString("INITVOICE"), false);
  	    updateProg(prog, false);
***************
*** 2159,2163 ****
  	}
      }
!     else { 
  	updatePresetName(QString("INITVOICE"), false);
  	updateProg(prog, false);
--- 2159,2163 ----
  	}
      }
!     else {
  	updatePresetName(QString("INITVOICE"), false);
  	updateProg(prog, false);