yuv colorspace/range + prefs, ffmpeg colorrange probe, x11 direct force colormodel...

[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..577224326d6a5cd2781d7ac1e95058faab0ef9e9 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 "bccolors.h"
 #include "clip.h"
 #include "bchash.h"
 #include "filexml.h"
 #include "guicast.h"
 #include "language.h"
 #include "loadbalance.h"
-#include "cicolors.h"
+#include "bccolors.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;
-       YUV yuv;
 };
 
 class VideoScopeEngine : public LoadServer
@@ -416,21 +416,13 @@ static void draw_point(unsigned char **rows,
                        { \
                                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 \
                                { \
-                                       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 \