ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Move AudioBackend related debug bits into libardour

Browse Source 
I put these in libpbd as that is where the debug bits are for the Waves backend
but I think it makes more sense for them to be in libardour as that is where
the AudioBackend class is defined

I left the Waves debug bits in libpbd for now.
This commit is contained in:
Tim Mayberry 2015-08-22 21:43:12 +10:00
parent 201d91aedd
commit a272c50597
6 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/ardour/debug.h
View File

@ -70,6 +70,11 @@ namespace PBD {
LIBARDOUR_API extern DebugBits Soundcloud;
LIBARDOUR_API extern DebugBits Butler;
LIBARDOUR_API extern DebugBits GenericMidi;
LIBARDOUR_API extern DebugBits BackendMIDI;
LIBARDOUR_API extern DebugBits BackendAudio;
LIBARDOUR_API extern DebugBits BackendTiming;
LIBARDOUR_API extern DebugBits BackendThreads;
}
}

5
libs/ardour/debug.cc
View File

@ -67,4 +67,7 @@ PBD::DebugBits PBD::DEBUG::Soundcloud = PBD::new_debug_bit ("Soundcloud");
PBD::DebugBits PBD::DEBUG::Butler = PBD::new_debug_bit ("Butler");
PBD::DebugBits PBD::DEBUG::GenericMidi = PBD::new_debug_bit ("genericmidi");
PBD::DebugBits PBD::DEBUG::BackendMIDI = PBD::new_debug_bit ("backendmidi");
PBD::DebugBits PBD::DEBUG::BackendAudio = PBD::new_debug_bit ("backendaudio");
PBD::DebugBits PBD::DEBUG::BackendTiming = PBD::new_debug_bit ("backendtiming");
PBD::DebugBits PBD::DEBUG::BackendThreads = PBD::new_debug_bit ("backendthreads");

12
libs/backends/portaudio/debug.h
View File

@ -1,13 +1,11 @@
#ifndef PORTAUDIO_BACKEND_DEBUG_H
#define PORTAUDIO_BACKEND_DEBUG_H
#include "pbd/debug.h"
#include "ardour/debug.h"
using namespace PBD;
#define DEBUG_AUDIO(msg) DEBUG_TRACE (DEBUG::BackendAudio, msg);
#define DEBUG_MIDI(msg) DEBUG_TRACE (DEBUG::BackendMIDI, msg);
#define DEBUG_TIMING(msg) DEBUG_TRACE (DEBUG::BackendTiming, msg);
#define DEBUG_THREADS(msg) DEBUG_TRACE (DEBUG::BackendThreads, msg);
#define DEBUG_AUDIO(msg) DEBUG_TRACE (PBD::DEBUG::BackendAudio, msg);
#define DEBUG_MIDI(msg) DEBUG_TRACE (PBD::DEBUG::BackendMIDI, msg);
#define DEBUG_TIMING(msg) DEBUG_TRACE (PBD::DEBUG::BackendTiming, msg);
#define DEBUG_THREADS(msg) DEBUG_TRACE (PBD::DEBUG::BackendThreads, msg);
#endif // PORTAUDIO_BACKEND_DEBUG_H

1
libs/backends/portaudio/portaudio_io.cc
View File

@ -38,6 +38,7 @@
#define INTERLEAVED_INPUT
#define INTERLEAVED_OUTPUT
using namespace PBD;
using namespace ARDOUR;
PortAudioIO::PortAudioIO ()

6
libs/pbd/debug.cc
View File

@ -64,12 +64,6 @@ DebugBits PBD::DEBUG::UndoHistory = PBD::new_debug_bit ("undohistory");
from dynamically loaded code, for use in command line parsing, is way above the pay grade
of this debug tracing scheme.
*/
DebugBits PBD::DEBUG::BackendMIDI = PBD::new_debug_bit ("BackendMIDI");
DebugBits PBD::DEBUG::BackendAudio = PBD::new_debug_bit ("BackendAudio");
DebugBits PBD::DEBUG::BackendTiming = PBD::new_debug_bit ("BackendTiming");
DebugBits PBD::DEBUG::BackendThreads = PBD::new_debug_bit ("BackendThreads");
DebugBits PBD::DEBUG::WavesMIDI = PBD::new_debug_bit ("WavesMIDI");
DebugBits PBD::DEBUG::WavesAudio = PBD::new_debug_bit ("WavesAudio");

5
libs/pbd/pbd/debug.h
View File

@ -57,11 +57,6 @@ namespace PBD {
LIBPBD_API extern DebugBits FileUtils;
LIBPBD_API extern DebugBits UndoHistory;
LIBPBD_API extern DebugBits BackendMIDI;
LIBPBD_API extern DebugBits BackendAudio;
LIBPBD_API extern DebugBits BackendTiming;
LIBPBD_API extern DebugBits BackendThreads;
/* See notes in ../debug.cc on why these are defined here */
LIBPBD_API extern DebugBits WavesMIDI;