From 091c4ed3a718c22ebcf205abdb3f2e2bad786459 Mon Sep 17 00:00:00 2001
From: Tim Mayberry <mojofunk@gmail.com>
Date: Mon, 14 Sep 2015 13:26:07 +1000
Subject: [PATCH] Move Windows MMCSS related utility functions into libpbd

---
 libs/backends/portaudio/portaudio_backend.cc                 | 2 +-
 libs/backends/portaudio/winmmemidi_input_device.cc           | 3 +--
 libs/backends/portaudio/winmmemidi_output_device.cc          | 2 +-
 libs/backends/portaudio/wscript                              | 1 -
 libs/{backends/portaudio/mmcss.h => pbd/pbd/windows_mmcss.h} | 0
 libs/{backends/portaudio/mmcss.cc => pbd/windows_mmcss.cc}   | 5 +++--
 libs/pbd/wscript                                             | 1 +
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename libs/{backends/portaudio/mmcss.h => pbd/pbd/windows_mmcss.h} (100%)
 rename libs/{backends/portaudio/mmcss.cc => pbd/windows_mmcss.cc} (97%)

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
similarity index 100%
rename from libs/backends/portaudio/mmcss.h
rename to libs/pbd/pbd/windows_mmcss.h
diff --git a/libs/backends/portaudio/mmcss.cc b/libs/pbd/windows_mmcss.cc
similarity index 97%
rename from libs/backends/portaudio/mmcss.cc
rename to 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'):