fixes for recent waves tracks => ardour cherry-picks of the wavesaudio backend

This commit is contained in:
Paul Davis 2015-03-31 18:03:51 -04:00
parent a5fc4dc614
commit c89f24e207

View file

@ -68,8 +68,6 @@ WavesMidiDevice::~WavesMidiDevice ()
int int
WavesMidiDevice::open (PmTimeProcPtr time_proc, void* time_info) WavesMidiDevice::open (PmTimeProcPtr time_proc, void* time_info)
{ {
DEBUG_TRACE (DEBUG::WavesMIDI, string_compose ("WavesMidiDevice::open (): %1", name ()));
if (is_input () ) { if (is_input () ) {
// COMMENTED DBG LOGS */ std::cout << "WavesMidiDevice::open (): INPUT" << _pm_input_id << "-[" << name () << "]" << std::endl; // COMMENTED DBG LOGS */ std::cout << "WavesMidiDevice::open (): INPUT" << _pm_input_id << "-[" << name () << "]" << std::endl;
@ -141,9 +139,9 @@ WavesMidiDevice::open (PmTimeProcPtr time_proc, void* time_info)
return 0; return 0;
} }
void
WavesMidiDevice::close () WavesMidiDevice::close ()
{ {
DEBUG_TRACE (DEBUG::WavesMIDI, string_compose ("WavesMidiDevice::close (): %1\n", name ()));
WavesMidiEvent *waves_midi_event; WavesMidiEvent *waves_midi_event;
// save _input_pm_stream and _output_pm_stream to local buf // save _input_pm_stream and _output_pm_stream to local buf
@ -151,7 +149,7 @@ WavesMidiDevice::close ()
PmStream* output_pm_stream = _output_pm_stream; PmStream* output_pm_stream = _output_pm_stream;
_input_pm_stream = _output_pm_stream = NULL; _input_pm_stream = _output_pm_stream = NULL;
//input // input
if (input_pm_stream) { if (input_pm_stream) {
// close stream // close stream
PmError err = Pm_Close (input_pm_stream); PmError err = Pm_Close (input_pm_stream);
@ -173,7 +171,7 @@ WavesMidiDevice::close ()
_input_queue = NULL; _input_queue = NULL;
} }
//output // output
if ( output_pm_stream ) { if ( output_pm_stream ) {
// close stream // close stream
PmError err = Pm_Close (output_pm_stream); PmError err = Pm_Close (output_pm_stream);