Move Windows timer utility functions from PA backend into libpbd

10 files changed, 13 insertions, 10 deletions

diff --git a/libs/backends/portaudio/portaudio_backend.cc b/libs/backends/portaudio/portaudio_backend.cc
index f4ab827556..2275c44276 100644
--- a/libs/backends/portaudio/portaudio_backend.cc
+++ b/libs/backends/portaudio/portaudio_backend.cc
@@ -32,12 +32,12 @@
 #include "pbd/compose.h"
 #include "pbd/error.h"
 #include "pbd/file_utils.h"
+#include "pbd/windows_timer_utils.h"
 
 #include "ardour/filesystem_paths.h"
 #include "ardour/port_manager.h"
 #include "i18n.h"
 
-#include "win_utils.h"
 #include "mmcss.h"
 #include "audio_utils.h"
 
diff --git a/libs/backends/portaudio/winmmemidi_input_device.cc b/libs/backends/portaudio/winmmemidi_input_device.cc
index 95e7faa476..4e5d2da257 100644
--- a/libs/backends/portaudio/winmmemidi_input_device.cc
+++ b/libs/backends/portaudio/winmmemidi_input_device.cc
@@ -22,8 +22,8 @@
 #include <cmath>
 
 #include "pbd/compose.h"
+#include "pbd/windows_timer_utils.h"
 
-#include "win_utils.h"
 #include "midi_util.h"
 
 #include "mmcss.h"
diff --git a/libs/backends/portaudio/winmmemidi_io.cc b/libs/backends/portaudio/winmmemidi_io.cc
index 4c93799637..427ff486d7 100644
--- a/libs/backends/portaudio/winmmemidi_io.cc
+++ b/libs/backends/portaudio/winmmemidi_io.cc
@@ -23,9 +23,9 @@
 
 #include "pbd/error.h"
 #include "pbd/compose.h"
+#include "pbd/windows_timer_utils.h"
 
 #include "winmmemidi_io.h"
-#include "win_utils.h"
 #include "debug.h"
 
 #include "i18n.h"
diff --git a/libs/backends/portaudio/winmmemidi_output_device.cc b/libs/backends/portaudio/winmmemidi_output_device.cc
index a1d76cd236..f8071dd9b1 100644
--- a/libs/backends/portaudio/winmmemidi_output_device.cc
+++ b/libs/backends/portaudio/winmmemidi_output_device.cc
@@ -22,9 +22,9 @@
 
 #include "pbd/debug.h"
 #include "pbd/compose.h"
+#include "pbd/windows_timer_utils.h"
 
 #include "rt_thread.h"
-#include "win_utils.h"
 #include "midi_util.h"
 
 #include "mmcss.h"
diff --git a/libs/backends/portaudio/wscript b/libs/backends/portaudio/wscript
index 9c661d83b0..c67490f1c7 100644
--- a/libs/backends/portaudio/wscript
+++ b/libs/backends/portaudio/wscript
@@ -26,7 +26,6 @@ def build(bld):
                    'winmmemidi_io.cc',
                    'winmmemidi_input_device.cc',
                    'winmmemidi_output_device.cc',
-                   'win_utils.cc',
                    'midi_util.cc',
                    'mmcss.cc'
                  ]
diff --git a/libs/pbd/debug.cc b/libs/pbd/debug.cc
index 3055c396c6..aa55d82f59 100644
--- a/libs/pbd/debug.cc
+++ b/libs/pbd/debug.cc
@@ -54,6 +54,7 @@ DebugBits PBD::DEBUG::AbstractUI = PBD::new_debug_bit ("abstractui");
 DebugBits PBD::DEBUG::FileUtils = PBD::new_debug_bit ("fileutils");
 DebugBits PBD::DEBUG::Configuration = PBD::new_debug_bit ("configuration");
 DebugBits PBD::DEBUG::UndoHistory = PBD::new_debug_bit ("undohistory");
+DebugBits PBD::DEBUG::Timing = PBD::new_debug_bit ("timing");
 
 /* These are debug bits that are used by backends. Since these are loaded dynamically,
    after command-line parsing, defining them in code that is part of the backend
diff --git a/libs/pbd/pbd/debug.h b/libs/pbd/pbd/debug.h
index 065bc4cae0..324638524c 100644
--- a/libs/pbd/pbd/debug.h
+++ b/libs/pbd/pbd/debug.h
@@ -56,6 +56,7 @@ namespace PBD {
 		LIBPBD_API extern DebugBits Configuration;
 		LIBPBD_API extern DebugBits FileUtils;
 		LIBPBD_API extern DebugBits UndoHistory;
+		LIBPBD_API extern DebugBits Timing;
 
 		/* See notes in ../debug.cc on why these are defined here */
 
diff --git a/libs/backends/portaudio/win_utils.h b/libs/pbd/pbd/windows_timer_utils.h
index c0c7bbf491..2e4f800bd5 100644
--- a/libs/backends/portaudio/win_utils.h
+++ b/libs/pbd/pbd/windows_timer_utils.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef WIN_UTILS_H
-#define WIN_UTILS_H
+#ifndef PBD_WINDOWS_TIMER_UTILS_H
+#define PBD_WINDOWS_TIMER_UTILS_H
 
 #include <stdint.h>
 
@@ -83,4 +83,4 @@ int64_t get_microseconds ();
 
 } // namespace PBD
 
-#endif // WIN_UTILS_H
+#endif // PBD_WINDOWS_TIMER_UTILS_H
diff --git a/libs/backends/portaudio/win_utils.cc b/libs/pbd/windows_timer_utils.cc
index 6d0e404749..fcf8fa8003 100644
--- a/libs/backends/portaudio/win_utils.cc
+++ b/libs/pbd/windows_timer_utils.cc
@@ -16,14 +16,15 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "win_utils.h"
+#include "pbd/windows_timer_utils.h"
 
 #include <windows.h>
 #include <mmsystem.h>
 
 #include "pbd/compose.h"
+#include "pbd/debug.h"
 
-#include "debug.h"
+#define DEBUG_TIMING(msg) DEBUG_TRACE (PBD::DEBUG::Timing, msg);
 
 namespace {
 
diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index b12210b542..7d74f09786 100644
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -148,6 +148,7 @@ def build(bld):
     if bld.env['build_target'] == 'mingw':
         obj.defines += [ 'NO_POSIX_MEMALIGN' ]
         obj.source += [ 'windows_special_dirs.cc' ]
+        obj.source += [ 'windows_timer_utils.cc' ]
         obj.uselib += ' OLE'
 
     if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):