X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Finterlacemodes.h;h=2201ca1accd099a961b88a586bd9836a718b954a;hp=f063397ecd48e48397fdd26852d790f0c4df1fa8;hb=7ffa6954689f14a41a3bae7a0fdb3f2abeaa9679;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1 diff --git a/cinelerra-5.1/cinelerra/interlacemodes.h b/cinelerra-5.1/cinelerra/interlacemodes.h index f063397e..2201ca1a 100644 --- a/cinelerra-5.1/cinelerra/interlacemodes.h +++ b/cinelerra-5.1/cinelerra/interlacemodes.h @@ -21,13 +21,6 @@ #define ILACE_UNKNOWN_T N_("Error!") -//Interlace Automatic fixing options -#define ILACE_AUTOFIXOPTION_MANUAL 0 -#define ILACE_AUTOFIXOPTION_MANUAL_T N_("Manual compensation using selection") -#define ILACE_AUTOFIXOPTION_AUTO 1 -#define ILACE_AUTOFIXOPTION_AUTO_T N_("Automatic compensation using modes") -//Note: Do not change what the numbers mean as this will make backward-compatability have erroraneous settings. - //Interlace Modes #define ILACE_MODE_UNDETECTED 0 #define ILACE_MODE_UNDETECTED_XMLT "UNKNOWN" @@ -41,6 +34,7 @@ #define ILACE_MODE_NOTINTERLACED 3 #define ILACE_MODE_NOTINTERLACED_XMLT "NOTINTERLACED" #define ILACE_MODE_NOTINTERLACED_T N_("Not Interlaced") +#define ILACE_MODE_FAKE_INTERLACE 4 #define ILACE_ASSET_MODEDEFAULT ILACE_MODE_UNDETECTED #define ILACE_PROJECT_MODEDEFAULT ILACE_MODE_NOTINTERLACED_T @@ -68,23 +62,11 @@ #define ILACE_Y4M_BOTTOM_FIRST_T N_("interlaced, bottom-field first") #define ILACE_Y4M_MIXED_T N_("mixed, \"refer to frame header\"") -void ilaceautofixoption_to_text(char *string, int autofixoption); -int ilaceautofixoption_from_text(const char *text, int thedefault); - void ilacemode_to_text(char *string, int ilacemode); int ilacemode_from_text(const char *text, int thedefault); void ilacemode_to_xmltext(char *string, int ilacemode); int ilacemode_from_xmltext(const char *text, int thedefault); -void ilacefixmethod_to_text(char *string, int fixmethod); -int ilacefixmethod_from_text(const char *text, int thedefault); -void ilacefixmethod_to_xmltext(char *string, int fixmethod); -int ilacefixmethod_from_xmltext(const char *text, int thedefault); - - -int ilaceautofixmethod(int projectilacemode, int assetilacemode); -int ilaceautofixmethod2(int projectilacemode, int assetautofixoption, int assetilacemode, int assetfixmethod); - int ilace_bc_to_yuv4mpeg(int ilacemode); int ilace_yuv4mpeg_to_bc(int ilacemode);