summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse/muse/audiooutput.cpp12
-rw-r--r--muse/muse/audiooutput.h2
-rw-r--r--muse/muse/audiotrack.cpp1
3 files changed, 13 insertions, 2 deletions
diff --git a/muse/muse/audiooutput.cpp b/muse/muse/audiooutput.cpp
index ba02813a..abde7f5a 100644
--- a/muse/muse/audiooutput.cpp
+++ b/muse/muse/audiooutput.cpp
@@ -19,7 +19,6 @@
//=============================================================================
#include "audiooutput.h"
-// #include "driver/alsamidi.h"
#include "driver/jackaudio.h"
#include "audio.h"
#include "globals.h"
@@ -197,6 +196,15 @@ void AudioOutput::process()
{
AudioTrack::process();
+ for (int c = 0; c < channels(); ++c) {
+ float* sp = buffer[c];
+if (jackPorts[c] == 0)
+ abort();
+ float* dp = audioDriver->getBuffer(jackPorts[c], segmentSize);
+ for (unsigned k = 0; k < segmentSize; ++k)
+ *dp++ = *sp++;
+ }
+#if 0
int n = segmentSize;
if (audio->isRecording() && recordFlag() && _recFile) {
// bounce to file
@@ -205,6 +213,8 @@ void AudioOutput::process()
else
putFifo(channels(), n, buffer);
}
+#endif
+
#if 0
if (audioClickFlag && song->click() && metronome) {
float b[n];
diff --git a/muse/muse/audiooutput.h b/muse/muse/audiooutput.h
index ca4a9792..40eb6362 100644
--- a/muse/muse/audiooutput.h
+++ b/muse/muse/audiooutput.h
@@ -31,7 +31,7 @@ class AudioOutput : public AudioTrack {
Q_OBJECT
void* jackPorts[MAX_CHANNELS];
- float* buffer[MAX_CHANNELS];
+// float* buffer[MAX_CHANNELS];
unsigned long _nframes;
float* _monitorBuffer[MAX_CHANNELS];
diff --git a/muse/muse/audiotrack.cpp b/muse/muse/audiotrack.cpp
index 711bdf78..45395d94 100644
--- a/muse/muse/audiotrack.cpp
+++ b/muse/muse/audiotrack.cpp
@@ -449,6 +449,7 @@ void AudioTrack::process()
setMeter(i, meter);
}
}
+
double vol[channels()];
double _volume = _mute ? 0.0 : ctrlVal(AC_VOLUME).f;
double _pan = ctrlVal(AC_PAN).f;