diff options
author | Tim Mayberry <mojofunk@gmail.com> | 2015-09-14 13:26:07 +1000 |
---|---|---|
committer | Tim Mayberry <mojofunk@gmail.com> | 2015-09-16 11:22:16 +1000 |
commit | 091c4ed3a718c22ebcf205abdb3f2e2bad786459 (patch) | |
tree | 228e85ee18f7707e1696980c3b9c29026d556ade | |
parent | 76a0c823caab700725fe8318d1a4c4e33f067847 (diff) |
Move Windows MMCSS related utility functions into libpbd
-rw-r--r-- | libs/backends/portaudio/portaudio_backend.cc | 2 | ||||
-rw-r--r-- | libs/backends/portaudio/winmmemidi_input_device.cc | 3 | ||||
-rw-r--r-- | libs/backends/portaudio/winmmemidi_output_device.cc | 2 | ||||
-rw-r--r-- | libs/backends/portaudio/wscript | 1 | ||||
-rw-r--r-- | libs/pbd/pbd/windows_mmcss.h (renamed from libs/backends/portaudio/mmcss.h) | 0 | ||||
-rw-r--r-- | libs/pbd/windows_mmcss.cc (renamed from libs/backends/portaudio/mmcss.cc) | 5 | ||||
-rw-r--r-- | libs/pbd/wscript | 1 |
7 files changed, 7 insertions, 7 deletions
diff --git a/libs/backends/portaudio/portaudio_backend.cc b/libs/backends/portaudio/portaudio_backend.cc index 973180f37f..f55d9c3131 100644 --- a/libs/backends/portaudio/portaudio_backend.cc +++ b/libs/backends/portaudio/portaudio_backend.cc @@ -33,12 +33,12 @@ #include "pbd/error.h" #include "pbd/file_utils.h" #include "pbd/windows_timer_utils.h" +#include "pbd/windows_mmcss.h" #include "ardour/filesystem_paths.h" #include "ardour/port_manager.h" #include "i18n.h" -#include "mmcss.h" #include "audio_utils.h" #include "debug.h" diff --git a/libs/backends/portaudio/winmmemidi_input_device.cc b/libs/backends/portaudio/winmmemidi_input_device.cc index 324306db12..ed9625d28b 100644 --- a/libs/backends/portaudio/winmmemidi_input_device.cc +++ b/libs/backends/portaudio/winmmemidi_input_device.cc @@ -23,11 +23,10 @@ #include "pbd/compose.h" #include "pbd/windows_timer_utils.h" +#include "pbd/windows_mmcss.h" #include "midi_util.h" -#include "mmcss.h" - #include "debug.h" static const uint32_t MIDI_BUFFER_SIZE = 32768; diff --git a/libs/backends/portaudio/winmmemidi_output_device.cc b/libs/backends/portaudio/winmmemidi_output_device.cc index 89f76f29d0..9c9b513443 100644 --- a/libs/backends/portaudio/winmmemidi_output_device.cc +++ b/libs/backends/portaudio/winmmemidi_output_device.cc @@ -23,11 +23,11 @@ #include "pbd/debug.h" #include "pbd/compose.h" #include "pbd/windows_timer_utils.h" +#include "pbd/windows_mmcss.h" #include "rt_thread.h" #include "midi_util.h" -#include "mmcss.h" #include "debug.h" // remove dup with input_device diff --git a/libs/backends/portaudio/wscript b/libs/backends/portaudio/wscript index c67490f1c7..0d679a1563 100644 --- a/libs/backends/portaudio/wscript +++ b/libs/backends/portaudio/wscript @@ -27,7 +27,6 @@ def build(bld): 'winmmemidi_input_device.cc', 'winmmemidi_output_device.cc', 'midi_util.cc', - 'mmcss.cc' ] obj.includes = ['.'] obj.name = 'portaudio_backend' diff --git a/libs/backends/portaudio/mmcss.h b/libs/pbd/pbd/windows_mmcss.h index 28dc737c4d..28dc737c4d 100644 --- a/libs/backends/portaudio/mmcss.h +++ b/libs/pbd/pbd/windows_mmcss.h diff --git a/libs/backends/portaudio/mmcss.cc b/libs/pbd/windows_mmcss.cc index 406345df34..92fdea2fdc 100644 --- a/libs/backends/portaudio/mmcss.cc +++ b/libs/pbd/windows_mmcss.cc @@ -16,11 +16,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "mmcss.h" +#include "pbd/windows_mmcss.h" #include "pbd/compose.h" +#include "pbd/debug.h" -#include "debug.h" +#define DEBUG_THREADS(msg) DEBUG_TRACE (PBD::DEBUG::Threads, msg); typedef HANDLE (WINAPI* AvSetMmThreadCharacteristicsA_t)(LPCSTR TaskName, LPDWORD TaskIndex); diff --git a/libs/pbd/wscript b/libs/pbd/wscript index 2d832669d1..c79b25732b 100644 --- a/libs/pbd/wscript +++ b/libs/pbd/wscript @@ -149,6 +149,7 @@ def build(bld): obj.defines += [ 'NO_POSIX_MEMALIGN' ] obj.source += [ 'windows_special_dirs.cc' ] obj.source += [ 'windows_timer_utils.cc' ] + obj.source += [ 'windows_mmcss.cc' ] obj.uselib += ' OLE' if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'): |