projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bsd build script and patch
[goodguy/history.git]
/
cinelerra-5.1
/
plugins
/
videoscope
/
videoscope.C
diff --git
a/cinelerra-5.1/plugins/videoscope/videoscope.C
b/cinelerra-5.1/plugins/videoscope/videoscope.C
index a420acf269c10096f7da000a5a5205717ec43b05..0744e83c60824b6ddaaf955d7fd085594b3b23bd 100644
(file)
--- a/
cinelerra-5.1/plugins/videoscope/videoscope.C
+++ b/
cinelerra-5.1/plugins/videoscope/videoscope.C
@@
-20,13
+20,14
@@
*/
#include "bcdisplayinfo.h"
*/
#include "bcdisplayinfo.h"
+#include "bccolors.h"
#include "clip.h"
#include "bchash.h"
#include "filexml.h"
#include "guicast.h"
#include "language.h"
#include "loadbalance.h"
#include "clip.h"
#include "bchash.h"
#include "filexml.h"
#include "guicast.h"
#include "language.h"
#include "loadbalance.h"
-#include "
ci
colors.h"
+#include "
bc
colors.h"
#include "pluginvclient.h"
#include "fonts.h"
#include "scopewindow.h"
#include "pluginvclient.h"
#include "fonts.h"
#include "scopewindow.h"
@@
-83,7
+84,6
@@
public:
VideoScopeUnit(VideoScopeEffect *plugin, VideoScopeEngine *server);
void process_package(LoadPackage *package);
VideoScopeEffect *plugin;
VideoScopeUnit(VideoScopeEffect *plugin, VideoScopeEngine *server);
void process_package(LoadPackage *package);
VideoScopeEffect *plugin;
- YUV yuv;
};
class VideoScopeEngine : public LoadServer
};
class VideoScopeEngine : public LoadServer
@@
-235,7
+235,7
@@
VideoScopeEffect::~VideoScopeEffect()
-const char* VideoScopeEffect::plugin_title() { return _("VideoScope"); }
+const char* VideoScopeEffect::plugin_title() { return
N
_("VideoScope"); }
int VideoScopeEffect::is_realtime() { return 1; }
int VideoScopeEffect::load_configuration()
int VideoScopeEffect::is_realtime() { return 1; }
int VideoScopeEffect::load_configuration()
@@
-416,21
+416,13
@@
static void draw_point(unsigned char **rows,
{ \
if(sizeof(type) == 2) \
{ \
{ \
if(sizeof(type) == 2) \
{ \
- yuv.yuv_to_rgb_16(r, \
- g, \
- b, \
- in_pixel[0], \
- in_pixel[1], \
- in_pixel[2]); \
+ YUV::yuv.yuv_to_rgb_16(r, g, b, \
+ in_pixel[0], in_pixel[1], in_pixel[2]); \
} \
else \
{ \
} \
else \
{ \
- yuv.yuv_to_rgb_8(r, \
- g, \
- b, \
- in_pixel[0], \
- in_pixel[1], \
- in_pixel[2]); \
+ YUV::yuv.yuv_to_rgb_8(r, g, b, \
+ in_pixel[0], in_pixel[1], in_pixel[2]); \
} \
} \
else \
} \
} \
else \