diff --git a/src/audio/audiodriversportaudio.cpp b/src/audio/audiodriversportaudio.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..f03effe58fc4da600607e39e4e9dfa36a319153e
--- /dev/null
+++ b/src/audio/audiodriversportaudio.cpp
@@ -0,0 +1,220 @@
+/**
+ * Copyright (C) 2005 Savoir-Faire Linux inc.
+ * Author: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifdef AUDIO_PORTAUDIO
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "audiodriversportaudio.h"
+#include "../global.h"
+#include "../manager.h"
+
+AudioDriversPortAudio::AudioDriversPortAudio (Manager* manager) {
+ _manager = manager;
+ mydata.dataToAddRem = 0;
+ mydata.dataFilled = 0;
+ mydata.dataIn = NULL;
+ mydata.dataOut = NULL;
+ this->initDevice();
+}
+
+// Destructor
+AudioDriversPortAudio::~AudioDriversPortAudio (void)
+{
+ closeDevice();
+ Pa_Terminate ();
+}
+
+int
+AudioDriversPortAudio::resetDevice (void) {
+ return 1;
+}
+
+int
+AudioDriversPortAudio::initDevice (void) {
+ int err;
+
+ err = Pa_Initialize();
+ if (err != paNoError) {
+ _debug ("PortAudio error in Pa_Initialize(): %s\n", Pa_GetErrorText(err));
+ exit (1);
+ //TODO: change exit to a clean GUI dialog (fatal).
+ }
+ return 1;
+}
+
+int
+AudioDriversPortAudio::closeDevice (void) {
+ int err = Pa_CloseStream(_stream);
+ if (err != paNoError) {
+ _debug ("PortAudio error in Pa_CloseStream: %s\n", Pa_GetErrorText(err));
+ exit (1);
+ //TODO: change exit to a clean GUI dialog (fatal).
+ }
+ return 1;
+}
+
+bool
+AudioDriversPortAudio::openDevice (void) {
+ int err = Pa_OpenDefaultStream (
+ &_stream, /* passes back stream pointer */
+ 1, /* mono input */
+ 1, /* mono output */
+ paFloat32, /* 32 bit float output */
+ SAMPLING_RATE, /* sample rate */
+ FRAME_PER_BUFFER, /* frames per buffer */
+ audioCallback, /* specify our custom callback */
+ &mydata); /* pass our data through to callback */
+
+ if (err != paNoError) {
+ _debug ("PortAudio error in Pa_OpenDefaultStream: %s\n", Pa_GetErrorText(err));
+ exit (1);
+ //TODO: change exit to a clean GUI dialog (fatal).
+ }
+ return true;
+}
+
+
+int
+AudioDriversPortAudio::readBuffer (void *ptr, int bytes) {
+ return 1;
+}
+
+int
+AudioDriversPortAudio::writeBuffer (void *ptr, int len) {
+ return 1;
+}
+
+int
+AudioDriversPortAudio::startStream(void)
+{
+ int err;
+
+ err = Pa_StartStream (_stream);
+ if( err != paNoError ) {
+ _debug ("PortAudio error in Pa_StartStream: %s\n", Pa_GetErrorText(err));
+ return 0;
+ }
+
+ return 1;
+}
+
+int
+AudioDriversPortAudio::stopStream(void)
+{
+ int err;
+
+ err = Pa_StopStream (_stream);
+ if( err != paNoError ) {
+ _debug ("PortAudio error in Pa_StopStream: %s\n", Pa_GetErrorText(err));
+ return 0;
+ }
+ return 1;
+}
+
+void
+AudioDriversPortAudio::sleep(int msec)
+{
+ Pa_Sleep(msec);
+}
+
+int
+AudioDriversPortAudio::isStreamActive (void)
+{
+ return Pa_IsStreamActive (_stream);
+}
+
+int
+AudioDriversPortAudio::isStreamStopped (void)
+{
+ return Pa_IsStreamStopped (_stream);
+}
+
+int
+AudioDriversPortAudio::getDeviceCount (void)
+{
+ return Pa_GetDeviceCount();
+}
+
+int
+AudioDriversPortAudio::audioCallback (const void *inputBuffer,
+ void *outputBuffer,
+ unsigned long framesPerBuffer,
+ const PaStreamCallbackTimeInfo* timeInfo,
+ PaStreamCallbackFlags statusFlags,
+ void *userData) {
+ (void) timeInfo;
+ (void) statusFlags;
+
+ float32 *in = (float32 *) inputBuffer;
+ float32 *out = (float32 *) outputBuffer;
+
+ paData* data = (paData*) userData;
+ unsigned int i;
+
+#if 1
+ /* Fill output buffer */
+ int j = data->dataToAddRem;
+ int k = data->dataFilled;
+ for (i = 0; i < framesPerBuffer; i++) {
+ if (j > 0 && k < j) {
+ *out++ = data->dataToAdd[i+k];
+ } else {
+ *out++ = data->dataOut[i];
+ }
+ }
+ k += framesPerBuffer;
+ if (k >= j) {
+ data->dataFilled = 0;
+ } else {
+ data->dataFilled = k;
+ }
+#endif
+
+ /* Read input buffer */
+ if (data->dataIn != NULL) {
+ memcpy (data->dataIn, in, sizeof(float32) * framesPerBuffer);
+ }
+
+#if 0
+ int j = data->dataToAddRem;
+ /* Fill output buffer */
+ for (i = 0; i < framesPerBuffer; i++) {
+ if (j > 0 && j >= i) {
+ *out++ = data->dataToAdd[j-i];
+ } else {
+ *out++ = data->dataOut[i];
+ }
+ }
+
+ j = j - i;
+ if (j > 0) {
+ data->dataToAddRem = j;
+ } else {
+ data->dataToAddRem = 0;
+ // cout << "please FREE data->dataToAdd now!!!" << endl;
+ }
+
+#endif
+ return paContinue;
+}
+#endif // defined(AUDIO_PORTAUDIO)
+
diff --git a/src/audio/audiodriversportaudio.h b/src/audio/audiodriversportaudio.h
new file mode 100644
index 0000000000000000000000000000000000000000..4e9d1582a8b3b25e383ee8b665641f2b50dc040b
--- /dev/null
+++ b/src/audio/audiodriversportaudio.h
@@ -0,0 +1,69 @@
+/**
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#if defined(AUDIO_PORTAUDIO)
+
+#ifndef _AUDIO_DRIVERS_PORTAUDIO_H
+#define _AUDIO_DRIVERS_PORTAUDIO_H
+
+#include "portaudio/pa_common/portaudio.h"
+#include "../global.h"
+
+#define TABLE_SIZE 360
+#define FRAME_PER_BUFFER 160
+
+class Manager;
+class AudioDriversPortAudio {
+public:
+ struct paData {
+ float32 *dataIn; // From mic
+ float32 *dataOut; // To spk
+ float32 *dataToAdd; // To spk
+ int dataToAddRem;
+ int dataFilled;
+ };
+ paData mydata;
+
+ AudioDriversPortAudio (Manager*);
+ ~AudioDriversPortAudio (void);
+
+ int resetDevice (void);
+ int initDevice (void);
+ bool openDevice (void);
+ int writeBuffer (void *, int);
+ int readBuffer (void *, int);
+ int startStream (void);
+ int stopStream (void);
+ void sleep (int);
+ int isStreamActive (void);
+ int isStreamStopped (void);
+ int getDeviceCount (void);
+
+ static int audioCallback (const void *, void *, unsigned long,
+ const PaStreamCallbackTimeInfo*, PaStreamCallbackFlags, void *);
+
+private:
+ int closeDevice (void);
+ Manager* _manager;
+ PaStream* _stream;
+};
+
+#endif // _AUDIO_DRIVERS_PORTAUDIO_H_
+
+#endif // defined(AUDIO_PORTAUDIO)