Permalink
Browse files

Move audiostream_pa.cpp to from common to qtclient

Only qtclient should depend on PortAudio.  Remove the dependency from
common code by moving audiostream_pa.cpp to qtclient.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
  • Loading branch information...
stefanha committed Jan 16, 2017
1 parent 81dac50 commit ad844e555ce1d4ca6f5c96af37899aeb6e074618
View
@@ -46,9 +46,4 @@ class audioStreamer
typedef void (*SPLPROC)(float **inbuf, int innch, float **outbuf, int outnch, int len, int srate);
audioStreamer *create_audioStreamer_PortAudio(const char *hostAPI,
const char *inputDevice, const char *outputDevice,
double sampleRate, double latency, SPLPROC proc);
bool portAudioInit();
#endif
View
@@ -9,8 +9,7 @@ mac {
}
QMAKE_CXXFLAGS += -Wno-write-strings
SOURCES = audiostream_pa.cpp \
mpb.cpp \
SOURCES = mpb.cpp \
netmsg.cpp \
njclient.cpp \
njmisc.cpp \
View
@@ -40,6 +40,7 @@
#include "EffectProcessor.h"
#include "EffectSettingsPage.h"
#include "UISettingsPage.h"
#include "audiostream_pa.h"
#include "screensleep.h"
#include "common/njmisc.h"
#include "common/UserPrivs.h"
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <portaudio.h>
#include <QtGlobal>
#include "audiostream.h"
#include "common/audiostream.h"
static void logPortAudioError(const char *msg, PaError error)
{
View
@@ -0,0 +1,29 @@
/*
Copyright (C) 2012-2017 Stefan Hajnoczi <stefanha@gmail.com>
Wahjam 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.
Wahjam 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 Wahjam; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef _AUDIOSTREAM_PA_H_
#define _AUDIOSTREAM_PA_H_
#include "common/audiostream.h"
audioStreamer *create_audioStreamer_PortAudio(const char *hostAPI,
const char *inputDevice, const char *outputDevice,
double sampleRate, double latency, SPLPROC proc);
bool portAudioInit();
#endif /* _AUDIOSTREAM_PA_H_ */
View
@@ -24,7 +24,7 @@
#include <QTextCodec>
#include "logging.h"
#include "common/audiostream.h"
#include "audiostream_pa.h"
#include "PortMidiStreamer.h"
#include "MainWindow.h"
View
@@ -104,6 +104,7 @@ HEADERS += JammrAccessControlDialog.h
HEADERS += JammrUpdateChecker.h
HEADERS += NINJAMServerBrowser.h
HEADERS += logging.h
HEADERS += audiostream_pa.h
HEADERS += EffectPlugin.h
HEADERS += VSTPlugin.h
mac:HEADERS += PmEventParser.h
@@ -134,6 +135,7 @@ SOURCES += JammrAccessControlDialog.cpp
SOURCES += JammrUpdateChecker.cpp
SOURCES += NINJAMServerBrowser.cpp
SOURCES += logging.cpp
SOURCES += audiostream_pa.cpp
SOURCES += EffectPlugin.cpp
SOURCES += VSTPlugin.cpp
mac:SOURCES += PmEventParser.cpp

0 comments on commit ad844e5

Please sign in to comment.