commit 9e5d641e3d7c361f05ad6baf7f5de5805a91aa5a
parent 2b2742af9f16eb68982b1becdcea5fa0f88b623a
Author: fundamental <[email protected]>
Date: Thu, 12 Nov 2009 22:04:29 -0500
Nio: Added OssEngine and fixed numerous bugs
Diffstat:
11 files changed, 438 insertions(+), 58 deletions(-)
diff --git a/src/Misc/Master.cpp b/src/Misc/Master.cpp
@@ -34,6 +34,7 @@ Master::Master()
swaplr = 0;
pthread_mutex_init(&mutex, NULL);
+ pthread_mutex_init(&vumutex, NULL);
fft = new FFTwrapper(OSCIL_SIZE);
tmpmixl = new REALTYPE[SOUND_BUFFER_SIZE];
@@ -430,30 +431,31 @@ void Master::AudioOut(REALTYPE *outl, REALTYPE *outr)
}
//Peak computation (for vumeters)
- vuoutpeakl = 1e-12;
- vuoutpeakr = 1e-12;
+ pthread_mutex_lock(&vumutex);
+ vu.outpeakl = 1e-12;
+ vu.outpeakr = 1e-12;
for(i = 0; i < SOUND_BUFFER_SIZE; i++) {
- if(fabs(outl[i]) > vuoutpeakl)
- vuoutpeakl = fabs(outl[i]);
- if(fabs(outr[i]) > vuoutpeakr)
- vuoutpeakr = fabs(outr[i]);
- }
- if((vuoutpeakl > 1.0) || (vuoutpeakr > 1.0))
- vuclipped = 1;
- if(vumaxoutpeakl < vuoutpeakl)
- vumaxoutpeakl = vuoutpeakl;
- if(vumaxoutpeakr < vuoutpeakr)
- vumaxoutpeakr = vuoutpeakr;
+ if(fabs(outl[i]) > vu.outpeakl)
+ vu.outpeakl = fabs(outl[i]);
+ if(fabs(outr[i]) > vu.outpeakr)
+ vu.outpeakr = fabs(outr[i]);
+ }
+ if((vu.outpeakl > 1.0) || (vu.outpeakr > 1.0))
+ vu.clipped = 1;
+ if(vu.maxoutpeakl < vu.outpeakl)
+ vu.maxoutpeakl = vu.outpeakl;
+ if(vu.maxoutpeakr < vu.outpeakr)
+ vu.maxoutpeakr = vu.outpeakr;
//RMS Peak computation (for vumeters)
- vurmspeakl = 1e-12;
- vurmspeakr = 1e-12;
+ vu.rmspeakl = 1e-12;
+ vu.rmspeakr = 1e-12;
for(i = 0; i < SOUND_BUFFER_SIZE; i++) {
- vurmspeakl += outl[i] * outl[i];
- vurmspeakr += outr[i] * outr[i];
+ vu.rmspeakl += outl[i] * outl[i];
+ vu.rmspeakr += outr[i] * outr[i];
}
- vurmspeakl = sqrt(vurmspeakl / SOUND_BUFFER_SIZE);
- vurmspeakr = sqrt(vurmspeakr / SOUND_BUFFER_SIZE);
+ vu.rmspeakl = sqrt(vu.rmspeakl / SOUND_BUFFER_SIZE);
+ vu.rmspeakr = sqrt(vu.rmspeakr / SOUND_BUFFER_SIZE);
//Part Peak computation (for Part vumeters or fake part vumeters)
for(npart = 0; npart < NUM_MIDI_PARTS; npart++) {
@@ -473,6 +475,7 @@ void Master::AudioOut(REALTYPE *outl, REALTYPE *outr)
fakepeakpart[npart]--;
;
}
+ pthread_mutex_unlock(&vumutex);
//Shutup if it is asked (with fade-out)
@@ -579,6 +582,7 @@ Master::~Master()
delete (fft);
pthread_mutex_destroy(&mutex);
+ pthread_mutex_destroy(&vumutex);
}
@@ -634,13 +638,29 @@ void Master::ShutUp()
*/
void Master::vuresetpeaks()
{
- vuoutpeakl = 1e-9;
- vuoutpeakr = 1e-9;
- vumaxoutpeakl = 1e-9;
- vumaxoutpeakr = 1e-9;
- vuclipped = 0;
+ pthread_mutex_lock(&vumutex);
+ vu.outpeakl = 1e-9;
+ vu.outpeakr = 1e-9;
+ vu.maxoutpeakl = 1e-9;
+ vu.maxoutpeakr = 1e-9;
+ vu.clipped = 0;
+ pthread_mutex_unlock(&vumutex);
}
+vuData Master::getVuData()
+{
+ vuData tmp;
+ pthread_mutex_lock(&vumutex);
+ tmp.outpeakl=vu.outpeakl;
+ tmp.outpeakr=vu.outpeakr;
+ tmp.maxoutpeakl=vu.maxoutpeakl;
+ tmp.maxoutpeakr=vu.maxoutpeakr;
+ tmp.rmspeakl=vu.rmspeakl;
+ tmp.rmspeakr=vu.rmspeakr;
+ tmp.clipped=vu.clipped;
+ pthread_mutex_unlock(&vumutex);
+ return tmp;
+}
void Master::applyparameters()
diff --git a/src/Misc/Master.h b/src/Misc/Master.h
@@ -38,6 +38,13 @@
typedef enum { MUTEX_TRYLOCK, MUTEX_LOCK, MUTEX_UNLOCK } lockset;
extern Dump dump;
+
+typedef struct vuData_t {
+ REALTYPE outpeakl, outpeakr, maxoutpeakl, maxoutpeakr,
+ rmspeakl, rmspeakr;
+ int clipped;
+} vuData;
+
/** It sends Midi Messages to Parts, receives samples from parts,
* process them with system/insertion effects and mix them */
class Master
@@ -126,13 +133,14 @@ class Master
//part that's apply the insertion effect; -1 to disable
short int Pinsparts[NUM_INS_EFX];
+
//peaks for VU-meter
void vuresetpeaks();
- REALTYPE vuoutpeakl, vuoutpeakr, vumaxoutpeakl, vumaxoutpeakr,
- vurmspeakl, vurmspeakr;
- int vuclipped;
+ //get VU-meter data
+ vuData getVuData();
//peaks for part VU-meters
+ /**\todo synchronize this with a mutex*/
REALTYPE vuoutpeakpart[NUM_MIDI_PARTS];
unsigned char fakepeakpart[NUM_MIDI_PARTS]; //this is used to compute the "peak" when the part is disabled
@@ -148,8 +156,10 @@ class Master
FFTwrapper *fft;
pthread_mutex_t mutex;
-
+ pthread_mutex_t vumutex;
+
private:
+ vuData vu;
REALTYPE volume;
REALTYPE sysefxvol[NUM_SYS_EFX][NUM_MIDI_PARTS];
REALTYPE sysefxsend[NUM_SYS_EFX][NUM_SYS_EFX];
diff --git a/src/Nio/AudioOut.h b/src/Nio/AudioOut.h
@@ -21,11 +21,18 @@
#ifndef AUDIO_OUT_H
#define AUDIO_OUT_H
+#include "../Misc/Stereo.h"
+#include "../Samples/Sample.h"
+#include <queue>
+#include <pthread.h>
+#include "OutMgr.h"
+
+class AudioOut;
class AudioOut
{
public:
AudioOut();
- virtual ~AudioOut() { };
+ virtual ~AudioOut() {};
virtual bool openAudio()=0;
virtual bool Start()=0;
diff --git a/src/Nio/CMakeLists.txt b/src/Nio/CMakeLists.txt
@@ -1,4 +1,5 @@
set(zynaddsubfx_nio_SRCS
+ OssEngine.cpp
AlsaEngine.cpp
AudioOut.cpp
OutMgr.cpp
diff --git a/src/Nio/OssEngine.cpp b/src/Nio/OssEngine.cpp
@@ -0,0 +1,238 @@
+/*
+ ZynAddSubFX - a software synthesizer
+
+ OSSaudiooutput.C - Audio output for Open Sound System
+ Copyright (C) 2002-2005 Nasca Octavian Paul
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of version 2 of the GNU General Public License
+ as published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License (version 2 or later) for more details.
+
+ You should have received a copy of the GNU General Public License (version 2)
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <sys/soundcard.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <iostream>
+
+#include "OssEngine.h"
+#include "../Misc/Util.h"
+#include "../globals.h"
+using namespace std;
+
+OssEngine::OssEngine()
+{
+ current = Stereo<Sample>(Sample(SOUND_BUFFER_SIZE),
+ Sample(SOUND_BUFFER_SIZE));
+ int i;
+ int snd_bitsize = 16;
+ snd_fragment = 0x00080009; //fragment size (?)
+ snd_stereo = 1; //stereo
+ snd_format = AFMT_S16_LE;
+ snd_samplerate = SAMPLE_RATE;
+ playing_until.tv_sec = 0;
+ playing_until.tv_usec = 0;
+
+ smps = new short int[SOUND_BUFFER_SIZE * 2];
+ for(i = 0; i < SOUND_BUFFER_SIZE * 2; i++)
+ smps[i] = 0;
+
+ snd_handle = open(config.cfg.LinuxOSSWaveOutDev, O_WRONLY, 0);
+ cerr << config.cfg.LinuxOSSWaveOutDev << endl;
+ if(snd_handle == -1) {
+ cerr << "ERROR - I can't open the ";
+ cerr << config.cfg.LinuxOSSWaveOutDev << '.' << endl;
+ return;
+ }
+ ioctl(snd_handle, SNDCTL_DSP_RESET, NULL);
+
+ ioctl(snd_handle, SNDCTL_DSP_SETFMT, &snd_format);
+ ioctl(snd_handle, SNDCTL_DSP_STEREO, &snd_stereo);
+ ioctl(snd_handle, SNDCTL_DSP_SPEED, &snd_samplerate);
+ ioctl(snd_handle, SNDCTL_DSP_SAMPLESIZE, &snd_bitsize);
+ ioctl(snd_handle, SNDCTL_DSP_SETFRAGMENT, &snd_fragment);
+
+ pthread_mutex_init(&outBuf_mutex, NULL);
+ pthread_cond_init (&outBuf_cv, NULL);
+ manager = sysOut;
+}
+
+
+void OssEngine::out(const Stereo<Sample> smps)
+{
+ pthread_mutex_lock(&outBuf_mutex);
+ outBuf.push(smps);
+ if(outBuf.size()<10)
+ manager->requestSamples();
+ pthread_cond_signal(&outBuf_cv);
+ pthread_mutex_unlock(&outBuf_mutex);
+}
+
+void *OssEngine::_AudioThread(void *arg)
+{
+ return (static_cast<OssEngine*>(arg))->AudioThread();
+}
+
+
+void *OssEngine::AudioThread()
+{
+ manager->requestSamples();
+ manager->requestSamples();
+ manager->requestSamples();
+ manager->requestSamples();
+ manager->requestSamples();
+ manager->requestSamples();
+ manager->requestSamples();
+ set_realtime();
+ while (!threadStop)
+ {
+ //cout << "OssEngine THREAD" << endl;
+ const Stereo<Sample> smps = getNext();
+ //cout << smps.l()[3] << endl;
+ OSSout(smps.l().c_buf(),smps.r().c_buf());
+ }
+ return NULL;
+}
+//void OssEngine::out(const Stereo<Sample> smps)
+//{
+// OSSout(smps.l().
+
+/*
+ * Output the samples to the soundcard
+ * The samples are bigger than -1.0 and smaller 1.0
+ */
+void OssEngine::OSSout(const REALTYPE *smp_left, const REALTYPE *smp_right)
+{
+ outOut(smp_left,smp_right);
+ return;
+// if(snd_handle < 0) { //output could not be opened
+ struct timeval now;
+ int remaining = 0;
+ gettimeofday(&now, NULL);
+ if((playing_until.tv_usec == 0) && (playing_until.tv_sec == 0)) {
+ playing_until.tv_usec = now.tv_usec;
+ playing_until.tv_sec = now.tv_sec;
+ }
+ else {
+ remaining = (playing_until.tv_usec - now.tv_usec)
+ + (playing_until.tv_sec - now.tv_sec) * 1000000;
+ if(remaining > 10000) //Don't sleep() less than 10ms.
+ //This will add latency...
+ usleep(remaining - 10000);
+ if(remaining < 0)
+ cerr << "WARNING - too late" << endl;
+ }
+ playing_until.tv_usec += SOUND_BUFFER_SIZE * 1000000 / SAMPLE_RATE;
+ if(remaining < 0)
+ playing_until.tv_usec -= remaining;
+ playing_until.tv_sec += playing_until.tv_usec / 1000000;
+ playing_until.tv_usec %= 1000000;
+ return;
+// }
+}
+
+void OssEngine::outOut(const REALTYPE *smp_left, const REALTYPE *smp_right)
+{
+ //cout << "Oi" << smp_left[2] << smp_right[2] << endl;
+ int i;
+ REALTYPE l, r;
+ for(i = 0; i < SOUND_BUFFER_SIZE; i++) {
+ l = smp_left[i];
+ r = smp_right[i];
+
+ if(l < -1.0)
+ l = -1.0;
+ else
+ if(l > 1.0)
+ l = 1.0;
+ if(r < -1.0)
+ r = -1.0;
+ else
+ if(r > 1.0)
+ r = 1.0;
+
+ smps[i * 2] = (short int) (l * 32767.0);
+ smps[i * 2 + 1] = (short int) (r * 32767.0);
+ }
+ write(snd_handle, smps, SOUND_BUFFER_SIZE * 4); // *2 because is 16 bit, again * 2 because is stereo
+}
+
+OssEngine::~OssEngine()
+{
+ close(snd_handle);
+ delete [] smps;
+}
+
+const Stereo<Sample> OssEngine::getNext()
+{
+ Stereo<Sample> ans;
+ pthread_mutex_lock(&outBuf_mutex);
+ bool isEmpty =outBuf.empty();
+ pthread_mutex_unlock(&outBuf_mutex);
+ if(isEmpty)//fetch samples if possible
+ {
+ if(true)//FIXME care about locking state later on
+ //mgr.requestSamples()!=-1)//samples are being prepared
+ {
+ manager->requestSamples();
+ //pthread_mutex_lock(&outBuf_mutex);
+ //pthread_cond_wait(&outBuf_cv, &outBuf_mutex);
+ //ans = outBuf.front();
+ //outBuf.pop();
+ //pthread_mutex_unlock(&outBuf_mutex);
+ return current;
+ }
+ }
+ else
+ {
+ pthread_mutex_lock(&outBuf_mutex);
+ if(outBuf.size()<10)
+ manager->requestSamples();
+ ans = outBuf.front();
+ outBuf.pop();
+ pthread_mutex_unlock(&outBuf_mutex);
+ }
+ current=ans;
+ return ans;
+}
+
+bool OssEngine::Start()
+{
+ int chk;
+ pthread_attr_t attr;
+ threadStop = false;
+ pthread_attr_init(&attr);
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+ pthread_create(&pThread, &attr, _AudioThread, this);
+
+ return true;
+}
+
+void OssEngine::Stop(void)
+{
+ threadStop = true;
+}
+
+void OssEngine::Close()
+{
+ Stop();
+}
+
+bool OssEngine::openAudio()
+{
+ return true;
+}
diff --git a/src/Nio/OssEngine.h b/src/Nio/OssEngine.h
@@ -0,0 +1,79 @@
+/*
+ ZynAddSubFX - a software synthesizer
+
+ OSSaudiooutput.h - Audio output for Open Sound System
+ Copyright (C) 2002-2005 Nasca Octavian Paul
+ Author: Nasca Octavian Paul
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of version 2 of the GNU General Public License
+ as published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License (version 2 or later) for more details.
+
+ You should have received a copy of the GNU General Public License (version 2)
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+*/
+
+#ifndef OSS_ENGINE_H
+#define OSS_ENGINE_H
+
+#include <sys/time.h>
+#include "../globals.h"
+#include "AudioOut.h"
+
+class OssEngine: public AudioOut
+{
+ public:
+ OssEngine();
+ ~OssEngine();
+
+ //the out is [-1.0 .. 1.0]
+ /* smp_left[] and smp_right[] has the size of SOUND_BUFFER_SIZE */
+
+ bool openAudio();
+ bool Start();
+ void Stop();
+ void Close();
+
+ void out(const Stereo<Sample> smps);
+
+ protected:
+ void *AudioThread();
+ static void *_AudioThread(void *arg);
+
+ private:
+
+ /**Get the next sample for output.*/
+ const Stereo<Sample> getNext();
+ void OSSout(const REALTYPE *smp_left, const REALTYPE *smp_right);
+ void outOut(const REALTYPE *smp_left, const REALTYPE *smp_right);
+ int snd_handle;
+ int snd_fragment;
+ int snd_stereo;
+ int snd_format;
+ int snd_samplerate;
+ struct timeval playing_until;
+
+ short int *smps; //Samples to be sent to soundcard
+ bool threadStop;
+
+ //outside audio interface
+ std::queue<Stereo<Sample> > outBuf;
+
+ const Sample * curSmp;
+ Stereo<Sample> current;
+ pthread_mutex_t outBuf_mutex;
+ pthread_cond_t outBuf_cv;
+ pthread_t pThread;
+
+ OutMgr *manager;
+};
+
+#endif
+
diff --git a/src/Nio/OutMgr.cpp b/src/Nio/OutMgr.cpp
@@ -25,6 +25,14 @@ OutMgr::OutMgr(Master *nmaster)
outl = new REALTYPE[SOUND_BUFFER_SIZE];
};
+OutMgr::~OutMgr()
+{
+ running = false;
+ pthread_mutex_lock(&close_m);
+ pthread_cond_wait(&close_cond, &close_m);
+ pthread_mutex_unlock(&close_m);
+}
+
void *_outputThread(void *arg)
{
return (static_cast<OutMgr*>(arg))->outputThread();
@@ -33,32 +41,37 @@ void *_outputThread(void *arg)
void *OutMgr::outputThread()
{
pthread_mutex_lock(&mutex);
- cout << "run start" << endl;
+ //cout << "run start" << endl;
for(int i = 0; i < outs.size(); ++i)
outs[i]->Start();
- cout << "running" << endl;
+ //cout << "running" << endl;
pthread_mutex_unlock(&mutex);
running=true;
init=true;
while(running){
- cout << "OutMgr THREAD" << endl;
+ //cout << "OutMgr THREAD" << endl;
pthread_mutex_lock(&processing);
- cout << "OutMgr wait" << endl;
- if(init||pthread_cond_wait(&needsProcess, &processing));
- //init=false;FIXME
+ //cout << "OutMgr wait" << endl;
+ pthread_cond_wait(&needsProcess, &processing);
//make master use samples
- cout << "have some food" << endl;
+ //cout << "have some food" << endl;
+ pthread_mutex_lock(&(master->mutex));
master->AudioOut(outl,outr);
+ pthread_mutex_unlock(&(master->mutex));
smps = Stereo<Sample>(Sample(SOUND_BUFFER_SIZE, outl),
- Sample(SOUND_BUFFER_SIZE, outr));
+ Sample(SOUND_BUFFER_SIZE, outr));
+ //cout << "Samp: " << outl[2] << outr[2] << endl;
pthread_mutex_unlock(&processing);
-
+
pthread_mutex_lock(&mutex);
for(int i = 0; i < outs.size(); ++i)
outs[i]->out(smps);
pthread_mutex_unlock(&mutex);
}
+ pthread_mutex_lock(&close_m);
+ pthread_cond_signal(&close_cond);
+ pthread_mutex_unlock(&close_m);
return NULL;
}
@@ -90,10 +103,10 @@ int OutMgr::remove(AudioOut *out)
int OutMgr::requestSamples()
{
- cout << "me hungry" << endl;
+ //cout << "me hungry" << endl;
pthread_mutex_lock(&processing);
pthread_cond_signal(&needsProcess);
- cout << "me start fire" << endl;
+ //cout << "me start fire" << endl;
pthread_mutex_unlock(&processing);
}
diff --git a/src/Nio/OutMgr.h b/src/Nio/OutMgr.h
@@ -18,10 +18,13 @@
// WAV_OUTPUT;
//} outputDriver;
+class AudioOut;
+
class OutMgr
{
public:
OutMgr(Master *nmaster);
+ ~OutMgr();
/**Adds audio output out.
* @return -1 for error 0 otherwise*/
int add(AudioOut *out);
@@ -49,6 +52,9 @@ class OutMgr
pthread_t outThread;
pthread_cond_t needsProcess;
+ /**for closing*/
+ pthread_mutex_t close_m;
+ pthread_cond_t close_cond;
/**Buffer*/
Stereo<Sample> smps;
REALTYPE *outl;
diff --git a/src/Samples/Sample.h b/src/Samples/Sample.h
@@ -55,7 +55,7 @@ class Sample
*
* This method is like c_str() from the string class and should be used
* sparingly*/
- const REALTYPE *c_buf() {
+ const REALTYPE *c_buf() const{
return buffer;
}
REALTYPE max() const;
diff --git a/src/UI/MasterUI.fl b/src/UI/MasterUI.fl
@@ -81,15 +81,17 @@ oldrmsdbr=0.0;} {}
int ox=x(); int oy=y(); int lx=w(); int ly=h();
-pthread_mutex_lock(&master->mutex);
-REALTYPE dbl=rap2dB(master->vuoutpeakl);
-REALTYPE dbr=rap2dB(master->vuoutpeakr);
-REALTYPE rmsdbl=rap2dB(master->vurmspeakl);
-REALTYPE rmsdbr=rap2dB(master->vurmspeakr);
-REALTYPE maxdbl=rap2dB(master->vumaxoutpeakl);
-REALTYPE maxdbr=rap2dB(master->vumaxoutpeakr);
-int clipped=master->vuclipped;
-pthread_mutex_unlock(&master->mutex);
+vuData data = master->getVuData();
+
+//pthread_mutex_lock(&master->mutex);
+REALTYPE dbl=rap2dB(data.outpeakl);
+REALTYPE dbr=rap2dB(data.outpeakr);
+REALTYPE rmsdbl=rap2dB(data.rmspeakl);
+REALTYPE rmsdbr=rap2dB(data.rmspeakr);
+REALTYPE maxdbl=rap2dB(data.maxoutpeakl);
+REALTYPE maxdbr=rap2dB(data.maxoutpeakr);
+int clipped=data.clipped;
+//pthread_mutex_unlock(&master->mutex);
dbl=(MIN_DB-dbl)/MIN_DB;
if (dbl<0.0) dbl=0.0;
@@ -414,8 +416,7 @@ panellistitemgroup->redraw();} {}
}
class MasterUI {} {
- Function {make_window()} {selected
- } {
+ Function {make_window()} {} {
Fl_Window masterwindow {
label zynaddsubfx
callback {\#ifdef VSTAUDIOOUT
@@ -1723,8 +1724,9 @@ pthread_mutex_lock(&master->mutex);
//load the data
int result=master->loadXML(filename);
-pthread_mutex_unlock(&master->mutex);
+
master->applyparameters();
+pthread_mutex_unlock(&master->mutex);
npartcounter->value(1);
refresh_master_ui();
@@ -1733,7 +1735,8 @@ if (result>=0) setfilelabel(filename);
if (result==-10) fl_alert("Error: Could not load the file\\nbecause it is not a zynaddsubfx parameters file.");
- else if (result<0) fl_alert("Error: Could not load the file.");} {}
+ else if (result<0) fl_alert("Error: Could not load the file.");} {selected
+ }
}
Function {do_save_master(const char* file = NULL)} {} {
code {const char *filename;
diff --git a/src/main.cpp b/src/main.cpp
@@ -82,7 +82,9 @@ int swaplr = 0; //1 for left-right swapping
bool usejackit = false;
#ifdef NEW_IO
+#include "Nio/AudioOut.h"//temporary include
#include "Nio/AlsaEngine.h"//temporary include
+#include "Nio/OssEngine.h"//temporary include
#include "Nio/OutMgr.h"
#endif
@@ -129,7 +131,7 @@ void *thread1(void *arg)
note = cmdparams[0];
vel = cmdparams[1];
- pthread_mutex_lock(&master->mutex);
+ // pthread_mutex_lock(&master->mutex);
if((cmdtype == MidiNoteON) && (note != 0))
master->NoteOn(cmdchan, note, vel);
@@ -138,7 +140,7 @@ void *thread1(void *arg)
if(cmdtype == MidiController)
master->SetController(cmdchan, cmdparams[0], cmdparams[1]);
- pthread_mutex_unlock(&master->mutex);
+ //pthread_mutex_unlock(&master->mutex);
}
return 0;
@@ -682,8 +684,9 @@ int main(int argc, char *argv[])
#ifdef NEW_IO
sysOut = new OutMgr(master);
- AlsaEngine *tmp = new AlsaEngine();
- tmp->openAudio();
+ //AlsaEngine *tmp = new AlsaEngine();
+ AudioOut *tmp = new OssEngine();
+ //tmp->openAudio();
sysOut->add(tmp);
sysOut->run();
