X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fvideoscope%2Fvideoscope.C;h=76b7cf720740f5d9a1116a79b71d0c608c6ae664;hp=a420acf269c10096f7da000a5a5205717ec43b05;hb=b2eb290b3f6e5c233393017aa152e67c76243130;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb

diff --git a/cinelerra-5.1/plugins/videoscope/videoscope.C b/cinelerra-5.1/plugins/videoscope/videoscope.C
index a420acf2..76b7cf72 100644
--- 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
@@ -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()
@@ -248,7 +248,7 @@ void VideoScopeEffect::save_data(KeyFrame *keyframe)
 	FileXML output;
 
 // cause data to be stored directly in text
-	output.set_shared_output(keyframe->get_data(), MESSAGESIZE);
+	output.set_shared_output(keyframe->xbuf);
 	output.tag.set_title("VIDEOSCOPE");
 
 
@@ -273,7 +273,7 @@ void VideoScopeEffect::save_data(KeyFrame *keyframe)
 void VideoScopeEffect::read_data(KeyFrame *keyframe)
 {
 	FileXML input;
-	input.set_shared_input(keyframe->get_data(), strlen(keyframe->get_data()));
+	input.set_shared_input(keyframe->xbuf);
 
 	int result = 0;
 
@@ -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 \