Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-16 16:10:06 +02:00
Code Issues Releases Wiki Activity

AUP3: Fix build issues

Browse Source
This commit is contained in:
Leland Lucius 2020-07-13 09:48:37 -05:00
parent 6193598b90
commit 6f233cbff5
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ProjectFileIO.cpp
View File

@ -23,6 +23,7 @@ Paul Licameli split from AudacityProject.cpp
#include "ProjectSerializer.h"
#include "ProjectSettings.h"
#include "SampleBlock.h"
#include "Sequence.h"
#include "Tags.h"
#include "ViewInfo.h"
#include "WaveClip.h"
@ -727,7 +728,7 @@ bool ProjectFileIO::CheckForOrphans(BlockIDs &blockids)
}
/* static */
void ProjectFileIO::UpdateCallback(void *data, int operation, char const *dbname, char const *table, int64_t rowid)
void ProjectFileIO::UpdateCallback(void *data, int operation, char const *dbname, char const *table, long long rowid)
{
UpdateCB cb = *static_cast<UpdateCB *>(data);
cb(operation, dbname, table, rowid);
@ -822,10 +823,10 @@ sqlite3 *ProjectFileIO::CopyTo(const FilePath &destpath, bool prune /* = false *
in doing something.*/
ProgressDialog progress(XO("Progress"), XO("Saving project"));
int64_t count = 0;
int64_t total = blockids.size();
wxLongLong_t count = 0;
wxLongLong_t total = blockids.size();
UpdateCB update = [&](int operation, char const *dbname, char const *table, int64_t rowid)
UpdateCB update = [&](int operation, char const *dbname, char const *table, long long rowid)
{
count++;
};

4
src/ProjectFileIO.h
View File

@ -170,8 +170,8 @@ private:
void SetError(const TranslatableString & msg);
void SetDBError(const TranslatableString & msg);
using UpdateCB = std::function<void(int operation, char const *dbname, char const *table, int64_t rowid)>;
static void UpdateCallback(void *data, int operation, char const *dbname, char const *table, int64_t rowid);
using UpdateCB = std::function<void(int operation, char const *dbname, char const *table, long long rowid)>;
static void UpdateCallback(void *data, int operation, char const *dbname, char const *table, long long rowid);
private:
// non-static data members