[Lmuse-cvs-traffic] muse/muse audio.cpp,1.125,1.126 audioaux.cpp,1.3,1.4 audioinput.cpp,1.7,1.8 audiotrack.cpp,1.53,1.54 plugingui.cpp,1.33,1.34 wavetrack.cpp,1.37,1.38

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

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

Modified Files:
	audio.cpp audioaux.cpp audioinput.cpp audiotrack.cpp 
	plugingui.cpp wavetrack.cpp 
Log Message:
updates


Index: audioinput.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/audioinput.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** audioinput.cpp	21 Apr 2006 12:16:56 -0000	1.7
--- audioinput.cpp	22 Apr 2006 12:41:32 -0000	1.8
***************
*** 162,165 ****
--- 162,166 ----
  void AudioInput::collectInputData()
        {
+       bufferEmpty = false;
        for (int ch = 0; ch < channels(); ++ch) {
              void* jackPort = jackPorts[ch];

Index: audiotrack.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/audiotrack.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** audiotrack.cpp	21 Apr 2006 12:16:56 -0000	1.53
--- audiotrack.cpp	22 Apr 2006 12:41:32 -0000	1.54
***************
*** 392,398 ****
  void AudioTrack::process()
        {
!       bufferEmpty = false;
!       if (_off)
              return;
        collectInputData();
  
--- 392,399 ----
  void AudioTrack::process()
        {
!       if (_off) {
!             bufferEmpty = true;
              return;
+             }
        collectInputData();
  
***************
*** 409,421 ****
        double vol[2];
        double _volume = ctrlVal(AC_VOLUME).f;
!     	if (_volume == 0.0) {
              for (int i = 0; i < channels(); ++i)
                    setMeter(i, 0.0);
-             bufferEmpty = true;
              }
        else {
  	      double _pan = ctrlVal(AC_PAN).f;
!       	vol[0] = _volume * (1.0 - _pan);
! 	      vol[1] = _volume * (1.0 + _pan);
  
  		for (int i = 0; i < channels(); ++i) {
--- 410,421 ----
        double vol[2];
        double _volume = ctrlVal(AC_VOLUME).f;
!     	if (_volume == 0.0 || bufferEmpty) {
              for (int i = 0; i < channels(); ++i)
                    setMeter(i, 0.0);
              }
        else {
  	      double _pan = ctrlVal(AC_PAN).f;
!       	vol[0]      = _volume * (1.0 - _pan);
! 	      vol[1]      = _volume * (1.0 + _pan);
  
  		for (int i = 0; i < channels(); ++i) {
***************
*** 529,532 ****
--- 529,533 ----
  void AudioTrack::collectInputData()
        {
+       bufferEmpty = false;
        RouteList* rl = inRoutes();
        bool copy = true;
***************
*** 547,550 ****
--- 548,552 ----
              for (int i = 0; i < channels(); ++i)
                    memset(buffer[i], 0, sizeof(float) * segmentSize);
+             bufferEmpty = true;
  	      }
        }

Index: audioaux.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/audioaux.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** audioaux.cpp	21 Apr 2006 17:16:56 -0000	1.3
--- audioaux.cpp	22 Apr 2006 12:41:32 -0000	1.4
***************
*** 69,72 ****
--- 69,73 ----
  void AudioAux::collectInputData()
  	{
+       bufferEmpty = false;
        int ctrl = AC_AUX;
        AuxList* al = song->auxs();          // aux sends
***************
*** 97,100 ****
--- 98,102 ----
        	for (int i = 0; i < channels(); ++i)
              	memset(buffer[i], 0, sizeof(float) * segmentSize);
+             bufferEmpty = true;
              }
        }

Index: wavetrack.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/wavetrack.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** wavetrack.cpp	21 Apr 2006 12:16:56 -0000	1.37
--- wavetrack.cpp	22 Apr 2006 12:41:32 -0000	1.38
***************
*** 292,295 ****
--- 292,296 ----
  void WaveTrack::collectInputData()
  	{
+       bufferEmpty = false;
        if (recordFlag() && (audio->isRecording() || !audio->isPlaying())) {
        	if (song->bounceTrack == this && audio->isPlaying()) {

Index: audio.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/audio.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** audio.cpp	21 Apr 2006 12:16:56 -0000	1.125
--- audio.cpp	22 Apr 2006 12:41:32 -0000	1.126
***************
*** 508,513 ****
        	            printf("PANIC: process(): no buffer from audio driver\n");
                    }
!       	if (!ao->multiplyCopy(och, buffer))
!                   printf("ZERO BUFFER missing\n");
              }
        if (_bounce == 1 && song->bounceTrack && song->bounceTrack->type() == Track::WAVE)
--- 508,515 ----
        	            printf("PANIC: process(): no buffer from audio driver\n");
                    }
!       	if (!ao->multiplyCopy(och, buffer)) {
!                   for (int i = 0; i < och; ++i)
!                         memset(buffer[i], 0, sizeof(float) * frames);
!                   }
              }
        if (_bounce == 1 && song->bounceTrack && song->bounceTrack->type() == Track::WAVE)

Index: plugingui.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/plugingui.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** plugingui.cpp	25 Jan 2006 16:24:32 -0000	1.33
--- plugingui.cpp	22 Apr 2006 12:41:32 -0000	1.34
***************
*** 372,381 ****
              setCentralWidget(mw);
              connectPrebuiltGui(mw);
- 
              }
        else {
              mw = new QWidget(this);
              setCentralWidget(mw);
!             QGridLayout* grid = new QGridLayout(mw);
              grid->setSpacing(2);
  
--- 372,381 ----
              setCentralWidget(mw);
              connectPrebuiltGui(mw);
              }
        else {
              mw = new QWidget(this);
              setCentralWidget(mw);
!             QGridLayout* grid = new QGridLayout;
!             mw->setLayout(grid);
              grid->setSpacing(2);