smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

tweak libardour to reflect get_microseconds() move to libpbd

Browse source
This commit is contained in:
Paul Davis 2021-06-26 18:26:13 -06:00
parent 9e598548f7
commit 04df262447
3 changed files with 2 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/ardour.h
View file

@ -83,8 +83,6 @@ namespace ARDOUR {
LIBARDOUR_API bool translations_are_enabled (); LIBARDOUR_API bool translations_are_enabled ();
LIBARDOUR_API bool set_translations_enabled (bool); LIBARDOUR_API bool set_translations_enabled (bool);
LIBARDOUR_API microseconds_t get_microseconds ();
LIBARDOUR_API void setup_fpu (); LIBARDOUR_API void setup_fpu ();
LIBARDOUR_API std::vector<SyncSource> get_available_sync_options(); LIBARDOUR_API std::vector<SyncSource> get_available_sync_options();

3
libs/ardour/ardour/types.h
View file

@ -47,6 +47,7 @@
#include "temporal/types.h" #include "temporal/types.h"
#include "pbd/id.h" #include "pbd/id.h"
#include "pbd/microseconds.h"
#include "evoral/Range.h" #include "evoral/Range.h"
@ -77,7 +78,7 @@ typedef float Sample;
typedef float pan_t; typedef float pan_t;
typedef float gain_t; typedef float gain_t;
typedef uint32_t layer_t; typedef uint32_t layer_t;
typedef uint64_t microseconds_t; typedef PBD::microseconds_t microseconds_t;
typedef uint32_t pframes_t; typedef uint32_t pframes_t;
/* rebind Temporal position types into ARDOUR namespace */ /* rebind Temporal position types into ARDOUR namespace */

22
libs/ardour/globals.cc
View file

@ -957,28 +957,6 @@ clock_gettime (int /*clk_id*/, struct timespec* t)
} }
#endif #endif
microseconds_t
ARDOUR::get_microseconds ()
{
#ifdef PLATFORM_WINDOWS
microseconds_t ret = 0;
LARGE_INTEGER freq, time;
if (QueryPerformanceFrequency (&freq))
if (QueryPerformanceCounter (&time))
ret = (microseconds_t) ((time.QuadPart * 1000000) / freq.QuadPart);
return ret;
#else
struct timespec ts;
if (clock_gettime (CLOCK_MONOTONIC, &ts) != 0) {
/* EEEK! */
return 0;
}
return (microseconds_t)ts.tv_sec * 1000000 + (ts.tv_nsec / 1000);
#endif
}
/** Return the number of bits per sample for a given sample format. /** Return the number of bits per sample for a given sample format.
* *
* This is closely related to sndfile_data_width() but does NOT * This is closely related to sndfile_data_width() but does NOT