X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Finterlacemodes.C;h=a77d0c522fbecc278a349e86a8afdac41a4a00ba;hp=cb2c74d6e1e4f239a58cd2b2ddc8428dfc336617;hb=9668279ccef86a9cc9138aaa1a659f158698f829;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/cinelerra/interlacemodes.C b/cinelerra-5.1/cinelerra/interlacemodes.C
index cb2c74d6..a77d0c52 100644
--- a/cinelerra-5.1/cinelerra/interlacemodes.C
+++ b/cinelerra-5.1/cinelerra/interlacemodes.C
@@ -31,28 +31,6 @@
 
 #include "interlacemodes.h"
 
-// AUTO FIX METHOD ====================
-
-void ilaceautofixoption_to_text(char *string, int autofixoption)
-{
-	const char *cp = 0;
-	switch(autofixoption) {
-	case ILACE_AUTOFIXOPTION_AUTO:		cp = ILACE_AUTOFIXOPTION_AUTO_T;	break;
-	case ILACE_AUTOFIXOPTION_MANUAL:	cp = ILACE_AUTOFIXOPTION_MANUAL_T;	break;
-	default: cp = ILACE_UNKNOWN_T;  break;
-	}
-	strcpy(string, _(cp));
-}
-
-int ilaceautofixoption_from_text(const char *text, int thedefault)
-{
-	if(!strcasecmp(text, _(ILACE_AUTOFIXOPTION_AUTO_T)))  	return ILACE_AUTOFIXOPTION_AUTO;
-	if(!strcasecmp(text, _(ILACE_AUTOFIXOPTION_MANUAL_T)))	return ILACE_AUTOFIXOPTION_MANUAL;
-	return thedefault;
-}
-
-// INTERLACE MODE ====================
-
 void ilacemode_to_text(char *string, int ilacemode)
 {
 	const char *cp = 0;
@@ -97,99 +75,3 @@ int ilacemode_from_xmltext(const char *text, int thedefault)
 	return thedefault;
 }
 
-// INTERLACE FIX METHOD ====================
-
-void ilacefixmethod_to_text(char *string, int fixmethod)
-{
-	const char *cp = 0;
-	switch(fixmethod) {
-	case ILACE_FIXMETHOD_NONE:   	cp = ILACE_FIXMETHOD_NONE_T;   	break;
-	case ILACE_FIXMETHOD_UPONE:  	cp = ILACE_FIXMETHOD_UPONE_T;  	break;
-	case ILACE_FIXMETHOD_DOWNONE:	cp = ILACE_FIXMETHOD_DOWNONE_T;	break;
-	default: cp = ILACE_UNKNOWN_T;  break;
-	}
-	strcpy(string, _(cp));
-}
-
-int ilacefixmethod_from_text(const char *text, int thedefault)
-{
-	if(!strcasecmp(text, _(ILACE_FIXMETHOD_NONE_T)))   	return ILACE_FIXMETHOD_NONE;
-	if(!strcasecmp(text, _(ILACE_FIXMETHOD_UPONE_T)))  	return ILACE_FIXMETHOD_UPONE;
-	if(!strcasecmp(text, _(ILACE_FIXMETHOD_DOWNONE_T)))	return ILACE_FIXMETHOD_DOWNONE;
-	return thedefault;
-}
-
-void ilacefixmethod_to_xmltext(char *string, int fixmethod)
-{
-	switch(fixmethod) {
-	case ILACE_FIXMETHOD_NONE:   	strcpy(string, ILACE_FIXMETHOD_NONE_XMLT);   	return;
-	case ILACE_FIXMETHOD_UPONE:  	strcpy(string, ILACE_FIXMETHOD_UPONE_XMLT);  	return;
-	case ILACE_FIXMETHOD_DOWNONE:	strcpy(string, ILACE_FIXMETHOD_DOWNONE_XMLT);	return;
-	}
-	strcpy(string, ILACE_UNKNOWN_T);
-}
-
-int ilacefixmethod_from_xmltext(const char *text, int thedefault)
-{
-	if(!strcasecmp(text, ILACE_FIXMETHOD_NONE_XMLT))   	return ILACE_FIXMETHOD_NONE;
-	if(!strcasecmp(text, ILACE_FIXMETHOD_UPONE_XMLT))  	return ILACE_FIXMETHOD_UPONE;
-	if(!strcasecmp(text, ILACE_FIXMETHOD_DOWNONE_XMLT))	return ILACE_FIXMETHOD_DOWNONE;
-	return thedefault;
-}
-
-int  ilaceautofixmethod(int projectmode, int assetmode)
-{
-	if (projectmode == assetmode)
-		return ILACE_FIXMETHOD_NONE;
-	if( (projectmode == ILACE_MODE_BOTTOM_FIRST && assetmode == ILACE_MODE_TOP_FIRST ) ||
-	    (projectmode == ILACE_MODE_TOP_FIRST  && assetmode == ILACE_MODE_BOTTOM_FIRST) )
-		return ILACE_FIXDEFAULT;
-	// still to implement anything else...
-	return ILACE_FIXMETHOD_NONE;
-}
-
-int  ilaceautofixmethod2(int projectilacemode, int assetautofixoption, int assetilacemode, int assetfixmethod)
-{
-	if (assetautofixoption == ILACE_AUTOFIXOPTION_AUTO)
-		return (ilaceautofixmethod(projectilacemode, assetilacemode));
-	return (assetfixmethod);
-}
-
-int ilace_bc_to_yuv4mpeg(int ilacemode)
-{
-	switch (ilacemode) {
-	case ILACE_MODE_UNDETECTED:	return(Y4M_UNKNOWN);
-	case ILACE_MODE_TOP_FIRST:	return(Y4M_ILACE_TOP_FIRST);
-	case ILACE_MODE_BOTTOM_FIRST: return(Y4M_ILACE_BOTTOM_FIRST);
-	case ILACE_MODE_NOTINTERLACED: return(Y4M_ILACE_NONE);
-	}
-	return(Y4M_UNKNOWN);
-}
-
-int ilace_yuv4mpeg_to_bc(int ilacemode)
-{
-	switch (ilacemode) {
-	case Y4M_UNKNOWN:		return (ILACE_MODE_UNDETECTED);
-	case Y4M_ILACE_NONE:		return (ILACE_MODE_NOTINTERLACED);
-	case Y4M_ILACE_TOP_FIRST:	return (ILACE_MODE_TOP_FIRST);
-	case Y4M_ILACE_BOTTOM_FIRST:	return (ILACE_MODE_BOTTOM_FIRST);
-//	case Y4M_ILACE_MIXED:		return (ILACE_MODE_UNDETECTED);  // fixme!!
-	}
-	return (ILACE_MODE_UNDETECTED);
-}
-
-
-void ilace_yuv4mpeg_mode_to_text(char *string, int ilacemode)
-{
-	const char *cp = 0;
-	switch(ilacemode) {
-	case Y4M_UNKNOWN:             cp = ILACE_Y4M_UKNOWN_T;       break;
-	case Y4M_ILACE_NONE:          cp = ILACE_Y4M_NONE_T;         break;
-	case Y4M_ILACE_TOP_FIRST:     cp = ILACE_Y4M_TOP_FIRST_T;    break;
-	case Y4M_ILACE_BOTTOM_FIRST:  cp = ILACE_Y4M_BOTTOM_FIRST_T; break;
-//	case Y4M_ILACE_MIXED:         cp = ILACE_Y4M_MIXED_T;        break;
-	default: cp = ILACE_UNKNOWN_T;  break;
-	}
-	strcpy(string, _(cp));
-}
-