work on frei0r support

2019-01-20 12:07:22 +11:00
parent 5cc02956f3
commit 1c620af9f5
12 changed files with 318 additions and 193 deletions
@@ -32,6 +32,7 @@
 #include "effects/internal/vsthostwin.h"
 #endif
 #include "effects/internal/fillleftrighteffect.h"
+#include "effects/internal/frei0reffect.h"

 #include <QCheckBox>
 #include <QGridLayout>
@@ -69,6 +70,7 @@ Effect* create_effect(Clip* c, const EffectMeta* em) {
 #ifdef _WIN32
 		case EFFECT_INTERNAL_VST: return new VSTHostWin(c, em);
 #endif
+		case EFFECT_INTERNAL_FREI0R: return new Frei0rEffect(c, em);
 		}
 	} else {
 		qCritical() << "Invalid effect data";
@@ -88,180 +90,6 @@ const EffectMeta* get_internal_meta(int internal_id, int type) {
 	return nullptr;
 }

-void load_internal_effects() {
-	if (!shaders_are_enabled) qWarning() << "Shaders are disabled, some effects may be nonfunctional";
-
-	EffectMeta em;
-
-	// internal effects
-	em.type = EFFECT_TYPE_EFFECT;
-	em.subtype = EFFECT_TYPE_AUDIO;
-
-	em.name = "Volume";
-	em.internal = EFFECT_INTERNAL_VOLUME;
-	effects.append(em);
-
-	em.name = "Pan";
-	em.internal = EFFECT_INTERNAL_PAN;
-	effects.append(em);
-
-#ifdef _WIN32
-	em.name = "VST Plugin 2.x";
-	em.internal = EFFECT_INTERNAL_VST;
-	effects.append(em);
-#endif
-
-	em.name = "Tone";
-	em.internal = EFFECT_INTERNAL_TONE;
-	effects.append(em);
-
-	em.name = "Noise";
-	em.internal = EFFECT_INTERNAL_NOISE;
-	effects.append(em);
-
-	em.name = "Fill Left/Right";
-	em.internal = EFFECT_INTERNAL_FILLLEFTRIGHT;
-	effects.append(em);
-
-	em.subtype = EFFECT_TYPE_VIDEO;
-
-	em.name = "Transform";
-	em.category = "Distort";
-	em.internal = EFFECT_INTERNAL_TRANSFORM;
-	effects.append(em);
-
-	em.name = "Corner Pin";
-	em.internal = EFFECT_INTERNAL_CORNERPIN;
-	effects.append(em);
-
-	/*em.name = "Mask";
-	em.internal = EFFECT_INTERNAL_MASK;
-	effects.append(em);*/
-
-	em.name = "Shake";
-	em.internal = EFFECT_INTERNAL_SHAKE;
-	effects.append(em);
-
-	em.name = "Text";
-	em.category = "Render";
-	em.internal = EFFECT_INTERNAL_TEXT;
-	effects.append(em);
-
-	em.name = "Timecode";
-	em.internal = EFFECT_INTERNAL_TIMECODE;
-	effects.append(em);
-
-	em.name = "Solid";
-	em.internal = EFFECT_INTERNAL_SOLID;
-	effects.append(em);
-
-	// internal transitions
-	em.type = EFFECT_TYPE_TRANSITION;
-	em.category = "";
-
-	em.name = "Cross Dissolve";
-	em.internal = TRANSITION_INTERNAL_CROSSDISSOLVE;
-	effects.append(em);
-
-	em.subtype = EFFECT_TYPE_AUDIO;
-
-	em.name = "Linear Fade";
-	em.internal = TRANSITION_INTERNAL_LINEARFADE;
-	effects.append(em);
-
-	em.name = "Exponential Fade";
-	em.internal = TRANSITION_INTERNAL_EXPONENTIALFADE;
-	effects.append(em);
-
-	em.name = "Logarithmic Fade";
-	em.internal = TRANSITION_INTERNAL_LOGARITHMICFADE;
-	effects.append(em);
-}
-
-QList<QString> get_effects_paths() {
-	QList<QString> effects_paths;
-	effects_paths.append(get_app_dir() + "/effects");
-	effects_paths.append(get_app_dir() + "/../share/olive-editor/effects");
-	QString env_path(qgetenv("OLIVE_EFFECTS_PATH"));
-	if (!env_path.isEmpty()) effects_paths.append(env_path);
-	return effects_paths;
-}
-
-void load_shader_effects() {
-	QList<QString> effects_paths = get_effects_paths();
-
-	for (int h=0;h<effects_paths.size();h++) {
-		const QString& effects_path = effects_paths.at(h);
-		QDir effects_dir(effects_path);
-		if (effects_dir.exists()) {
-			QList<QString> entries = effects_dir.entryList(QStringList("*.xml"), QDir::Files);
-			for (int i=0;i<entries.size();i++) {
-				QFile file(effects_path + "/" + entries.at(i));
-				if (!file.open(QIODevice::ReadOnly)) {
-					qCritical() << "Could not open" << entries.at(i);
-					return;
-				}
-
-				QXmlStreamReader reader(&file);
-				while (!reader.atEnd()) {
-					if (reader.name() == "effect") {
-						QString effect_name = "";
-						QString effect_cat = "";
-						const QXmlStreamAttributes attr = reader.attributes();
-						for (int j=0;j<attr.size();j++) {
-							if (attr.at(j).name() == "name") {
-								effect_name = attr.at(j).value().toString();
-							} else if (attr.at(j).name() == "category") {
-								effect_cat = attr.at(j).value().toString();
-							}
-						}
-						if (!effect_name.isEmpty()) {
-							EffectMeta em;
-							em.type = EFFECT_TYPE_EFFECT;
-							em.subtype = EFFECT_TYPE_VIDEO;
-							em.name = effect_name;
-							em.category = effect_cat;
-							em.filename = file.fileName();
-							em.path = effects_path;
-							em.internal = -1;
-							effects.append(em);
-						} else {
-							qCritical() << "Invalid effect found in" << entries.at(i);
-						}
-						break;
-					}
-					reader.readNext();
-				}
-
-				file.close();
-			}
-		}
-	}
-}
-
-void load_vst_effects() {
-
-}
-
-void init_effects() {
-	EffectInit* init_thread = new EffectInit();
-	QObject::connect(init_thread, SIGNAL(finished()), init_thread, SLOT(deleteLater()));
-	init_thread->start();
-}
-
-EffectInit::EffectInit() {
-	panel_effect_controls->effects_loaded.lock();
-}
-
-void EffectInit::run() {
-	qInfo() << "Initializing effects...";
-	load_internal_effects();
-	load_shader_effects();
-	load_vst_effects();
-	panel_effect_controls->effects_loaded.unlock();
-	qInfo() << "Finished initializing effects";
-}
-
 Effect::Effect(Clip* c, const EffectMeta *em) :
 	parent_clip(c),
 	meta(em),
@@ -866,7 +694,7 @@ void Effect::endEffect() {
 	bound = false;
 }

-void Effect::process_image(double, uint8_t *, int) {}
+void Effect::process_image(double, uint8_t *input, uint8_t *output, int) {}

 Effect* Effect::copy(Clip* c) {
 	Effect* copy = create_effect(c, meta);