X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fvideoscope%2Fvideoscope.C;h=0744e83c60824b6ddaaf955d7fd085594b3b23bd;hb=4b63344ef93576909bef74d89a09a7a69a6a5d15;hp=178091cf680d6eb3b21bd08ea4dbef7c1f7b9d09;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/videoscope/videoscope.C b/cinelerra-5.1/plugins/videoscope/videoscope.C
index 178091cf..0744e83c 100644
--- a/cinelerra-5.1/plugins/videoscope/videoscope.C
+++ b/cinelerra-5.1/plugins/videoscope/videoscope.C
@@ -2,31 +2,32 @@
 /*
  * CINELERRA
  * Copyright (C) 1997-2011 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #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
@@ -146,8 +146,8 @@ VideoScopeConfig::VideoScopeConfig()
 
 
 VideoScopeWindow::VideoScopeWindow(VideoScopeEffect *plugin)
- : ScopeGUI(plugin, 
-	plugin->w, 
+ : ScopeGUI(plugin,
+	plugin->w,
 	plugin->h)
 {
 	this->plugin = plugin;
@@ -229,13 +229,13 @@ VideoScopeEffect::VideoScopeEffect(PluginServer *server)
 
 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()
@@ -348,7 +348,7 @@ VideoScopePackage::VideoScopePackage()
 
 
 
-VideoScopeUnit::VideoScopeUnit(VideoScopeEffect *plugin, 
+VideoScopeUnit::VideoScopeUnit(VideoScopeEffect *plugin,
 	VideoScopeEngine *server)
  : LoadClient(server)
 {
@@ -361,12 +361,12 @@ VideoScopeUnit::VideoScopeUnit(VideoScopeEffect *plugin,
 									((p)[2] * 29)) >> 8)
 
 
-static void draw_point(unsigned char **rows, 
-	int color_model, 
-	int x, 
-	int y, 
-	int r, 
-	int g, 
+static void draw_point(unsigned char **rows,
+	int color_model,
+	int x,
+	int y,
+	int r,
+	int g,
 	int b)
 {
 	switch(color_model)
@@ -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 \