Fix compile errors
This commit is contained in:
@@ -161,14 +161,16 @@ OliveHost::makeDescriptor(const std::string &bundlePath,
|
||||
return desc;
|
||||
}
|
||||
|
||||
ImageEffect::Instance* OliveHost::newInstance(std::shared_ptr<PluginNode> clientData,
|
||||
ImageEffect::Instance* OliveHost::newInstance(void *clientData,
|
||||
ImageEffect::ImageEffectPlugin* plugin,
|
||||
ImageEffect::Descriptor& desc,
|
||||
const std::string& context){
|
||||
auto* instance = new OlivePluginInstance(
|
||||
plugin, desc, context, Current::getInstance().interactive());
|
||||
if (clientData) {
|
||||
instance->setNode(clientData);
|
||||
auto *node = static_cast<PluginNode *>(clientData);
|
||||
instance->setNode(
|
||||
std::shared_ptr<PluginNode>(node, [](PluginNode *) {}));
|
||||
}
|
||||
instances_.append(instance);
|
||||
return instance;
|
||||
|
||||
@@ -57,7 +57,7 @@ public:
|
||||
return true;
|
||||
};
|
||||
|
||||
OFX::Host::ImageEffect::Instance* newInstance(std::shared_ptr<PluginNode> ptr,
|
||||
OFX::Host::ImageEffect::Instance* newInstance(void *clientData,
|
||||
OFX::Host::ImageEffect::ImageEffectPlugin* plugin,
|
||||
OFX::Host::ImageEffect::Descriptor& desc,
|
||||
const std::string& context) override;
|
||||
|
||||
@@ -377,11 +377,12 @@ void OlivePluginInstance::progressStart(const std::string &message,
|
||||
? QStringLiteral("Processing...")
|
||||
: QString::fromStdString(message);
|
||||
|
||||
progress_dialog_ = new ProgressDialog(
|
||||
dialog_message, QStringLiteral("OpenFX"), Core::instance()->main_window());
|
||||
progress_dialog_ = new ::olive::ProgressDialog(
|
||||
dialog_message, QStringLiteral("OpenFX"), nullptr);
|
||||
progress_dialog_->setAttribute(Qt::WA_DeleteOnClose);
|
||||
connect(progress_dialog_, &ProgressDialog::Cancelled, this,
|
||||
[this]() { progress_cancelled_ = true; });
|
||||
QObject::connect(progress_dialog_, &::olive::ProgressDialog::Cancelled,
|
||||
progress_dialog_,
|
||||
[this]() { progress_cancelled_ = true; });
|
||||
progress_dialog_->show();
|
||||
}
|
||||
|
||||
@@ -440,7 +441,7 @@ double OlivePluginInstance::timeLineGetTime()
|
||||
void OlivePluginInstance::timeLineGotoTime(double t)
|
||||
{
|
||||
if (ViewerOutput *viewer = GetActiveViewerOutput()) {
|
||||
viewer->SetPlayhead(core::rational::fromDouble(t));
|
||||
viewer->SetPlayhead(olive::core::rational::fromDouble(t));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -30,9 +30,9 @@
|
||||
#include <qcontainerfwd.h>
|
||||
#include <qlist.h>
|
||||
namespace olive {
|
||||
class ProgressDialog;
|
||||
namespace plugin{
|
||||
class PluginNode;
|
||||
class ProgressDialog;
|
||||
enum class ErrorType{
|
||||
Error,
|
||||
Warning,
|
||||
@@ -202,7 +202,7 @@ private:
|
||||
QString edit_label_;
|
||||
QString edit_first_label_;
|
||||
int edit_param_count_ = 0;
|
||||
QPointer<ProgressDialog> progress_dialog_;
|
||||
QPointer<olive::ProgressDialog> progress_dialog_;
|
||||
bool progress_cancelled_ = false;
|
||||
bool progress_active_ = false;
|
||||
bool open_gl_enabled_ = false;
|
||||
|
||||
Reference in New Issue
Block a user