Fix a couple of Windows 2Gig file size issues.

[platform/upstream/flac.git] / src / flac / encode.h

diff --git a/src/flac/encode.h b/src/flac/encode.h
index 5202479..337d5af 100644 (file)
--- a/src/flac/encode.h
+++ b/src/flac/encode.h
@@ -1,5 +1,5 @@
 /* flac - Command-line FLAC encoder/decoder
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -11,25 +11,22 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * 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.
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef flac__encode_h
 #define flac__encode_h
 
-/* needed because of off_t */
 #if HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
 #include "FLAC/metadata.h"
+#include "foreign_metadata.h"
 #include "utils.h"
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "share/compat.h"
 
 extern const int FLAC_ENCODE__DEFAULT_PADDING;
 
@@ -73,6 +70,7 @@ typedef struct {
        char *requested_seek_points;
        int num_requested_seek_points;
        const char *cuesheet_filename;
+       FLAC__bool treat_warnings_as_errors;
        FLAC__bool continue_through_decode_errors; /* currently only obeyed when encoding from FLAC or Ogg FLAC */
        FLAC__bool cued_seekpoints;
        FLAC__bool channel_map_none; /* --channel-map=none specified, eventually will expand to take actual channel map */
@@ -83,40 +81,35 @@ typedef struct {
        FLAC__int32 **align_reservoir;
        unsigned *align_reservoir_samples;
        FLAC__bool replay_gain;
+       FLAC__bool ignore_chunk_sizes;
        FLAC__bool sector_align;
 
        FLAC__StreamMetadata *vorbis_comment;
        FLAC__StreamMetadata *pictures[64];
        unsigned num_pictures;
 
+       FileFormat format;
+       union {
+               struct {
+                       FLAC__bool is_big_endian;
+                       FLAC__bool is_unsigned_samples;
+                       unsigned channels;
+                       unsigned bps;
+                       unsigned sample_rate;
+               } raw;
+               struct {
+                       foreign_metadata_t *foreign_metadata; /* NULL unless --keep-foreign-metadata requested */
+               } iff;
+       } format_options;
+
        struct {
                FLAC__bool disable_constant_subframes;
                FLAC__bool disable_fixed_subframes;
                FLAC__bool disable_verbatim_subframes;
+               FLAC__bool do_md5;
        } debug;
 } encode_options_t;
 
-typedef struct {
-       encode_options_t common;
-} wav_encode_options_t;
-
-typedef struct {
-       encode_options_t common;
-
-       FLAC__bool is_big_endian;
-       FLAC__bool is_unsigned_samples;
-       unsigned channels;
-       unsigned bps;
-       unsigned sample_rate;
-} raw_encode_options_t;
-
-typedef struct {
-       encode_options_t common;
-} flac_encode_options_t;
-
-int flac__encode_aif(FILE *infile, off_t infilesize, const char *infilename, const char *outfilename, const FLAC__byte *lookahead, unsigned lookahead_length, wav_encode_options_t options, FLAC__bool is_aifc);
-int flac__encode_wav(FILE *infile, off_t infilesize, const char *infilename, const char *outfilename, const FLAC__byte *lookahead, unsigned lookahead_length, wav_encode_options_t options);
-int flac__encode_raw(FILE *infile, off_t infilesize, const char *infilename, const char *outfilename, const FLAC__byte *lookahead, unsigned lookahead_length, raw_encode_options_t options);
-int flac__encode_flac(FILE *infile, off_t infilesize, const char *infilename, const char *outfilename, const FLAC__byte *lookahead, unsigned lookahead_length, flac_encode_options_t options, FLAC__bool input_is_ogg);
+int flac__encode_file(FILE *infile, FLAC__off_t infilesize, const char *infilename, const char *outfilename, const FLAC__byte *lookahead, unsigned lookahead_length, encode_options_t options);
 
 #endif