From 8ad3d1d252581bde81d0144b80350ebff264b1e8 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Sun, 16 Apr 2006 00:10:21 +0000
Subject: [PATCH] Removed unused vars from colorpicker dialog. No longer
 depends on lavc headers when USE_LAVC is undefined.

Originally committed to SVN as r344.
---
 core/dialog_colorpicker.cpp | 10 +++++-----
 core/lavc_file.h            |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/dialog_colorpicker.cpp b/core/dialog_colorpicker.cpp
index 1445aa260..85b0fd775 100644
--- a/core/dialog_colorpicker.cpp
+++ b/core/dialog_colorpicker.cpp
@@ -592,7 +592,7 @@ void DialogColorPicker::UpdateFromRGB()
 	if (updating_controls) return;
 	updating_controls = true;
 
-	unsigned char r, g, b, y, u, v, h, s, l, h2, s2, v2;
+	unsigned char r, g, b, h, s, l, h2, s2, v2;
 	r = rgb_input[0]->GetValue();
 	g = rgb_input[1]->GetValue();
 	b = rgb_input[2]->GetValue();
@@ -619,7 +619,7 @@ void DialogColorPicker::UpdateFromHSL()
 	if (updating_controls) return;
 	updating_controls = true;
 
-	unsigned char r, g, b, y, u, v, h, s, l, h2, s2, v2;
+	unsigned char r, g, b, h, s, l, h2, s2, v2;
 	h = hsl_input[0]->GetValue();
 	s = hsl_input[1]->GetValue();
 	l = hsl_input[2]->GetValue();
@@ -645,7 +645,7 @@ void DialogColorPicker::UpdateFromHSV()
 	if (updating_controls) return;
 	updating_controls = true;
 
-	unsigned char r, g, b, y, u, v, h, s, l, h2, s2, v2;
+	unsigned char r, g, b, h, s, l, h2, s2, v2;
 	//int r, g, b, h2, s2, v2;
 	h2 = hsv_input[0]->GetValue();
 	s2 = hsv_input[1]->GetValue();
@@ -673,7 +673,7 @@ void DialogColorPicker::UpdateFromASS()
 	if (updating_controls) return;
 	updating_controls = true;
 
-	unsigned char r, g, b, y, u, v, h, s, l, h2, s2, v2;
+	unsigned char r, g, b, h, s, l, h2, s2, v2;
 	AssColor ass;
 	ass.ParseASS(ass_input->GetValue());
 	r = ass.r;
@@ -703,7 +703,7 @@ void DialogColorPicker::UpdateFromHTML()
 	if (updating_controls) return;
 	updating_controls = true;
 
-	unsigned char r, g, b, y, u, v, h, s, l, h2, s2, v2;
+	unsigned char r, g, b, h, s, l, h2, s2, v2;
 	cur_color = html_to_color(html_input->GetValue());
 	r = cur_color.Red();
 	g = cur_color.Green();
diff --git a/core/lavc_file.h b/core/lavc_file.h
index 00d1f6bf9..09a3b24a3 100644
--- a/core/lavc_file.h
+++ b/core/lavc_file.h
@@ -38,6 +38,7 @@
 
 #ifndef LAVC_FILE_H
 #define LAVC_FILE_H
+#ifdef USE_LAVC
 
 #define EMULATE_INTTYPES
 #include <wx/filename.h>
@@ -65,5 +66,6 @@ public:
 	void Release() { if (!--refs) delete this; };
 };
 
+#endif /* USE_LAVC */
 #endif /* LAVC_FILE_H */