X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcmeter.h;h=e43c52b7f4cb41cb38cbb0ef630bc36794deb01a;hp=9a5cf807c43100a51b834e7f605477d832f5e4dd;hb=eb9df615719cf3afe2bc08035900e5d3451034e1;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/guicast/bcmeter.h b/cinelerra-5.1/guicast/bcmeter.h
index 9a5cf807..e43c52b7 100644
--- a/cinelerra-5.1/guicast/bcmeter.h
+++ b/cinelerra-5.1/guicast/bcmeter.h
@@ -1,7 +1,6 @@
-
 /*
  * CINELERRA
- * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2008-2019 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
@@ -16,7 +15,6 @@
  * 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
- *
  */
 
 #ifndef BCMETER_H
@@ -35,20 +33,20 @@
 
 // Distance from subwindow border to top and bottom tick mark
 #define METER_MARGIN 0
+// tick width
+#define TICK_W1 xS(10)
+#define TICK_W2 xS(5)
 
 class BC_Meter : public BC_SubWindow
 {
 public:
-	BC_Meter(int x,
-		int y,
-		int orientation,
-		int pixels,
-		int min, /* = -40, */
-		int max,
+	BC_Meter(int x, int y, int orientation, int pixels,
+		int min, /* = -40, */ int max,
 		int mode, /* = METER_DB, */
 		int use_titles, /* = 0, */
-		int span, /* = -1 width for vertical mode only */
-		int downmix = 0);
+		int span /* = -1 width for vertical mode only */,
+		int is_downmix = 0,
+		int is_gain_change = 0);
 	virtual ~BC_Meter();
 
 	int initialize();
@@ -64,12 +62,11 @@ public:
 
 	static int get_title_w();
 	static int get_meter_w();
-	int update(float new_value, int over, int dmix=-1);
-	int reposition_window(int x,
-		int y,
+	int update(float new_value, int over, int downmix=-1);
+	int reposition_window(int x, int y,
 		int span /* = -1 for vertical mode only */,
 		int pixels);
-	int reset(int dmix=-1);
+	int reset(int downmix=-1);
 	int reset_over();
 	int change_format(int mode, int min, int max);
 
@@ -91,25 +88,22 @@ private:
 	int use_titles;
 // Tick mark positions
 	ArrayList<int> tick_pixels;
+// Tick widths
+	ArrayList<int> tick_w;
 // Title positions
 	ArrayList<int> title_pixels;
 	ArrayList<char*> db_titles;
 	float level, peak;
 	int mode;
-	DB db;
 	int peak_timer;
-
-
-
-
-
+	int is_gain_change;
 
 	int peak_pixel, level_pixel, peak_pixel1, peak_pixel2;
 	int over_count, over_timer;
 	int min, max;
-	int downmix;
-	int over_delay;       // Number of updates the over warning lasts.
-	int peak_delay;       // Number of updates the peak lasts.
+	int is_downmix;
+	int over_delay;	   // Number of updates the over warning lasts.
+	int peak_delay;	   // Number of updates the peak lasts.
 };
 
 #endif