projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed incomplete merge for audioengine.cc
[ardour.git]
/
libs
/
ardour
/
ardour
/
import_status.h
diff --git
a/libs/ardour/ardour/import_status.h
b/libs/ardour/ardour/import_status.h
index d06a464716135494c2f0a08d1a9f4a81749711a4..4dbf8f8456505056050ee7f287a27c58336b94d5 100644
(file)
--- a/
libs/ardour/ardour/import_status.h
+++ b/
libs/ardour/ardour/import_status.h
@@
-25,11
+25,14
@@
#include <stdint.h>
#include <stdint.h>
+#include "ardour/interthread_info.h"
+#include "ardour/libardour_visibility.h"
#include "ardour/types.h"
namespace ARDOUR {
#include "ardour/types.h"
namespace ARDOUR {
-struct ImportStatus : public InterThreadInfo {
+class LIBARDOUR_API ImportStatus : public InterThreadInfo {
+public:
std::string doing_what;
/* control info */
std::string doing_what;
/* control info */
@@
-40,6
+43,11
@@
struct ImportStatus : public InterThreadInfo {
std::vector<std::string> paths;
bool replace_existing_source;
std::vector<std::string> paths;
bool replace_existing_source;
+ /** set to true when all files have been imported, as distinct from the done in ARDOUR::InterThreadInfo,
+ * which indicates that one run of the import thread has been completed.
+ */
+ bool all_done;
+
/* result */
SourceList sources;
};
/* result */
SourceList sources;
};