X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Finterlacemodes.h;h=9e11b3f7a94d88c2e6d62f87eac9128462f11f9b;hb=refs%2Fheads%2Fmaster;hp=f063397ecd48e48397fdd26852d790f0c4df1fa8;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/interlacemodes.h b/cinelerra-5.1/cinelerra/interlacemodes.h index f063397e..9e11b3f7 100644 --- a/cinelerra-5.1/cinelerra/interlacemodes.h +++ b/cinelerra-5.1/cinelerra/interlacemodes.h @@ -1,16 +1,16 @@ /* - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published + * 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 the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but + * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software + * 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 */ @@ -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);