prepare for JACK MIDI support
This commit is contained in:
parent
29688d1cc5
commit
718a6f9f83
|
@ -290,7 +290,7 @@ endif()
|
||||||
if (WITH_JACK)
|
if (WITH_JACK)
|
||||||
find_package(PkgConfig REQUIRED)
|
find_package(PkgConfig REQUIRED)
|
||||||
pkg_check_modules(JACK REQUIRED jack)
|
pkg_check_modules(JACK REQUIRED jack)
|
||||||
list(APPEND AUDIO_SOURCES src/audio/jack.cpp)
|
list(APPEND AUDIO_SOURCES src/audio/jack.cpp src/audio/jackmidi.cpp)
|
||||||
list(APPEND DEPENDENCIES_INCLUDE_DIRS ${JACK_INCLUDE_DIRS})
|
list(APPEND DEPENDENCIES_INCLUDE_DIRS ${JACK_INCLUDE_DIRS})
|
||||||
list(APPEND DEPENDENCIES_DEFINES HAVE_JACK)
|
list(APPEND DEPENDENCIES_DEFINES HAVE_JACK)
|
||||||
list(APPEND DEPENDENCIES_COMPILE_OPTIONS ${JACK_CFLAGS_OTHER})
|
list(APPEND DEPENDENCIES_COMPILE_OPTIONS ${JACK_CFLAGS_OTHER})
|
||||||
|
|
|
@ -55,6 +55,10 @@ bool TAAudio::init(TAAudioDesc& request, TAAudioDesc& response) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unsigned char TAAudio::getID() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
TAAudio::~TAAudio() {
|
TAAudio::~TAAudio() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -255,3 +255,8 @@ bool TAAudioJACK::init(TAAudioDesc& request, TAAudioDesc& response) {
|
||||||
initialized=true;
|
initialized=true;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
unsigned char TAAudioJACK::getID() {
|
||||||
|
return 'J';
|
||||||
|
}
|
|
@ -21,6 +21,42 @@
|
||||||
#include <jack/weakjack.h>
|
#include <jack/weakjack.h>
|
||||||
#include <jack/jack.h>
|
#include <jack/jack.h>
|
||||||
|
|
||||||
|
class TAMidiInJACK: public TAMidiIn {
|
||||||
|
jack_client_t* ac;
|
||||||
|
jack_port_t* port;
|
||||||
|
bool isOpen;
|
||||||
|
public:
|
||||||
|
bool gather();
|
||||||
|
bool isDeviceOpen();
|
||||||
|
bool openDevice(String name);
|
||||||
|
bool closeDevice();
|
||||||
|
std::vector<String> listDevices();
|
||||||
|
bool quit();
|
||||||
|
bool init();
|
||||||
|
TAMidiInJACK(jack_client_t* client):
|
||||||
|
ac(client),
|
||||||
|
port(NULL),
|
||||||
|
isOpen(false) {}
|
||||||
|
};
|
||||||
|
|
||||||
|
class TAMidiOutJACK: public TAMidiOut {
|
||||||
|
jack_client_t* ac;
|
||||||
|
jack_port_t* port;
|
||||||
|
bool isOpen;
|
||||||
|
public:
|
||||||
|
bool send(const TAMidiMessage& what);
|
||||||
|
bool isDeviceOpen();
|
||||||
|
bool openDevice(String name);
|
||||||
|
bool closeDevice();
|
||||||
|
std::vector<String> listDevices();
|
||||||
|
bool quit();
|
||||||
|
bool init();
|
||||||
|
TAMidiOutJACK(jack_client_t* client):
|
||||||
|
ac(client),
|
||||||
|
port(NULL),
|
||||||
|
isOpen(false) {}
|
||||||
|
};
|
||||||
|
|
||||||
class TAAudioJACK: public TAAudio {
|
class TAAudioJACK: public TAAudio {
|
||||||
jack_client_t* ac;
|
jack_client_t* ac;
|
||||||
jack_port_t** ai;
|
jack_port_t** ai;
|
||||||
|
@ -40,6 +76,7 @@ class TAAudioJACK: public TAAudio {
|
||||||
bool quit();
|
bool quit();
|
||||||
bool setRun(bool run);
|
bool setRun(bool run);
|
||||||
bool init(TAAudioDesc& request, TAAudioDesc& response);
|
bool init(TAAudioDesc& request, TAAudioDesc& response);
|
||||||
|
unsigned char getID();
|
||||||
|
|
||||||
TAAudioJACK():
|
TAAudioJACK():
|
||||||
ac(NULL),
|
ac(NULL),
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
/**
|
||||||
|
* Furnace Tracker - multi-system chiptune tracker
|
||||||
|
* Copyright (C) 2021-2023 tildearrow and contributors
|
||||||
|
*
|
||||||
|
* 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.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "taAudio.h"
|
||||||
|
#include "jack.h"
|
|
@ -21,30 +21,62 @@
|
||||||
#ifdef HAVE_RTMIDI
|
#ifdef HAVE_RTMIDI
|
||||||
#include "rtmidi.h"
|
#include "rtmidi.h"
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef HAVE_JACK
|
||||||
|
#include "jack.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
bool TAAudio::initMidi(bool jack) {
|
bool TAAudio::initMidi(bool jack) {
|
||||||
#ifndef HAVE_RTMIDI
|
if (jack) {
|
||||||
return false;
|
#ifndef HAVE_JACK
|
||||||
|
return false;
|
||||||
#else
|
#else
|
||||||
midiIn=new TAMidiInRtMidi;
|
if (getID()!='J') {
|
||||||
midiOut=new TAMidiOutRtMidi;
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
midiIn=new TAMidiInJACK((jack_client_t*)getContext());
|
||||||
|
midiOut=new TAMidiOutJACK((jack_client_t*)getContext());
|
||||||
|
|
||||||
if (!midiIn->init()) {
|
if (!midiIn->init()) {
|
||||||
delete midiIn;
|
delete midiIn;
|
||||||
midiIn=NULL;
|
midiIn=NULL;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!midiOut->init()) {
|
if (!midiOut->init()) {
|
||||||
midiIn->quit();
|
midiIn->quit();
|
||||||
delete midiOut;
|
delete midiOut;
|
||||||
delete midiIn;
|
delete midiIn;
|
||||||
midiOut=NULL;
|
midiOut=NULL;
|
||||||
midiIn=NULL;
|
midiIn=NULL;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
#endif
|
#endif
|
||||||
|
} else {
|
||||||
|
#ifndef HAVE_RTMIDI
|
||||||
|
return false;
|
||||||
|
#else
|
||||||
|
midiIn=new TAMidiInRtMidi;
|
||||||
|
midiOut=new TAMidiOutRtMidi;
|
||||||
|
|
||||||
|
if (!midiIn->init()) {
|
||||||
|
delete midiIn;
|
||||||
|
midiIn=NULL;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!midiOut->init()) {
|
||||||
|
midiIn->quit();
|
||||||
|
delete midiOut;
|
||||||
|
delete midiIn;
|
||||||
|
midiOut=NULL;
|
||||||
|
midiIn=NULL;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void TAAudio::quitMidi() {
|
void TAAudio::quitMidi() {
|
||||||
|
|
|
@ -152,3 +152,7 @@ bool TAAudioSDL::init(TAAudioDesc& request, TAAudioDesc& response) {
|
||||||
initialized=true;
|
initialized=true;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unsigned char TAAudioSDL::getID() {
|
||||||
|
return 'S';
|
||||||
|
}
|
|
@ -33,6 +33,7 @@ class TAAudioSDL: public TAAudio {
|
||||||
bool setRun(bool run);
|
bool setRun(bool run);
|
||||||
std::vector<String> listAudioDevices();
|
std::vector<String> listAudioDevices();
|
||||||
bool init(TAAudioDesc& request, TAAudioDesc& response);
|
bool init(TAAudioDesc& request, TAAudioDesc& response);
|
||||||
|
unsigned char getID();
|
||||||
TAAudioSDL():
|
TAAudioSDL():
|
||||||
audioSysStarted(false) {}
|
audioSysStarted(false) {}
|
||||||
};
|
};
|
||||||
|
|
|
@ -176,6 +176,7 @@ class TAAudio {
|
||||||
bool initMidi(bool jack);
|
bool initMidi(bool jack);
|
||||||
void quitMidi();
|
void quitMidi();
|
||||||
virtual bool init(TAAudioDesc& request, TAAudioDesc& response);
|
virtual bool init(TAAudioDesc& request, TAAudioDesc& response);
|
||||||
|
virtual unsigned char getID();
|
||||||
|
|
||||||
TAAudio():
|
TAAudio():
|
||||||
outFormat(TA_AUDIO_FORMAT_F32),
|
outFormat(TA_AUDIO_FORMAT_F32),
|
||||||
|
|
Loading…
Reference in New Issue