projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add VFrameJpeg for shapewipe shapes, switch to jpeg for shapes, cam/prjr x,y,z range...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
plugins
/
findobj
/
findobj.C
diff --git
a/cinelerra-5.1/plugins/findobj/findobj.C
b/cinelerra-5.1/plugins/findobj/findobj.C
index b54b1c727f7ec8cfc0d5cd02927ca27f0b950839..c445bff37a69ad2d986c9966cf4c85d96ba55eb7 100644
(file)
--- a/
cinelerra-5.1/plugins/findobj/findobj.C
+++ b/
cinelerra-5.1/plugins/findobj/findobj.C
@@
-21,6
+21,8
@@
#include "affine.h"
#include "bccolors.h"
#include "clip.h"
#include "affine.h"
#include "bccolors.h"
#include "clip.h"
+#include "edl.h"
+#include "edlsession.h"
#include "filexml.h"
#include "language.h"
#include "findobj.h"
#include "filexml.h"
#include "language.h"
#include "findobj.h"
@@
-30,6
+32,7
@@
#include "plugin.h"
#include "pluginserver.h"
#include "track.h"
#include "plugin.h"
#include "pluginserver.h"
#include "track.h"
+#include "tracks.h"
#include <errno.h>
#include <exception>
#include <errno.h>
#include <exception>
@@
-311,6
+314,13
@@
void FindObjMain::read_data(KeyFrame *keyframe)
config.boundaries();
}
config.boundaries();
}
+Track *FindObjMain::get_plugin_track()
+{
+ int plugin_id = server->plugin_id;
+ Plugin *plugin = server->edl->tracks->plugin_exists(plugin_id);
+ return !plugin ? 0 : plugin->track;
+}
+
void FindObjMain::draw_line(VFrame *vframe, int x1, int y1, int x2, int y2)
{
vframe->draw_line(x1, y1, x2, y2);
void FindObjMain::draw_line(VFrame *vframe, int x1, int y1, int x2, int y2)
{
vframe->draw_line(x1, y1, x2, y2);
@@
-716,9
+726,9
@@
int FindObjMain::process_buffer(VFrame **frame, int64_t start_position, double f
object_layer = config.object_layer;
scene_layer = config.scene_layer;
replace_layer = config.replace_layer;
object_layer = config.object_layer;
scene_layer = config.scene_layer;
replace_layer = config.replace_layer;
- Track *track =
server->plugin->track
;
- w = track
->track
_w;
- h = track
->track
_h;
+ Track *track =
get_plugin_track()
;
+ w = track
? track->track_w : get_edl()->session->output
_w;
+ h = track
? track->track_h : get_edl()->session->output
_h;
int max_layer = PluginClient::get_total_buffers() - 1;
object_layer = bclip(config.object_layer, 0, max_layer);
int max_layer = PluginClient::get_total_buffers() - 1;
object_layer = bclip(config.object_layer, 0, max_layer);