[CinCV-commits] CinelerraCV.git (#1552) - master (branch) updated: v2.3-100-g551c4d3

git repository hosting git at cinelerra-cv.org
Fri Apr 29 19:40:19 CEST 2016


The branch, master has been updated
       via  551c4d3ac9df1f7ddabdf44bad3a9e01740215ad (commit)
       via  2707ac974b6234d6a3f125ad3ad343db07a3cd70 (commit)
       via  a50c86a6309baf58369a2ea79bf0d812a98ad124 (commit)
       via  0f5192cd85b992f684e794711c8f9b508d22e84b (commit)
       via  d42dbc76e4fb4569b6baee0aaad105070d838c58 (commit)
      from  21049b7c53ab6019383b8be9a0789e6e8c148cb8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 551c4d3ac9df1f7ddabdf44bad3a9e01740215ad
Author: Igor Vladimirsky aka igor_ubuntu <sitelve at gmail.com>
Date:   Wed Apr 27 19:58:31 2016 +0300

    Fix markup of translatable strings in overlay.C
    
    The strings `Normal`, `Replace`, `Addition`, `Subtract`, Multiply`,
    `Divide`, `Max` are untranslatable.
    Fixed.

commit 2707ac974b6234d6a3f125ad3ad343db07a3cd70
Author: Igor Vladimirsky aka igor_ubuntu <sitelve at gmail.com>
Date:   Wed Apr 27 20:28:38 2016 +0300

    Fix markup of translatable strings in compressor.C
    
    The strings `Trigger`, `Maximum`, `Total` are untranslatable.
    Fixed.

commit a50c86a6309baf58369a2ea79bf0d812a98ad124
Author: Johannes Sixt <j6t at kdbg.org>
Date:   Sun Apr 24 12:14:30 2016 +0200

    Remove unused parameter "Delay frames" from Denoise video2 plugin.
    
    The value that the UI element "Delay frames" controls is not used anywhere
    in the plugin. Remove the element and associated code.
    
    Noticed by igor_ubuntu.

commit 0f5192cd85b992f684e794711c8f9b508d22e84b
Author: Einar Rünkaru <einarrunkaru at gmail.com>
Date:   Sat Apr 9 17:20:50 2016 +0300

    Make interlacemode texts translatable
    
    Copy interlacemode texts from quicktime to mwindow
    and make them translatable.
    Disable textboxes - the changes in them are ignored
    or they are not usable.

commit d42dbc76e4fb4569b6baee0aaad105070d838c58
Author: Einar Rünkaru <einarrunkaru at gmail.com>
Date:   Tue Apr 26 20:40:09 2016 +0300

    New option of BC_TextBox::disable - do not dim the text
    
    Used in selections where changing the item is done only through pulldown

-----------------------------------------------------------------------

Summary of changes:
 cinelerra/assetedit.C               | 79 +++++++----------------------------
 cinelerra/assetedit.h               | 35 +---------------
 cinelerra/mwindow.C                 | 83 +++++++++++++++++++++++++++++--------
 cinelerra/mwindow.h                 |  3 ++
 cinelerra/new.C                     | 12 ++----
 cinelerra/new.h                     |  8 +---
 cinelerra/setformat.C               |  1 +
 guicast/bctextbox.C                 |  7 +++-
 guicast/bctextbox.h                 |  4 +-
 plugins/compressor/compressor.C     |  8 ++--
 plugins/denoisemjpeg/denoisemjpeg.C | 48 +--------------------
 plugins/denoisemjpeg/denoisemjpeg.h | 10 -----
 plugins/overlay/overlay.C           | 16 +++----
 13 files changed, 112 insertions(+), 202 deletions(-)

The diff of changes is:
diff --git a/cinelerra/assetedit.C b/cinelerra/assetedit.C
index 1c9b9b3..10a322c 100644
--- a/cinelerra/assetedit.C
+++ b/cinelerra/assetedit.C
@@ -24,6 +24,7 @@
 #include "awindow.h"
 #include "awindowgui.h"
 #include "bcprogressbox.h"
+#include "bcsignals.h"
 #include "bitspopup.h"
 #include "cache.h"
 #include "clip.h"
@@ -457,7 +458,8 @@ int AssetEditWindow::create_objects()
 
 		// --------------------
 		add_subwindow(title = new BC_Title(x1, y, _("Asset's interlacing:")));
-		add_subwindow(textboxw = new AssetEditILacemode(this, "", BC_ILACE_ASSET_MODEDEFAULT, x2, y, 200));
+		add_subwindow(textboxw = textboxw = new BC_TextBox(x2, y, 200, 1, ""));
+		textboxw->disable(1);
 		ilacefixoption_chkboxw->ilacemode_textbox = textboxw;
 		add_subwindow(listboxw = new AssetEditInterlacemodePulldown(mwindow,
 							textboxw, 
@@ -471,7 +473,8 @@ int AssetEditWindow::create_objects()
 
 		// --------------------
 		add_subwindow(title = new BC_Title(x1, y, _("Interlace correction:")));
-		add_subwindow(textboxw = new AssetEditILacefixmethod(this, "", BC_ILACE_FIXDEFAULT, x2, y, 200));
+		add_subwindow(textboxw = new BC_TextBox(x2, y, 200, 1, ""));
+		textboxw->disable(1);
 		ilacefixoption_chkboxw->ilacefixmethod_textbox = textboxw;
 		add_subwindow(listboxw = new InterlacefixmethodPulldown(mwindow, 
 							textboxw,
@@ -613,22 +616,23 @@ void Interlaceautofix::showhideotherwidgets()
 
 	if (thevalue == BC_ILACE_AUTOFIXOPTION_AUTO) 
 	  {
-	    this->ilacemode_textbox->enable(); 
+	    this->ilacemode_textbox->disable(1);
 	    this->ilacemode_listbox->enable(); 
 	    this->ilacefixmethod_textbox->disable();
 	    this->ilacefixmethod_listbox->disable();
-	    int xx = ilaceautofixmethod(mwindow->edl->session->interlace_mode,fwindow->asset->interlace_mode);
-	    ilacefixmethod_to_text(string,xx);
-	    this->ilacefixmethod_textbox->update(string);
+	    this->ilacefixmethod_textbox->update(
+		MWindow::ilacefixmethod_to_text(ilaceautofixmethod(
+		    mwindow->edl->session->interlace_mode,
+		    fwindow->asset->interlace_mode)));
 	  }
 	if (thevalue == BC_ILACE_AUTOFIXOPTION_MANUAL) 
 	  {
 	    this->ilacemode_textbox->disable(); 
 	    this->ilacemode_listbox->disable(); 
-	    this->ilacefixmethod_textbox->enable(); 
+	    this->ilacefixmethod_textbox->disable(1);
 	    this->ilacefixmethod_listbox->enable(); 
-	    ilacefixmethod_to_text(string,fwindow->asset->interlace_fixmethod);
-	    this->ilacefixmethod_textbox->update(string);
+	    this->ilacefixmethod_textbox->update(
+		MWindow::ilacefixmethod_to_text(fwindow->asset->interlace_fixmethod));
 	  }
 }
 
@@ -661,7 +665,7 @@ InterlacefixmethodPulldown::InterlacefixmethodPulldown(MWindow *mwindow,
 	this->mwindow = mwindow;
 	this->output_text = output_text;
 	this->output_value = output_value;
-	output_text->update(interlacefixmethod_to_text());
+	output_text->update(MWindow::ilacefixmethod_to_text(*output_value));
 }
 
 int InterlacefixmethodPulldown::handle_event()
@@ -671,39 +675,6 @@ int InterlacefixmethodPulldown::handle_event()
 	return 1;
 }
 
-const char* InterlacefixmethodPulldown::interlacefixmethod_to_text()
-{
-	ilacefixmethod_to_text(this->string,*output_value);
-	return (this->string);
-}
-
-AssetEditILaceautofixoption::AssetEditILaceautofixoption(AssetEditWindow *fwindow, char *text, int thedefault, int x, int y, int w)
- : BC_TextBox(x, y, w, 1, text)
-{
-	this->fwindow = fwindow;
-	this->thedefault = thedefault;
-}
-
-int AssetEditILaceautofixoption::handle_event()
-{
-	fwindow->asset->interlace_autofixoption = ilaceautofixoption_from_text(get_text(), this->thedefault);
-	return 1;
-}
-
-
-AssetEditILacemode::AssetEditILacemode(AssetEditWindow *fwindow, const char *text, int thedefault, int x, int y, int w)
- : BC_TextBox(x, y, w, 1, text)
-{
-	this->fwindow = fwindow;
-	this->thedefault = thedefault;
-}
-
-int AssetEditILacemode::handle_event()
-{
-	fwindow->asset->interlace_mode = ilacemode_from_text(get_text(),this->thedefault);
-	return 1;
-}
-
 AssetEditInterlacemodePulldown::AssetEditInterlacemodePulldown(MWindow *mwindow, 
 		BC_TextBox *output_text,
 		int *output_value,
@@ -723,12 +694,11 @@ AssetEditInterlacemodePulldown::AssetEditInterlacemodePulldown(MWindow *mwindow,
 	0,
 	1)
 {
-	char string[BCTEXTLEN];
 	this->fixoption_chkbox = fixoption_chkboxw;
 	this->mwindow = mwindow;
 	this->output_text = output_text;
 	this->output_value = output_value;
-	output_text->update(interlacemode_to_text());
+	output_text->update(MWindow::ilacemode_to_text(*output_value));
 }
 
 int AssetEditInterlacemodePulldown::handle_event()
@@ -739,25 +709,6 @@ int AssetEditInterlacemodePulldown::handle_event()
 	return 1;
 }
 
-char* AssetEditInterlacemodePulldown::interlacemode_to_text()
-{
-	ilacemode_to_text(this->string,*output_value);
-	return (this->string);
-}
-
-AssetEditILacefixmethod::AssetEditILacefixmethod(AssetEditWindow *fwindow, const char *text, int thedefault, int x, int y, int w)
- : BC_TextBox(x, y, w, 1, text)
-{
-	this->fwindow = fwindow;
-	this->thedefault = thedefault;
-}
-
-int AssetEditILacefixmethod::handle_event()
-{
-	fwindow->asset->interlace_fixmethod = ilacefixmethod_from_text(get_text(),this->thedefault);
-	return 1;
-}
-
 AssetEditHeader::AssetEditHeader(AssetEditWindow *fwindow, char *text, int x, int y)
  : BC_TextBox(x, y, 100, 1, text)
 {
diff --git a/cinelerra/assetedit.h b/cinelerra/assetedit.h
index 70c0854..03861c5 100644
--- a/cinelerra/assetedit.h
+++ b/cinelerra/assetedit.h
@@ -166,27 +166,6 @@ public:
 	BC_ListBox *ilacemode_listbox;
 	BC_TextBox *ilacefixmethod_textbox;
 	BC_ListBox *ilacefixmethod_listbox;
-private:
-  	char string[BCTEXTLEN];
-};
-
-class AssetEditILaceautofixoption : public BC_TextBox
-{
-public:
-	AssetEditILaceautofixoption(AssetEditWindow *fwindow, char *text, int thedefault, int x, int y, int w);
-
-	int handle_event();
-	int thedefault;
-	AssetEditWindow *fwindow;
-};
-
-class AssetEditILacemode : public BC_TextBox
-{
-public:
-	AssetEditILacemode(AssetEditWindow *fwindow, const char *text, int thedefault, int x, int y, int w);
-	int handle_event();
-	int thedefault;	
-	AssetEditWindow *fwindow;
 };
 
 class AssetEditInterlacemodePulldown : public BC_ListBox
@@ -200,23 +179,11 @@ public:
 				int x,
 				int y);
 	int handle_event();
-	char* interlacemode_to_text();
+
 	MWindow *mwindow;
 	BC_TextBox *output_text;
 	int *output_value;
 	Interlaceautofix *fixoption_chkbox;
-private:
-  	char string[BCTEXTLEN];
-};
-
-class AssetEditILacefixmethod : public BC_TextBox
-{
-public:
-	AssetEditILacefixmethod(AssetEditWindow *fwindow, const char *text, int thedefault, int x, int y, int w);
-	
-	int handle_event();
-	int thedefault;
-	AssetEditWindow *fwindow;
 };
 
 class AssetEditHeader : public BC_TextBox
diff --git a/cinelerra/mwindow.C b/cinelerra/mwindow.C
index df35622..df81754 100644
--- a/cinelerra/mwindow.C
+++ b/cinelerra/mwindow.C
@@ -790,31 +790,78 @@ void MWindow::init_menus()
 //	cmodel_to_text(string, BC_YUVA16161616);
 //	colormodels.append(new ColormodelItem(string, BC_YUVA16161616));
 
-#define ILACEPROJECTMODELISTADD(x) ilacemode_to_text(string, x); \
-                           interlace_project_modes.append(new InterlacemodeItem(string, x));
+	// Interlacing Modes
+	// Not included in the list for the project options.
+	interlace_asset_modes.append(
+		new InterlacemodeItem(ilacemode_to_text(BC_ILACE_MODE_UNDETECTED),
+			BC_ILACE_MODE_UNDETECTED));
+
+	interlace_asset_modes.append(
+		new InterlacemodeItem(ilacemode_to_text(BC_ILACE_MODE_TOP_FIRST),
+			BC_ILACE_MODE_TOP_FIRST));
+	interlace_project_modes.append(
+		new InterlacemodeItem(ilacemode_to_text(BC_ILACE_MODE_TOP_FIRST),
+			BC_ILACE_MODE_TOP_FIRST));
+
+	interlace_asset_modes.append(
+		new InterlacemodeItem(ilacemode_to_text(BC_ILACE_MODE_BOTTOM_FIRST),
+			BC_ILACE_MODE_BOTTOM_FIRST));
+	interlace_project_modes.append(
+		new InterlacemodeItem(ilacemode_to_text(BC_ILACE_MODE_BOTTOM_FIRST),
+			BC_ILACE_MODE_BOTTOM_FIRST));
+
+	interlace_asset_modes.append(
+		new InterlacemodeItem(ilacemode_to_text(BC_ILACE_MODE_NOTINTERLACED),
+			BC_ILACE_MODE_NOTINTERLACED));
+	interlace_project_modes.append(
+		new InterlacemodeItem(ilacemode_to_text(BC_ILACE_MODE_NOTINTERLACED),
+			BC_ILACE_MODE_NOTINTERLACED));
 
-#define ILACEASSETMODELISTADD(x) ilacemode_to_text(string, x); \
-                           interlace_asset_modes.append(new InterlacemodeItem(string, x));
+	// Interlacing Fixing Methods
+	interlace_asset_fixmethods.append(
+		new InterlacefixmethodItem(ilacefixmethod_to_text(BC_ILACE_FIXMETHOD_NONE),
+			BC_ILACE_FIXMETHOD_NONE));
+	interlace_asset_fixmethods.append(
+		new InterlacefixmethodItem(ilacefixmethod_to_text(BC_ILACE_FIXMETHOD_UPONE),
+			BC_ILACE_FIXMETHOD_UPONE));
+	interlace_asset_fixmethods.append(
+		new InterlacefixmethodItem(ilacefixmethod_to_text(BC_ILACE_FIXMETHOD_DOWNONE),
+			BC_ILACE_FIXMETHOD_DOWNONE));
+}
 
-#define ILACEFIXMETHODLISTADD(x) ilacefixmethod_to_text(string, x); \
-                           interlace_asset_fixmethods.append(new InterlacefixmethodItem(string, x));
+const char *MWindow::ilacemode_to_text(int ilacemode)
+{
+	switch(ilacemode)
+	{
+	case BC_ILACE_MODE_UNDETECTED:
+		return _("Unknown");
 
-	// Interlacing Modes
-	ILACEASSETMODELISTADD(BC_ILACE_MODE_UNDETECTED); // Not included in the list for the project options.
+	case BC_ILACE_MODE_TOP_FIRST:
+		return _("Top Fields First");
 
-	ILACEASSETMODELISTADD(BC_ILACE_MODE_TOP_FIRST);
-	ILACEPROJECTMODELISTADD(BC_ILACE_MODE_TOP_FIRST);
+	case BC_ILACE_MODE_BOTTOM_FIRST:
+		return _("Bottom Fields First");
 
-	ILACEASSETMODELISTADD(BC_ILACE_MODE_BOTTOM_FIRST);
-	ILACEPROJECTMODELISTADD(BC_ILACE_MODE_BOTTOM_FIRST);
+	case BC_ILACE_MODE_NOTINTERLACED:
+		return _("Not Interlaced");
+	}
+	return _("Unknown");
+}
+
+const char *MWindow::ilacefixmethod_to_text(int fixmethod)
+{
+	switch(fixmethod)
+	{
+	case BC_ILACE_FIXMETHOD_NONE:
+		return _("Do Nothing");
 
-	ILACEASSETMODELISTADD(BC_ILACE_MODE_NOTINTERLACED);
-	ILACEPROJECTMODELISTADD(BC_ILACE_MODE_NOTINTERLACED);
+	case BC_ILACE_FIXMETHOD_UPONE:
+		return _("Shift Up 1 pixel");
 
-	// Interlacing Fixing Methods
-	ILACEFIXMETHODLISTADD(BC_ILACE_FIXMETHOD_NONE);
-	ILACEFIXMETHODLISTADD(BC_ILACE_FIXMETHOD_UPONE);
-	ILACEFIXMETHODLISTADD(BC_ILACE_FIXMETHOD_DOWNONE);
+	case BC_ILACE_FIXMETHOD_DOWNONE:
+		return _("Shift Down 1 pixel");
+        }
+	return _("Error!");
 }
 
 void MWindow::init_indexes()
diff --git a/cinelerra/mwindow.h b/cinelerra/mwindow.h
index 702883f..2381ae4 100644
--- a/cinelerra/mwindow.h
+++ b/cinelerra/mwindow.h
@@ -290,6 +290,9 @@ public:
 	static void create_defaults_path(char *string);
 // Compose standard window title
 	static char *create_title(const char *name);
+// Interlace(fix)methods to text
+	static const char *ilacemode_to_text(int ilacemode);
+	static const char *ilacefixmethod_to_text(int fixmethod);
 
 	void delete_folder(char *folder);
 	void delete_inpoint();
diff --git a/cinelerra/new.C b/cinelerra/new.C
index 62854d4..ee4cfef 100644
--- a/cinelerra/new.C
+++ b/cinelerra/new.C
@@ -383,6 +383,7 @@ int NewWindow::create_objects()
 	// --------------------
 	add_subwindow(new BC_Title(x, y, _("Interlace mode:")));
 	add_subwindow(textbox = new BC_TextBox(x + 100, y, 140, 1, ""));
+	textbox->disable(1);
 	add_subwindow(interlace_pulldown = new InterlacemodePulldown(mwindow, 
 		textbox, 
 		&new_edl->session->interlace_mode,
@@ -877,11 +878,10 @@ InterlacemodePulldown::InterlacemodePulldown(MWindow *mwindow,
 	0,
 	1)
 {
-	char string[BCTEXTLEN];
 	this->mwindow = mwindow;
 	this->output_text = output_text;
 	this->output_value = output_value;
-	output_text->update(interlacemode_to_text());
+	output_text->update(MWindow::ilacemode_to_text(*output_value));
 }
 
 int InterlacemodePulldown::handle_event()
@@ -891,16 +891,10 @@ int InterlacemodePulldown::handle_event()
 	return 1;
 }
 
-const char* InterlacemodePulldown::interlacemode_to_text()
-{
-	ilacemode_to_text(this->string,*output_value);
-	return (this->string);
-}
-
 int InterlacemodePulldown::update(int interlace_mode)
 {
 	*output_value = interlace_mode;
-	output_text->update(interlacemode_to_text());
+	output_text->update(MWindow::ilacemode_to_text(interlace_mode));
 	return 1;
 }
 
diff --git a/cinelerra/new.h b/cinelerra/new.h
index c58fcd4..5a68fa0 100644
--- a/cinelerra/new.h
+++ b/cinelerra/new.h
@@ -357,13 +357,11 @@ public:
 				int x,
 				int y);
 	int handle_event();
-	const char* interlacemode_to_text();
+
 	int update(int value);
 	MWindow *mwindow;
 	BC_TextBox *output_text;
 	int *output_value;
-private:
-  	char string[BCTEXTLEN];
 };
 
 class InterlacefixmethodItem : public BC_ListBoxItem
@@ -383,12 +381,10 @@ public:
 				   int x, 
 				   int y);
 	int handle_event();
-	const char* interlacefixmethod_to_text();
+
 	MWindow *mwindow;
 	BC_TextBox *output_text;
 	int *output_value;
-private:
-  	char string[BCTEXTLEN];
 };
 
 
diff --git a/cinelerra/setformat.C b/cinelerra/setformat.C
index 071e17c..181bb0f 100644
--- a/cinelerra/setformat.C
+++ b/cinelerra/setformat.C
@@ -524,6 +524,7 @@ void SetFormatWindow::create_objects()
 		140, 
 		1, 
 		""));
+	textbox->disable(1);
 	add_subwindow(interlace_pulldown = new InterlacemodePulldown(mwindow, 
 		textbox,
 		&(thread->new_settings->session->interlace_mode),
diff --git a/guicast/bctextbox.C b/guicast/bctextbox.C
index 688468e..4bf7e00 100644
--- a/guicast/bctextbox.C
+++ b/guicast/bctextbox.C
@@ -174,6 +174,7 @@ int BC_TextBox::reset_parameters(int rows, int has_border, int font)
 	keypress_draw = 1;
 	last_keypress = 0;
 	separators = 0;
+	defaultcolor = 0;
 	wtext_len = 0;
 	positions = 0;
 	return 0;
@@ -312,11 +313,12 @@ int BC_TextBox::update(float value)
 	return 0;
 }
 
-void BC_TextBox::disable()
+void BC_TextBox::disable(int options)
 {
 	if(enabled)
 	{
 		enabled = 0;
+		defaultcolor = options;
 		if(top_level)
 		{
 			if(active) top_level->deactivate();
@@ -330,6 +332,7 @@ void BC_TextBox::enable()
 	if(!enabled)
 	{
 		enabled = 1;
+		defaultcolor = 0;
 		if(top_level)
 		{
 			draw();
@@ -537,7 +540,7 @@ void BC_TextBox::draw()
 			}
 
 // Draw text over highlight
-			if(enabled)
+			if(enabled || defaultcolor)
 				set_color(resources->text_default);
 			else
 				set_color(MEGREY);
diff --git a/guicast/bctextbox.h b/guicast/bctextbox.h
index 65961a3..f4c1510 100644
--- a/guicast/bctextbox.h
+++ b/guicast/bctextbox.h
@@ -85,7 +85,8 @@ public:
 	void updateutf8(const char *text);
 	int update(int64_t value);
 	int update(float value);
-	void disable();
+// options: do not dim the text when the box is disabled
+	void disable(int options = 0);
 	void enable();
 	int get_enabled();
 
@@ -179,6 +180,7 @@ private:
 	int *positions;
 	int active;
 	int enabled;
+	int defaultcolor;
 	int precision;
 	int keypress_draw;
 // Cause the repeater to skip a cursor refresh if a certain event happened
diff --git a/plugins/compressor/compressor.C b/plugins/compressor/compressor.C
index 69484e1..0621db5 100644
--- a/plugins/compressor/compressor.C
+++ b/plugins/compressor/compressor.C
@@ -1373,12 +1373,12 @@ const char* CompressorInput::value_to_text(int value)
 {
 	switch(value)
 	{
-		case CompressorConfig::TRIGGER: return "Trigger";
-		case CompressorConfig::MAX: return "Maximum";
-		case CompressorConfig::SUM: return "Total";
+		case CompressorConfig::TRIGGER: return _("Trigger");
+		case CompressorConfig::MAX: return _("Maximum");
+		case CompressorConfig::SUM: return _("Total");
 	}
 
-	return "Trigger";
+	return _("Trigger");
 }
 
 int CompressorInput::text_to_value(char *text)
diff --git a/plugins/denoisemjpeg/denoisemjpeg.C b/plugins/denoisemjpeg/denoisemjpeg.C
index 188c2cd..0a18720 100644
--- a/plugins/denoisemjpeg/denoisemjpeg.C
+++ b/plugins/denoisemjpeg/denoisemjpeg.C
@@ -59,7 +59,6 @@ DenoiseMJPEGConfig::DenoiseMJPEGConfig()
 	ccontrast = 100;
 	deinterlace = 0;
 	mode = 0;
-	delay = 3;
 }
 
 int DenoiseMJPEGConfig::equivalent(DenoiseMJPEGConfig &that)
@@ -72,8 +71,7 @@ int DenoiseMJPEGConfig::equivalent(DenoiseMJPEGConfig &that)
 		that.lcontrast == lcontrast && 
 		that.ccontrast == ccontrast && 
 		that.deinterlace == deinterlace && 
-		that.mode == mode && 
-		that.delay == delay;
+		that.mode == mode;
 }
 
 void DenoiseMJPEGConfig::copy_from(DenoiseMJPEGConfig &that)
@@ -86,7 +84,6 @@ void DenoiseMJPEGConfig::copy_from(DenoiseMJPEGConfig &that)
 	ccontrast = that.ccontrast;
 	deinterlace = that.deinterlace;
 	mode = that.mode;
-	delay = that.delay;
 }
 
 void DenoiseMJPEGConfig::interpolate(DenoiseMJPEGConfig &prev, 
@@ -106,7 +103,6 @@ void DenoiseMJPEGConfig::interpolate(DenoiseMJPEGConfig &prev,
 	this->ccontrast = (int)(prev.ccontrast * prev_scale + next.ccontrast * next_scale);
 	this->deinterlace = prev.deinterlace;
 	this->mode = prev.mode;
-	this->delay = (int)(prev.delay * prev_scale + next.delay * next_scale);
 }
 
 
@@ -332,43 +328,12 @@ int DenoiseMJPEGModeFast::handle_event()
 
 
 
-
-
-
-DenoiseMJPEGDelay::DenoiseMJPEGDelay(DenoiseMJPEG *plugin, int x, int y)
- : BC_IPot(x, 
- 	y, 
-	plugin->config.delay,
-	1,
-	8)
-{
-	this->plugin = plugin;
-}
-
-int DenoiseMJPEGDelay::handle_event()
-{
-	int result = get_value();
-	plugin->config.delay = result;
-	plugin->send_configure_change();
-	return 1;
-}
-
-
-
-
-
-
-
-
-
-
-
 DenoiseMJPEGWindow::DenoiseMJPEGWindow(DenoiseMJPEG *plugin, int x, int y)
  : PluginWindow(plugin->gui_string,
  	x, 
 	y, 
 	250, 
-	350)
+	320)
 {
 	this->plugin = plugin;
 }
@@ -401,10 +366,6 @@ void DenoiseMJPEGWindow::create_objects()
 	add_subwindow(ccontrast = new DenoiseMJPEGCContrast(plugin, x3, y2));
 	y1 += margin;
 	y2 += margin;
-	add_subwindow(new BC_Title(x1, y1, _("Delay frames:")));
-	add_subwindow(delay = new DenoiseMJPEGDelay(plugin, x2, y2));
-	y1 += margin;
-	y2 += margin;
 	add_subwindow(new BC_Title(x1, y1, _("Mode:")));
 	add_subwindow(interlaced = new DenoiseMJPEGModeInterlaced(plugin, this, x2, y1));
 	y1 += margin2;
@@ -484,7 +445,6 @@ void DenoiseMJPEG::update_gui()
 	{
 		load_configuration();
 		thread->window->lock_window();
-		thread->window->delay->update(config.delay);
 		thread->window->threshold1->update(config.threshold);
 		thread->window->unlock_window();
 	}
@@ -514,7 +474,6 @@ int DenoiseMJPEG::load_defaults()
 	config.ccontrast = defaults->get("CCONTRAST", config.ccontrast);
 	config.deinterlace = defaults->get("DEINTERLACE", config.deinterlace);
 	config.mode = defaults->get("MODE", config.mode);
-	config.delay = defaults->get("DELAY", config.delay);
 	return 0;
 }
 
@@ -528,7 +487,6 @@ int DenoiseMJPEG::save_defaults()
 	defaults->update("CCONTRAST", config.ccontrast);
 	defaults->update("DEINTERLACE", config.deinterlace);
 	defaults->update("MODE", config.mode);
-	defaults->update("DELAY", config.delay);
 	defaults->save();
 	return 0;
 }
@@ -548,7 +506,6 @@ void DenoiseMJPEG::save_data(KeyFrame *keyframe)
 	output.tag.set_property("CCONTRAST", config.ccontrast);
 	output.tag.set_property("DEINTERLACE", config.deinterlace);
 	output.tag.set_property("MODE", config.mode);
-	output.tag.set_property("DELAY", config.delay);
 	output.append_tag();
 	output.tag.set_title("/DENOISE_VIDEO2");
 	output.append_tag();
@@ -575,7 +532,6 @@ void DenoiseMJPEG::read_data(KeyFrame *keyframe)
 			config.ccontrast = input.tag.get_property("CCONTRAST", config.ccontrast);
 			config.deinterlace = input.tag.get_property("DEINTERLACE", config.deinterlace);
 			config.mode = input.tag.get_property("MODE", config.mode);
-			config.delay = input.tag.get_property("DELAY", config.delay);
 		}
 	}
 }
diff --git a/plugins/denoisemjpeg/denoisemjpeg.h b/plugins/denoisemjpeg/denoisemjpeg.h
index ae0cd2c..4ac4ec6 100644
--- a/plugins/denoisemjpeg/denoisemjpeg.h
+++ b/plugins/denoisemjpeg/denoisemjpeg.h
@@ -53,7 +53,6 @@ public:
 	int ccontrast;
 	int deinterlace;
 	int mode;
-	int delay;
 };
 
 
@@ -142,14 +141,6 @@ public:
 	DenoiseMJPEGWindow *gui;
 };
 
-class DenoiseMJPEGDelay : public BC_IPot
-{
-public:
-	DenoiseMJPEGDelay(DenoiseMJPEG *plugin, int x, int y);
-	int handle_event();
-	DenoiseMJPEG *plugin;
-};
-
 
 class DenoiseMJPEGWindow : public PluginWindow
 {
@@ -170,7 +161,6 @@ public:
 	DenoiseMJPEGModeInterlaced *interlaced;
 	DenoiseMJPEGModeProgressive *progressive;
 	DenoiseMJPEGModeFast *fast;
-	DenoiseMJPEGDelay *delay;
 };
 
 
diff --git a/plugins/overlay/overlay.C b/plugins/overlay/overlay.C
index f03581b..19d31c2 100644
--- a/plugins/overlay/overlay.C
+++ b/plugins/overlay/overlay.C
@@ -178,35 +178,35 @@ const char* OverlayConfig::mode_to_text(int mode)
 	switch(mode)
 	{
 		case TRANSFER_NORMAL:
-			return "Normal";
+			return _("Normal");
 			break;
 
 		case TRANSFER_REPLACE:
-			return "Replace";
+			return _("Replace");
 			break;
 
 		case TRANSFER_ADDITION:
-			return "Addition";
+			return _("Addition");
 			break;
 
 		case TRANSFER_SUBTRACT:
-			return "Subtract";
+			return _("Subtract");
 			break;
 
 		case TRANSFER_MULTIPLY:
-			return "Multiply";
+			return _("Multiply");
 			break;
 
 		case TRANSFER_DIVIDE:
-			return "Divide";
+			return _("Divide");
 			break;
 
 		case TRANSFER_MAX:
-			return "Max";
+			return _("Max");
 			break;
 
 		default:
-			return "Normal";
+			return _("Normal");
 			break;
 	}
 	return "";


hooks/post-receive
-- 
CinelerraCV.git (CinelerraCV)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CinelerraCV.git" (CinelerraCV).



More information about the cinelerra-commits mailing list