allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Fix time_t <> long int ambiguity, 32bit builds

Browse Source 
See 7cf68eaf72 for a detailed explanation.
This commit is contained in:
Robin Gareus
2020-06-25 20:14:17 +02:00
parent c6ee111c3d
commit a006b8c412
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/ardour/plugin_manager.h
View File

@@ -75,7 +75,7 @@ public:
bool no_timeout () { return _cancel_timeout; }
void stats_use_plugin (PluginInfoPtr const&);
bool stats (PluginInfoPtr const&, time_t& lru, uint64_t& use_count) const;
bool stats (PluginInfoPtr const&, int64_t& lru, uint64_t& use_count) const;
void save_stats ();
enum PluginStatusType {
@@ -172,10 +172,10 @@ private:
struct PluginStats {
PluginType const type;
std::string const unique_id;
time_t lru;
int64_t lru;
uint64_t use_count;
PluginStats (ARDOUR::PluginType t, std::string const& id, time_t lru = 0, uint64_t use_count = 0)
PluginStats (ARDOUR::PluginType t, std::string const& id, int64_t lru = 0, uint64_t use_count = 0)
: type (t), unique_id (id), lru (lru), use_count (use_count) {}
bool operator==(const PluginStats& other) const {

4
libs/ardour/plugin_manager.cc
View File

@@ -1631,7 +1631,7 @@ PluginManager::load_stats ()
{
PluginType type;
string id;
time_t lru;
int64_t lru;
uint64_t use_count;
if (!(*i)->get_property (X_("type"), type) ||
@@ -1691,7 +1691,7 @@ PluginManager::stats_use_plugin (PluginInfoPtr const& pip)
}
bool
PluginManager::stats (PluginInfoPtr const& pip, time_t& lru, uint64_t& use_count) const
PluginManager::stats (PluginInfoPtr const& pip, int64_t& lru, uint64_t& use_count) const
{
PluginStats ps (pip->type, pip->unique_id, time (NULL));
PluginStatsList::const_iterator i = find (statistics.begin(), statistics.end(), ps);